Author: elecharny
Date: Wed Oct 31 17:51:09 2012
New Revision: 1404273
URL: http://svn.apache.org/viewvc?rev=1404273&view=rev
Log:
Removed tables and divs from SSHD. Some fix in asyncwebé
Modified:
mina/site/trunk/content/asyncweb/contributors.mdtext
mina/site/trunk/content/sshd/building.mdtext
mina/site/trunk/content/sshd/configuring_security.mdtext
mina/site/trunk/content/sshd/embedding_ssh.mdtext
mina/site/trunk/content/sshd/load_ssh_editor.mdtext
mina/site/trunk/content/sshd/mailing_lists.mdtext
mina/site/trunk/content/sshd/required_dependencies.mdtext
mina/site/trunk/content/sshd/sources.mdtext
mina/site/trunk/content/sshd/tips.mdtext
Modified: mina/site/trunk/content/asyncweb/contributors.mdtext
URL:
http://svn.apache.org/viewvc/mina/site/trunk/content/asyncweb/contributors.mdtext?rev=1404273&r1=1404272&r2=1404273&view=diff
==============================================================================
--- mina/site/trunk/content/asyncweb/contributors.mdtext (original)
+++ mina/site/trunk/content/asyncweb/contributors.mdtext Wed Oct 31 17:51:09
2012
@@ -26,7 +26,7 @@ The following is a list of developers wi
* Jeff Genender
* Mike Heath
* Alex Karasulu
-* Emmanuel Lecharny
+* Emmanuel Lécharny
* Sangjin Lee
* Trustin Lee
* Rick McGuire
Modified: mina/site/trunk/content/sshd/building.mdtext
URL:
http://svn.apache.org/viewvc/mina/site/trunk/content/sshd/building.mdtext?rev=1404273&r1=1404272&r2=1404273&view=diff
==============================================================================
--- mina/site/trunk/content/sshd/building.mdtext (original)
+++ mina/site/trunk/content/sshd/building.mdtext Wed Oct 31 17:51:09 2012
@@ -25,8 +25,4 @@ SSHD uses [Maven](http://maven.apache.or
* Get the latest code from [SVN](sources.html)
* Build the code with the following command
-<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent
panelContent">
-<PRE class="code-java">
-mvn
-</PRE>
-</DIV></DIV>
+ mvn clean install
Modified: mina/site/trunk/content/sshd/configuring_security.mdtext
URL:
http://svn.apache.org/viewvc/mina/site/trunk/content/sshd/configuring_security.mdtext?rev=1404273&r1=1404272&r2=1404273&view=diff
==============================================================================
--- mina/site/trunk/content/sshd/configuring_security.mdtext (original)
+++ mina/site/trunk/content/sshd/configuring_security.mdtext Wed Oct 31
17:51:09 2012
@@ -27,13 +27,10 @@ This layer is pluggable and use the foll
Those custom classes can be configured on the SSHD server using the following
code:
-<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent
panelContent">
-<PRE class="code-java">
-SshServer sshd = SshServer.setUpDefaultServer();
-sshd.setPasswordAuthenticator(<SPAN class="code-keyword">new</SPAN>
MyPasswordAuthenticator());
-sshd.setPublickeyAuthenticator(<SPAN class="code-keyword">new</SPAN>
MyPublickeyAuthenticator());
-</PRE>
-</DIV></DIV>
+ :::java
+ SshServer sshd = SshServer.setUpDefaultServer();
+ sshd.setPasswordAuthenticator(<SPAN class="code-keyword">new</SPAN>
MyPasswordAuthenticator());
+ sshd.setPublickeyAuthenticator(<SPAN class="code-keyword">new</SPAN>
MyPublickeyAuthenticator());
If only one of those class is implemented, only the related authentication
mechanism will be enabled.
@@ -42,14 +39,11 @@ If only one of those class is implemente
SSHD provides a password based authentication that delegates to JAAS.
This can be configured in the following way:
-<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent
panelContent">
-<PRE class="code-java">
-SshServer sshd = SshServer.setUpDefaultServer();
-JaasPasswordAuthenticator pswdAuth = <SPAN class="code-keyword">new</SPAN>
JaasPasswordAuthenticator();
-pswdAuth.setDomain(<SPAN class="code-quote">"myJaasDomain"</SPAN>);
-sshd.setPasswordAuthenticator(pswdAuth);
-</PRE>
-</DIV></DIV>
+ :::java
+ SshServer sshd = SshServer.setUpDefaultServer();
+ JaasPasswordAuthenticator pswdAuth = <SPAN
class="code-keyword">new</SPAN> JaasPasswordAuthenticator();
+ pswdAuth.setDomain(<SPAN
class="code-quote">"myJaasDomain"</SPAN>);
+ sshd.setPasswordAuthenticator(pswdAuth);
The domain name must be set to the JAAS domain that will be used for
authentication.
Modified: mina/site/trunk/content/sshd/embedding_ssh.mdtext
URL:
http://svn.apache.org/viewvc/mina/site/trunk/content/sshd/embedding_ssh.mdtext?rev=1404273&r1=1404272&r2=1404273&view=diff
==============================================================================
--- mina/site/trunk/content/sshd/embedding_ssh.mdtext (original)
+++ mina/site/trunk/content/sshd/embedding_ssh.mdtext Wed Oct 31 17:51:09 2012
@@ -31,11 +31,8 @@ Lets look at all these steps. Refer to t
This is as simple as creating a new object
-<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent
panelContent">
-<PRE class="code-java">
-SshServer sshd = SshServer.setUpDefaultServer();
-</PRE>
-</DIV></DIV>
+ :::java
+ SshServer sshd = SshServer.setUpDefaultServer();
It will configure the server with sensible defaults for ciphers, macs, key
exchange algorithm, etc...
If you want a different behavior, you can look at the code of the
setUpDefaultServer method and configure the SSH server the way you need.
@@ -46,19 +43,13 @@ There are a few things that needs to be
### Port
-<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent
panelContent">
-<PRE class="code-java">
-sshd.setPort(22);
-</PRE>
-</DIV></DIV>
+ :::java
+ sshd.setPort(22);
### KeyPairProvider
-<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent
panelContent">
-<PRE class="code-java">
-sshd.setKeyPairProvider(new SimpleGeneratorHostKeyProvider("hostkey.ser"));
-</PRE>
-</DIV></DIV>
+ :::java
+ sshd.setKeyPairProvider(new
SimpleGeneratorHostKeyProvider("hostkey.ser"));
It's usually a good idea to give the host key generator a path, so that if you
restart the sshd server, the same key will be used to authenticate the server.
@@ -66,11 +57,8 @@ It's usually a good idea to give the hos
That's the part you will usually have to write to customize the SSHD server.
The shell factory will be used to create a new shell each time a user logs in.
SSHD provides a single implementation that you can use if you want. This
implementation will create a process and delegate everything to it, so it's
mostly useful to launch the OS native shell.
-<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent
panelContent">
-<PRE class="code-java">
-sshd.setShellFactory(new ProcessShellFactory(new String[] { "/bin/sh", "-i",
"-l" });
-</PRE>
-</DIV></DIV>
+ :::java
+ sshd.setShellFactory(new ProcessShellFactory(new String[] { "/bin/sh",
"-i", "-l" });
Note that the ShellFactory is not required. If none is configured, any request
for a shell will be denied to users.
@@ -80,19 +68,13 @@ The CommandFactory can be used in additi
SSHD provides a CommandFactory to support SCP that can be configure in the
following way:
-<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent
panelContent">
-<PRE class="code-java">
-sshd.setCommandFactory(new ScpCommandFactory());
-</PRE>
-</DIV></DIV>
+ :::java
+ sshd.setCommandFactory(new ScpCommandFactory());
You can also use the ScpCommandFactory on top of your own CommandFactory:
-<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent
panelContent">
-<PRE class="code-java">
-</PRE>
-sshd.setCommandFactory(new ScpCommandFactory(myCommandFactory));
-</DIV></DIV>
+ :::java
+ sshd.setCommandFactory(new ScpCommandFactory(myCommandFactory));
Note that the CommandFactory is optional. If none is configured, any direct
command sent by users will be rejected.
@@ -100,8 +82,5 @@ Note that the CommandFactory is optional
Once we have configured the Server, we need to call start(), to start the
Server
-<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent
panelContent">
-<PRE class="code-java">
-</PRE>
-sshd.start();
-</DIV></DIV>
+ :::java
+ sshd.start();
Modified: mina/site/trunk/content/sshd/load_ssh_editor.mdtext
URL:
http://svn.apache.org/viewvc/mina/site/trunk/content/sshd/load_ssh_editor.mdtext?rev=1404273&r1=1404272&r2=1404273&view=diff
==============================================================================
--- mina/site/trunk/content/sshd/load_ssh_editor.mdtext (original)
+++ mina/site/trunk/content/sshd/load_ssh_editor.mdtext Wed Oct 31 17:51:09 2012
@@ -21,23 +21,16 @@ Notice: Licensed to the Apache Softwa
If you want to debug or develop on SSHD, chances are you want to load it in
your IDE. Most IDE now have some maven support (either natively or through
plugins), but if you don't have those plugins installed, you can create the
required project files using one of the following command:
-<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent
panelContent">
-<PRE class="code-java">
-mvn eclipse:eclipse
-</PRE>
-</DIV></DIV>
+ mvn eclipse:eclipse
or
-<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent
panelContent">
-<PRE class="code-java">
-mvn idea:idea
-</PRE>
-</DIV></DIV>
+ mvn idea:idea
If you want to have the source code for the various dependencies available for
debugging, you can add the -DdownloadSources=true parameter on the command line.
-Next step is to load the generated project from Eclipse or IDEA.<br>
+Next step is to load the generated project from Eclipse or IDEA.
+
Note that you may have to set up some global variables to point to the local
maven repository.
Modified: mina/site/trunk/content/sshd/mailing_lists.mdtext
URL:
http://svn.apache.org/viewvc/mina/site/trunk/content/sshd/mailing_lists.mdtext?rev=1404273&r1=1404272&r2=1404273&view=diff
==============================================================================
--- mina/site/trunk/content/sshd/mailing_lists.mdtext (original)
+++ mina/site/trunk/content/sshd/mailing_lists.mdtext Wed Oct 31 17:51:09 2012
@@ -25,73 +25,31 @@ General information about the SSHD maili
Please use this list for any questions regarding how to use SSHD.
-<DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TH class="confluenceTh"> Subscribe </TH>
-<TD class="confluenceTd"> <A href="mailto:[email protected]"
class="external-link" rel="nofollow">[email protected]</A> </TD>
-</TR>
-<TR>
-<TH class="confluenceTh"> Unsubscribe </TH>
-<TD class="confluenceTd"> <A href="mailto:[email protected]"
class="external-link" rel="nofollow">[email protected]</A> </TD>
-</TR>
-<TR>
-<TH class="confluenceTh"> Post </TH>
-<TD class="confluenceTd"> <A href="mailto:[email protected]"
class="external-link" rel="nofollow">[email protected]</A> </TD>
-</TR>
-<TR>
-<TH class="confluenceTh"> Archive </TH>
-<TD class="confluenceTd"> <A
href="http://www.mail-archive.com/[email protected]/" class="external-link"
rel="nofollow">http://www.mail-archive.com/[email protected]/</A> </TD>
-</TR>
-</TBODY></TABLE>
-</DIV>
+| | |
+|---|---|
+| Subscribe |
[[email protected]](mailto:[email protected]) |
+| Unsubscribe |
[[email protected]](mailto:[email protected]) |
+| Post | [[email protected]](mailto:[email protected]) |
+| Archive |
[http://www.mail-archive.com/[email protected]/](http://www.mail-archive.com/[email protected]/)
|
## For Developers
We use the MINA developers list for asking technical questions, discussing
feature suggestions or general questions regarding the project.
-<DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TH class="confluenceTh"> Subscribe </TH>
-<TD class="confluenceTd"> <A href="mailto:[email protected]"
class="external-link" rel="nofollow">[email protected]</A> </TD>
-</TR>
-<TR>
-<TH class="confluenceTh"> Unsubscribe </TH>
-<TD class="confluenceTd"> <A href="mailto:[email protected]"
class="external-link" rel="nofollow">[email protected]</A> </TD>
-</TR>
-<TR>
-<TH class="confluenceTh"> Post </TH>
-<TD class="confluenceTd"> <A href="mailto:[email protected]"
class="external-link" rel="nofollow">[email protected]</A> </TD>
-</TR>
-<TR>
-<TH class="confluenceTh"> Archive </TH>
-<TD class="confluenceTd"> <A
href="http://www.mail-archive.com/[email protected]/" class="external-link"
rel="nofollow">http://www.mail-archive.com/[email protected]/</A> </TD>
-</TR>
-</TBODY></TABLE>
-</DIV>
+| | |
+|---|---|
+| Subscribe |
[[email protected]](mailto:[email protected]) |
+| Unsubscribe |
[[email protected]](mailto:[email protected]) |
+| Post | [[email protected]](mailto:[email protected]) |
+| Archive |
[http://www.mail-archive.com/[email protected]/](http://www.mail-archive.com/[email protected]/)
|
## Subversion commits
-<DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TH class="confluenceTh"> Subscribe </TH>
-<TD class="confluenceTd"> <A href="mailto:[email protected]"
class="external-link" rel="nofollow">[email protected]</A> </TD>
-</TR>
-<TR>
-<TH class="confluenceTh"> Unsubscribe </TH>
-<TD class="confluenceTd"> <A href="mailto:[email protected]"
class="external-link" rel="nofollow">[email protected]</A>
</TD>
-</TR>
-<TR>
-<TH class="confluenceTh"> Post </TH>
-<TD class="confluenceTd"> <A href="mailto:[email protected]"
class="external-link" rel="nofollow">[email protected]</A> </TD>
-</TR>
-<TR>
-<TH class="confluenceTh"> Archive </TH>
-<TD class="confluenceTd"> <A
href="http://www.mail-archive.com/[email protected]/"
class="external-link"
rel="nofollow">http://www.mail-archive.com/[email protected]/</A> </TD>
-</TR>
-</TBODY></TABLE>
-</DIV>
+| | |
+|---|---|
+| Subscribe |
[[email protected]](mailto:[email protected]) |
+| Unsubscribe |
[[email protected]](mailto:[email protected])
|
+| Post | [[email protected]](mailto:[email protected]) |
+| Archive |
[http://www.mail-archive.com/[email protected]/](http://www.mail-archive.com/[email protected]/)
|
Modified: mina/site/trunk/content/sshd/required_dependencies.mdtext
URL:
http://svn.apache.org/viewvc/mina/site/trunk/content/sshd/required_dependencies.mdtext?rev=1404273&r1=1404272&r2=1404273&view=diff
==============================================================================
--- mina/site/trunk/content/sshd/required_dependencies.mdtext (original)
+++ mina/site/trunk/content/sshd/required_dependencies.mdtext Wed Oct 31
17:51:09 2012
@@ -21,8 +21,8 @@ Notice: Licensed to the Apache Softwa
SSHD has 2 compile-time dependencies:
-* MINA Core 2.0.x
(<http://repo1.maven.org/maven2/org/apache/mina/mina-core/2.0.5/mina-core-2.0.5.jar>)
-* SLF4J API 1.5.2
(<http://repo2.maven.org/maven2/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar>)
+* [MINA Core
2.0.x](http://repo1.maven.org/maven2/org/apache/mina/mina-core/2.0.5/mina-core-2.0.5.jar)
:
http://repo1.maven.org/maven2/org/apache/mina/mina-core/2.0.5/mina-core-2.0.5.jar
+* [SLF4J API
1.5.2](http://repo2.maven.org/maven2/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar)
: http://repo2.maven.org/maven2/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar
To be able to run SSHD, you will also need one SLF4J Logger implementation.
The simpliest one is the one using java.util.logging underneath which can be
downloaded at
<http://repo2.maven.org/maven2/org/slf4j/slf4j-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar>
Modified: mina/site/trunk/content/sshd/sources.mdtext
URL:
http://svn.apache.org/viewvc/mina/site/trunk/content/sshd/sources.mdtext?rev=1404273&r1=1404272&r2=1404273&view=diff
==============================================================================
--- mina/site/trunk/content/sshd/sources.mdtext (original)
+++ mina/site/trunk/content/sshd/sources.mdtext Wed Oct 31 17:51:09 2012
@@ -29,35 +29,23 @@ The following is a link to the [online s
The source can be checked out anonymously from SVN with this command:
-<DIV class="preformatted panel" style="border-width: 1px;"><DIV
class="preformattedContent panelContent">
-<PRE>$ svn checkout http://svn.apache.org/repos/asf/mina/sshd/trunk sshd
-</PRE>
-</DIV></DIV>
+ $ svn checkout http://svn.apache.org/repos/asf/mina/sshd/trunk sshd
## Developer access
Everyone can access the Subversion repository via HTTPS, but Committers must
checkout the Subversion repository via HTTPS.
-<DIV class="preformatted panel" style="border-width: 1px;"><DIV
class="preformattedContent panelContent">
-<PRE>$ svn checkout https://svn.apache.org/repos/asf/mina/sshd/trunk sshd
-</PRE>
-</DIV></DIV>
+ $ svn checkout https://svn.apache.org/repos/asf/mina/sshd/trunk sshd
To commit changes to the repository, execute the following command to commit
your changes (svn will prompt you for your password)
-<DIV class="preformatted panel" style="border-width: 1px;"><DIV
class="preformattedContent panelContent">
-<PRE>$ svn commit --username your-username -m "A message"
-</PRE>
-</DIV></DIV>
+ $ svn commit --username your-username -m "A message"
## Access from behind a firewall
For those users who are stuck behind a corporate firewall which is blocking
http access to the Subversion repository, you can try to access it via the
developer connection:
-<DIV class="preformatted panel" style="border-width: 1px;"><DIV
class="preformattedContent panelContent">
-<PRE>$ svn checkout https://svn.apache.org/repos/asf/mina/sshd/trunk sshd
-</PRE>
-</DIV></DIV>
+ $ svn checkout https://svn.apache.org/repos/asf/mina/sshd/trunk sshd
## Access through a proxy
@@ -67,9 +55,6 @@ There are comments in the file explainin
Example : Edit the 'servers' file and add something like :
-<DIV class="preformatted panel" style="border-width: 1px;"><DIV
class="preformattedContent panelContent">
-<PRE>[global]
-http-proxy-host = your.proxy.name
-http-proxy-port = 3128
-</PRE>
-</DIV></DIV>
+ [global]
+ http-proxy-host = your.proxy.name
+ http-proxy-port = 3128
Modified: mina/site/trunk/content/sshd/tips.mdtext
URL:
http://svn.apache.org/viewvc/mina/site/trunk/content/sshd/tips.mdtext?rev=1404273&r1=1404272&r2=1404273&view=diff
==============================================================================
--- mina/site/trunk/content/sshd/tips.mdtext (original)
+++ mina/site/trunk/content/sshd/tips.mdtext Wed Oct 31 17:51:09 2012
@@ -20,25 +20,19 @@ Notice: Licensed to the Apache Softwa
# How to execute commands as processes on the server side?
If you want the SSH server to support direct command execution, you need to
configure it with a Factory<Command> which will allow that.
+
It can be done using the following code:
-<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent
panelContent">
-<PRE class="code-java">
-sshd.setCommandFactory(<SPAN class="code-keyword">new</SPAN>
ScpCommandFactory(<SPAN class="code-keyword">new</SPAN> CommandFactory() {
- <SPAN class="code-keyword">public</SPAN> Command createCommand(<SPAN
class="code-object">String</SPAN> command) {
- <SPAN class="code-keyword">return</SPAN> <SPAN
class="code-keyword">new</SPAN> ProcessShellFactory(command.split(<SPAN
class="code-quote">" "</SPAN>)).create();
- }
-}));
-</PRE>
-</DIV></DIV>
+ :::java
+ sshd.setCommandFactory(new ScpCommandFactory(new CommandFactory() {
+ public Command createCommand(String command) {
+ return new ProcessShellFactory(command.split(<SPAN
class="code-quote">" ")).create();
+ }
+ }));
This way, you can use the following:
-<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent
panelContent">
-<PRE class="code-java">
-ssh -p 8202 localhost ls -l
-</PRE>
-</DIV></DIV>
+ ssh -p 8202 localhost ls -l