You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2015/02/23 16:30:04 UTC
[03/15] mina-sshd git commit: Upgrade to 1.0.0-SNAPSHOT and remove
unsupported modules
Upgrade to 1.0.0-SNAPSHOT and remove unsupported modules
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/80d8a51a
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/80d8a51a
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/80d8a51a
Branch: refs/heads/master
Commit: 80d8a51afe356e3ebc91676a1ccba4fd845a24b4
Parents: 964e768
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Feb 23 16:20:07 2015 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Feb 23 16:20:07 2015 +0100
----------------------------------------------------------------------
assembly/pom.xml | 4 +-
pom.xml | 2 +-
sshd-core/pom.xml | 4 +-
sshd-git/pom.xml | 4 +-
sshd-pam/pom.xml | 52 --
.../server/pam/PAMPasswordAuthenticator.java | 58 --
sshd-sftp/pom.xml | 82 --
.../main/java/org/apache/sshd/sftp/Handle.java | 36 -
.../main/java/org/apache/sshd/sftp/Reply.java | 43 -
.../main/java/org/apache/sshd/sftp/Request.java | 50 --
.../java/org/apache/sshd/sftp/SftpSession.java | 36 -
.../main/java/org/apache/sshd/sftp/Sftplet.java | 74 --
.../org/apache/sshd/sftp/reply/BaseReply.java | 53 --
.../apache/sshd/sftp/reply/FileAttributes.java | 166 ----
.../sshd/sftp/reply/SshFxpAttrsReply.java | 66 --
.../apache/sshd/sftp/reply/SshFxpDataReply.java | 96 ---
.../sshd/sftp/reply/SshFxpHandleReply.java | 66 --
.../apache/sshd/sftp/reply/SshFxpNameReply.java | 150 ----
.../sshd/sftp/reply/SshFxpStatusReply.java | 164 ----
.../sshd/sftp/reply/SshFxpVersionReply.java | 61 --
.../apache/sshd/sftp/request/BaseRequest.java | 58 --
.../sshd/sftp/request/SshFxpCloseRequest.java | 83 --
.../sftp/request/SshFxpFsetstatRequest.java | 52 --
.../sshd/sftp/request/SshFxpFstatRequest.java | 74 --
.../sshd/sftp/request/SshFxpInitRequest.java | 51 --
.../sshd/sftp/request/SshFxpLstatRequest.java | 72 --
.../sshd/sftp/request/SshFxpMkdirRequest.java | 65 --
.../sshd/sftp/request/SshFxpOpenRequest.java | 99 ---
.../sshd/sftp/request/SshFxpOpendirRequest.java | 64 --
.../sshd/sftp/request/SshFxpReadRequest.java | 109 ---
.../sshd/sftp/request/SshFxpReaddirRequest.java | 74 --
.../sftp/request/SshFxpRealpathRequest.java | 78 --
.../sshd/sftp/request/SshFxpRemoveRequest.java | 64 --
.../sshd/sftp/request/SshFxpRenameRequest.java | 76 --
.../sshd/sftp/request/SshFxpRmdirRequest.java | 64 --
.../sshd/sftp/request/SshFxpSetstatRequest.java | 52 --
.../sshd/sftp/request/SshFxpStatRequest.java | 71 --
.../sshd/sftp/request/SshFxpWriteRequest.java | 110 ---
.../sshd/sftp/request/UnsupportedRequest.java | 56 --
.../apache/sshd/sftp/subsystem/BaseHandle.java | 48 --
.../sftp/subsystem/DefaultSftpletContainer.java | 90 ---
.../sshd/sftp/subsystem/DirectoryHandle.java | 65 --
.../apache/sshd/sftp/subsystem/FileHandle.java | 86 --
.../apache/sshd/sftp/subsystem/Serializer.java | 535 -------------
.../sshd/sftp/subsystem/SftpConstants.java | 305 -------
.../sshd/sftp/subsystem/SftpSubsystem.java | 786 -------------------
.../java/org/apache/sshd/sftp/SftpTest.java | 263 -------
.../sftp/util/BogusPasswordAuthenticator.java | 34 -
.../apache/sshd/sftp/util/EchoShellFactory.java | 111 ---
.../org/apache/sshd/sftp/util/JSchLogger.java | 56 --
.../apache/sshd/sftp/util/SimpleUserInfo.java | 63 --
.../java/org/apache/sshd/sftp/util/Utils.java | 58 --
sshd-sftp/src/test/resources/hostkey.pem | 30 -
sshd-sftp/src/test/resources/log4j.properties | 38 -
54 files changed, 7 insertions(+), 5200 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 7ebd56e..aa24ba0 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -24,12 +24,12 @@
<parent>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sshd</groupId>
<artifactId>apache-sshd</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<name>Apache Mina SSHD :: Assembly</name>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ca326d2..063f47e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.sshd</groupId>
<artifactId>sshd</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<name>Apache Mina SSHD</name>
<packaging>pom</packaging>
<inceptionYear>2008</inceptionYear>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-core/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-core/pom.xml b/sshd-core/pom.xml
index 15753b7..d8ff2a1 100644
--- a/sshd-core/pom.xml
+++ b/sshd-core/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>sshd-core</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<name>Apache Mina SSHD :: Core</name>
<packaging>jar</packaging>
<inceptionYear>2008</inceptionYear>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-git/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-git/pom.xml b/sshd-git/pom.xml
index 8cdebdd..c1c1f5b 100644
--- a/sshd-git/pom.xml
+++ b/sshd-git/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>sshd-git</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<name>Apache Mina SSHD :: Git</name>
<packaging>jar</packaging>
<inceptionYear>2008</inceptionYear>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-pam/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-pam/pom.xml b/sshd-pam/pom.xml
deleted file mode 100644
index 15ff731..0000000
--- a/sshd-pam/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-
- <!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You 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.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.sshd</groupId>
- <artifactId>sshd</artifactId>
- <version>0.13.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>sshd-pam</artifactId>
- <version>0.13.0-SNAPSHOT</version>
- <name>Apache Mina SSHD :: PAM</name>
- <!--
- <packaging>bundle</packaging>
- -->
-
- <properties>
- <projectRoot>${basedir}/..</projectRoot>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.sshd</groupId>
- <artifactId>sshd-core</artifactId>
- </dependency>
- <dependency>
- <groupId>net.sf.jpam</groupId>
- <artifactId>jpam</artifactId>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-pam/src/main/java/org/apache/sshd/server/pam/PAMPasswordAuthenticator.java
----------------------------------------------------------------------
diff --git a/sshd-pam/src/main/java/org/apache/sshd/server/pam/PAMPasswordAuthenticator.java b/sshd-pam/src/main/java/org/apache/sshd/server/pam/PAMPasswordAuthenticator.java
deleted file mode 100644
index a63c6a1..0000000
--- a/sshd-pam/src/main/java/org/apache/sshd/server/pam/PAMPasswordAuthenticator.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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 org.apache.sshd.server.pam;
-
-import net.sf.jpam.Pam;
-import net.sf.jpam.PamReturnValue;
-import org.apache.sshd.server.PasswordAuthenticator;
-import org.apache.sshd.server.session.ServerSession;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * A password authenticator using PAM (Pluggable Authentication Module).
- * Such an authenticator can be used to integrate into an Unix operating
- * system.
- *
- * @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
- */
-public class PAMPasswordAuthenticator implements PasswordAuthenticator {
-
- private static final Logger LOG = LoggerFactory.getLogger(PAMPasswordAuthenticator.class);
-
- private String service = "sshd";
-
- public String getService() {
- return service;
- }
-
- public void setService(String service) {
- this.service = service;
- }
-
- public boolean authenticate(String username, String password, ServerSession session) {
- LOG.info("Authenticating user {} using PAM", username);
- PamReturnValue val = new Pam(service).authenticate(username, password);
- LOG.info("Result: {}", val);
- if (PamReturnValue.PAM_SUCCESS.equals(val)) {
- return true;
- }
- return false;
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-sftp/pom.xml b/sshd-sftp/pom.xml
deleted file mode 100644
index 50cb5b4..0000000
--- a/sshd-sftp/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-
- <!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You 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.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.sshd</groupId>
- <artifactId>sshd</artifactId>
- <version>0.13.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>sshd-sftp</artifactId>
- <version>0.13.0-SNAPSHOT</version>
- <name>Apache Mina SSHD :: SFTP</name>
- <packaging>jar</packaging>
- <inceptionYear>2008</inceptionYear>
-
- <properties>
- <projectRoot>${basedir}/..</projectRoot>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.sshd</groupId>
- <artifactId>sshd-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpg-jdk15on</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/filtered-resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/Handle.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/Handle.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/Handle.java
deleted file mode 100644
index c2a726d..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/Handle.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp;
-
-import org.apache.sshd.common.file.SshFile;
-
-import java.io.Closeable;
-
-/**
- * A sftp handle.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public interface Handle extends Closeable {
-
- String getId();
-
- SshFile getFile();
-
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/Reply.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/Reply.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/Reply.java
deleted file mode 100644
index 98f9c87..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/Reply.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp;
-
-import org.apache.sshd.sftp.subsystem.SftpConstants;
-
-/**
- * Common ssh reply interface.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public interface Reply {
-
- /**
- * Returns the reply message type.
- *
- * @return the message type
- */
- SftpConstants.Type getMessage();
-
- /**
- * Returns the name of the reply code.
- *
- * @return The name of the reply code.
- */
- String getName();
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/Request.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/Request.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/Request.java
deleted file mode 100644
index 7803a8f..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/Request.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp;
-
-import org.apache.sshd.sftp.subsystem.SftpConstants;
-
-/**
- * Common ssh request interface.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public interface Request {
-
- /**
- * Returns the request id.
- *
- * @return The request id.
- */
- int getId();
-
- /**
- * Returns the message type.
- *
- * @return The message type.
- */
- SftpConstants.Type getMessage();
-
- /**
- * Returns the request name.
- *
- * @return The request name.
- */
- String getName();
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/SftpSession.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/SftpSession.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/SftpSession.java
deleted file mode 100644
index a6956db..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/SftpSession.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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 org.apache.sshd.sftp;
-
-import org.apache.sshd.common.Session;
-import org.apache.sshd.common.file.SshFile;
-
-public interface SftpSession {
-
- int getVersion();
-
- Session getSession();
-
- Handle getHandle(String id);
-
- Handle createFileHandle(SshFile file, int flags);
-
- Handle createDirectoryHandle(SshFile file);
-
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/Sftplet.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/Sftplet.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/Sftplet.java
deleted file mode 100644
index 6cd4542..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/Sftplet.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp;
-
-import org.apache.sshd.common.Session;
-
-import java.io.IOException;
-
-
-
-/**
- * Similar to org.apache.ftpserver.ftplet.Ftplet.
- * For custom command handling. For example adopting monoring tools, individual loggings, event processing,
- * customizing command processing.
- * There should be a ServerSession interface to avoid an implementation dependency.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public interface Sftplet {
- /**
- * Client connect notification method.
- *
- * @param session The according session.
- */
- void onConnect(SftpSession session);
-
- /**
- * Client disconnect notification method.
- *
- * @param session The according session.
- */
- void onDisconnect(SftpSession session);
-
- /**
- * Called before the server invoke the command.
- *
- * @param session The according session.
- * @param sftpRequest The sftp request.
- *
- * @return If null, the standard processing goes on.
- * If not null, there will be no further processing and this reply will be returned to client.
- */
- Reply beforeCommand(SftpSession session, Request sftpRequest);
-
- /**
- * Called after the server as invoked the command.
- *
- * @param session The according session.
- * @param sftpRequest The sftp request.
- * @param sftpReply The sftp reply.
- *
- * @return If null, default sftp reply will be used.
- * If not null, there will be no further processing and this reply will be returned to client.
- *
- * @throws IOException If an error occured.
- */
- Reply afterCommand(SftpSession session, Request sftpRequest, Reply sftpReply) throws IOException;
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/BaseReply.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/BaseReply.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/BaseReply.java
deleted file mode 100644
index 3cbea00..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/BaseReply.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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 org.apache.sshd.sftp.reply;
-
-import org.apache.sshd.sftp.Reply;
-
-public abstract class BaseReply implements Reply {
-
- private final int id;
-
- /**
- * Creates a Request instance.
- *
- * @param id The request id.
- */
- public BaseReply(final int id) {
- this.id = id;
- }
-
- /**
- * Returns the request id.
- *
- * @return The request id.
- */
- public int getId() {
- return id;
- }
-
- /**
- * Returns the request name.
- *
- * @return The request name.
- */
- public String getName() {
- return getMessage().toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/FileAttributes.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/FileAttributes.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/FileAttributes.java
deleted file mode 100644
index 16c0f52..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/FileAttributes.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp.reply;
-
-import org.apache.sshd.common.file.SshFile;
-
-import static org.apache.sshd.sftp.subsystem.SftpConstants.*;
-
-/**
- * Data container for file attributes in relies.
- * TODO: implement
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public class FileAttributes {
-
- int flags = 0;
- byte type;
- long size;
- long allocationSize;
- String owner;
- String group;
- int permissions;
- long accessTime;
- int accessTimeNanos;
- long modifyTime;
- int modifyTimeNanos;
- long createTime;
- int createTimeNanos;
- String acl;
- int attribBits;
- int attribBitsValid;
- byte textHint;
- String mimeType;
- int linkCount;
- String untranslatedName;
- int extended;
-
- public FileAttributes() {
- }
-
- public FileAttributes(SshFile file, int flags) {
- // Type
- if (file.isFile()) {
- setType((byte) SSH_FILEXFER_TYPE_REGULAR);
- } else if (file.isDirectory()) {
- setType((byte) SSH_FILEXFER_TYPE_DIRECTORY);
- } else {
- setType((byte) SSH_FILEXFER_TYPE_UNKNOWN);
- }
- // Size
- if ((flags & SSH_FILEXFER_ATTR_SIZE) != 0) {
- setSize(file.getSize());
- }
- // Permissions
- if ((flags & SSH_FILEXFER_ATTR_PERMISSIONS) != 0) {
- setPermissions((file.isReadable() ? S_IRUSR : 0) | (file.isWritable() ? S_IWUSR : 0) | (file.isExecutable() ? S_IXUSR : 0));
- }
- // Times
- if ((flags & SSH_FILEXFER_ATTR_ACCESSTIME) != 0) {
- setAccessTime(file.getLastModified() / 1000);
- }
- if ((flags & SSH_FILEXFER_ATTR_CREATETIME) != 0) {
- setCreateTime(file.getLastModified() / 1000);
- }
- if ((flags & SSH_FILEXFER_ATTR_MODIFYTIME) != 0) {
- setModifyTime(file.getLastModified() / 1000);
- }
- }
-
- public int getFlags() {
- return flags;
- }
-
- public byte getType() {
- return type;
- }
-
- public void setType(byte type) {
- this.type = type;
- }
-
- public long getSize() {
- return size;
- }
-
- public void setSize(long size) {
- this.flags |= SSH_FILEXFER_ATTR_SIZE;
- this.size = size;
- }
-
- public long getAllocationSize() {
- return allocationSize;
- }
-
- public void setAllocationSize(long allocationSize) {
- this.flags |= SSH_FILEXFER_ATTR_ALLOCATION_SIZE;
- this.allocationSize = allocationSize;
- }
-
- public String getOwner() {
- return owner;
- }
-
- public String getGroup() {
- return group;
- }
-
- public void setOwnerGroup(String owner, String group) {
- this.flags |= SSH_FILEXFER_ATTR_OWNERGROUP;
- this.owner = owner;
- this.group = group;
- }
-
- public int getPermissions() {
- return permissions;
- }
-
- public void setPermissions(int permissions) {
- this.flags |= SSH_FILEXFER_ATTR_PERMISSIONS;
- this.permissions = permissions;
- }
-
- public long getAccessTime() {
- return accessTime;
- }
-
- public void setAccessTime(long accessTime) {
- this.flags |= SSH_FILEXFER_ATTR_ACCESSTIME;
- this.accessTime = accessTime;
- }
-
- public long getModifyTime() {
- return modifyTime;
- }
-
- public void setModifyTime(long modifyTime) {
- this.flags |= SSH_FILEXFER_ATTR_MODIFYTIME;
- this.modifyTime = modifyTime;
- }
-
- public long getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(long createTime) {
- this.flags |= SSH_FILEXFER_ATTR_CREATETIME;
- this.createTime = createTime;
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpAttrsReply.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpAttrsReply.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpAttrsReply.java
deleted file mode 100644
index e825cd0..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpAttrsReply.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp.reply;
-
-import org.apache.sshd.sftp.subsystem.SftpConstants;
-
-/**
- * Data container for 'SSH_FXP_ATTRS' reply.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public class SshFxpAttrsReply extends BaseReply {
-
- private final FileAttributes attrs;
-
- /**
- * Creates a SshFxpAttrsReply instance.
- *
- * @param id The reply id.
- * @param attrs The attributes.
- */
- public SshFxpAttrsReply(final int id, final FileAttributes attrs) {
- super(id);
- this.attrs = attrs;
- }
-
- /**
- * {@inheritDoc}
- */
- public SftpConstants.Type getMessage() {
- return SftpConstants.Type.SSH_FXP_ATTRS;
- }
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- return getName() + "[attrs=" + attrs + "]";
- }
-
- /**
- * Returns the attributes.
- *
- * @return the attributes.
- */
- public FileAttributes getAttributes() {
- return attrs;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpDataReply.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpDataReply.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpDataReply.java
deleted file mode 100644
index 7a02d4e..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpDataReply.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp.reply;
-
-import org.apache.sshd.sftp.subsystem.SftpConstants;
-
-/**
- * Data container for 'SSH_FXP_DATA' reply.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public class SshFxpDataReply extends BaseReply {
-
- private final byte[] data;
- private final int offset;
- private final int length;
- private final boolean eof;
-
- /**
- * Creates a SshFxpData instance.
- *
- * @param id The reply id.
- * @param data The transfer data.
- */
- public SshFxpDataReply(final int id, final byte[] data) {
- this(id, data, 0, data.length, false);
- }
-
- /**
- * Creates a SshFxpData instance.
- *
- * @param id The reply id.
- * @param data The transfer data.
- * @param offset The offset in the data.
- * @param length The length of data.
- * @param eof The EOF flag.
- */
- public SshFxpDataReply(final int id, final byte[] data, final int offset, final int length, final boolean eof) {
- super(id);
- this.data = data;
- this.offset = offset;
- this.length = length;
- this.eof = eof;
- }
-
- /**
- * {@inheritDoc}
- */
- public SftpConstants.Type getMessage() {
- return SftpConstants.Type.SSH_FXP_DATA;
- }
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- return getName() + "[data=<data(len=" + length + ")>, eof=" + eof + "]";
- }
-
- /**
- * Returns the data.
- *
- * @return The data.
- */
- public byte[] getData() {
- return data;
- }
-
- public int getOffset() {
- return offset;
- }
-
- public int getLength() {
- return length;
- }
-
- public boolean isEof() {
- return eof;
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpHandleReply.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpHandleReply.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpHandleReply.java
deleted file mode 100644
index 266ebf7..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpHandleReply.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp.reply;
-
-import org.apache.sshd.sftp.Handle;
-import org.apache.sshd.sftp.subsystem.SftpConstants;
-
-/**
- * Data container for 'SSH_FXP_HANDLE' reply.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public class SshFxpHandleReply extends BaseReply {
-
- private final Handle handle;
-
- /**
- * Creates a SshFxpHandleReply instance.
- *
- * @param id The reply id.
- * @param handle The handle.
- */
- public SshFxpHandleReply(final int id, final Handle handle) {
- super(id);
- this.handle = handle;
- }
-
- /**
- * {@inheritDoc}
- */
- public SftpConstants.Type getMessage() {
- return SftpConstants.Type.SSH_FXP_HANDLE;
- }
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- return getName() + "[handle=" + handle.getId() + ", file=" + handle.getFile().getAbsolutePath();
- }
-
- /**
- * Returns the handle.
- *
- * @return The handle.
- */
- public Handle getHandle() {
- return handle;
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpNameReply.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpNameReply.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpNameReply.java
deleted file mode 100644
index 17e4efe..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpNameReply.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp.reply;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.sshd.common.file.SshFile;
-import org.apache.sshd.sftp.subsystem.SftpConstants;
-
-/**
- * Data container for 'SSH_FXP_NAME' reply.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public class SshFxpNameReply extends BaseReply {
- /**
- * Contains informations of requested files.
- */
- public static class ReplyFile {
-
- private final SshFile file;
- private final String fileName;
- private final String longName;
- private final FileAttributes attrs;
-
- /**
- * Creates ReplyFile instance.
- *
- * @param fileName The file name.
- * @param longName The virtual absolute file path.
- * @param attrs File attributes.
- */
- public ReplyFile(final SshFile file, final String fileName, final String longName, final FileAttributes attrs) {
- this.file = file;
- this.fileName = fileName;
- this.longName = longName;
- this.attrs = attrs;
- }
-
- public SshFile getFile() {
- return file;
- }
-
- public String getFileName() {
- return fileName;
- }
-
- public String getLongName() {
- return longName;
- }
-
- /**
- * Returns the file attributes.
- *
- * @return The file attributes.
- */
- public FileAttributes getAttrs() {
- return attrs;
- }
-
- public String toString() {
- return "fileName=" + fileName + ", longName=" + longName;
- }
-
- }
-
- private List<ReplyFile> files = new ArrayList<ReplyFile>();
- private boolean eol;
-
- /**
- * Creates a SshFxpHandleReply instance.
- *
- * @param id The reply id.
- */
- public SshFxpNameReply(final int id) {
- super(id);
- }
-
- /**
- * {@inheritDoc}
- */
- public SftpConstants.Type getMessage() {
- return SftpConstants.Type.SSH_FXP_NAME;
- }
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- StringBuffer fs = new StringBuffer();
- fs.append(getName());
- fs.append("[");
- fs.append("\n");
- for (ReplyFile f : files) {
- fs.append(" ");
- fs.append(f.toString());
- fs.append(",\n");
- }
- fs.append("]");
-
- return fs.toString();
- }
-
- /**
- * Add a file to the reply.
- *
- * @param sshFile The ssh file.
- * @param filename The file name.
- * @param longname The long file message.
- * @param attrs The file attributes.
- */
- public void addFile(final SshFile sshFile, final String filename, final String longname, final FileAttributes attrs) {
- files.add(new ReplyFile(sshFile, filename, longname, attrs));
- }
-
- /**
- * Returns the files.
- *
- * @return the files.
- */
- public Collection<ReplyFile> getFiles() {
- return files;
- }
-
- public boolean isEol() {
- return eol;
- }
-
- public void setEol(boolean eol) {
- this.eol = eol;
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpStatusReply.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpStatusReply.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpStatusReply.java
deleted file mode 100644
index 9722480..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpStatusReply.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp.reply;
-
-import java.io.IOException;
-
-import org.apache.sshd.sftp.subsystem.SftpConstants;
-
-import static org.apache.sshd.sftp.subsystem.SftpConstants.*;
-
-/**
- * Data container for 'SSH_FXP_STATUS' reply.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public class SshFxpStatusReply extends BaseReply {
-
- private String substatusAsSTR;
- private String msg;
- private String lang;
- private final int substatus;
-
- /**
- * Creates a SshFxpStatusReply instance.
- *
- * @param id The reply id.
- * @param substatus The sub status.
- * @param msg The status message.
- *
- * @throws IOException If the given reply is unsupported.
- */
- public SshFxpStatusReply(final int id, final int substatus, final String msg)
- throws IOException {
- this(id, substatus, msg, "");
- }
-
- /**
- * Creates a SshFxpStatusReply instance.
- *
- * @param id The reply id.
- * @param substatus The sub status.
- * @param msg The status message.
- * @param lang The lang status message.
- *
- * @throws IOException If the given reply is unsupported.
- */
- public SshFxpStatusReply(final int id, final int substatus, final String msg, final String lang)
- throws IOException {
- super(id);
- this.substatus = substatus;
- this.lang = lang;
- this.msg = msg;
-
- switch (substatus) {
- case SSH_FX_FILE_ALREADY_EXISTS:
- substatusAsSTR = "SSH_FX_FILE_ALREADY_EXISTS";
- break;
- case SSH_FX_DIR_NOT_EMPTY:
- substatusAsSTR = "SSH_FX_DIR_NOT_EMPTY";
- break;
- case SSH_FX_EOF:
- substatusAsSTR = "SSH_FX_EOF";
- break;
- case SSH_FX_FILE_IS_A_DIRECTORY:
- substatusAsSTR = "SSH_FX_FILE_IS_A_DIRECTORY";
- break;
- case SSH_FX_INVALID_HANDLE:
- substatusAsSTR = "SSH_FX_INVALID_HANDLE";
- break;
- case SSH_FX_NO_SUCH_FILE:
- substatusAsSTR = "SSH_FX_NO_SUCH_FILE";
- break;
- case SSH_FX_NO_SUCH_PATH:
- substatusAsSTR = "SSH_FX_NO_SUCH_PATH";
- break;
- case SSH_FX_NOT_A_DIRECTORY:
- substatusAsSTR = "SSH_FX_NOT_A_DIRECTORY";
- break;
- case SSH_FX_OK:
- substatusAsSTR = "SSH_FX_OK";
- break;
- case SSH_FX_OP_UNSUPPORTED:
- substatusAsSTR = "SSH_FX_OP_UNSUPPORTED";
- break;
- case SSH_FX_FAILURE:
- substatusAsSTR = "SSH_FX_FAILURE";
- break;
- case SSH_FX_PERMISSION_DENIED:
- substatusAsSTR = "SSH_FX_PERMISSION_DENIED";
- break;
- case SSH_FXP_MKDIR:
- substatusAsSTR = "SSH_FXP_MKDIR";
- break;
- case SSH_FXP_REMOVE:
- substatusAsSTR = "SSH_FXP_REMOVE";
- break;
- case SSH_FXP_RMDIR:
- substatusAsSTR = "SSH_FXP_RMDIR";
- break;
- case SSH_FX_WRITE_PROTECT:
- substatusAsSTR = "SSH_FX_WRITE_PROTECT";
- break;
- default:
- throw new IOException("Internal error - unexpected substatus: " + substatus);
- }
- }
-
- /**
- * Returns the substatus.
- *
- * @return The substatus.
- */
- public int getSubstatus() {
- return substatus;
- }
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- return getName() + "[status=" + substatusAsSTR + ", msg=" + msg + "]";
- }
-
- /**
- * {@inheritDoc}
- */
- public SftpConstants.Type getMessage() {
- return SftpConstants.Type.SSH_FXP_STATUS;
- }
-
- /**
- * Returns the status message.
- *
- * @return The status message.
- */
- public String getMsg() {
- return msg;
- }
-
- /**
- * Returns the long status message.
- *
- * @return The long status message.
- */
- public String getLang() {
- return lang;
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpVersionReply.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpVersionReply.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpVersionReply.java
deleted file mode 100644
index c744942..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/reply/SshFxpVersionReply.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp.reply;
-
-import org.apache.sshd.sftp.subsystem.SftpConstants;
-
-/**
- * Data container for 'SSH_FXP_VERSION' reply.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public class SshFxpVersionReply extends BaseReply {
-
- /**
- * Creates a SshFxpVersionReply instance.
- *
- * @param version The requested version.
- */
- public SshFxpVersionReply(final int version) {
- super(version);
- }
-
- /**
- * {@inheritDoc}
- */
- public SftpConstants.Type getMessage() {
- return SftpConstants.Type.SSH_FXP_VERSION;
- }
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- return getName() + "[version=" + getId() + "]";
- }
-
- /**
- * Returns the requested version.
- *
- * @return The requested version.
- */
- public int getVersion() {
- return getId();
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/BaseRequest.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/BaseRequest.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/BaseRequest.java
deleted file mode 100644
index 2e2cfc9..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/BaseRequest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp.request;
-
-import org.apache.sshd.sftp.Request;
-
-/**
- * Common ssh request interface.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public abstract class BaseRequest implements Request {
-
- private final int id;
-
- /**
- * Creates a Request instance.
- *
- * @param id The request id.
- */
- public BaseRequest(final int id) {
- this.id = id;
- }
-
- /**
- * Returns the request id.
- *
- * @return The request id.
- */
- public int getId() {
- return id;
- }
-
- /**
- * Returns the request name.
- *
- * @return The request name.
- */
- public String getName() {
- return getMessage().toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpCloseRequest.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpCloseRequest.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpCloseRequest.java
deleted file mode 100644
index 8ebfd35..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpCloseRequest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp.request;
-
-import org.apache.sshd.sftp.Handle;
-import org.apache.sshd.sftp.subsystem.SftpConstants;
-
-/**
- * Data container for 'SSH_FXP_CLOSE' request.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public class SshFxpCloseRequest extends BaseRequest {
- private final Handle handle;
- private final String handleId;
-
- /**
- * Create SshFxpCloseRequest instance.
- *
- * @param id The request id.
- * @param handleId The according handle id.
- * @param handle The according file handle.
- */
- public SshFxpCloseRequest(final int id, final String handleId, final Handle handle) {
- super(id);
- this.handleId = handleId;
- this.handle = handle;
- }
-
- /**
- * {@inheritDoc}
- */
- public SftpConstants.Type getMessage() {
- return SftpConstants.Type.SSH_FXP_CLOSE;
- }
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- String sh;
- if (handle != null && handle.getFile() != null) {
- sh = handle.getFile().getAbsolutePath();
- } else {
- sh = "";
- }
- return getName() + "[handle=" + handleId + ", file=" + sh + "]";
- }
-
- /**
- * Returns the according handle.
- *
- * @return The according handle.
- */
- public Handle getHandle() {
- return handle;
- }
-
- /**
- * Returns the handle id.
- *
- * @return The handle id.
- */
- public String getHandleId() {
- return handleId;
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpFsetstatRequest.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpFsetstatRequest.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpFsetstatRequest.java
deleted file mode 100644
index a19c08c..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpFsetstatRequest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp.request;
-
-import org.apache.sshd.sftp.subsystem.SftpConstants;
-
-/**
- * Data container for 'SSH_FXP_FSETSTAT' request.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public class SshFxpFsetstatRequest extends BaseRequest {
-
- /**
- * Creates a SshFxpFsetstatRequest instance.
- *
- * @param id The request id.
- */
- public SshFxpFsetstatRequest(final int id) {
- super(id);
- }
-
- /**
- * {@inheritDoc}
- */
- public SftpConstants.Type getMessage() {
- return SftpConstants.Type.SSH_FXP_SETSTAT;
- }
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- return getName() + "[]";
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpFstatRequest.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpFstatRequest.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpFstatRequest.java
deleted file mode 100644
index 6dbfba4..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpFstatRequest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp.request;
-
-import org.apache.sshd.sftp.Handle;
-import org.apache.sshd.sftp.subsystem.SftpConstants;
-
-/**
- * Data container for 'SSH_FXP_FSTAT' request.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public class SshFxpFstatRequest extends BaseRequest {
- private final String handle;
- private final Handle handleRef;
-
- /**
- * Creates a SshFxpFstatRequest instance.
- *
- * @param id The request id.
- * @param handle The handle.
- * @param handleRef The handle reference.
- */
- public SshFxpFstatRequest(final int id, final String handle, final Handle handleRef) {
- super(id);
- this.handle = handle;
- this.handleRef = handleRef;
- }
-
- /**
- * {@inheritDoc}
- */
- public SftpConstants.Type getMessage() {
- return SftpConstants.Type.SSH_FXP_FSTAT;
- }
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- String ps;
- if (handleRef != null && handleRef.getFile() != null) {
- ps = handleRef.getFile().getAbsolutePath();
- } else {
- ps = "";
- }
- return getName() + "[handle=" + handle + ", file=" + ps + "]";
- }
-
- /**
- * Returns the handle id.
- *
- * @return The handle id.
- */
- public String getHandleId() {
- return handle;
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpInitRequest.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpInitRequest.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpInitRequest.java
deleted file mode 100644
index be54767..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpInitRequest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp.request;
-
-import org.apache.sshd.sftp.subsystem.SftpConstants;
-
-/**
- * Data container for 'SSH_FXP_INIT' request.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public class SshFxpInitRequest extends BaseRequest {
- /**
- * Creates a SshFxpInitRequest instance.
- *
- * @param id The request id.
- */
- public SshFxpInitRequest(final int id) {
- super(id);
- }
-
- /**
- * {@inheritDoc}
- */
- public SftpConstants.Type getMessage() {
- return SftpConstants.Type.SSH_FXP_INIT;
- }
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- return getName() + "[version=" + getId() + "]";
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpLstatRequest.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpLstatRequest.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpLstatRequest.java
deleted file mode 100644
index 9251063..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpLstatRequest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp.request;
-
-import org.apache.sshd.sftp.subsystem.SftpConstants;
-
-/**
- * Data container for 'SSH_FXP_STAT' request.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public class SshFxpLstatRequest extends BaseRequest {
-
- private final String path;
- private final int flags;
-
- /**
- * Creates a SshFxpLstatRequest instance.
- *
- * @param id The request id.
- * @param path The requested path.
- * @param flags The stat flags.
- */
- public SshFxpLstatRequest(final int id, final String path, final int flags) {
- super(id);
- this.path = path;
- this.flags = flags;
- }
-
- /**
- * {@inheritDoc}
- */
- public SftpConstants.Type getMessage() {
- return SftpConstants.Type.SSH_FXP_STAT;
- }
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- return getName() + "[path=" + path + "]";
- }
-
- /**
- * Returns the path.
- *
- * @return The path.
- */
- public String getPath() {
- return path;
- }
-
- public int getFlags() {
- return flags;
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpMkdirRequest.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpMkdirRequest.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpMkdirRequest.java
deleted file mode 100644
index 8c04e49..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpMkdirRequest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp.request;
-
-import org.apache.sshd.sftp.subsystem.SftpConstants;
-
-/**
- * Data container for 'SSH_FXP_MKDIR' request.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public class SshFxpMkdirRequest extends BaseRequest {
-
- private final String path;
-
- /**
- * Creates a SshFxpMkdirRequest instance.
- *
- * @param id The request id.
- * @param path The path to create.
- */
- public SshFxpMkdirRequest(final int id, final String path) {
- super(id);
- this.path = path;
- }
-
- /**
- * {@inheritDoc}
- */
- public SftpConstants.Type getMessage() {
- return SftpConstants.Type.SSH_FXP_MKDIR;
- }
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- return getName() + "[path=" + path + "]";
- }
-
- /**
- * Returns the path.
- *
- * @return The path.
- */
- public String getPath() {
- return path;
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpOpenRequest.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpOpenRequest.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpOpenRequest.java
deleted file mode 100644
index 9dec41e..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpOpenRequest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp.request;
-
-import org.apache.sshd.sftp.subsystem.SftpConstants;
-
-/**
- * Data container for 'SSH_FXP_OPEN' request.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public class SshFxpOpenRequest extends BaseRequest {
- private final String path;
- private final int acc;
- private final int flags;
-
- /**
- * Creates a SshFxpOpenRequest instance.
- *
- * @param id The request id.
- * @param path The path.
- * @param flags The flags.
- */
- public SshFxpOpenRequest(final int id, String path, final int flags) {
- this(id, path, 0, flags);
- }
-
- /**
- * Creates a SshFxpOpenRequest instance.
- *
- * @param id The request id.
- * @param path The path.
- * @param acc The acc.
- * @param flags The flags.
- */
- public SshFxpOpenRequest(final int id, String path, final int acc, final int flags) {
- super(id);
- this.path = path;
- this.acc = acc;
- this.flags = flags;
- }
-
- /**
- * {@inheritDoc}
- */
- public SftpConstants.Type getMessage() {
- return SftpConstants.Type.SSH_FXP_OPEN;
- }
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- return getName() + "[path=" + path + ", acc=" + acc + ", flags=" + flags + "]";
- }
-
- /**
- * Returns the path.
- *
- * @return The path.
- */
- public String getPath() {
- return path;
- }
-
- /**
- * Returns the flags.
- *
- * @return The flags.
- */
- public int getFlags() {
- return flags;
- }
-
- /**
- * Returns the acc.
- *
- * @return The acc.
- */
- public int getAcc() {
- return acc;
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpOpendirRequest.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpOpendirRequest.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpOpendirRequest.java
deleted file mode 100644
index ac2e281..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpOpendirRequest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp.request;
-
-import org.apache.sshd.sftp.subsystem.SftpConstants;
-
-/**
- * Data container for 'SSH_FXP_OPENDIR' request.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public class SshFxpOpendirRequest extends BaseRequest {
- private final String path;
-
- /**
- * Create a SshFxpOpendirRequest instance.
- *
- * @param id The request id.
- * @param path The directory path to open.
- */
- public SshFxpOpendirRequest(final int id, final String path) {
- super(id);
- this.path = path;
- }
-
- /**
- * {@inheritDoc}
- */
- public SftpConstants.Type getMessage() {
- return SftpConstants.Type.SSH_FXP_OPENDIR;
- }
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- return getName() + "[path=" + path + "]";
- }
-
- /**
- * Returns the path.
- *
- * @return The path.
- */
- public String getPath() {
- return path;
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpReadRequest.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpReadRequest.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpReadRequest.java
deleted file mode 100644
index 74fa654..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpReadRequest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp.request;
-
-import org.apache.sshd.sftp.Handle;
-import org.apache.sshd.sftp.subsystem.SftpConstants;
-
-/**
- * Data container for 'SSH_FXP_READ' request.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public class SshFxpReadRequest extends BaseRequest {
- private final String handleId;
- private final long offset;
- private final Handle handle;
- private final int length;
-
- /**
- * Creates a SshFxpReadRequest instance.
- *
- * @param id The request id.
- * @param handleId The according file handle id.
- * @param offset The read offset.
- * @param length The length.
- * @param handle The according file handle.
- */
- public SshFxpReadRequest(
- final int id, final String handleId, final long offset, final int length, final Handle handle) {
- super(id);
- this.handleId = handleId;
- this.offset = offset;
- this.length = length;
- this.handle = handle;
- }
-
- /**
- * {@inheritDoc}
- */
- public SftpConstants.Type getMessage() {
- return SftpConstants.Type.SSH_FXP_READ;
- }
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- String ps;
- if (handle != null && handle.getFile() != null) {
- ps = handle.getFile().getAbsolutePath();
- } else {
- ps = "";
- }
- return getName() + "[handle=" + handleId + ", file=" + ps + ", offset=" + offset + ", length=" + length + "]";
- }
-
- /**
- * Returns the according handle.
- *
- * @return The according handle.
- */
- public Handle getHandle() {
- return handle;
- }
-
- /**
- * Returns the handle id.
- *
- * @return The handle id.
- */
- public String getHandleId() {
- return handleId;
- }
-
- /**
- * Returns the length.
- *
- * @return The length.
- */
- public int getLength() {
- return length;
- }
-
- /**
- * Returns the offset.
- *
- * @return The offset.
- */
- public long getOffset() {
- return offset;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpReaddirRequest.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpReaddirRequest.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpReaddirRequest.java
deleted file mode 100644
index e3338fe..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpReaddirRequest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp.request;
-
-import org.apache.sshd.sftp.Handle;
-import org.apache.sshd.sftp.subsystem.SftpConstants;
-
-/**
- * Data container for 'SSH_FXP_READDIR' request.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public class SshFxpReaddirRequest extends BaseRequest {
- private final String handleId;
- private final Handle handle;
-
- /**
- * Creates a SshFxpReaddirRequest instance.
- *
- * @param id The request id.
- * @param handleId The according handle id.
- * @param handle The according file handle.
- */
- public SshFxpReaddirRequest(final int id, final String handleId, final Handle handle) {
- super(id);
- this.handleId = handleId;
- this.handle = handle;
- }
-
- /**
- * {@inheritDoc}
- */
- public SftpConstants.Type getMessage() {
- return SftpConstants.Type.SSH_FXP_READDIR;
- }
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- String ps;
- if (handle != null && handle.getFile() != null) {
- ps = handle.getFile().getAbsolutePath();
- } else {
- ps = "";
- }
- return getName() + "[handle=" + handleId + ", file=" + ps + "]";
- }
-
- /**
- * Returns the handle id.
- *
- * @return The handle id.
- */
- public String getHandleId() {
- return handleId;
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpRealpathRequest.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpRealpathRequest.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpRealpathRequest.java
deleted file mode 100644
index 064c651..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpRealpathRequest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp.request;
-
-import java.util.List;
-
-import org.apache.sshd.sftp.subsystem.SftpConstants;
-
-/**
- * Data container for 'SSH_FXP_REALPATH' request.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public class SshFxpRealpathRequest extends BaseRequest {
- private final String path;
- private final byte options;
- private final List<String> compose;
-
- /**
- * Creates a SshFxpRealpathRequest instance.
- *
- * @param id The request id.
- * @param path The requested file path.
- */
- public SshFxpRealpathRequest(final int id, final String path, final byte options, final List<String> compose) {
- super(id);
- this.path = path;
- this.options = options;
- this.compose = compose;
- }
-
- /**
- * {@inheritDoc}
- */
- public SftpConstants.Type getMessage() {
- return SftpConstants.Type.SSH_FXP_REALPATH;
- }
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- return getName() + "[path=" + path + "]";
- }
-
- /**
- * Returns the path.
- *
- * @return The path.
- */
- public String getPath() {
- return path;
- }
-
- public byte getOptions() {
- return options;
- }
-
- public List<String> getCompose() {
- return compose;
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpRemoveRequest.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpRemoveRequest.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpRemoveRequest.java
deleted file mode 100644
index 664b4b2..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpRemoveRequest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp.request;
-
-import org.apache.sshd.sftp.subsystem.SftpConstants;
-
-/**
- * Data container for 'SSH_FXP_REMOVE' request.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public class SshFxpRemoveRequest extends BaseRequest {
- private final String path;
-
- /**
- * Create a SshFxpRemoveRequest instance.
- *
- * @param id The request id.
- * @param path The file path to remove.
- */
- public SshFxpRemoveRequest(final int id, final String path) {
- super(id);
- this.path = path;
- }
-
- /**
- * {@inheritDoc}
- */
- public SftpConstants.Type getMessage() {
- return SftpConstants.Type.SSH_FXP_REMOVE;
- }
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- return getName() + "[path=" + path + "]";
- }
-
- /**
- * Returns the path.
- *
- * @return The path.
- */
- public String getPath() {
- return path;
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpRenameRequest.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpRenameRequest.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpRenameRequest.java
deleted file mode 100644
index cd0a3c6..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpRenameRequest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp.request;
-
-import org.apache.sshd.sftp.subsystem.SftpConstants;
-
-/**
- * Data container for 'SSH_FXP_RENAME' request.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public class SshFxpRenameRequest extends BaseRequest {
- private final String oldPath;
- private final String newPath;
-
- /**
- * Create a SshFxpRenameRequest instance.
- *
- * @param id The request id.
- * @param oldPath The old path.
- * @param newPath The new path.
- */
- public SshFxpRenameRequest(final int id, final String oldPath, final String newPath) {
- super(id);
- this.oldPath = oldPath;
- this.newPath = newPath;
- }
-
- /**
- * {@inheritDoc}
- */
- public SftpConstants.Type getMessage() {
- return SftpConstants.Type.SSH_FXP_RENAME;
- }
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- return getName() + "[old=" + oldPath + ", new=" + newPath + "]";
- }
-
- /**
- * Returns the old path.
- *
- * @return The old path.
- */
- public String getOldPath() {
- return oldPath;
- }
-
- /**
- * Returns the new path.
- *
- * @return The new path.
- */
- public String getNewPath() {
- return newPath;
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/80d8a51a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpRmdirRequest.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpRmdirRequest.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpRmdirRequest.java
deleted file mode 100644
index 46263ef..0000000
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/request/SshFxpRmdirRequest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you 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 org.apache.sshd.sftp.request;
-
-import org.apache.sshd.sftp.subsystem.SftpConstants;
-
-/**
- * Data container for 'SSH_FXP_RMDIR' request.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- */
-public class SshFxpRmdirRequest extends BaseRequest {
- private final String path;
-
- /**
- * Creates a SshFxpRmdirRequest instance.
- *
- * @param id The request id.
- * @param path The requested file path.
- */
- public SshFxpRmdirRequest(final int id, final String path) {
- super(id);
- this.path = path;
- }
-
- /**
- * {@inheritDoc}
- */
- public SftpConstants.Type getMessage() {
- return SftpConstants.Type.SSH_FXP_RMDIR;
- }
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- return getName() + "[path=" + path + "]";
- }
-
- /**
- * Returns the path.
- *
- * @return The path.
- */
- public String getPath() {
- return path;
- }
-}