Subversion Repositories XServices

Rev

Rev 49 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 49 Rev 58
Line 124... Line 124...
124
    /* (non-Javadoc)
124
    /* (non-Javadoc)
125
	 * @see net.brutex.xservices.ws.impl.ExecuteService#runCommandWithSSH(java.lang.String, int, java.lang.String, java.lang.String, java.lang.String, long)
125
	 * @see net.brutex.xservices.ws.impl.ExecuteService#runCommandWithSSH(java.lang.String, int, java.lang.String, java.lang.String, java.lang.String, long)
126
	 */
126
	 */
127
    @Override
127
    @Override
128
	@WebMethod(operationName = "runCommandWithSSH")
128
	@WebMethod(operationName = "runCommandWithSSH")
129
    public ReturnCode runCommandWithSSH(@WebParam(name = "host") String host,
129
    public ReturnCode runCommandWithSSH(@WebParam(name = "host") HostConnection host,
130
            @WebParam(name = "port") int port,
-
 
131
            @WebParam(name = "username") String username,
-
 
132
            @WebParam(name = "password") String password,
-
 
133
            @WebParam(name = "command") String cmd,
130
            @WebParam(name = "command") String cmd,
134
            @WebParam(name = "timeout") long timeout) {
131
            @WebParam(name = "timeout") long timeout) {
Line 135... Line 132...
135
 
132
 
136
        return sshExec(host, username, password, port, cmd, timeout);
133
        return sshExec(host.hostname, host.user, host.password, host.port, cmd, timeout);
Line 137... Line 134...
137
    }
134
    }
138
 
135
 
139
    /* (non-Javadoc)
136
    /* (non-Javadoc)
140
	 * @see net.brutex.xservices.ws.impl.ExecuteService#runCommandWithSSHKeyAuth(java.lang.String, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String, long)
137
	 * @see net.brutex.xservices.ws.impl.ExecuteService#runCommandWithSSHKeyAuth(java.lang.String, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String, long)
141
	 */
138
	 */
142
    @Override
139
    @Override
143
	@WebMethod(operationName = "runCommandWithSSHKeyAuth")
-
 
144
    public ReturnCode runCommandWithSSHKeyAuth(@WebParam(name = "host") String host,
-
 
145
            @WebParam(name = "port") int port,
-
 
146
            @WebParam(name = "username") String username,
140
	@WebMethod(operationName = "runCommandWithSSHKeyAuth")
147
            @WebParam(name = "passphrase") String passphrase,
141
    public ReturnCode runCommandWithSSHKeyAuth(@WebParam(name = "host") HostConnection host,
148
            @WebParam(name = "keyfile") String keyfile,
142
            @WebParam(name = "keyfile") String keyfile,
Line 149... Line 143...
149
            @WebParam(name = "command") String cmd,
143
            @WebParam(name = "command") String cmd,
150
            @WebParam(name = "timeout") long timeout) {
144
            @WebParam(name = "timeout") long timeout) {
Line 151... Line 145...
151
 
145
 
152
        return sshExecWithCert(host, username, passphrase, keyfile, port, cmd, timeout);
146
        return sshExecWithCert(host.hostname, host.user, host.password, keyfile, host.port, cmd, timeout);
153
    }
147
    }