svn commit: r938810 - /mina/ftpserver/trunk/core/pom.xml

2010-04-28 Thread ngn 
Author: ngn
Date: Wed Apr 28 07:35:45 2010
New Revision: 938810

URL: http://svn.apache.org/viewvc?rev=938810view=rev
Log:
Exporting ipfilter package for OSGi (reported by Peter van der Velde)

Modified:
mina/ftpserver/trunk/core/pom.xml

Modified: mina/ftpserver/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/pom.xml?rev=938810r1=938809r2=938810view=diff
==
--- mina/ftpserver/trunk/core/pom.xml (original)
+++ mina/ftpserver/trunk/core/pom.xml Wed Apr 28 07:35:45 2010
@@ -69,6 +69,7 @@

org.apache.ftpserver.config.spring;version=${pom.version},

org.apache.ftpserver.filesystem.nativefs;version=${pom.version},

org.apache.ftpserver.ftpletcontainer;version=${pom.version},
+   
org.apache.ftpserver.ipfilter;version=${pom.version},

org.apache.ftpserver.listener;version=${pom.version},

org.apache.ftpserver.main;version=${pom.version},

org.apache.ftpserver.message;version=${pom.version},

svn commit: r938927 - in /mina/vysper/trunk/nbxml/src: main/java/org/apache/vysper/xml/fragment/Renderer.java test/java/org/apache/vysper/xml/fragment/RendererTestCase.java

2010-04-28 Thread berndf 
Author: berndf
Date: Wed Apr 28 11:24:22 2010
New Revision: 938927

URL: http://svn.apache.org/viewvc?rev=938927view=rev
Log:
fix rendering: do not print empty namespaces, e.g. xmlns='', because that 
causes major irritations with clients

Modified:

mina/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/Renderer.java

mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/RendererTestCase.java

Modified: 
mina/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/Renderer.java
URL: 
http://svn.apache.org/viewvc/mina/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/Renderer.java?rev=938927r1=938926r2=938927view=diff
==
--- 
mina/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/Renderer.java
 (original)
+++ 
mina/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/fragment/Renderer.java
 Wed Apr 28 11:24:22 2010
@@ -70,12 +70,15 @@ public class Renderer {
 for(EntryString, String nsAttr : nsAttrs.entrySet()) {
openElementBuffer.append( );
String name;
-   if(nsAttr.getKey().length() == 0) {
+String value = nsAttr.getValue();
+   if(value == null || value.length() == 0) {
+continue; // don't issue xmlns='', this will only confuse 
clients
+} else if(nsAttr.getKey().length() == 0) {
name = xmlns;
} else {
name = xmlns: + nsAttr.getKey();
}
-   renderAttribute(openElementBuffer, name, nsAttr.getValue());
+renderAttribute(openElementBuffer, name, value);
 }
 
 for (Attribute attribute : element.getAttributes()) {

Modified: 
mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/RendererTestCase.java
URL: 
http://svn.apache.org/viewvc/mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/RendererTestCase.java?rev=938927r1=938926r2=938927view=diff
==
--- 
mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/RendererTestCase.java
 (original)
+++ 
mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/RendererTestCase.java
 Wed Apr 28 11:24:22 2010
@@ -153,7 +153,7 @@ public class RendererTestCase extends Te
public void testRenderInnerNoNamespaceElement() {
XMLElementBuilder builder = new XMLElementBuilder(foo, 
http://example.com;);
builder.startInnerElement(bar);
-   assertRendering(foo xmlns=\http://example.com\;bar 
xmlns=\\/bar/foo, builder.build());
+   assertRendering(foo xmlns=\http://example.com\;bar 
/bar/foo, builder.build());
}

public void testRenderSimpleText() {

svn commit: r938940 - /mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PublishSubscribeModule.java

2010-04-28 Thread berndf 
Author: berndf
Date: Wed Apr 28 11:29:19 2010
New Revision: 938940

URL: http://svn.apache.org/viewvc?rev=938940view=rev
Log:
do not step into other components disco's

Modified:

mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PublishSubscribeModule.java

Modified: 
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PublishSubscribeModule.java
URL: 
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PublishSubscribeModule.java?rev=938940r1=938939r2=938940view=diff
==
--- 
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PublishSubscribeModule.java
 (original)
+++ 
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/PublishSubscribeModule.java
 Wed Apr 28 11:29:19 2010
@@ -196,6 +196,8 @@ public class PublishSubscribeModule
 ListItem componentItem = new ArrayListItem();
 componentItem.add(new Item(fullDomain));
 return componentItem;
+} else if (!fullDomain.equals(request.getTo())) {
+return null; // not in component's domain
 }
 ServiceDiscoItemsVisitor nv = new 
ServiceDiscoItemsVisitor(serviceConfiguration);
 root.acceptNodes(nv);

svn commit: r939036 - /mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java

2010-04-28 Thread gnodet 
Author: gnodet
Date: Wed Apr 28 18:20:39 2010
New Revision: 939036

URL: http://svn.apache.org/viewvc?rev=939036view=rev
Log:
SSHD-77: Accept SSH-2 names from Putty

Modified:

mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java

Modified: 
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
URL: 
http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java?rev=939036r1=939035r2=939036view=diff
==
--- 
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
 (original)
+++ 
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
 Wed Apr 28 18:20:39 2010
@@ -252,6 +252,11 @@ public class ChannelSession extends Abst
 if (x11-req.equals(type)) {
 return handleX11Forwarding(buffer);
 }
+if (type != null  type.endsWith(@putty.projects.tartarus.org)) {
+// Ignore but accept, more doc at
+// 
http://tartarus.org/~simon/putty-snapshots/htmldoc/AppendixF.html
+return true;
+}
 return false;
 }

svn commit: r939038 - /mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProvider.java

2010-04-28 Thread gnodet 
Author: gnodet
Date: Wed Apr 28 18:21:24 2010
New Revision: 939038

URL: http://svn.apache.org/viewvc?rev=939038view=rev
Log:
SSHD-78: PEMGeneratorHostKeyProvider doesn't close PEMWriter

Modified:

mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProvider.java

Modified: 
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProvider.java
URL: 
http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProvider.java?rev=939038r1=939037r2=939038view=diff
==
--- 
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProvider.java
 (original)
+++ 
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProvider.java
 Wed Apr 28 18:21:24 2010
@@ -56,7 +56,11 @@ public class PEMGeneratorHostKeyProvider
 
 protected void doWriteKeyPair(KeyPair kp, OutputStream os) throws 
Exception {
 PEMWriter w = new PEMWriter(new OutputStreamWriter(os));
-w.writeObject(kp);
+try {
+w.writeObject(kp);
+} finally {
+w.close();
+}
 }
 
 }

svn commit: r939044 - /mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelPipedInputStream.java

2010-04-28 Thread gnodet 
Author: gnodet
Date: Wed Apr 28 18:28:24 2010
New Revision: 939044

URL: http://svn.apache.org/viewvc?rev=939044view=rev
Log:
SSHD-79: ChannelPipedInputStream returns improper negative values for some bytes

Modified:

mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelPipedInputStream.java

Modified: 
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelPipedInputStream.java
URL: 
http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelPipedInputStream.java?rev=939044r1=939043r2=939044view=diff
==
--- 
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelPipedInputStream.java
 (original)
+++ 
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelPipedInputStream.java
 Wed Apr 28 18:28:24 2010
@@ -59,7 +59,7 @@ public class ChannelPipedInputStream ext
 if (l == -1) {
 return -1;
 }
-return b[0];
+return ((int) b[0]  0xff);
 }
 }

svn commit: r939051 - /mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshServer.java

2010-04-28 Thread gnodet 
Author: gnodet
Date: Wed Apr 28 18:49:37 2010
New Revision: 939051

URL: http://svn.apache.org/viewvc?rev=939051view=rev
Log:
SSHD-74: Even if I do setPublicKeyAuthenticator(null) (or 
setPasswordAuthenticator(null)) Apache SSHD still reports that it supports that 
kind of authentication

Modified:
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshServer.java

Modified: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshServer.java
URL: 
http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshServer.java?rev=939051r1=939050r2=939051view=diff
==
--- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshServer.java 
(original)
+++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshServer.java Wed 
Apr 28 18:49:37 2010
@@ -249,7 +249,18 @@ public class SshServer extends AbstractF
 throw new IllegalArgumentException(KeyExchangeFactories not set);
 }
 if (getUserAuthFactories() == null) {
-throw new IllegalArgumentException(UserAuthFactories not set);
+ListNamedFactoryUserAuth factories = new 
ArrayListNamedFactoryUserAuth();
+if (getPasswordAuthenticator() != null) {
+factories.add(new UserAuthPassword.Factory());
+}
+if (getPublickeyAuthenticator() != null) {
+factories.add(new UserAuthPublicKey.Factory());
+}
+if (factories.size()  0) {
+setUserAuthFactories(factories);
+} else {
+throw new IllegalArgumentException(UserAuthFactories not 
set);
+}
 }
 if (getCipherFactories() == null) {
 throw new IllegalArgumentException(CipherFactories not set);
@@ -376,9 +387,6 @@ public class SshServer extends AbstractF
 new DHG1.Factory()));
 sshd.setRandomFactory(new SingletonRandomFactory(new 
JceRandom.Factory()));
 }
-sshd.setUserAuthFactories(Arrays.NamedFactoryUserAuthasList(
-new UserAuthPassword.Factory(),
-new UserAuthPublicKey.Factory()));
 setUpDefaultCiphers(sshd);
 // Compression is not enabled by default
 // 
sshd.setCompressionFactories(Arrays.NamedFactoryCompressionasList(