tag:old.nabble.com,2006:forum-16868
Nabble - Apache MINA
2009-12-05T17:24:32Z
Welcome to the <a href="http://mina.apache.org/" target="_top" rel="nofollow">Apache MINA</a> mailing list archive! Please read <a href="http://mina.apache.org/contact.html" target="_top" rel="nofollow">the community guideline</a> before your first post.
tag:old.nabble.com,2006:post-26661289
Who is the author of AbstractPollingIOProcessor.java?
2009-12-05T17:24:32Z
2009-12-05T17:24:32Z
zswallow
<br>I use mina-2.0.0-RC1 to recv media data(TCP/IP) and immediately send it out.
<br>I set 2 NioProcessor, one is for recving data, the other is for sending the recved data.
<br>My recv NioProcessor works well. the "select" function will be wakeup more than 25 times per second. But there is sth wrong with my send NioProcessor. Sometimes it will keep sleep for 1 second, although there is lots of data waiting to be sent out.
<br>But if I set 1 NioProcessor, recving and sending data shared this processor, then everything is OK. The problem didn't happen any more.
<br>
<br>I found the reason is that, there is something wrong in thread synchronization.
<br><br>I changed the code, and everything works well.
<br>1 In AbstractorPollingIoProcessor.java : private void flush(long currentTime) function
<br> I remove "if(flushedAll && ....)
<br> scheduleFlush(session);
<br> "
<br>2 In AbstractorPollingIoProcessor.java: public final void flush(T session) function
<br> I changed "if(scheduleFlush(session) && needsWakeup)"
<br> to "if(needsWakeup && scheduleFlush(session))"
<br><br>if it is a bug? Anyone can help me with this, or contact the author of AbstractPollingIOProcessor.java?
<br><br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-User-Forum-f32104.html" embed="fixTarget[32104]" target="_top" >Apache MINA User Forum</a></p>
tag:old.nabble.com,2006:post-26656409
[jira] Resolved: (DIRMINA-750) IoBuffer.normalizeCapacity bug
2009-12-05T07:07:20Z
2009-12-05T07:07:20Z
JIRA jira@apache.org
<br> [ <a href="https://issues.apache.org/jira/browse/DIRMINA-750?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel" target="_top" rel="nofollow">https://issues.apache.org/jira/browse/DIRMINA-750?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel</a> ]
<br><br>Emmanuel Lecharny resolved DIRMINA-750.
<br>---------------------------------------
<br><br> Resolution: Fixed
<br><br>Thanks for the patch, it has been applied !
<br><br><a href="http://svn.apache.org/viewvc?rev=887550&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=887550&view=rev</a><br><div class='shrinkable-quote'><br>> IoBuffer.normalizeCapacity bug
<br>> ------------------------------
<br>>
<br>> Key: DIRMINA-750
<br>> URL: <a href="https://issues.apache.org/jira/browse/DIRMINA-750" target="_top" rel="nofollow">https://issues.apache.org/jira/browse/DIRMINA-750</a><br>> Project: MINA
<br>> Issue Type: Bug
<br>> Components: Core
<br>> Affects Versions: 2.0.0-RC1
<br>> Environment: N/A
<br>> Reporter: Bogdan Pistol
<br>> Priority: Minor
<br>> Fix For: 2.0.0-RC1
<br>>
<br>> Attachments: patch.txt
<br>>
<br>>
<br>> The org.apache.mina.core.buffer.IoBuffer class contains a bug in the normalizeCapacity method: there is an omission in the switch for the 1 << 20 case.
</div><br>--
<br>This message is automatically generated by JIRA.
<br>-
<br>You can reply to this email to add a comment to the issue online.
<br><br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Developer-Forum-f16869.html" embed="fixTarget[16869]" target="_top" >Apache MINA Developer Forum</a></p>
tag:old.nabble.com,2006:post-26656373
svn commit: r887550 - /mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBuffer.java
2009-12-05T07:04:11Z
2009-12-05T07:04:11Z
Emmanuel Lecharny
Author: elecharny
<br>Date: Sat Dec 5 15:04:10 2009
<br>New Revision: 887550
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=887550&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=887550&view=rev</a><br>Log:
<br>Fixed a missing value (DIRMINA-750)
<br><br>Modified:
<br> mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBuffer.java
<br><br>Modified: mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBuffer.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBuffer.java?rev=887550&r1=887549&r2=887550&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBuffer.java?rev=887550&r1=887549&r2=887550&view=diff</a><br>==============================================================================
<br>--- mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBuffer.java (original)
<br>+++ mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBuffer.java Sat Dec 5 15:04:10 2009
<br>@@ -19,6 +19,7 @@
<br> */
<br> package org.apache.mina.core.buffer;
<br>
<br>+
<br> import java.io.IOException;
<br> import java.io.InputStream;
<br> import java.io.OutputStream;
<br>@@ -30,6 +31,7 @@
<br> import java.nio.FloatBuffer;
<br> import java.nio.IntBuffer;
<br> import java.nio.LongBuffer;
<br>+import java.nio.ReadOnlyBufferException;
<br> import java.nio.ShortBuffer;
<br> import java.nio.charset.CharacterCodingException;
<br> import java.nio.charset.CharsetDecoder;
<br>@@ -39,6 +41,7 @@
<br>
<br> import org.apache.mina.core.session.IoSession;
<br>
<br>+
<br> /**
<br> * A byte buffer used by MINA applications.
<br> * <p>
<br>@@ -142,55 +145,67 @@
<br> *
<br> * @author <a href="<a href="http://mina.apache.org" target="_top" rel="nofollow">http://mina.apache.org</a>">Apache MINA Project</a>
<br> */
<br>-public abstract class IoBuffer implements Comparable<IoBuffer> {
<br>+public abstract class IoBuffer implements Comparable<IoBuffer>
<br>+{
<br> /** The allocator used to create new buffers */
<br> private static IoBufferAllocator allocator = new SimpleBufferAllocator();
<br>
<br> /** A flag indicating which type of buffer we are using : heap or direct */
<br> private static boolean useDirectBuffer = false;
<br>
<br>+
<br> /**
<br> * Returns the allocator used by existing and new buffers
<br> */
<br>- public static IoBufferAllocator getAllocator() {
<br>+ public static IoBufferAllocator getAllocator()
<br>+ {
<br> return allocator;
<br> }
<br>
<br>+
<br> /**
<br> * Sets the allocator used by existing and new buffers
<br> */
<br>- public static void setAllocator(IoBufferAllocator newAllocator) {
<br>- if (newAllocator == null) {
<br>- throw new NullPointerException("allocator");
<br>+ public static void setAllocator( IoBufferAllocator newAllocator )
<br>+ {
<br>+ if ( newAllocator == null )
<br>+ {
<br>+ throw new NullPointerException( "allocator" );
<br> }
<br>
<br> IoBufferAllocator oldAllocator = allocator;
<br>
<br> allocator = newAllocator;
<br>
<br>- if (null != oldAllocator) {
<br>+ if ( null != oldAllocator )
<br>+ {
<br> oldAllocator.dispose();
<br> }
<br> }
<br>
<br>+
<br> /**
<br> * Returns <tt>true</tt> if and only if a direct buffer is allocated
<br> * by default when the type of the new buffer is not specified. The
<br> * default value is <tt>false</tt>.
<br> */
<br>- public static boolean isUseDirectBuffer() {
<br>+ public static boolean isUseDirectBuffer()
<br>+ {
<br> return useDirectBuffer;
<br> }
<br>
<br>+
<br> /**
<br> * Sets if a direct buffer should be allocated by default when the
<br> * type of the new buffer is not specified. The default value is
<br> * <tt>false</tt>.
<br> */
<br>- public static void setUseDirectBuffer(boolean useDirectBuffer) {
<br>+ public static void setUseDirectBuffer( boolean useDirectBuffer )
<br>+ {
<br> IoBuffer.useDirectBuffer = useDirectBuffer;
<br> }
<br>
<br>+
<br> /**
<br> * Returns the direct or heap buffer which is capable to store the
<br> * specified amount of bytes.
<br>@@ -199,10 +214,12 @@
<br> *
<br> * @see #setUseDirectBuffer(boolean)
<br> */
<br>- public static IoBuffer allocate(int capacity) {
<br>- return allocate(capacity, useDirectBuffer);
<br>+ public static IoBuffer allocate( int capacity )
<br>+ {
<br>+ return allocate( capacity, useDirectBuffer );
<br> }
<br>
<br>+
<br> /**
<br> * Returns the buffer which is capable of the specified size.
<br> *
<br>@@ -210,95 +227,112 @@
<br> * @param direct <tt>true</tt> to get a direct buffer,
<br> * <tt>false</tt> to get a heap buffer.
<br> */
<br>- public static IoBuffer allocate(int capacity, boolean direct) {
<br>- if (capacity < 0) {
<br>- throw new IllegalArgumentException("capacity: " + capacity);
<br>+ public static IoBuffer allocate( int capacity, boolean direct )
<br>+ {
<br>+ if ( capacity < 0 )
<br>+ {
<br>+ throw new IllegalArgumentException( "capacity: " + capacity );
<br> }
<br>
<br>- return allocator.allocate(capacity, direct);
<br>+ return allocator.allocate( capacity, direct );
<br> }
<br>
<br>+
<br> /**
<br> * Wraps the specified NIO {@link ByteBuffer} into MINA buffer.
<br> */
<br>- public static IoBuffer wrap(ByteBuffer nioBuffer) {
<br>- return allocator.wrap(nioBuffer);
<br>+ public static IoBuffer wrap( ByteBuffer nioBuffer )
<br>+ {
<br>+ return allocator.wrap( nioBuffer );
<br> }
<br>
<br>+
<br> /**
<br> * Wraps the specified byte array into MINA heap buffer.
<br> */
<br>- public static IoBuffer wrap(byte[] byteArray) {
<br>- return wrap(ByteBuffer.wrap(byteArray));
<br>+ public static IoBuffer wrap( byte[] byteArray )
<br>+ {
<br>+ return wrap( ByteBuffer.wrap( byteArray ) );
<br> }
<br>
<br>+
<br> /**
<br> * Wraps the specified byte array into MINA heap buffer.
<br> */
<br>- public static IoBuffer wrap(byte[] byteArray, int offset, int length) {
<br>- return wrap(ByteBuffer.wrap(byteArray, offset, length));
<br>+ public static IoBuffer wrap( byte[] byteArray, int offset, int length )
<br>+ {
<br>+ return wrap( ByteBuffer.wrap( byteArray, offset, length ) );
<br> }
<br>
<br>+
<br> /**
<br> * Normalizes the specified capacity of the buffer to power of 2,
<br> * which is often helpful for optimal memory usage and performance.
<br> * If it is greater than or equal to {@link Integer#MAX_VALUE}, it
<br> * returns {@link Integer#MAX_VALUE}. If it is zero, it returns zero.
<br> */
<br>- protected static int normalizeCapacity(int requestedCapacity) {
<br>- switch (requestedCapacity) {
<br>- case 0:
<br>- case 1 << 0:
<br>- case 1 << 1:
<br>- case 1 << 2:
<br>- case 1 << 3:
<br>- case 1 << 4:
<br>- case 1 << 5:
<br>- case 1 << 6:
<br>- case 1 << 7:
<br>- case 1 << 8:
<br>- case 1 << 9:
<br>- case 1 << 10:
<br>- case 1 << 11:
<br>- case 1 << 12:
<br>- case 1 << 13:
<br>- case 1 << 14:
<br>- case 1 << 15:
<br>- case 1 << 16:
<br>- case 1 << 17:
<br>- case 1 << 18:
<br>- case 1 << 19:
<br>- case 1 << 21:
<br>- case 1 << 22:
<br>- case 1 << 23:
<br>- case 1 << 24:
<br>- case 1 << 25:
<br>- case 1 << 26:
<br>- case 1 << 27:
<br>- case 1 << 28:
<br>- case 1 << 29:
<br>- case 1 << 30:
<br>- case Integer.MAX_VALUE:
<br>- return requestedCapacity;
<br>+ protected static int normalizeCapacity( int requestedCapacity )
<br>+ {
<br>+ switch ( requestedCapacity )
<br>+ {
<br>+ case 0:
<br>+ case 1 << 0:
<br>+ case 1 << 1:
<br>+ case 1 << 2:
<br>+ case 1 << 3:
<br>+ case 1 << 4:
<br>+ case 1 << 5:
<br>+ case 1 << 6:
<br>+ case 1 << 7:
<br>+ case 1 << 8:
<br>+ case 1 << 9:
<br>+ case 1 << 10:
<br>+ case 1 << 11:
<br>+ case 1 << 12:
<br>+ case 1 << 13:
<br>+ case 1 << 14:
<br>+ case 1 << 15:
<br>+ case 1 << 16:
<br>+ case 1 << 17:
<br>+ case 1 << 18:
<br>+ case 1 << 19:
<br>+ case 1 << 20:
<br>+ case 1 << 21:
<br>+ case 1 << 22:
<br>+ case 1 << 23:
<br>+ case 1 << 24:
<br>+ case 1 << 25:
<br>+ case 1 << 26:
<br>+ case 1 << 27:
<br>+ case 1 << 28:
<br>+ case 1 << 29:
<br>+ case 1 << 30:
<br>+ case Integer.MAX_VALUE:
<br>+ return requestedCapacity;
<br> }
<br>
<br> int newCapacity = 1;
<br>- while (newCapacity < requestedCapacity) {
<br>+ while ( newCapacity < requestedCapacity )
<br>+ {
<br> newCapacity <<= 1;
<br>- if (newCapacity < 0) {
<br>+ if ( newCapacity < 0 )
<br>+ {
<br> return Integer.MAX_VALUE;
<br> }
<br> }
<br> return newCapacity;
<br> }
<br>-
<br>+
<br>+
<br> /**
<br> * Creates a new instance. This is an empty constructor.
<br> */
<br>- protected IoBuffer() {
<br>+ protected IoBuffer()
<br>+ {
<br> // Do nothing
<br> }
<br>
<br>+
<br> /**
<br> * Declares this buffer and all its derived buffers are not used anymore
<br> * so that it can be reused by some {@link IoBufferAllocator} implementations.
<br>@@ -307,27 +341,32 @@
<br> */
<br> public abstract void free();
<br>
<br>+
<br> /**
<br> * Returns the underlying NIO buffer instance.
<br> */
<br> public abstract ByteBuffer buf();
<br>
<br>+
<br> /**
<br> * @see ByteBuffer#isDirect()
<br> */
<br> public abstract boolean isDirect();
<br>
<br>+
<br> /**
<br> * returns <tt>true</tt> if and only if this buffer is derived from other buffer
<br> * via {@link #duplicate()}, {@link #slice()} or {@link #asReadOnlyBuffer()}.
<br> */
<br> public abstract boolean isDerived();
<br>
<br>+
<br> /**
<br> * @see ByteBuffer#isReadOnly()
<br> */
<br> public abstract boolean isReadOnly();
<br>
<br>+
<br> /**
<br> * Returns the minimum capacity of this buffer which is used to determine
<br> * the new capacity of the buffer shrunk by {@link #compact()} and
<br>@@ -336,19 +375,22 @@
<br> */
<br> public abstract int minimumCapacity();
<br>
<br>+
<br> /**
<br> * Sets the minimum capacity of this buffer which is used to determine
<br> * the new capacity of the buffer shrunk by {@link #compact()} and
<br> * {@link #shrink()} operation. The default value is the initial capacity
<br> * of the buffer.
<br> */
<br>- public abstract IoBuffer minimumCapacity(int minimumCapacity);
<br>+ public abstract IoBuffer minimumCapacity( int minimumCapacity );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#capacity()
<br> */
<br> public abstract int capacity();
<br>
<br>+
<br> /**
<br> * Increases the capacity of this buffer. If the new capacity is less than
<br> * or equal to the current capacity, this method returns silently. If the
<br>@@ -356,27 +398,32 @@
<br> * reallocated while retaining the position, limit, mark and the content
<br> * of the buffer.
<br> */
<br>- public abstract IoBuffer capacity(int newCapacity);
<br>+ public abstract IoBuffer capacity( int newCapacity );
<br>+
<br>
<br> /**
<br> * Returns <tt>true</tt> if and only if <tt>autoExpand</tt> is turned on.
<br> */
<br> public abstract boolean isAutoExpand();
<br>
<br>+
<br> /**
<br> * Turns on or off <tt>autoExpand</tt>.
<br> */
<br>- public abstract IoBuffer setAutoExpand(boolean autoExpand);
<br>+ public abstract IoBuffer setAutoExpand( boolean autoExpand );
<br>+
<br>
<br> /**
<br> * Returns <tt>true</tt> if and only if <tt>autoShrink</tt> is turned on.
<br> */
<br> public abstract boolean isAutoShrink();
<br>
<br>+
<br> /**
<br> * Turns on or off <tt>autoShrink</tt>.
<br> */
<br>- public abstract IoBuffer setAutoShrink(boolean autoShrink);
<br>+ public abstract IoBuffer setAutoShrink( boolean autoShrink );
<br>+
<br>
<br> /**
<br> * Changes the capacity and limit of this buffer so this buffer get
<br>@@ -384,7 +431,8 @@
<br> * This method works even if you didn't set <tt>autoExpand</tt> to
<br> * <tt>true</tt>.
<br> */
<br>- public abstract IoBuffer expand(int expectedRemaining);
<br>+ public abstract IoBuffer expand( int expectedRemaining );
<br>+
<br>
<br> /**
<br> * Changes the capacity and limit of this buffer so this buffer get
<br>@@ -393,7 +441,8 @@
<br> * This method works even if you didn't set <tt>autoExpand</tt> to
<br> * <tt>true</tt>.
<br> */
<br>- public abstract IoBuffer expand(int position, int expectedRemaining);
<br>+ public abstract IoBuffer expand( int position, int expectedRemaining );
<br>+
<br>
<br> /**
<br> * Changes the capacity of this buffer so this buffer occupies as less
<br>@@ -404,47 +453,56 @@
<br> */
<br> public abstract IoBuffer shrink();
<br>
<br>+
<br> /**
<br> * @see java.nio.Buffer#position()
<br> */
<br> public abstract int position();
<br>
<br>+
<br> /**
<br> * @see java.nio.Buffer#position(int)
<br> */
<br>- public abstract IoBuffer position(int newPosition);
<br>+ public abstract IoBuffer position( int newPosition );
<br>+
<br>
<br> /**
<br> * @see java.nio.Buffer#limit()
<br> */
<br> public abstract int limit();
<br>
<br>+
<br> /**
<br> * @see java.nio.Buffer#limit(int)
<br> */
<br>- public abstract IoBuffer limit(int newLimit);
<br>+ public abstract IoBuffer limit( int newLimit );
<br>+
<br>
<br> /**
<br> * @see java.nio.Buffer#mark()
<br> */
<br> public abstract IoBuffer mark();
<br>
<br>+
<br> /**
<br> * Returns the position of the current mark. This method returns <tt>-1</tt> if no
<br> * mark is set.
<br> */
<br> public abstract int markValue();
<br>
<br>+
<br> /**
<br> * @see java.nio.Buffer#reset()
<br> */
<br> public abstract IoBuffer reset();
<br>
<br>+
<br> /**
<br> * @see java.nio.Buffer#clear()
<br> */
<br> public abstract IoBuffer clear();
<br>
<br>+
<br> /**
<br> * Clears this buffer and fills its content with <tt>NUL</tt>.
<br> * The position is set to zero, the limit is set to the capacity,
<br>@@ -452,218 +510,261 @@
<br> */
<br> public abstract IoBuffer sweep();
<br>
<br>+
<br> /**double
<br> * Clears this buffer and fills its content with <tt>value</tt>.
<br> * The position is set to zero, the limit is set to the capacity,
<br> * and the mark is discarded.
<br> */
<br>- public abstract IoBuffer sweep(byte value);
<br>+ public abstract IoBuffer sweep( byte value );
<br>+
<br>
<br> /**
<br> * @see java.nio.Buffer#flip()
<br> */
<br> public abstract IoBuffer flip();
<br>
<br>+
<br> /**
<br> * @see java.nio.Buffer#rewind()
<br> */
<br> public abstract IoBuffer rewind();
<br>
<br>+
<br> /**
<br> * @see java.nio.Buffer#remaining()
<br> */
<br> public abstract int remaining();
<br>
<br>+
<br> /**
<br> * @see java.nio.Buffer#hasRemaining()
<br> */
<br> public abstract boolean hasRemaining();
<br>
<br>+
<br> /**
<br> * @see ByteBuffer#duplicate()
<br> */
<br> public abstract IoBuffer duplicate();
<br>
<br>+
<br> /**
<br> * @see ByteBuffer#slice()
<br> */
<br> public abstract IoBuffer slice();
<br>-
<br>+
<br>+
<br> /**
<br> * @see ByteBuffer#asReadOnlyBuffer()
<br> */
<br> public abstract IoBuffer asReadOnlyBuffer();
<br>
<br>+
<br> /**
<br> * @see ByteBuffer#hasArray()
<br> */
<br> public abstract boolean hasArray();
<br>
<br>+
<br> /**
<br> * @see ByteBuffer#array()
<br> */
<br> public abstract byte[] array();
<br>
<br>+
<br> /**
<br> * @see ByteBuffer#arrayOffset()
<br> */
<br> public abstract int arrayOffset();
<br>
<br>+
<br> /**
<br> * @see ByteBuffer#get()
<br> */
<br> public abstract byte get();
<br>
<br>+
<br> /**
<br> * Reads one unsigned byte as a short integer.
<br> */
<br> public abstract short getUnsigned();
<br>
<br>+
<br> /**
<br> * @see ByteBuffer#put(byte)
<br> */
<br>- public abstract IoBuffer put(byte b);
<br>+ public abstract IoBuffer put( byte b );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#get(int)
<br> */
<br>- public abstract byte get(int index);
<br>+ public abstract byte get( int index );
<br>+
<br>
<br> /**
<br> * Reads one byte as an unsigned short integer.
<br> */
<br>- public abstract short getUnsigned(int index);
<br>+ public abstract short getUnsigned( int index );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#put(int, byte)
<br> */
<br>- public abstract IoBuffer put(int index, byte b);
<br>+ public abstract IoBuffer put( int index, byte b );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#get(byte[], int, int)
<br> */
<br>- public abstract IoBuffer get(byte[] dst, int offset, int length);
<br>+ public abstract IoBuffer get( byte[] dst, int offset, int length );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#get(byte[])
<br> */
<br>- public abstract IoBuffer get(byte[] dst);
<br>+ public abstract IoBuffer get( byte[] dst );
<br>+
<br>
<br> /**
<br> * TODO document me.
<br> */
<br>- public abstract IoBuffer getSlice(int index, int length);
<br>+ public abstract IoBuffer getSlice( int index, int length );
<br>+
<br>
<br> /**
<br> * TODO document me.
<br> */
<br>- public abstract IoBuffer getSlice(int length);
<br>+ public abstract IoBuffer getSlice( int length );
<br>+
<br>
<br> /**
<br> * Writes the content of the specified <tt>src</tt> into this buffer.
<br> */
<br>- public abstract IoBuffer put(ByteBuffer src);
<br>+ public abstract IoBuffer put( ByteBuffer src );
<br>+
<br>
<br> /**
<br> * Writes the content of the specified <tt>src</tt> into this buffer.
<br> */
<br>- public abstract IoBuffer put(IoBuffer src);
<br>+ public abstract IoBuffer put( IoBuffer src );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#put(byte[], int, int)
<br> */
<br>- public abstract IoBuffer put(byte[] src, int offset, int length);
<br>+ public abstract IoBuffer put( byte[] src, int offset, int length );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#put(byte[])
<br> */
<br>- public abstract IoBuffer put(byte[] src);
<br>+ public abstract IoBuffer put( byte[] src );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#compact()
<br> */
<br> public abstract IoBuffer compact();
<br>
<br>+
<br> /**
<br> * @see ByteBuffer#order()
<br> */
<br> public abstract ByteOrder order();
<br>
<br>+
<br> /**
<br> * @see ByteBuffer#order(ByteOrder)
<br> */
<br>- public abstract IoBuffer order(ByteOrder bo);
<br>+ public abstract IoBuffer order( ByteOrder bo );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#getChar()
<br> */
<br> public abstract char getChar();
<br>
<br>+
<br> /**
<br> * @see ByteBuffer#putChar(char)
<br> */
<br>- public abstract IoBuffer putChar(char value);
<br>+ public abstract IoBuffer putChar( char value );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#getChar(int)
<br> */
<br>- public abstract char getChar(int index);
<br>+ public abstract char getChar( int index );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#putChar(int, char)
<br> */
<br>- public abstract IoBuffer putChar(int index, char value);
<br>+ public abstract IoBuffer putChar( int index, char value );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#asCharBuffer()
<br> */
<br> public abstract CharBuffer asCharBuffer();
<br>
<br>+
<br> /**
<br> * @see ByteBuffer#getShort()
<br> */
<br> public abstract short getShort();
<br>
<br>+
<br> /**
<br> * Reads two bytes unsigned integer.
<br> */
<br> public abstract int getUnsignedShort();
<br>
<br>+
<br> /**
<br> * @see ByteBuffer#putShort(short)
<br> */
<br>- public abstract IoBuffer putShort(short value);
<br>+ public abstract IoBuffer putShort( short value );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#getShort()
<br> */
<br>- public abstract short getShort(int index);
<br>+ public abstract short getShort( int index );
<br>+
<br>
<br> /**
<br> * Reads two bytes unsigned integer.
<br> */
<br>- public abstract int getUnsignedShort(int index);
<br>+ public abstract int getUnsignedShort( int index );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#putShort(int, short)
<br> */
<br>- public abstract IoBuffer putShort(int index, short value);
<br>+ public abstract IoBuffer putShort( int index, short value );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#asShortBuffer()
<br> */
<br> public abstract ShortBuffer asShortBuffer();
<br>
<br>+
<br> /**
<br> * @see ByteBuffer#getInt()
<br> */
<br> public abstract int getInt();
<br>
<br>+
<br> /**
<br> * Reads four bytes unsigned integer.
<br> */
<br> public abstract long getUnsignedInt();
<br>
<br>+
<br> /**
<br> * Relative <i>get</i> method for reading a medium int value.
<br> *
<br>@@ -675,6 +776,7 @@
<br> */
<br> public abstract int getMediumInt();
<br>
<br>+
<br> /**
<br> * Relative <i>get</i> method for reading an unsigned medium int value.
<br> *
<br>@@ -686,6 +788,7 @@
<br> */
<br> public abstract int getUnsignedMediumInt();
<br>
<br>+
<br> /**
<br> * Absolute <i>get</i> method for reading a medium int value.
<br> *
<br>@@ -699,7 +802,8 @@
<br> * If <tt>index</tt> is negative
<br> * or not smaller than the buffer's limit
<br> */
<br>- public abstract int getMediumInt(int index);
<br>+ public abstract int getMediumInt( int index );
<br>+
<br>
<br> /**
<br> * Absolute <i>get</i> method for reading an unsigned medium int value.
<br>@@ -714,7 +818,8 @@
<br> * If <tt>index</tt> is negative
<br> * or not smaller than the buffer's limit
<br> */
<br>- public abstract int getUnsignedMediumInt(int index);
<br>+ public abstract int getUnsignedMediumInt( int index );
<br>+
<br>
<br> /**
<br> * Relative <i>put</i> method for writing a medium int
<br>@@ -736,7 +841,8 @@
<br> * @throws ReadOnlyBufferException
<br> * If this buffer is read-only
<br> */
<br>- public abstract IoBuffer putMediumInt(int value);
<br>+ public abstract IoBuffer putMediumInt( int value );
<br>+
<br>
<br> /**
<br> * Absolute <i>put</i> method for writing a medium int
<br>@@ -761,108 +867,129 @@
<br> * @throws ReadOnlyBufferException
<br> * If this buffer is read-only
<br> */
<br>- public abstract IoBuffer putMediumInt(int index, int value);
<br>+ public abstract IoBuffer putMediumInt( int index, int value );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#putInt(int)
<br> */
<br>- public abstract IoBuffer putInt(int value);
<br>+ public abstract IoBuffer putInt( int value );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#getInt(int)
<br> */
<br>- public abstract int getInt(int index);
<br>+ public abstract int getInt( int index );
<br>+
<br>
<br> /**
<br> * Reads four bytes unsigned integer.
<br> */
<br>- public abstract long getUnsignedInt(int index);
<br>+ public abstract long getUnsignedInt( int index );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#putInt(int, int)
<br> */
<br>- public abstract IoBuffer putInt(int index, int value);
<br>+ public abstract IoBuffer putInt( int index, int value );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#asIntBuffer()
<br> */
<br> public abstract IntBuffer asIntBuffer();
<br>
<br>+
<br> /**
<br> * @see ByteBuffer#getLong()
<br> */
<br> public abstract long getLong();
<br>
<br>+
<br> /**
<br> * @see ByteBuffer#putLong(int, long)
<br> */
<br>- public abstract IoBuffer putLong(long value);
<br>+ public abstract IoBuffer putLong( long value );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#getLong(int)
<br> */
<br>- public abstract long getLong(int index);
<br>+ public abstract long getLong( int index );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#putLong(int, long)
<br> */
<br>- public abstract IoBuffer putLong(int index, long value);
<br>+ public abstract IoBuffer putLong( int index, long value );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#asLongBuffer()
<br> */
<br> public abstract LongBuffer asLongBuffer();
<br>
<br>+
<br> /**
<br> * @see ByteBuffer#getFloat()
<br> */
<br> public abstract float getFloat();
<br>
<br>+
<br> /**
<br> * @see ByteBuffer#putFloat(float)
<br> */
<br>- public abstract IoBuffer putFloat(float value);
<br>+ public abstract IoBuffer putFloat( float value );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#getFloat(int)
<br> */
<br>- public abstract float getFloat(int index);
<br>+ public abstract float getFloat( int index );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#putFloat(int, float)
<br> */
<br>- public abstract IoBuffer putFloat(int index, float value);
<br>+ public abstract IoBuffer putFloat( int index, float value );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#asFloatBuffer()
<br> */
<br> public abstract FloatBuffer asFloatBuffer();
<br>
<br>+
<br> /**
<br> * @see ByteBuffer#getDouble()
<br> */
<br> public abstract double getDouble();
<br>
<br>+
<br> /**
<br> * @see ByteBuffer#putDouble(double)
<br> */
<br>- public abstract IoBuffer putDouble(double value);
<br>+ public abstract IoBuffer putDouble( double value );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#getDouble(int)
<br> */
<br>- public abstract double getDouble(int index);
<br>+ public abstract double getDouble( int index );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#putDouble(int, double)
<br> */
<br>- public abstract IoBuffer putDouble(int index, double value);
<br>+ public abstract IoBuffer putDouble( int index, double value );
<br>+
<br>
<br> /**
<br> * @see ByteBuffer#asDoubleBuffer()
<br> */
<br> public abstract DoubleBuffer asDoubleBuffer();
<br>
<br>+
<br> /**
<br> * Returns an {@link InputStream} that reads the data from this buffer.
<br> * {@link InputStream#read()} returns <tt>-1</tt> if the buffer position
<br>@@ -870,6 +997,7 @@
<br> */
<br> public abstract InputStream asInputStream();
<br>
<br>+
<br> /**
<br> * Returns an {@link OutputStream} that appends the data into this buffer.
<br> * Please note that the {@link OutputStream#write(int)} will throw a
<br>@@ -880,6 +1008,7 @@
<br> */
<br> public abstract OutputStream asOutputStream();
<br>
<br>+
<br> /**
<br> * Returns hexdump of this buffer. The data and pointer are
<br> * not changed as a result of this method call.
<br>@@ -889,6 +1018,7 @@
<br> */
<br> public abstract String getHexDump();
<br>
<br>+
<br> /**
<br> * Return hexdump of this buffer with limited length.
<br> *
<br>@@ -897,7 +1027,8 @@
<br> * @return
<br> * hexidecimal representation of this buffer
<br> */
<br>- public abstract String getHexDump(int lengthLimit);
<br>+ public abstract String getHexDump( int lengthLimit );
<br>+
<br>
<br> ////////////////////////////////
<br> // String getters and putters //
<br>@@ -908,8 +1039,8 @@
<br> * specified <code>decoder</code> and returns it. This method reads
<br> * until the limit of this buffer if no <tt>NUL</tt> is found.
<br> */
<br>- public abstract String getString(CharsetDecoder decoder)
<br>- throws CharacterCodingException;
<br>+ public abstract String getString( CharsetDecoder decoder ) throws CharacterCodingException;
<br>+
<br>
<br> /**
<br> * Reads a <code>NUL</code>-terminated string from this buffer using the
<br>@@ -917,8 +1048,8 @@
<br> *
<br> * @param fieldSize the maximum number of bytes to read
<br> */
<br>- public abstract String getString(int fieldSize, CharsetDecoder decoder)
<br>- throws CharacterCodingException;
<br>+ public abstract String getString( int fieldSize, CharsetDecoder decoder ) throws CharacterCodingException;
<br>+
<br>
<br> /**
<br> * Writes the content of <code>in</code> into this buffer using the
<br>@@ -927,8 +1058,8 @@
<br> *
<br> * @throws BufferOverflowException if the specified string doesn't fit
<br> */
<br>- public abstract IoBuffer putString(CharSequence val, CharsetEncoder encoder)
<br>- throws CharacterCodingException;
<br>+ public abstract IoBuffer putString( CharSequence val, CharsetEncoder encoder ) throws CharacterCodingException;
<br>+
<br>
<br> /**
<br> * Writes the content of <code>in</code> into this buffer as a
<br>@@ -944,16 +1075,17 @@
<br> *
<br> * @param fieldSize the maximum number of bytes to write
<br> */
<br>- public abstract IoBuffer putString(CharSequence val, int fieldSize,
<br>- CharsetEncoder encoder) throws CharacterCodingException;
<br>+ public abstract IoBuffer putString( CharSequence val, int fieldSize, CharsetEncoder encoder )
<br>+ throws CharacterCodingException;
<br>+
<br>
<br> /**
<br> * Reads a string which has a 16-bit length field before the actual
<br> * encoded string, using the specified <code>decoder</code> and returns it.
<br> * This method is a shortcut for <tt>getPrefixedString(2, decoder)</tt>.
<br> */
<br>- public abstract String getPrefixedString(CharsetDecoder decoder)
<br>- throws CharacterCodingException;
<br>+ public abstract String getPrefixedString( CharsetDecoder decoder ) throws CharacterCodingException;
<br>+
<br>
<br> /**
<br> * Reads a string which has a length field before the actual
<br>@@ -961,8 +1093,9 @@
<br> *
<br> * @param prefixLength the length of the length field (1, 2, or 4)
<br> */
<br>- public abstract String getPrefixedString(int prefixLength, CharsetDecoder decoder)
<br>- throws CharacterCodingException;
<br>+ public abstract String getPrefixedString( int prefixLength, CharsetDecoder decoder )
<br>+ throws CharacterCodingException;
<br>+
<br>
<br> /**
<br> * Writes the content of <code>in</code> into this buffer as a
<br>@@ -972,8 +1105,9 @@
<br> *
<br> * @throws BufferOverflowException if the specified string doesn't fit
<br> */
<br>- public abstract IoBuffer putPrefixedString(CharSequence in, CharsetEncoder encoder)
<br>- throws CharacterCodingException;
<br>+ public abstract IoBuffer putPrefixedString( CharSequence in, CharsetEncoder encoder )
<br>+ throws CharacterCodingException;
<br>+
<br>
<br> /**
<br> * Writes the content of <code>in</code> into this buffer as a
<br>@@ -985,8 +1119,9 @@
<br> *
<br> * @throws BufferOverflowException if the specified string doesn't fit
<br> */
<br>- public abstract IoBuffer putPrefixedString(CharSequence in, int prefixLength,
<br>- CharsetEncoder encoder) throws CharacterCodingException;
<br>+ public abstract IoBuffer putPrefixedString( CharSequence in, int prefixLength, CharsetEncoder encoder )
<br>+ throws CharacterCodingException;
<br>+
<br>
<br> /**
<br> * Writes the content of <code>in</code> into this buffer as a
<br>@@ -999,9 +1134,9 @@
<br> *
<br> * @throws BufferOverflowException if the specified string doesn't fit
<br> */
<br>- public abstract IoBuffer putPrefixedString(CharSequence in, int prefixLength,
<br>- int padding, CharsetEncoder encoder)
<br>- throws CharacterCodingException;
<br>+ public abstract IoBuffer putPrefixedString( CharSequence in, int prefixLength, int padding, CharsetEncoder encoder )
<br>+ throws CharacterCodingException;
<br>+
<br>
<br> /**
<br> * Writes the content of <code>in</code> into this buffer as a
<br>@@ -1014,9 +1149,9 @@
<br> *
<br> * @throws BufferOverflowException if the specified string doesn't fit
<br> */
<br>- public abstract IoBuffer putPrefixedString(CharSequence val, int prefixLength,
<br>- int padding, byte padValue, CharsetEncoder encoder)
<br>- throws CharacterCodingException;
<br>+ public abstract IoBuffer putPrefixedString( CharSequence val, int prefixLength, int padding, byte padValue,
<br>+ CharsetEncoder encoder ) throws CharacterCodingException;
<br>+
<br>
<br> /**
<br> * Reads a Java object from the buffer using the context {@link ClassLoader}
<br>@@ -1024,16 +1159,18 @@
<br> */
<br> public abstract Object getObject() throws ClassNotFoundException;
<br>
<br>+
<br> /**
<br> * Reads a Java object from the buffer using the specified <tt>classLoader</tt>.
<br> */
<br>- public abstract Object getObject(final ClassLoader classLoader)
<br>- throws ClassNotFoundException;
<br>+ public abstract Object getObject( final ClassLoader classLoader ) throws ClassNotFoundException;
<br>+
<br>
<br> /**
<br> * Writes the specified Java object to the buffer.
<br> */
<br>- public abstract IoBuffer putObject(Object o);
<br>+ public abstract IoBuffer putObject( Object o );
<br>+
<br>
<br> /**
<br> * Returns <tt>true</tt> if this buffer contains a data which has a data
<br>@@ -1050,7 +1187,8 @@
<br> * @throws IllegalArgumentException if prefixLength is wrong
<br> * @throws BufferDataException if data length is negative
<br> */
<br>- public abstract boolean prefixedDataAvailable(int prefixLength);
<br>+ public abstract boolean prefixedDataAvailable( int prefixLength );
<br>+
<br>
<br> /**
<br> * Returns <tt>true</tt> if this buffer contains a data which has a data
<br>@@ -1063,7 +1201,8 @@
<br> * @throws IllegalArgumentException if prefixLength is wrong
<br> * @throws BufferDataException if data length is negative or greater then <tt>maxDataLength</tt>
<br> */
<br>- public abstract boolean prefixedDataAvailable(int prefixLength, int maxDataLength);
<br>+ public abstract boolean prefixedDataAvailable( int prefixLength, int maxDataLength );
<br>+
<br>
<br> /////////////////////
<br> // IndexOf methods //
<br>@@ -1075,7 +1214,8 @@
<br> *
<br> * @return <tt>-1</tt> if the specified byte is not found
<br> */
<br>- public abstract int indexOf(byte b);
<br>+ public abstract int indexOf( byte b );
<br>+
<br>
<br> //////////////////////////
<br> // Skip or fill methods //
<br>@@ -1085,31 +1225,36 @@
<br> * Forwards the position of this buffer as the specified <code>size</code>
<br> * bytes.
<br> */
<br>- public abstract IoBuffer skip(int size);
<br>+ public abstract IoBuffer skip( int size );
<br>+
<br>
<br> /**
<br> * Fills this buffer with the specified value.
<br> * This method moves buffer position forward.
<br> */
<br>- public abstract IoBuffer fill(byte value, int size);
<br>+ public abstract IoBuffer fill( byte value, int size );
<br>+
<br>
<br> /**
<br> * Fills this buffer with the specified value.
<br> * This method does not change buffer position.
<br> */
<br>- public abstract IoBuffer fillAndReset(byte value, int size);
<br>+ public abstract IoBuffer fillAndReset( byte value, int size );
<br>+
<br>
<br> /**
<br> * Fills this buffer with <code>NUL (0x00)</code>.
<br> * This method moves buffer position forward.
<br> */
<br>- public abstract IoBuffer fill(int size);
<br>+ public abstract IoBuffer fill( int size );
<br>+
<br>
<br> /**
<br> * Fills this buffer with <code>NUL (0x00)</code>.
<br> * This method does not change buffer position.
<br> */
<br>- public abstract IoBuffer fillAndReset(int size);
<br>+ public abstract IoBuffer fillAndReset( int size );
<br>+
<br>
<br> //////////////////////////
<br> // Enum methods //
<br>@@ -1122,7 +1267,8 @@
<br> * @param <E> The enum type to return
<br> * @param enumClass The enum's class object
<br> */
<br>- public abstract <E extends Enum<E>> E getEnum(Class<E> enumClass);
<br>+ public abstract <E extends Enum<E>> E getEnum( Class<E> enumClass );
<br>+
<br>
<br> /**
<br> * Reads a byte from the buffer and returns the correlating enum constant defined
<br>@@ -1132,7 +1278,8 @@
<br> * @param index the index from which the byte will be read
<br> * @param enumClass The enum's class object
<br> */
<br>- public abstract <E extends Enum<E>> E getEnum(int index, Class<E> enumClass);
<br>+ public abstract <E extends Enum<E>> E getEnum( int index, Class<E> enumClass );
<br>+
<br>
<br> /**
<br> * Reads a short from the buffer and returns the correlating enum constant defined
<br>@@ -1141,7 +1288,8 @@
<br> * @param <E> The enum type to return
<br> * @param enumClass The enum's class object
<br> */
<br>- public abstract <E extends Enum<E>> E getEnumShort(Class<E> enumClass);
<br>+ public abstract <E extends Enum<E>> E getEnumShort( Class<E> enumClass );
<br>+
<br>
<br> /**
<br> * Reads a short from the buffer and returns the correlating enum constant defined
<br>@@ -1151,7 +1299,8 @@
<br> * @param index the index from which the bytes will be read
<br> * @param enumClass The enum's class object
<br> */
<br>- public abstract <E extends Enum<E>> E getEnumShort(int index, Class<E> enumClass);
<br>+ public abstract <E extends Enum<E>> E getEnumShort( int index, Class<E> enumClass );
<br>+
<br>
<br> /**
<br> * Reads an int from the buffer and returns the correlating enum constant defined
<br>@@ -1160,7 +1309,8 @@
<br> * @param <E> The enum type to return
<br> * @param enumClass The enum's class object
<br> */
<br>- public abstract <E extends Enum<E>> E getEnumInt(Class<E> enumClass);
<br>+ public abstract <E extends Enum<E>> E getEnumInt( Class<E> enumClass );
<br>+
<br>
<br> /**
<br> * Reads an int from the buffer and returns the correlating enum constant defined
<br>@@ -1170,14 +1320,16 @@
<br> * @param index the index from which the bytes will be read
<br> * @param enumClass The enum's class object
<br> */
<br>- public abstract <E extends Enum<E>> E getEnumInt(int index, Class<E> enumClass);
<br>+ public abstract <E extends Enum<E>> E getEnumInt( int index, Class<E> enumClass );
<br>+
<br>
<br> /**
<br> * Writes an enum's ordinal value to the buffer as a byte.
<br> *
<br> * @param e The enum to write to the buffer
<br> */
<br>- public abstract IoBuffer putEnum(Enum<?> e);
<br>+ public abstract IoBuffer putEnum( Enum<?> e );
<br>+
<br>
<br> /**
<br> * Writes an enum's ordinal value to the buffer as a byte.
<br>@@ -1185,14 +1337,16 @@
<br> * @param index The index at which the byte will be written
<br> * @param e The enum to write to the buffer
<br> */
<br>- public abstract IoBuffer putEnum(int index, Enum<?> e);
<br>+ public abstract IoBuffer putEnum( int index, Enum<?> e );
<br>+
<br>
<br> /**
<br> * Writes an enum's ordinal value to the buffer as a short.
<br> *
<br> * @param e The enum to write to the buffer
<br> */
<br>- public abstract IoBuffer putEnumShort(Enum<?> e);
<br>+ public abstract IoBuffer putEnumShort( Enum<?> e );
<br>+
<br>
<br> /**
<br> * Writes an enum's ordinal value to the buffer as a short.
<br>@@ -1200,14 +1354,16 @@
<br> * @param index The index at which the bytes will be written
<br> * @param e The enum to write to the buffer
<br> */
<br>- public abstract IoBuffer putEnumShort(int index, Enum<?> e);
<br>+ public abstract IoBuffer putEnumShort( int index, Enum<?> e );
<br>+
<br>
<br> /**
<br> * Writes an enum's ordinal value to the buffer as an integer.
<br> *
<br> * @param e The enum to write to the buffer
<br> */
<br>- public abstract IoBuffer putEnumInt(Enum<?> e);
<br>+ public abstract IoBuffer putEnumInt( Enum<?> e );
<br>+
<br>
<br> /**
<br> * Writes an enum's ordinal value to the buffer as an integer.
<br>@@ -1215,7 +1371,8 @@
<br> * @param index The index at which the bytes will be written
<br> * @param e The enum to write to the buffer
<br> */
<br>- public abstract IoBuffer putEnumInt(int index, Enum<?> e);
<br>+ public abstract IoBuffer putEnumInt( int index, Enum<?> e );
<br>+
<br>
<br> //////////////////////////
<br> // EnumSet methods //
<br>@@ -1232,7 +1389,8 @@
<br> * @param enumClass the enum class used to create the EnumSet
<br> * @return the EnumSet representation of the bit vector
<br> */
<br>- public abstract <E extends Enum<E>> EnumSet<E> getEnumSet(Class<E> enumClass);
<br>+ public abstract <E extends Enum<E>> EnumSet<E> getEnumSet( Class<E> enumClass );
<br>+
<br>
<br> /**
<br> * Reads a byte sized bit vector and converts it to an {@link EnumSet}.
<br>@@ -1243,8 +1401,8 @@
<br> * @param enumClass the enum class used to create the EnumSet
<br> * @return the EnumSet representation of the bit vector
<br> */
<br>- public abstract <E extends Enum<E>> EnumSet<E> getEnumSet(int index,
<br>- Class<E> enumClass);
<br>+ public abstract <E extends Enum<E>> EnumSet<E> getEnumSet( int index, Class<E> enumClass );
<br>+
<br>
<br> /**
<br> * Reads a short sized bit vector and converts it to an {@link EnumSet}.
<br>@@ -1254,7 +1412,8 @@
<br> * @param enumClass the enum class used to create the EnumSet
<br> * @return the EnumSet representation of the bit vector
<br> */
<br>- public abstract <E extends Enum<E>> EnumSet<E> getEnumSetShort(Class<E> enumClass);
<br>+ public abstract <E extends Enum<E>> EnumSet<E> getEnumSetShort( Class<E> enumClass );
<br>+
<br>
<br> /**
<br> * Reads a short sized bit vector and converts it to an {@link EnumSet}.
<br>@@ -1265,8 +1424,8 @@
<br> * @param enumClass the enum class used to create the EnumSet
<br> * @return the EnumSet representation of the bit vector
<br> */
<br>- public abstract <E extends Enum<E>> EnumSet<E> getEnumSetShort(int index,
<br>- Class<E> enumClass);
<br>+ public abstract <E extends Enum<E>> EnumSet<E> getEnumSetShort( int index, Class<E> enumClass );
<br>+
<br>
<br> /**
<br> * Reads an int sized bit vector and converts it to an {@link EnumSet}.
<br>@@ -1276,7 +1435,8 @@
<br> * @param enumClass the enum class used to create the EnumSet
<br> * @return the EnumSet representation of the bit vector
<br> */
<br>- public abstract <E extends Enum<E>> EnumSet<E> getEnumSetInt(Class<E> enumClass);
<br>+ public abstract <E extends Enum<E>> EnumSet<E> getEnumSetInt( Class<E> enumClass );
<br>+
<br>
<br> /**
<br> * Reads an int sized bit vector and converts it to an {@link EnumSet}.
<br>@@ -1287,8 +1447,8 @@
<br> * @param enumClass the enum class used to create the EnumSet
<br> * @return the EnumSet representation of the bit vector
<br> */
<br>- public abstract <E extends Enum<E>> EnumSet<E> getEnumSetInt(int index,
<br>- Class<E> enumClass);
<br>+ public abstract <E extends Enum<E>> EnumSet<E> getEnumSetInt( int index, Class<E> enumClass );
<br>+
<br>
<br> /**
<br> * Reads a long sized bit vector and converts it to an {@link EnumSet}.
<br>@@ -1298,7 +1458,8 @@
<br> * @param enumClass the enum class used to create the EnumSet
<br> * @return the EnumSet representation of the bit vector
<br> */
<br>- public abstract <E extends Enum<E>> EnumSet<E> getEnumSetLong(Class<E> enumClass);
<br>+ public abstract <E extends Enum<E>> EnumSet<E> getEnumSetLong( Class<E> enumClass );
<br>+
<br>
<br> /**
<br> * Reads a long sized bit vector and converts it to an {@link EnumSet}.
<br>@@ -1309,8 +1470,8 @@
<br> * @param enumClass the enum class used to create the EnumSet
<br> * @return the EnumSet representation of the bit vector
<br> */
<br>- public abstract <E extends Enum<E>> EnumSet<E> getEnumSetLong(int index,
<br>- Class<E> enumClass);
<br>+ public abstract <E extends Enum<E>> EnumSet<E> getEnumSetLong( int index, Class<E> enumClass );
<br>+
<br>
<br> /**
<br> * Writes the specified {@link Set} to the buffer as a byte sized bit vector.
<br>@@ -1318,7 +1479,8 @@
<br> * @param <E> the enum type of the Set
<br> * @param set the enum set to write to the buffer
<br> */
<br>- public abstract <E extends Enum<E>> IoBuffer putEnumSet(Set<E> set);
<br>+ public abstract <E extends Enum<E>> IoBuffer putEnumSet( Set<E> set );
<br>+
<br>
<br> /**
<br> * Writes the specified {@link Set} to the buffer as a byte sized bit vector.
<br>@@ -1327,7 +1489,8 @@
<br> * @param index the index at which the byte will be written
<br> * @param set the enum set to write to the buffer
<br> */
<br>- public abstract <E extends Enum<E>> IoBuffer putEnumSet(int index, Set<E> set);
<br>+ public abstract <E extends Enum<E>> IoBuffer putEnumSet( int index, Set<E> set );
<br>+
<br>
<br> /**
<br> * Writes the specified {@link Set} to the buffer as a short sized bit vector.
<br>@@ -1335,7 +1498,8 @@
<br> * @param <E> the enum type of the Set
<br> * @param set the enum set to write to the buffer
<br> */
<br>- public abstract <E extends Enum<E>> IoBuffer putEnumSetShort(Set<E> set);
<br>+ public abstract <E extends Enum<E>> IoBuffer putEnumSetShort( Set<E> set );
<br>+
<br>
<br> /**
<br> * Writes the specified {@link Set} to the buffer as a short sized bit vector.
<br>@@ -1344,7 +1508,8 @@
<br> * @param index the index at which the bytes will be written
<br> * @param set the enum set to write to the buffer
<br> */
<br>- public abstract <E extends Enum<E>> IoBuffer putEnumSetShort(int index, Set<E> set);
<br>+ public abstract <E extends Enum<E>> IoBuffer putEnumSetShort( int index, Set<E> set );
<br>+
<br>
<br> /**
<br> * Writes the specified {@link Set} to the buffer as an int sized bit vector.
<br>@@ -1352,7 +1517,8 @@
<br> * @param <E> the enum type of the Set
<br> * @param set the enum set to write to the buffer
<br> */
<br>- public abstract <E extends Enum<E>> IoBuffer putEnumSetInt(Set<E> set);
<br>+ public abstract <E extends Enum<E>> IoBuffer putEnumSetInt( Set<E> set );
<br>+
<br>
<br> /**
<br> * Writes the specified {@link Set} to the buffer as an int sized bit vector.
<br>@@ -1361,7 +1527,8 @@
<br> * @param index the index at which the bytes will be written
<br> * @param set the enum set to write to the buffer
<br> */
<br>- public abstract <E extends Enum<E>> IoBuffer putEnumSetInt(int index, Set<E> set);
<br>+ public abstract <E extends Enum<E>> IoBuffer putEnumSetInt( int index, Set<E> set );
<br>+
<br>
<br> /**
<br> * Writes the specified {@link Set} to the buffer as a long sized bit vector.
<br>@@ -1369,7 +1536,8 @@
<br> * @param <E> the enum type of the Set
<br> * @param set the enum set to write to the buffer
<br> */
<br>- public abstract <E extends Enum<E>> IoBuffer putEnumSetLong(Set<E> set);
<br>+ public abstract <E extends Enum<E>> IoBuffer putEnumSetLong( Set<E> set );
<br>+
<br>
<br> /**
<br> * Writes the specified {@link Set} to the buffer as a long sized bit vector.
<br>@@ -1378,5 +1546,5 @@
<br> * @param index the index at which the bytes will be written
<br> * @param set the enum set to write to the buffer
<br> */
<br>- public abstract <E extends Enum<E>> IoBuffer putEnumSetLong(int index, Set<E> set);
<br>+ public abstract <E extends Enum<E>> IoBuffer putEnumSetLong( int index, Set<E> set );
<br> }
<br><br><br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Commits-f16870.html" embed="fixTarget[16870]" target="_top" >Apache MINA Commits</a></p>
tag:old.nabble.com,2006:post-26656353
Re: Version 2.x - Norweigian Wood
2009-12-05T07:01:22Z
2009-12-05T07:01:22Z
Emmanuel Lcharny
David Latorre a écrit :
<div class='shrinkable-quote'><br>> 2009/12/4 "Trustin Lee (이희승)" <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26656353&i=0" target="_top" rel="nofollow">trustin@...</a>>:
<br>>
<br>>> On 2009/12/04 9:25 pm, Emmanuel Lecharny wrote:
<br>>>
<br>>>> Glenn Ivar Klausen a écrit :
<br>>>>
<br>>>>> Emmanuel LŽcharny wrote:
<br>>>>>
<br>>>>>> Well, less than "dead wood"...
<br>>>>>>
<br>>>>>> This name was picked by someone who was at the origin of the project,
<br>>>>>> at a time he was pretty alone working on it (since then, he quit). I
<br>>>>>> personnaly don't think it's a good idea to attach a name with a
<br>>>>>> version, à la Ubuntu (I have always been totally lost with Intrepid
<br>>>>>> Jakal or Laughable Vampire, not being able to make a connection with
<br>>>>>> 8.04 or 9.10).
<br>>>>>>
<br>>>>>> Anyway, I think we should get rid of those useless nicknames.
<br>>>>>>
<br>>>>>>
<br>>>>>>
<br>>>>> Ok, ... I was just referring to the fact that Norwegian is spelled
<br>>>>> wrong, however, its a good point regarding the nick names.
<br>>>>>
<br>>>>> G (Norwegian)
<br>>>>>
<br>>>> Wikipedia, about "Norwegian wood" :
<br>>>>
<br>>>> "This exchange took place in a press conference in Los Angeles on 24
<br>>>> August 1966:
<br>>>>
<br>>>> Reporter: I'd like to direct this question to messrs. Lennon and
<br>>>> McCartney. In a recent article, Time magazine put down pop music. And
<br>>>> they referred to "Day Tripper" as being about a prostitute...
<br>>>> Paul: Oh yeah.
<br>>>> Reporter: ...and "Norwegian Wood" as being about a lesbian.
<br>>>> Paul: Oh yeah."
<br>>>>
<br>>>> :)
<br>>>>
<br>>>>
<br>>> It actually means a novel with the same title [1]. Other code names are
<br>>> also the titles of Haruki's novels. The code names were never announced
<br>>> anyway. Feel free to remove it from JIRA. I'd be glad to take it over to
<br>>> Netty [2].
<br>>>
<br>>
<br>> What a great novelist he is :-) To my mind, having our 'nickames'
<br>> based on Haruki's novels instead of what's usual in other projects (I
<br>> won't give any examples ...) is something to be proud of :P
<br>> But it is true that version numbers are much more useful so ..
<br>> whatever. Otherwise I would suggest "sputnik" as a new nickname (and
<br>> goal) for next MINA version. That's from "Sputnik, my love" by
<br>> Murakami, of course.
<br>>
<br>> I'm sorry that no one seemed to notice the misspelling, Glen, but
<br>> these things happen from time to time, my apologies :P Btw in Spain,
<br>> they coined their own title for this novel, although it is in English!
<br>> Tokio Blues ( Ok, so not English either as they don't say Tokyo but
<br>> definitely not Spanish).
<br>>
</div><br>Don't get me wrong : I don't think that giving nicknames to a project
<br>(even with some spelling issues) is a bad thing. The problem is that
<br>it's hard to remember which version it's associated with, and it may
<br>have some local interpretation which may be embarassing; One interesting
<br>example is the Mitshubishi Pajero car : try to sell this car in spain !
<br>(<a href="http://en.wiktionary.org/wiki/pajero" target="_top" rel="nofollow">http://en.wiktionary.org/wiki/pajero</a>)
<br><br>Let's stick to the version numbers, it's just plain ok.
<br><br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Developer-Forum-f16869.html" embed="fixTarget[16869]" target="_top" >Apache MINA Developer Forum</a></p>
tag:old.nabble.com,2006:post-26656306
[jira] Updated: (DIRMINA-750) IoBuffer.normalizeCapacity bug
2009-12-05T06:55:20Z
2009-12-05T06:55:20Z
JIRA jira@apache.org
<br> [ <a href="https://issues.apache.org/jira/browse/DIRMINA-750?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel" target="_top" rel="nofollow">https://issues.apache.org/jira/browse/DIRMINA-750?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel</a> ]
<br><br>Bogdan Pistol updated DIRMINA-750:
<br>----------------------------------
<br><br> Attachment: patch.txt
<br><br>A patch that solves the bug in r887546.
<br><div class='shrinkable-quote'><br>> IoBuffer.normalizeCapacity bug
<br>> ------------------------------
<br>>
<br>> Key: DIRMINA-750
<br>> URL: <a href="https://issues.apache.org/jira/browse/DIRMINA-750" target="_top" rel="nofollow">https://issues.apache.org/jira/browse/DIRMINA-750</a><br>> Project: MINA
<br>> Issue Type: Bug
<br>> Components: Core
<br>> Affects Versions: 2.0.0-RC1
<br>> Environment: N/A
<br>> Reporter: Bogdan Pistol
<br>> Priority: Minor
<br>> Fix For: 2.0.0-RC1
<br>>
<br>> Attachments: patch.txt
<br>>
<br>>
<br>> The org.apache.mina.core.buffer.IoBuffer class contains a bug in the normalizeCapacity method: there is an omission in the switch for the 1 << 20 case.
</div><br>--
<br>This message is automatically generated by JIRA.
<br>-
<br>You can reply to this email to add a comment to the issue online.
<br><br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Developer-Forum-f16869.html" embed="fixTarget[16869]" target="_top" >Apache MINA Developer Forum</a></p>
tag:old.nabble.com,2006:post-26656296
[jira] Created: (DIRMINA-750) IoBuffer.normalizeCapacity bug
2009-12-05T06:53:20Z
2009-12-05T06:53:20Z
JIRA jira@apache.org
IoBuffer.normalizeCapacity bug
<br>------------------------------
<br><br> Key: DIRMINA-750
<br> URL: <a href="https://issues.apache.org/jira/browse/DIRMINA-750" target="_top" rel="nofollow">https://issues.apache.org/jira/browse/DIRMINA-750</a><br> Project: MINA
<br> Issue Type: Bug
<br> Components: Core
<br> Affects Versions: 2.0.0-RC1
<br> Environment: N/A
<br> Reporter: Bogdan Pistol
<br> Priority: Minor
<br> Fix For: 2.0.0-RC1
<br><br><br>The org.apache.mina.core.buffer.IoBuffer class contains a bug in the normalizeCapacity method: there is an omission in the switch for the 1 << 20 case.
<br><br>--
<br>This message is automatically generated by JIRA.
<br>-
<br>You can reply to this email to add a comment to the issue online.
<br><br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Developer-Forum-f16869.html" embed="fixTarget[16869]" target="_top" >Apache MINA Developer Forum</a></p>
tag:old.nabble.com,2006:post-26656237
Re: Version 2.x - Norweigian Wood
2009-12-05T06:44:04Z
2009-12-05T06:44:04Z
David Latorre
2009/12/4 "Trustin Lee (이희승)" <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26656237&i=0" target="_top" rel="nofollow">trustin@...</a>>:
<div class='shrinkable-quote'><br>> On 2009/12/04 9:25 pm, Emmanuel Lecharny wrote:
<br>>>
<br>>> Glenn Ivar Klausen a écrit :
<br>>>>
<br>>>> Emmanuel LŽcharny wrote:
<br>>>>>
<br>>>>> Well, less than "dead wood"...
<br>>>>>
<br>>>>> This name was picked by someone who was at the origin of the project,
<br>>>>> at a time he was pretty alone working on it (since then, he quit). I
<br>>>>> personnaly don't think it's a good idea to attach a name with a
<br>>>>> version, à la Ubuntu (I have always been totally lost with Intrepid
<br>>>>> Jakal or Laughable Vampire, not being able to make a connection with
<br>>>>> 8.04 or 9.10).
<br>>>>>
<br>>>>> Anyway, I think we should get rid of those useless nicknames.
<br>>>>>
<br>>>>>
<br>>>>
<br>>>> Ok, ... I was just referring to the fact that Norwegian is spelled
<br>>>> wrong, however, its a good point regarding the nick names.
<br>>>>
<br>>>> G (Norwegian)
<br>>>
<br>>> Wikipedia, about "Norwegian wood" :
<br>>>
<br>>> "This exchange took place in a press conference in Los Angeles on 24
<br>>> August 1966:
<br>>>
<br>>> Reporter: I'd like to direct this question to messrs. Lennon and
<br>>> McCartney. In a recent article, Time magazine put down pop music. And
<br>>> they referred to "Day Tripper" as being about a prostitute...
<br>>> Paul: Oh yeah.
<br>>> Reporter: ...and "Norwegian Wood" as being about a lesbian.
<br>>> Paul: Oh yeah."
<br>>>
<br>>> :)
<br>>>
<br>>
<br>> It actually means a novel with the same title [1]. Other code names are
<br>> also the titles of Haruki's novels. The code names were never announced
<br>> anyway. Feel free to remove it from JIRA. I'd be glad to take it over to
<br>> Netty [2].
</div><br>What a great novelist he is :-) To my mind, having our 'nickames'
<br>based on Haruki's novels instead of what's usual in other projects (I
<br>won't give any examples ...) is something to be proud of :P
<br>But it is true that version numbers are much more useful so ..
<br>whatever. Otherwise I would suggest "sputnik" as a new nickname (and
<br>goal) for next MINA version. That's from "Sputnik, my love" by
<br>Murakami, of course.
<br><br>I'm sorry that no one seemed to notice the misspelling, Glen, but
<br>these things happen from time to time, my apologies :P Btw in Spain,
<br>they coined their own title for this novel, although it is in English!
<br>Tokio Blues ( Ok, so not English either as they don't say Tokyo but
<br>definitely not Spanish).
<br><br><br>> Trustin
<br>>
<br>> [1] <a href="http://en.wikipedia.org/wiki/Norwegian_Wood_(novel" target="_top" rel="nofollow">http://en.wikipedia.org/wiki/Norwegian_Wood_(novel</a>)
<br>> [2] <a href="http://www.jboss.org/netty/" target="_top" rel="nofollow">http://www.jboss.org/netty/</a><br>>
<br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Developer-Forum-f16869.html" embed="fixTarget[16869]" target="_top" >Apache MINA Developer Forum</a></p>
tag:old.nabble.com,2006:post-26656065
Re: Question about delays with server writing messages
2009-12-05T06:24:44Z
2009-12-05T06:24:44Z
Emmanuel Lcharny
Daniel Egger a écrit :
<br>> It turns out that the problem does not seem to be on the network side...
<br>>
<br>Well, that's a good news, somehow. The error you get sounds so weird,
<br>that I rather prefer to see it as a pb on your client :)
<br>> Is it really the case that the server only actually sends the message
<br>> after a write on a session when the Mina session on the client side
<br>> actually reads the buffer?
<br>>
<br>The pb is that the server depends on the socket to be ready for write in
<br>order to write some more data. This is an issue you have to deal with
<br>when writing servers, it's known as the 'slow client' issue : if clients
<br>aren't fast enough to read the data the server writes back, at some
<br>point, it can swamp the whole server. Malevolent clients can also send
<br>thousands of requests without ever reading the response, for the same
<br>result...
<br><br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-User-Forum-f32104.html" embed="fixTarget[32104]" target="_top" >Apache MINA User Forum</a></p>
tag:old.nabble.com,2006:post-26655747
Re: Question about delays with server writing messages
2009-12-05T05:42:05Z
2009-12-05T05:42:05Z
daniel.egger@gmail.com
It turns out that the problem does not seem to be on the network side...
<br><br>I tried to make a simple example client and server which uses more or
<br>less the same network code as my game with a very simple Swing GUI
<br>client. This example worked well without delays up to even 9 clients.
<br><br>As I tried to compare the running behaviour with my actual game it
<br>turned out that with 4 local clients running at the same time, and all
<br>graphically displaying on my machine, the CPU usage often peeks at
<br>100%. With only 3 clients it never uses all the CPU and under these
<br>circumstances there also occur no network delays.
<br>Still it is somewhat strange. Even with a profiler run on one of the
<br>clients I cannot see, which threads use so much CPU. But I think it
<br>must be something on the graphic side.
<br><br>So I suppose the delays which I experienced on the server seem to be
<br>caused by clients which do not read the message right away but only
<br>after some delay.
<br><br>Is it really the case that the server only actually sends the message
<br>after a write on a session when the Mina session on the client side
<br>actually reads the buffer?
<br><br>On Mon, Nov 30, 2009 at 10:12 PM, Emmanuel Lecharny
<br><<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26655747&i=0" target="_top" rel="nofollow">elecharny@...</a>> wrote:
<div class='shrinkable-quote'><br>> Very strange...
<br>>
<br>> Some code could help at this point, it's very difficult to know what's
<br>> going on without a minimal version we can test.
<br>>
<br>> On Mon, Nov 30, 2009 at 10:06 PM, Daniel Egger <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26655747&i=1" target="_top" rel="nofollow">daniel.egger@...</a>> wrote:
<br>>> Hello all
<br>>>
<br>>> I am trying to program a simple network game with the help of Mina.
<br>>> I am using version 2.0 RC1 of Mina right now.
<br>>> For the moment my game is very simple. I have a simple server which
<br>>> writes any incoming message in its messageReceived method out to any
<br>>> connected client.
<br>>> I use the ObjectSerializationCodecFactory as a protocol codec filter
<br>>> and my messages are very small only having a small number of fields.
<br>>>
<br>>> So much for the setup. This system seems to work rather well for only
<br>>> two connected clients and I even tested it successfully in a
<br>>> distributed manner.
<br>>>
<br>>> But in the last few days I tried to setup a server on my local machine
<br>>> with four local clients connected. With these setup a few strange
<br>>> delays occur. It often happens that messages don't get written right
<br>>> away to the client but only a considerable number of seconds later.
<br>>> (about 5 seconds up until 20 seconds...).
<br>>> Here is a simple example: Rhe server receives an incoming message in
<br>>> the messageReceived method and writes this message immediately to
<br>>> every of its four connected clients. Then the server sends the message
<br>>> right away out to three out of the four connected clients. I can see
<br>>> that by logging the calls to the messageSent method. But the server
<br>>> calls the messageSent for the fourth client only about 5 seconds later
<br>>> and sometimes even later.
<br>>> This behaviour happens quite often at about 25% of every incoming
<br>>> message event. At other times all the four clients get the message
<br>>> right away.
<br>>>
<br>>> I don't know much about the inner workings of NIO and/or buffers so
<br>>> this could be trivial. I am not very sure if this is an expected
<br>>> behaviour (maybe a buffering problem?), or if I could do something
<br>>> against that. But I am very surprised that in this simple setting with
<br>>> only local clients and a local server a delay of several seconds can
<br>>> even occur.
<br>>>
<br>>> Any suggestions on how I could solve this issue are very welcome.
<br>>> Thanks
<br>>> Daniel
<br>>>
<br>>
<br>>
<br>>
<br>> --
<br>> Regards,
<br>> Cordialement,
<br>> Emmanuel Lécharny
<br>> www.iktek.com
<br>>
<br></div><p>From forum: <a href="http://old.nabble.com/Apache-MINA-User-Forum-f32104.html" embed="fixTarget[32104]" target="_top" >Apache MINA User Forum</a></p>
tag:old.nabble.com,2006:post-26648187
svn commit: r887332 - /mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshServer.java
2009-12-04T11:47:43Z
2009-12-04T11:47:43Z
gnodet-2
Author: gnodet
<br>Date: Fri Dec 4 19:47:43 2009
<br>New Revision: 887332
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=887332&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=887332&view=rev</a><br>Log:
<br>SSHD-65: Ability to specify the host name when binding the sshd server socket
<br><br>Modified:
<br> mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshServer.java
<br><br>Modified: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshServer.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshServer.java?rev=887332&r1=887331&r2=887332&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshServer.java?rev=887332&r1=887331&r2=887332&view=diff</a><br>==============================================================================
<br>--- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshServer.java (original)
<br>+++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshServer.java Fri Dec 4 19:47:43 2009
<br>@@ -108,6 +108,7 @@
<br> public class SshServer extends AbstractFactoryManager implements ServerFactoryManager {
<br>
<br> protected IoAcceptor acceptor;
<br>+ protected String host;
<br> protected int port;
<br> protected int backlog = 50;
<br> protected boolean reuseAddress = true;
<br>@@ -124,6 +125,14 @@
<br> public SshServer() {
<br> }
<br>
<br>+ public String getHost() {
<br>+ return host;
<br>+ }
<br>+
<br>+ public void setHost(String host) {
<br>+ this.host = host;
<br>+ }
<br>+
<br> public int getPort() {
<br> return port;
<br> }
<br>@@ -272,7 +281,7 @@
<br> handler.setServer(this);
<br> acceptor.setHandler(handler);
<br>
<br>- acceptor.bind(new InetSocketAddress(port));
<br>+ acceptor.bind(host != null ? new InetSocketAddress(host, port) : new InetSocketAddress(port));
<br> if (port == 0) {
<br> port = ((InetSocketAddress) acceptor.getLocalAddress()).getPort();
<br> }
<br><br><br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Commits-f16870.html" embed="fixTarget[16870]" target="_top" >Apache MINA Commits</a></p>
tag:old.nabble.com,2006:post-26646241
svn commit: r887288 - in /mina/sshd/trunk/sshd-core/src: main/java/org/apache/sshd/ main/java/org/apache/sshd/client/auth/ main/java/org/apache/sshd/client/session/ main/java/org/apache/sshd/common/keyprovider/ test/java/org/apache/sshd/
2009-12-04T09:40:20Z
2009-12-04T09:40:20Z
gnodet-2
Author: gnodet
<br>Date: Fri Dec 4 17:40:19 2009
<br>New Revision: 887288
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=887288&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=887288&view=rev</a><br>Log:
<br>SSHD-25: Support key based authentication on the client side
<br><br>Added:
<br> mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/auth/UserAuthPublicKey.java
<br>Modified:
<br> mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/ClientSession.java
<br> mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshClient.java
<br> mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshServer.java
<br> mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
<br> mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/FileKeyPairProvider.java
<br> mina/sshd/trunk/sshd-core/src/test/java/org/apache/sshd/ClientTest.java
<br><br>Modified: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/ClientSession.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/ClientSession.java?rev=887288&r1=887287&r2=887288&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/ClientSession.java?rev=887288&r1=887287&r2=887288&view=diff</a><br>==============================================================================
<br>--- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/ClientSession.java (original)
<br>+++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/ClientSession.java Fri Dec 4 17:40:19 2009
<br>@@ -19,6 +19,7 @@
<br> package org.apache.sshd;
<br>
<br> import java.io.IOException;
<br>+import java.security.KeyPair;
<br> import java.security.PublicKey;
<br>
<br> import org.apache.sshd.client.future.AuthFuture;
<br>@@ -30,7 +31,7 @@
<br> * A client session is established using the {@link SshClient}.
<br> * Once the session has been created, the user has to authenticate
<br> * using either {@link #authPassword(String, String)} or
<br>- * {@link #authPublicKey(String, java.security.PublicKey)}.
<br>+ * {@link #authPublicKey(String, java.security.KeyPair)}.
<br> *
<br> * From this session, channels can be created using the
<br> * {@link #createChannel(String)} method. Multiple channels can
<br>@@ -54,7 +55,7 @@
<br>
<br> AuthFuture authPassword(String username, String password) throws IOException;
<br>
<br>- AuthFuture authPublicKey(String username, PublicKey key) throws IOException;
<br>+ AuthFuture authPublicKey(String username, KeyPair key) throws IOException;
<br>
<br> ClientChannel createChannel(String type) throws Exception;
<br>
<br><br>Modified: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshClient.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshClient.java?rev=887288&r1=887287&r2=887288&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshClient.java?rev=887288&r1=887287&r2=887288&view=diff</a><br>==============================================================================
<br>--- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshClient.java (original)
<br>+++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshClient.java Fri Dec 4 17:40:19 2009
<br>@@ -18,14 +18,10 @@
<br> */
<br> package org.apache.sshd;
<br>
<br>-import java.io.BufferedReader;
<br>-import java.io.InputStreamReader;
<br>-import java.io.ByteArrayInputStream;
<br>-import java.io.ByteArrayOutputStream;
<br>-import java.io.OutputStreamWriter;
<br>-import java.io.Writer;
<br>+import java.io.*;
<br> import java.net.InetSocketAddress;
<br> import java.net.SocketAddress;
<br>+import java.security.KeyPair;
<br> import java.util.ArrayList;
<br> import java.util.Arrays;
<br> import java.util.List;
<br>@@ -55,6 +51,7 @@
<br> import org.apache.sshd.common.cipher.BlowfishCBC;
<br> import org.apache.sshd.common.cipher.TripleDESCBC;
<br> import org.apache.sshd.common.compression.CompressionNone;
<br>+import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
<br> import org.apache.sshd.common.mac.HMACMD5;
<br> import org.apache.sshd.common.mac.HMACMD596;
<br> import org.apache.sshd.common.mac.HMACSHA1;
<br>@@ -68,6 +65,8 @@
<br> import org.apache.sshd.common.util.NoCloseInputStream;
<br> import org.apache.sshd.common.util.NoCloseOutputStream;
<br> import org.apache.sshd.common.util.SecurityUtils;
<br>+import org.bouncycastle.openssl.PEMReader;
<br>+import org.bouncycastle.openssl.PasswordFinder;
<br>
<br> /**
<br> * Entry point for the client side of the SSH protocol.
<br>@@ -304,12 +303,46 @@
<br> ClientSession session = client.connect(host, port).await().getSession();
<br>
<br> int ret = ClientSession.WAIT_AUTH;
<br>+
<br>+ List<String> files = new ArrayList<String>();
<br>+ File f = new File(System.getProperty("user.home"), ".ssh/id_dsa");
<br>+ if (f.exists() && f.isFile() && f.canRead()) {
<br>+ files.add(f.getAbsolutePath());
<br>+ }
<br>+ f = new File(System.getProperty("user.home"), ".ssh/id_rsa");
<br>+ if (f.exists() && f.isFile() && f.canRead()) {
<br>+ files.add(f.getAbsolutePath());
<br>+ }
<br>+ KeyPair[] keys = null;
<br>+ try {
<br>+ if (files.size() > 0) {
<br>+ keys = new FileKeyPairProvider(files.toArray(new String[0]), new PasswordFinder() {
<br>+ public char[] getPassword() {
<br>+ try {
<br>+ System.out.println("Enter password for private key: ");
<br>+ BufferedReader r = new BufferedReader(new InputStreamReader(System.in));
<br>+ String password = r.readLine();
<br>+ return password.toCharArray();
<br>+ } catch (IOException e) {
<br>+ return null;
<br>+ }
<br>+ }
<br>+ }).loadKeys();
<br>+ }
<br>+ } catch (Exception e) {
<br>+ }
<br>+ int nbKey = 0;
<br> while ((ret & ClientSession.WAIT_AUTH) != 0) {
<br>- System.out.print("Password:");
<br>- BufferedReader r = new BufferedReader(new InputStreamReader(System.in));
<br>- String password = r.readLine();
<br>- session.authPassword(login, password);
<br>- ret = session.waitFor(ClientSession.WAIT_AUTH | ClientSession.CLOSED | ClientSession.AUTHED, 0);
<br>+ if (keys != null && nbKey < keys.length) {
<br>+ session.authPublicKey(login, keys[nbKey++]);
<br>+ ret = session.waitFor(ClientSession.WAIT_AUTH | ClientSession.CLOSED | ClientSession.AUTHED, 0);
<br>+ } else {
<br>+ System.out.print("Password:");
<br>+ BufferedReader r = new BufferedReader(new InputStreamReader(System.in));
<br>+ String password = r.readLine();
<br>+ session.authPassword(login, password);
<br>+ ret = session.waitFor(ClientSession.WAIT_AUTH | ClientSession.CLOSED | ClientSession.AUTHED, 0);
<br>+ }
<br> }
<br> if ((ret & ClientSession.CLOSED) != 0) {
<br> System.err.println("error");
<br><br>Modified: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshServer.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshServer.java?rev=887288&r1=887287&r2=887288&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshServer.java?rev=887288&r1=887287&r2=887288&view=diff</a><br>==============================================================================
<br>--- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshServer.java (original)
<br>+++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/SshServer.java Fri Dec 4 17:40:19 2009
<br>@@ -18,9 +18,11 @@
<br> */
<br> package org.apache.sshd;
<br>
<br>+import java.io.File;
<br> import java.io.IOException;
<br> import java.net.InetSocketAddress;
<br> import java.security.InvalidKeyException;
<br>+import java.security.PublicKey;
<br> import java.util.ArrayList;
<br> import java.util.Arrays;
<br> import java.util.EnumSet;
<br>@@ -420,7 +422,7 @@
<br> }
<br>
<br> System.err.println("Starting SSHD on port " + port);
<br>-
<br>+
<br> SshServer sshd = SshServer.setUpDefaultServer();
<br> sshd.setPort(port);
<br> if (SecurityUtils.isBouncyCastleRegistered()) {
<br>@@ -440,6 +442,12 @@
<br> return username != null && username.equals(password);
<br> }
<br> });
<br>+ sshd.setPublickeyAuthenticator(new PublickeyAuthenticator() {
<br>+ public boolean authenticate(String username, PublicKey key, ServerSession session) {
<br>+ //File f = new File("/Users/" + username + "/.ssh/authorized_keys");
<br>+ return true;
<br>+ }
<br>+ });
<br> sshd.setTcpIpForwardFilter(new TcpIpForwardFilter() {
<br> public boolean canListen(InetSocketAddress address, ServerSession session) {
<br> return true;
<br><br>Added: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/auth/UserAuthPublicKey.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/auth/UserAuthPublicKey.java?rev=887288&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/auth/UserAuthPublicKey.java?rev=887288&view=auto</a><br>==============================================================================
<br>--- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/auth/UserAuthPublicKey.java (added)
<br>+++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/auth/UserAuthPublicKey.java Fri Dec 4 17:40:19 2009
<br>@@ -0,0 +1,101 @@
<br>+/*
<br>+ * Licensed to the Apache Software Foundation (ASF) under one
<br>+ * or more contributor license agreements. See the NOTICE file
<br>+ * distributed with this work for additional information
<br>+ * regarding copyright ownership. The ASF licenses this file
<br>+ * to you under the Apache License, Version 2.0 (the
<br>+ * "License"); you may not use this file except in compliance
<br>+ * with the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing,
<br>+ * software distributed under the License is distributed on an
<br>+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
<br>+ * KIND, either express or implied. See the License for the
<br>+ * specific language governing permissions and limitations
<br>+ * under the License.
<br>+ */
<br>+package org.apache.sshd.client.auth;
<br>+
<br>+import org.apache.sshd.client.UserAuth;
<br>+import org.apache.sshd.client.session.ClientSessionImpl;
<br>+import org.apache.sshd.common.KeyPairProvider;
<br>+import org.apache.sshd.common.NamedFactory;
<br>+import org.apache.sshd.common.Signature;
<br>+import org.apache.sshd.common.SshConstants;
<br>+import org.apache.sshd.common.util.Buffer;
<br>+import org.apache.sshd.common.util.BufferUtils;
<br>+import org.slf4j.Logger;
<br>+import org.slf4j.LoggerFactory;
<br>+
<br>+import java.io.IOException;
<br>+import java.security.KeyPair;
<br>+import java.security.PublicKey;
<br>+import java.security.interfaces.DSAPublicKey;
<br>+import java.security.interfaces.RSAPublicKey;
<br>+
<br>+/**
<br>+ * TODO Add javadoc
<br>+ *
<br>+ * @author <a href="mailto:<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26646241&i=0" target="_top" rel="nofollow">dev@...</a>">Apache MINA SSHD Project</a>
<br>+ */
<br>+public class UserAuthPublicKey implements UserAuth {
<br>+
<br>+ protected final Logger log = LoggerFactory.getLogger(getClass());
<br>+
<br>+ public UserAuthPublicKey(ClientSessionImpl session, String username, KeyPair key) throws IOException {
<br>+ try {
<br>+ log.info("Send SSH_MSG_USERAUTH_REQUEST for password");
<br>+ Buffer buffer = session.createBuffer(SshConstants.Message.SSH_MSG_USERAUTH_REQUEST);
<br>+ int pos1 = buffer.wpos() - 1;
<br>+ buffer.putString(username);
<br>+ buffer.putString("ssh-connection");
<br>+ buffer.putString("publickey");
<br>+ buffer.putByte((byte) 1);
<br>+ buffer.putString((key.getPublic() instanceof RSAPublicKey) ? KeyPairProvider.SSH_RSA : KeyPairProvider.SSH_DSS);
<br>+ int pos2 = buffer.wpos();
<br>+ Buffer b = new Buffer();
<br>+ b.putPublicKey(key.getPublic());
<br>+ buffer.putInt(b.available());
<br>+ buffer.putBuffer(b);
<br>+
<br>+ Signature verif = NamedFactory.Utils.create(session.getFactoryManager().getSignatureFactories(), (key.getPublic() instanceof RSAPublicKey) ? KeyPairProvider.SSH_RSA : KeyPairProvider.SSH_DSS);
<br>+ verif.init(key.getPublic(), key.getPrivate());
<br>+
<br>+ Buffer bs = new Buffer();
<br>+ bs.putString(session.getKex().getH());
<br>+ bs.putCommand(SshConstants.Message.SSH_MSG_USERAUTH_REQUEST);
<br>+ bs.putString(username);
<br>+ bs.putString("ssh-connection");
<br>+ bs.putString("publickey");
<br>+ bs.putByte((byte) 1);
<br>+ bs.putString((key.getPublic() instanceof RSAPublicKey) ? KeyPairProvider.SSH_RSA : KeyPairProvider.SSH_DSS);
<br>+ bs.putInt(b.available());
<br>+ bs.putBuffer(b);
<br>+ verif.update(bs.array(), bs.rpos(), bs.available());
<br>+
<br>+ buffer.putBytes(verif.sign());
<br>+
<br>+ session.writePacket(buffer);
<br>+ } catch (IOException e) {
<br>+ throw e;
<br>+ } catch (Exception e) {
<br>+ throw (IOException) new IOException("Error performing public key authentication").initCause(e);
<br>+ }
<br>+ }
<br>+
<br>+ public Result next(Buffer buffer) throws IOException {
<br>+ SshConstants.Message cmd = buffer.getCommand();
<br>+ log.info("Received {}", cmd);
<br>+ if (cmd == SshConstants.Message.SSH_MSG_USERAUTH_SUCCESS) {
<br>+ return Result.Success;
<br>+ } if (cmd == SshConstants.Message.SSH_MSG_USERAUTH_FAILURE) {
<br>+ return Result.Failure;
<br>+ } else {
<br>+ // TODO: check packets
<br>+ return Result.Continued;
<br>+ }
<br>+ }
<br>+
<br>+}
<br>\ No newline at end of file
<br><br>Modified: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java?rev=887288&r1=887287&r2=887288&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java?rev=887288&r1=887287&r2=887288&view=diff</a><br>==============================================================================
<br>--- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java (original)
<br>+++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java Fri Dec 4 17:40:19 2009
<br>@@ -19,6 +19,7 @@
<br> package org.apache.sshd.client.session;
<br>
<br> import java.io.IOException;
<br>+import java.security.KeyPair;
<br> import java.security.PublicKey;
<br>
<br> import org.apache.mina.core.session.IoSession;
<br>@@ -26,19 +27,17 @@
<br> import org.apache.sshd.ClientSession;
<br> import org.apache.sshd.client.UserAuth;
<br> import org.apache.sshd.client.auth.UserAuthPassword;
<br>+import org.apache.sshd.client.auth.UserAuthPublicKey;
<br> import org.apache.sshd.client.channel.AbstractClientChannel;
<br> import org.apache.sshd.client.channel.ChannelShell;
<br> import org.apache.sshd.client.channel.ChannelExec;
<br> import org.apache.sshd.client.future.AuthFuture;
<br> import org.apache.sshd.client.future.DefaultAuthFuture;
<br>-import org.apache.sshd.common.FactoryManager;
<br>-import org.apache.sshd.common.KeyPairProvider;
<br>-import org.apache.sshd.common.NamedFactory;
<br>-import org.apache.sshd.common.SshConstants;
<br>-import org.apache.sshd.common.SshException;
<br>+import org.apache.sshd.common.*;
<br> import org.apache.sshd.common.future.CloseFuture;
<br> import org.apache.sshd.common.session.AbstractSession;
<br> import org.apache.sshd.common.util.Buffer;
<br>+import org.bouncycastle.asn1.x9.X9ECParameters;
<br>
<br> /**
<br> * TODO Add javadoc
<br>@@ -62,6 +61,10 @@
<br> sendKexInit();
<br> }
<br>
<br>+ public KeyExchange getKex() {
<br>+ return kex;
<br>+ }
<br>+
<br> public AuthFuture authPassword(String username, String password) throws IOException {
<br> synchronized (lock) {
<br> if (closeFuture.isClosed()) {
<br>@@ -84,7 +87,7 @@
<br> }
<br> }
<br>
<br>- public AuthFuture authPublicKey(String username, PublicKey key) throws IOException {
<br>+ public AuthFuture authPublicKey(String username, KeyPair key) throws IOException {
<br> synchronized (lock) {
<br> if (closeFuture.isClosed()) {
<br> throw new IllegalStateException("Session is closed");
<br>@@ -99,9 +102,10 @@
<br> if (closeFuture.isClosed()) {
<br> throw new IllegalStateException("Session is closed");
<br> }
<br>- //authFuture = new DefaultAuthFuture<ClientSession>(this, lock);
<br>- // TODO: implement public key authentication method
<br>- throw new UnsupportedOperationException("Not supported yet");
<br>+ authFuture = new DefaultAuthFuture(lock);
<br>+ userAuth = new UserAuthPublicKey(this, username, key);
<br>+ setState(ClientSessionImpl.State.UserAuth);
<br>+ return authFuture;
<br> }
<br> }
<br>
<br>@@ -130,6 +134,12 @@
<br> }
<br>
<br> protected void handleMessage(Buffer buffer) throws Exception {
<br>+ synchronized (lock) {
<br>+ doHandleMessage(buffer);
<br>+ }
<br>+ }
<br>+
<br>+ protected void doHandleMessage(Buffer buffer) throws Exception {
<br> SshConstants.Message cmd = buffer.getCommand();
<br> log.debug("Received packet {}", cmd);
<br> switch (cmd) {
<br><br>Modified: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/FileKeyPairProvider.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/FileKeyPairProvider.java?rev=887288&r1=887287&r2=887288&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/FileKeyPairProvider.java?rev=887288&r1=887287&r2=887288&view=diff</a><br>==============================================================================
<br>--- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/FileKeyPairProvider.java (original)
<br>+++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/FileKeyPairProvider.java Fri Dec 4 17:40:19 2009
<br>@@ -73,7 +73,7 @@
<br> this.passwordFinder = passwordFinder;
<br> }
<br>
<br>- protected KeyPair[] loadKeys() {
<br>+ public KeyPair[] loadKeys() {
<br> if (!SecurityUtils.isBouncyCastleRegistered()) {
<br> throw new IllegalStateException("BouncyCastle must be registered as a JCE provider");
<br> }
<br><br>Modified: mina/sshd/trunk/sshd-core/src/test/java/org/apache/sshd/ClientTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/test/java/org/apache/sshd/ClientTest.java?rev=887288&r1=887287&r2=887288&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/test/java/org/apache/sshd/ClientTest.java?rev=887288&r1=887287&r2=887288&view=diff</a><br>==============================================================================
<br>--- mina/sshd/trunk/sshd-core/src/test/java/org/apache/sshd/ClientTest.java (original)
<br>+++ mina/sshd/trunk/sshd-core/src/test/java/org/apache/sshd/ClientTest.java Fri Dec 4 17:40:19 2009
<br>@@ -23,14 +23,17 @@
<br> import java.io.PipedInputStream;
<br> import java.io.PipedOutputStream;
<br> import java.net.ServerSocket;
<br>+import java.security.KeyPair;
<br>
<br> import org.apache.sshd.client.future.AuthFuture;
<br> import org.apache.sshd.client.future.OpenFuture;
<br>+import org.apache.sshd.common.KeyPairProvider;
<br> import org.apache.sshd.common.SshException;
<br> import org.apache.sshd.common.future.CloseFuture;
<br> import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
<br> import org.apache.sshd.common.util.BufferUtils;
<br> import org.apache.sshd.util.BogusPasswordAuthenticator;
<br>+import org.apache.sshd.util.BogusPublickeyAuthenticator;
<br> import org.apache.sshd.util.EchoShellFactory;
<br> import org.apache.sshd.util.TeePipedOutputStream;
<br> import org.junit.After;
<br>@@ -61,6 +64,7 @@
<br> sshd.setKeyPairProvider(new FileKeyPairProvider(new String[] { "src/test/resources/hostkey.pem" }));
<br> sshd.setShellFactory(new EchoShellFactory());
<br> sshd.setPasswordAuthenticator(new BogusPasswordAuthenticator());
<br>+ sshd.setPublickeyAuthenticator(new BogusPublickeyAuthenticator());
<br> sshd.start();
<br> }
<br>
<br>@@ -230,6 +234,17 @@
<br> assertTrue(closeFuture.isClosed());
<br> }
<br>
<br>+ @Test
<br>+ public void testPublicKeyAuth() throws Exception {
<br>+ SshClient client = SshClient.setUpDefaultClient();
<br>+ client.start();
<br>+ ClientSession session = client.connect("localhost", port).await().getSession();
<br>+
<br>+ KeyPair pair = new FileKeyPairProvider(new String[] { "src/test/resources/hostkey.pem" }).loadKey(KeyPairProvider.SSH_RSA);
<br>+
<br>+ assertTrue(session.authPublicKey("smx", pair).await().isSuccess());
<br>+ }
<br>+
<br> public static void main(String[] args) throws Exception {
<br> SshClient.main(args);
<br> }
<br><br><br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Commits-f16870.html" embed="fixTarget[16870]" target="_top" >Apache MINA Commits</a></p>
tag:old.nabble.com,2006:post-26645969
svn commit: r887278 - /mina/sshd/trunk/pom.xml
2009-12-04T09:22:18Z
2009-12-04T09:22:18Z
gnodet-2
Author: gnodet
<br>Date: Fri Dec 4 17:22:15 2009
<br>New Revision: 887278
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=887278&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=887278&view=rev</a><br>Log:
<br>[sshd] upgrade jsch to 0.1.142
<br><br>Modified:
<br> mina/sshd/trunk/pom.xml
<br><br>Modified: mina/sshd/trunk/pom.xml
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sshd/trunk/pom.xml?rev=887278&r1=887277&r2=887278&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sshd/trunk/pom.xml?rev=887278&r1=887277&r2=887278&view=diff</a><br>==============================================================================
<br>--- mina/sshd/trunk/pom.xml (original)
<br>+++ mina/sshd/trunk/pom.xml Fri Dec 4 17:22:15 2009
<br>@@ -112,7 +112,7 @@
<br> <dependency>
<br> <groupId>com.jcraft</groupId>
<br> <artifactId>jsch</artifactId>
<br>- <version>0.1.40</version>
<br>+ <version>0.1.42</version>
<br> </dependency>
<br> <dependency>
<br> <groupId>org.springframework</groupId>
<br><br><br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Commits-f16870.html" embed="fixTarget[16870]" target="_top" >Apache MINA Commits</a></p>
tag:old.nabble.com,2006:post-26645833
svn commit: r887273 - in /mina/sshd/trunk/assembly: pom.xml src/main/descriptors/unix-bin.xml src/main/distribution/bin/ssh.bat src/main/distribution/bin/ssh.sh
2009-12-04T09:12:13Z
2009-12-04T09:12:13Z
gnodet-2
Author: gnodet
<br>Date: Fri Dec 4 17:12:12 2009
<br>New Revision: 887273
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=887273&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=887273&view=rev</a><br>Log:
<br>Add a ssh client script to the distribution
<br><br>Added:
<br> mina/sshd/trunk/assembly/src/main/distribution/bin/ssh.bat
<br> mina/sshd/trunk/assembly/src/main/distribution/bin/ssh.sh
<br>Modified:
<br> mina/sshd/trunk/assembly/pom.xml
<br> mina/sshd/trunk/assembly/src/main/descriptors/unix-bin.xml
<br><br>Modified: mina/sshd/trunk/assembly/pom.xml
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sshd/trunk/assembly/pom.xml?rev=887273&r1=887272&r2=887273&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sshd/trunk/assembly/pom.xml?rev=887273&r1=887272&r2=887273&view=diff</a><br>==============================================================================
<br>--- mina/sshd/trunk/assembly/pom.xml (original)
<br>+++ mina/sshd/trunk/assembly/pom.xml Fri Dec 4 17:12:12 2009
<br>@@ -58,6 +58,10 @@
<br> <groupId>org.slf4j</groupId>
<br> <artifactId>slf4j-simple</artifactId>
<br> </dependency>
<br>+ <dependency>
<br>+ <groupId>bouncycastle</groupId>
<br>+ <artifactId>bcprov-jdk15</artifactId>
<br>+ </dependency>
<br> </dependencies>
<br>
<br> <build>
<br><br>Modified: mina/sshd/trunk/assembly/src/main/descriptors/unix-bin.xml
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sshd/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=887273&r1=887272&r2=887273&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sshd/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=887273&r1=887272&r2=887273&view=diff</a><br>==============================================================================
<br>--- mina/sshd/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
<br>+++ mina/sshd/trunk/assembly/src/main/descriptors/unix-bin.xml Fri Dec 4 17:12:12 2009
<br>@@ -38,6 +38,7 @@
<br> <lineEnding>unix</lineEnding>
<br> <excludes>
<br> <exclude>bin/sshd.sh</exclude>
<br>+ <exclude>bin/ssh.sh</exclude>
<br> </excludes>
<br> </fileSet>
<br> </fileSets>
<br>@@ -49,6 +50,12 @@
<br> <fileMode>0755</fileMode>
<br> <lineEnding>unix</lineEnding>
<br> </file>
<br>+ <file>
<br>+ <source>src/main/distribution/bin/ssh.sh</source>
<br>+ <outputDirectory>/bin/</outputDirectory>
<br>+ <fileMode>0755</fileMode>
<br>+ <lineEnding>unix</lineEnding>
<br>+ </file>
<br> </files>
<br>
<br> <dependencySets>
<br><br>Added: mina/sshd/trunk/assembly/src/main/distribution/bin/ssh.bat
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sshd/trunk/assembly/src/main/distribution/bin/ssh.bat?rev=887273&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sshd/trunk/assembly/src/main/distribution/bin/ssh.bat?rev=887273&view=auto</a><br>==============================================================================
<br>--- mina/sshd/trunk/assembly/src/main/distribution/bin/ssh.bat (added)
<br>+++ mina/sshd/trunk/assembly/src/main/distribution/bin/ssh.bat Fri Dec 4 17:12:12 2009
<br>@@ -0,0 +1,105 @@
<br>+@echo off
<br>+rem
<br>+rem
<br>+rem Licensed to the Apache Software Foundation (ASF) under one or more
<br>+rem contributor license agreements. See the NOTICE file distributed with
<br>+rem this work for additional information regarding copyright ownership.
<br>+rem The ASF licenses this file to You under the Apache License, Version 2.0
<br>+rem (the "License"); you may not use this file except in compliance with
<br>+rem the License. You may obtain a copy of the License at
<br>+rem
<br>+rem <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+rem
<br>+rem Unless required by applicable law or agreed to in writing, software
<br>+rem distributed under the License is distributed on an "AS IS" BASIS,
<br>+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+rem See the License for the specific language governing permissions and
<br>+rem limitations under the License.
<br>+rem
<br>+rem
<br>+
<br>+if not "%ECHO%" == "" echo %ECHO%
<br>+
<br>+setlocal
<br>+set DIRNAME=%~dp0%
<br>+set PROGNAME=%~nx0%
<br>+set ARGS=%*
<br>+
<br>+title Sshd
<br>+
<br>+goto BEGIN
<br>+
<br>+:warn
<br>+ echo %PROGNAME%: %*
<br>+goto :EOF
<br>+
<br>+:BEGIN
<br>+
<br>+rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
<br>+
<br>+if not "%SSHD_HOME%" == "" (
<br>+ call :warn Ignoring predefined value for SSHD_HOME
<br>+)
<br>+set SSHD_HOME=%DIRNAME%..
<br>+if not exist "%SSHD_HOME%" (
<br>+ call :warn SSHD_HOME is not valid: %SSHD_HOME%
<br>+ goto END
<br>+)
<br>+
<br>+set DEFAULT_JAVA_OPTS=-server -Xmx512M -Dcom.sun.management.jmxremote
<br>+set DEFAULT_JAVA_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
<br>+
<br>+rem Support for loading native libraries
<br>+set PATH=%PATH%;%SSHD_HOME%\lib
<br>+
<br>+rem Setup the Java Virtual Machine
<br>+if not "%JAVA%" == "" goto :Check_JAVA_END
<br>+ set JAVA=java
<br>+ if "%JAVA_HOME%" == "" call :warn JAVA_HOME not set; results may vary
<br>+ if not "%JAVA_HOME%" == "" set JAVA=%JAVA_HOME%\bin\java
<br>+ if not exist "%JAVA_HOME%" (
<br>+ call :warn JAVA_HOME is not valid: "%JAVA_HOME%"
<br>+ goto END
<br>+ )
<br>+:Check_JAVA_END
<br>+
<br>+if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS%
<br>+
<br>+if "%SSHD_DEBUG%" == "" goto :SSHD_DEBUG_END
<br>+ rem Use the defaults if JAVA_DEBUG_OPTS was not set
<br>+ if "%JAVA_DEBUG_OPTS%" == "" set JAVA_DEBUG_OPTS=%DEFAULT_JAVA_DEBUG_OPTS%
<br>+
<br>+ set "JAVA_OPTS=%JAVA_DEBUG_OPTS% %JAVA_OPTS%"
<br>+ call :warn Enabling Java debug options: %JAVA_DEBUG_OPTS%
<br>+:SSHD_DEBUG_END
<br>+
<br>+rem Setup the classpath
<br>+set CLASSPATH=%LOCAL_CLASSPATH%
<br>+pushd "%SSHD_HOME%\lib"
<br>+for %%G in (*.*) do call:APPEND_TO_CLASSPATH %%G
<br>+popd
<br>+goto CLASSPATH_END
<br>+
<br>+: APPEND_TO_CLASSPATH
<br>+set filename=%~1
<br>+set suffix=%filename:~-4%
<br>+if %suffix% equ .jar set CLASSPATH=%CLASSPATH%;%SSHD_HOME%\lib\%filename%
<br>+goto :EOF
<br>+
<br>+:CLASSPATH_END
<br>+
<br>+SET ARGS=%1 %2 %3 %4 %5 %6 %7 %8
<br>+rem Execute the Java Virtual Machine
<br>+cd %SSHD_HOME%
<br>+"%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Dsshd.home="%SSHD_HOME%" org.apache.sshd.SshClient %ARGS%
<br>+
<br>+rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
<br>+
<br>+:END
<br>+
<br>+endlocal
<br>+
<br>+if not "%PAUSE%" == "" pause
<br>+
<br>+:END_NO_PAUSE
<br>+
<br><br>Added: mina/sshd/trunk/assembly/src/main/distribution/bin/ssh.sh
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sshd/trunk/assembly/src/main/distribution/bin/ssh.sh?rev=887273&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sshd/trunk/assembly/src/main/distribution/bin/ssh.sh?rev=887273&view=auto</a><br>==============================================================================
<br>--- mina/sshd/trunk/assembly/src/main/distribution/bin/ssh.sh (added)
<br>+++ mina/sshd/trunk/assembly/src/main/distribution/bin/ssh.sh Fri Dec 4 17:12:12 2009
<br>@@ -0,0 +1,266 @@
<br>+#!/bin/sh
<br>+#
<br>+# Licensed to the Apache Software Foundation (ASF) under one or more
<br>+# contributor license agreements. See the NOTICE file distributed with
<br>+# this work for additional information regarding copyright ownership.
<br>+# The ASF licenses this file to You under the Apache License, Version 2.0
<br>+# (the "License"); you may not use this file except in compliance with
<br>+# the License. You may obtain a copy of the License at
<br>+#
<br>+# <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+#
<br>+# Unless required by applicable law or agreed to in writing, software
<br>+# distributed under the License is distributed on an "AS IS" BASIS,
<br>+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+# See the License for the specific language governing permissions and
<br>+# limitations under the License.
<br>+#
<br>+
<br>+DIRNAME=`dirname $0`
<br>+PROGNAME=`basename $0`
<br>+
<br>+#
<br>+# Check/Set up some easily accessible MIN/MAX params for JVM mem usage
<br>+#
<br>+
<br>+if [ "x$JAVA_MIN_MEM" = "x" ]; then
<br>+ JAVA_MIN_MEM=128M
<br>+ export JAVA_MIN_MEM
<br>+fi
<br>+
<br>+if [ "x$JAVA_MAX_MEM" = "x" ]; then
<br>+ JAVA_MAX_MEM=512M
<br>+ export JAVA_MAX_MEM
<br>+fi
<br>+
<br>+warn() {
<br>+ echo "${PROGNAME}: $*"
<br>+}
<br>+
<br>+die() {
<br>+ warn "$*"
<br>+ exit 1
<br>+}
<br>+
<br>+maybeSource() {
<br>+ file="$1"
<br>+ if [ -f "$file" ] ; then
<br>+ . $file
<br>+ fi
<br>+}
<br>+
<br>+detectOS() {
<br>+ # OS specific support (must be 'true' or 'false').
<br>+ cygwin=false;
<br>+ darwin=false;
<br>+ aix=false;
<br>+ os400=false;
<br>+ case "`uname`" in
<br>+ CYGWIN*)
<br>+ cygwin=true
<br>+ ;;
<br>+ Darwin*)
<br>+ darwin=true
<br>+ ;;
<br>+ AIX*)
<br>+ aix=true
<br>+ ;;
<br>+ OS400*)
<br>+ os400=true
<br>+ ;;
<br>+ esac
<br>+ # For AIX, set an environment variable
<br>+ if $aix; then
<br>+ export LDR_CNTRL=MAXDATA=0xB0000000@DSA
<br>+ export IBM_JAVA_HEAPDUMP_TEXT=true
<br>+ echo $LDR_CNTRL
<br>+ fi
<br>+}
<br>+
<br>+unlimitFD() {
<br>+ # Use the maximum available, or set MAX_FD != -1 to use that
<br>+ if [ "x$MAX_FD" = "x" ]; then
<br>+ MAX_FD="maximum"
<br>+ fi
<br>+
<br>+ # Increase the maximum file descriptors if we can
<br>+ if [ "$os400" = "false" ] && [ "$cygwin" = "false" ]; then
<br>+ MAX_FD_LIMIT=`ulimit -H -n`
<br>+ if [ "$MAX_FD_LIMIT" != 'unlimited' ]; then
<br>+ if [ $? -eq 0 ]; then
<br>+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
<br>+ # use the system max
<br>+ MAX_FD="$MAX_FD_LIMIT"
<br>+ fi
<br>+
<br>+ ulimit -n $MAX_FD > /dev/null
<br>+ # echo "ulimit -n" `ulimit -n`
<br>+ if [ $? -ne 0 ]; then
<br>+ warn "Could not set maximum file descriptor limit: $MAX_FD"
<br>+ fi
<br>+ else
<br>+ warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT"
<br>+ fi
<br>+ fi
<br>+ fi
<br>+}
<br>+
<br>+locateHome() {
<br>+ if [ "x$SSHD_HOME" != "x" ]; then
<br>+ warn "Ignoring predefined value for SSHD_HOME"
<br>+ fi
<br>+
<br>+ # In POSIX shells, CDPATH may cause cd to write to stdout
<br>+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
<br>+
<br>+ SSHD_HOME=`cd $DIRNAME/..; pwd`
<br>+ if [ ! -d "$SSHD_HOME" ]; then
<br>+ die "SSHD_HOME is not valid: $SSHD_HOME"
<br>+ fi
<br>+}
<br>+
<br>+setupNativePath() {
<br>+ # Support for loading native libraries
<br>+ LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$SSHD_BASE/lib:$SSHD_HOME/lib"
<br>+
<br>+ # For Cygwin, set PATH from LD_LIBRARY_PATH
<br>+ if $cygwin; then
<br>+ LD_LIBRARY_PATH=`cygpath --path --windows "$LD_LIBRARY_PATH"`
<br>+ PATH="$PATH;$LD_LIBRARY_PATH"
<br>+ export PATH
<br>+ fi
<br>+ export LD_LIBRARY_PATH
<br>+}
<br>+
<br>+locateJava() {
<br>+ # Setup the Java Virtual Machine
<br>+ if $cygwin ; then
<br>+ [ -n "$JAVA" ] && JAVA=`cygpath --unix "$JAVA"`
<br>+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
<br>+ fi
<br>+
<br>+ if [ "x$JAVA" = "x" ]; then
<br>+ if [ "x$JAVA_HOME" = "x" ] && [ "$darwin" = "true" ]; then
<br>+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
<br>+ fi
<br>+ if [ "x$JAVA_HOME" != "x" ]; then
<br>+ if [ ! -d "$JAVA_HOME" ]; then
<br>+ die "JAVA_HOME is not valid: $JAVA_HOME"
<br>+ fi
<br>+ JAVA="$JAVA_HOME/bin/java"
<br>+ else
<br>+ warn "JAVA_HOME not set; results may vary"
<br>+ JAVA="java"
<br>+ fi
<br>+ fi
<br>+}
<br>+
<br>+detectJVM() {
<br>+ #echo "`$JAVA -version`"
<br>+ # This service should call `java -version`,
<br>+ # read stdout, and look for hints
<br>+ if $JAVA -version 2>&1 | grep "^IBM" ; then
<br>+ JVM_VENDOR="IBM"
<br>+ # on OS/400, java -version does not contain IBM explicitly
<br>+ elif $os400; then
<br>+ JVM_VENDOR="IBM"
<br>+ else
<br>+ JVM_VENDOR="SUN"
<br>+ fi
<br>+ # echo "JVM vendor is $JVM_VENDOR"
<br>+}
<br>+
<br>+setupDebugOptions() {
<br>+ if [ "x$JAVA_OPTS" = "x" ]; then
<br>+ JAVA_OPTS="$DEFAULT_JAVA_OPTS"
<br>+ fi
<br>+ export JAVA_OPTS
<br>+
<br>+ # Set Debug options if enabled
<br>+ if [ "x$SSHD_DEBUG" != "x" ]; then
<br>+ # Use the defaults if JAVA_DEBUG_OPTS was not set
<br>+ if [ "x$JAVA_DEBUG_OPTS" = "x" ]; then
<br>+ JAVA_DEBUG_OPTS="$DEFAULT_JAVA_DEBUG_OPTS"
<br>+ fi
<br>+
<br>+ JAVA_OPTS="$JAVA_DEBUG_OPTS $JAVA_OPTS"
<br>+ warn "Enabling Java debug options: $JAVA_DEBUG_OPTS"
<br>+ fi
<br>+}
<br>+
<br>+setupDefaults() {
<br>+ DEFAULT_JAVA_OPTS="-Xms$JAVA_MIN_MEM -Xmx$JAVA_MAX_MEM "
<br>+
<br>+ #Set the JVM_VENDOR specific JVM flags
<br>+ if [ "$JVM_VENDOR" = "SUN" ]; then
<br>+ DEFAULT_JAVA_OPTS="-server $DEFAULT_JAVA_OPTS -Dcom.sun.management.jmxremote"
<br>+ elif [ "$JVM_VENDOR" = "IBM" ]; then
<br>+ if $os400; then
<br>+ DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS"
<br>+ elif $aix; then
<br>+ DEFAULT_JAVA_OPTS="-Xverify:none -Xlp $DEFAULT_JAVA_OPTS"
<br>+ else
<br>+ DEFAULT_JAVA_OPTS="-Xverify:none $DEFAULT_JAVA_OPTS"
<br>+ fi
<br>+ fi
<br>+
<br>+ # Add the jars in the lib dir
<br>+ for file in $SSHD_HOME/lib/*.jar
<br>+ do
<br>+ if [ -z "$CLASSPATH" ]; then
<br>+ CLASSPATH="$file"
<br>+ else
<br>+ CLASSPATH="$CLASSPATH:$file"
<br>+ fi
<br>+ done
<br>+ DEFAULT_JAVA_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"
<br>+
<br>+ ##
<br>+ ## TODO: Move to conf/profiler/yourkit.{sh|cmd}
<br>+ ##
<br>+ # Uncomment to enable YourKit profiling
<br>+ #DEFAULT_JAVA_DEBUG_OPTS="-Xrunyjpagent"
<br>+}
<br>+
<br>+init() {
<br>+ # Determine if there is special OS handling we must perform
<br>+ detectOS
<br>+
<br>+ # Unlimit the number of file descriptors if possible
<br>+ unlimitFD
<br>+
<br>+ # Locate the Sshd home directory
<br>+ locateHome
<br>+
<br>+ # Setup the native library path
<br>+ setupNativePath
<br>+
<br>+ # Locate the Java VM to execute
<br>+ locateJava
<br>+
<br>+ # Determine the JVM vendor
<br>+ detectJVM
<br>+
<br>+ # Setup default options
<br>+ setupDefaults
<br>+
<br>+ # Install debug options
<br>+ setupDebugOptions
<br>+
<br>+}
<br>+
<br>+run() {
<br>+ if $cygwin; then
<br>+ SSHD_HOME=`cygpath --path --windows "$SSHD_HOME"`
<br>+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
<br>+ fi
<br>+ cd $SSHD_BASE
<br>+ exec $JAVA $JAVA_OPTS -Dsshd.home="$SSHD_HOME" $OPTS -classpath "$CLASSPATH" org.apache.sshd.SshClient "$@"
<br>+}
<br>+
<br>+main() {
<br>+ init
<br>+ run "$@"
<br>+}
<br>+
<br>+main "$@"
<br><br><br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Commits-f16870.html" embed="fixTarget[16870]" target="_top" >Apache MINA Commits</a></p>
tag:old.nabble.com,2006:post-26645571
Vysper Build
2009-12-04T08:55:58Z
2009-12-04T08:55:58Z
Tammer Salem
Hello All,
<br>regarding the Vysper build, I've done all the required downloads
<br>of dependencies, and am using Maven.
<br><br>I am now having a problem that one test is failing:
<br><br>Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.032 sec
<br><br><br>> Results :
<br><br><br>> Failed tests:
<br><br> testHandshake(org.apache.vysper.stanzasession.StanzaSessionTestCase)
<br><br><br>I've looked into this test in more detail and realised that it is trying to
<br>contact a Jabber.org server. Here is the exception I'm getting:
<br><br>-------------------------------------------------------------------------------
<br><br>Test set: org.apache.vysper.stanzasession.StanzaSessionTestCase
<br><br>-------------------------------------------------------------------------------
<br><br>Tests run: 1, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 3.015 sec
<br>> <<< FAILURE!
<br><br>testHandshake(org.apache.vysper.stanzasession.StanzaSessionTestCase) Time
<br>> elapsed: 2.89 sec <<< FAILURE!
<br><br>junit.framework.AssertionFailedError
<br><br>at junit.framework.Assert.fail(Assert.java:47)
<br><br>at junit.framework.Assert.assertTrue(Assert.java:20)
<br><br>at junit.framework.Assert.assertNotNull(Assert.java:217)
<br><br>at junit.framework.Assert.assertNotNull(Assert.java:210)
<br><br>at
<br>> org.apache.vysper.stanzasession.StanzaSessionTestCase.testHandshake(StanzaSessionTestCase.java:78)
<br><br><br>All I can tell is that the assertion is saying the Stanza is NULL for some
<br>strange reason - presumably something to do with reaching the URL [
<br><a href="http://etherx.jabber.org/streams" target="_top" rel="nofollow">http://etherx.jabber.org/streams</a>]? Also I might add that I'm behind a
<br>corporate proxy and that we do not have access to jabber.org, but this URL
<br>seems to redirect to [<a href="http://xmpp.org/" target="_top" rel="nofollow">http://xmpp.org/</a>]
<br><br>regards,
<br>Tammer
<br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-User-Forum-f32104.html" embed="fixTarget[32104]" target="_top" >Apache MINA User Forum</a></p>
tag:old.nabble.com,2006:post-26645321
Re: Version 2.x - Norweigian Wood
2009-12-04T08:21:57Z
2009-12-04T08:21:57Z
Trustin Lee
On 2009/12/04 9:25 pm, Emmanuel Lecharny wrote:
<div class='shrinkable-quote'><br>> Glenn Ivar Klausen a écrit :
<br>>> Emmanuel Lcharny wrote:
<br>>>> Well, less than "dead wood"...
<br>>>>
<br>>>> This name was picked by someone who was at the origin of the project,
<br>>>> at a time he was pretty alone working on it (since then, he quit). I
<br>>>> personnaly don't think it's a good idea to attach a name with a
<br>>>> version, à la Ubuntu (I have always been totally lost with Intrepid
<br>>>> Jakal or Laughable Vampire, not being able to make a connection with
<br>>>> 8.04 or 9.10).
<br>>>>
<br>>>> Anyway, I think we should get rid of those useless nicknames.
<br>>>>
<br>>>>
<br>>>
<br>>> Ok, ... I was just referring to the fact that Norwegian is spelled
<br>>> wrong, however, its a good point regarding the nick names.
<br>>>
<br>>> G (Norwegian)
<br>>
<br>> Wikipedia, about "Norwegian wood" :
<br>>
<br>> "This exchange took place in a press conference in Los Angeles on 24
<br>> August 1966:
<br>>
<br>> Reporter: I'd like to direct this question to messrs. Lennon and
<br>> McCartney. In a recent article, Time magazine put down pop music. And
<br>> they referred to "Day Tripper" as being about a prostitute...
<br>> Paul: Oh yeah.
<br>> Reporter: ...and "Norwegian Wood" as being about a lesbian.
<br>> Paul: Oh yeah."
<br>>
<br>> :)
<br>>
</div><br>It actually means a novel with the same title [1]. Other code names are
<br>also the titles of Haruki's novels. The code names were never announced
<br>anyway. Feel free to remove it from JIRA. I'd be glad to take it over
<br>to Netty [2].
<br><br>Trustin
<br><br>[1] <a href="http://en.wikipedia.org/wiki/Norwegian_Wood_(novel" target="_top" rel="nofollow">http://en.wikipedia.org/wiki/Norwegian_Wood_(novel</a>)
<br>[2] <a href="http://www.jboss.org/netty/" target="_top" rel="nofollow">http://www.jboss.org/netty/</a><br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Developer-Forum-f16869.html" embed="fixTarget[16869]" target="_top" >Apache MINA Developer Forum</a></p>
tag:old.nabble.com,2006:post-26645045
Re: Errors while building sshd (trunk) on mac
2009-12-04T08:16:49Z
2009-12-04T08:16:49Z
Shawn Pearce
Guillaume Nodet <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26645045&i=0" target="_top" rel="nofollow">gnodet@...</a>> wrote:
<br>> Yeah, we have a jira for that. For some reasons, some tests are
<br>> sometime failing, not sure yet where it comes from though.
<br><br>I'd bet this is a race condition in the test... or its caused by
<br>an RNG seed changing. Because the tests randomly fail or pass on
<br>my Linux desktop. Haven't tried them on my Mac laptop.
<br><br>I haven't bothered to look into it myself because if I run them a
<br>second time on an idle system, they usually pass. :-)
<br>
<br>> On Thu, Dec 3, 2009 at 20:08, Emmanuel Lecharny <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26645045&i=1" target="_top" rel="nofollow">elecharny@...</a>> wrote:
<br>> > Mac OSX 10.6,
<br>> > $ mvn clean install
<br>> > ...
<br>> > Tests in error:
<br>> > testFailAuthentication(org.apache.sshd.ServerTest)
<br>> > testScp(org.apache.sshd.ScpTest)
<br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Developer-Forum-f16869.html" embed="fixTarget[16869]" target="_top" >Apache MINA Developer Forum</a></p>
tag:old.nabble.com,2006:post-26643489
Re: Errors while building sshd (trunk) on mac
2009-12-04T06:41:40Z
2009-12-04T06:41:40Z
gnodet
Yeah, we have a jira for that. For some reasons, some tests are
<br>sometime failing, not sure yet where it comes from though.
<br><br>On Thu, Dec 3, 2009 at 20:08, Emmanuel Lecharny <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26643489&i=0" target="_top" rel="nofollow">elecharny@...</a>> wrote:
<div class='shrinkable-quote'><br>> Mac OSX 10.6,
<br>>
<br>> $ java -version
<br>> java version "1.6.0_15"
<br>> Java(TM) SE Runtime Environment (build 1.6.0_15-b03-219)
<br>> Java HotSpot(TM) 64-Bit Server VM (build 14.1-b02-90, mixed mode)
<br>>
<br>> $ mvn --version
<br>> mvn --version
<br>> Maven version: 2.0.9
<br>> Java version: 1.6.0_15
<br>> OS name: "mac os x" version: "10.6.2" arch: "x86_64" Family: "mac"
<br>>
<br>> $ mvn clean install
<br>>
<br>> ...
<br>> Tests in error:
<br>> testFailAuthentication(org.apache.sshd.ServerTest)
<br>> testScp(org.apache.sshd.ScpTest)
<br>>
<br>> Tests run: 41, Failures: 0, Errors: 2, Skipped: 3
<br>>
<br>> [INFO]
<br>> ------------------------------------------------------------------------
<br>> [ERROR] BUILD FAILURE
<br>> [INFO]
<br>> ------------------------------------------------------------------------
<br>> [INFO] There are test failures.
<br>>
<br>> Please refer to /Users/elecharny/mina/sshd/sshd-core/target/surefire-reports
<br>> for the individual test results.
<br>>
<br>>
</div><br><br><br>--
<br>Cheers,
<br>Guillaume Nodet
<br>------------------------
<br>Blog: <a href="http://gnodet.blogspot.com/" target="_top" rel="nofollow">http://gnodet.blogspot.com/</a><br>------------------------
<br>Open Source SOA
<br><a href="http://fusesource.com" target="_top" rel="nofollow">http://fusesource.com</a><br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Developer-Forum-f16869.html" embed="fixTarget[16869]" target="_top" >Apache MINA Developer Forum</a></p>
tag:old.nabble.com,2006:post-26642316
Hudson build became unstable: vysper-trunk-jdk1.5-solaris #169
2009-12-04T05:11:26Z
2009-12-04T05:11:26Z
Apache Hudson Server
See <<a href="http://hudson.zones.apache.org/hudson/job/vysper-trunk-jdk1.5-solaris/169/changes" target="_top" rel="nofollow">http://hudson.zones.apache.org/hudson/job/vysper-trunk-jdk1.5-solaris/169/changes</a>>
<br><br><br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Developer-Forum-f16869.html" embed="fixTarget[16869]" target="_top" >Apache MINA Developer Forum</a></p>
tag:old.nabble.com,2006:post-26642314
Hudson build became unstable: vysper-trunk-jdk1.5-solaris » Apache Vysper Core #169
2009-12-04T05:11:21Z
2009-12-04T05:11:21Z
Apache Hudson Server
See <<a href="http://hudson.zones.apache.org/hudson/job/vysper-trunk-jdk1.5-solaris/org.apache.vysper$vysper-core/169/changes" target="_top" rel="nofollow">http://hudson.zones.apache.org/hudson/job/vysper-trunk-jdk1.5-solaris/org.apache.vysper$vysper-core/169/changes</a>>
<br><br><br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Developer-Forum-f16869.html" embed="fixTarget[16869]" target="_top" >Apache MINA Developer Forum</a></p>
tag:old.nabble.com,2006:post-26642213
Re: Vysper Documentation
2009-12-04T05:00:46Z
2009-12-04T05:00:46Z
Emmanuel Lcharny
Tammer Salem a écrit :
<div class='shrinkable-quote'><br>> Hi Ashish,
<br>> thank you for the response - I'm currently trying to build Vysper (with
<br>> little success at the moment). But ultimately I want to overload some of the
<br>> standard Stanza responses.
<br>>
<br>> I will try to get the build done first, then start asking about the
<br>> architecture.
<br>>
<br>> Regarding the build - I'll start a separate thread for it.
<br>>
</div>Building Vysper is pretty simple :
<br><br>svn co <a href="http://sn.apache.org/repos/asf/mina/sandbox/vysper" target="_top" rel="nofollow">http://sn.apache.org/repos/asf/mina/sandbox/vysper</a> vysper
<br>mvn clean install
<br><br>You must have a Java 5 or 6 installed, maven 2.0.9 at least. Note that
<br>we don't guarantee that it will build with a JVM like gnuj. Use
<br>Sun/IBM/JRockit JVM.
<br><br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-User-Forum-f32104.html" embed="fixTarget[32104]" target="_top" >Apache MINA User Forum</a></p>
tag:old.nabble.com,2006:post-26641984
Hudson build is back to stable: vysper-trunk-jdk1.6-solaris » Apache Vysper XEP-0045 Multi-user chat #167
2009-12-04T04:39:35Z
2009-12-04T04:39:35Z
Apache Hudson Server
See <<a href="http://hudson.zones.apache.org/hudson/job/vysper-trunk-jdk1.6-solaris/org.apache.vysper.extensions$xep0045-muc/167/" target="_top" rel="nofollow">http://hudson.zones.apache.org/hudson/job/vysper-trunk-jdk1.6-solaris/org.apache.vysper.extensions$xep0045-muc/167/</a>>
<br><br><br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Developer-Forum-f16869.html" embed="fixTarget[16869]" target="_top" >Apache MINA Developer Forum</a></p>
tag:old.nabble.com,2006:post-26641897
Re: Vysper Documentation
2009-12-04T04:31:59Z
2009-12-04T04:31:59Z
Tammer Salem
Hi Ashish,
<br>thank you for the response - I'm currently trying to build Vysper (with
<br>little success at the moment). But ultimately I want to overload some of the
<br>standard Stanza responses.
<br><br>I will try to get the build done first, then start asking about the
<br>architecture.
<br><br>Regarding the build - I'll start a separate thread for it.
<br><br>regards,
<br>Tammer
<br><br>2009/12/4 Ashish <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26641897&i=0" target="_top" rel="nofollow">paliwalashish@...</a>>
<br><div class='shrinkable-quote'><br>> On Thu, Dec 3, 2009 at 11:00 PM, Tammer Salem
<br>> <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26641897&i=1" target="_top" rel="nofollow">tammer.salem@...</a>> wrote:
<br>> > Hello,
<br>> > I'm new to Vysper and I'm very interested in using an XMPP server for
<br>> many
<br>> > devices to machine automation (so not as an IM service, but rather as a
<br>> > messaging service).
<br>> >
<br>> > I have been searching for a few days now and can't find any more
<br>> > documentation than what is already provided at
<br>> > <a href="http://mina.apache.org/vysper/index.html" target="_top" rel="nofollow">http://mina.apache.org/vysper/index.html</a><br>> >
<br>> > Is this it? Or is there something a bit more comprehensive (specifically
<br>> I'm
<br>> > looking to use pubsub and possibly overload functions using stanzas to
<br>> > transport simple light XML)
<br>> >
<br>> > thanks,
<br>> > Tammer
<br>>
<br>> Unfortunately, we don't have more comprehensive documentation as of now.
<br>> We are open to accept submissions :-)
<br>>
<br>> Would recommend that you give it a try, and use this Mailing list, in
<br>> case you run into issues
<br>> and we will be glad to help you
<br>> --
<br>> thanks
<br>> ashish
<br>>
<br>> Blog: <a href="http://www.ashishpaliwal.com/blog" target="_top" rel="nofollow">http://www.ashishpaliwal.com/blog</a><br>> My Photo Galleries: <a href="http://www.pbase.com/ashishpaliwal" target="_top" rel="nofollow">http://www.pbase.com/ashishpaliwal</a><br>>
<br></div><p>From forum: <a href="http://old.nabble.com/Apache-MINA-User-Forum-f32104.html" embed="fixTarget[32104]" target="_top" >Apache MINA User Forum</a></p>
tag:old.nabble.com,2006:post-26641880
svn commit: r887171 - in /mina/sandbox/vysper/trunk/server: core/src/main/java/org/apache/vysper/xmpp/authorization/ core/src/main/java/org/apache/vysper/xmpp/modules/core/bind/handler/ core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep005...
2009-12-04T04:30:08Z
2009-12-04T04:30:08Z
ngn
Author: ngn
<br>Date: Fri Dec 4 12:30:06 2009
<br>New Revision: 887171
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=887171&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=887171&view=rev</a><br>Log:
<br>Remove the use of addNamespaceAttribute(String) from most places as it is no longer needed
<br><br>Modified:
<br> mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/authorization/AuthorizationResponses.java
<br> mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/bind/handler/BindIQHandler.java
<br> mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempIQHandler.java
<br> mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionIQHandler.java
<br> mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeIQHandler.java
<br> mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeXEP0090IQHandler.java
<br> mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterStanzaUtils.java
<br> mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java
<br> mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java
<br> mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java
<br> mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerResponses.java
<br> mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/stanzasession/StanzaSessionTestCase.java
<br> mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/authorization/PlainTestCase.java
<br> mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java
<br> mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerPlainMechanismTestCase.java
<br> mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerUnavailableMechanismTestCase.java
<br> mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java
<br> mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandlerTestCase.java
<br> mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java
<br> mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/SubscriberPayloadNotificationVisitor.java
<br> mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java
<br> mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsHandler.java
<br> mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsHandler.java
<br> mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java
<br> mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java
<br> mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerManageAffiliationsHandler.java
<br> mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoInfoTestCase.java
<br> mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java
<br> mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/AbstractStanzaGenerator.java
<br><br>Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/authorization/AuthorizationResponses.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/authorization/AuthorizationResponses.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/authorization/AuthorizationResponses.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/authorization/AuthorizationResponses.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/authorization/AuthorizationResponses.java Fri Dec 4 12:30:06 2009
<br>@@ -32,8 +32,7 @@
<br> public class AuthorizationResponses {
<br>
<br> public Stanza getSuccess() {
<br>- StanzaBuilder stanzaBuilder = new StanzaBuilder("success");
<br>- stanzaBuilder.addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
<br>+ StanzaBuilder stanzaBuilder = new StanzaBuilder("success", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
<br> return stanzaBuilder.build();
<br> }
<br>
<br>@@ -42,7 +41,7 @@
<br> }
<br>
<br> public Stanza getFailure(SASLFailureType failureType) {
<br>- return new StanzaBuilder("failure").addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL)
<br>+ return new StanzaBuilder("failure", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL)
<br> .startInnerElement(failureType.value()).endInnerElement().build();
<br> }
<br> public Stanza getFailureMalformedRequest() {
<br><br>Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/bind/handler/BindIQHandler.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/bind/handler/BindIQHandler.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/bind/handler/BindIQHandler.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/bind/handler/BindIQHandler.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/bind/handler/BindIQHandler.java Fri Dec 4 12:30:06 2009
<br>@@ -72,9 +72,9 @@
<br>
<br> StanzaBuilder stanzaBuilder =
<br> StanzaBuilder.createIQStanza(null, null, IQStanzaType.RESULT, stanza.getID()).
<br>- startInnerElement("bind").
<br>- addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_BIND).
<br>- startInnerElement("jid").addText(entity.getFullQualifiedName()).endInnerElement().
<br>+ startInnerElement("bind", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_BIND).
<br>+ startInnerElement("jid", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_BIND).
<br>+ addText(entity.getFullQualifiedName()).endInnerElement().
<br> endInnerElement();
<br>
<br> return stanzaBuilder.build();
<br><br>Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempIQHandler.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempIQHandler.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempIQHandler.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempIQHandler.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempIQHandler.java Fri Dec 4 12:30:06 2009
<br>@@ -112,13 +112,13 @@
<br> if (vcardXml == null) {
<br> IQStanzaType iqStanzaType = returnEmptyVCardWhenNonExistent ? IQStanzaType.RESULT : IQStanzaType.ERROR;
<br> StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(stanza.getTo(), stanza.getFrom(), iqStanzaType, stanza.getID());
<br>- stanzaBuilder.startInnerElement("vCard").addNamespaceAttribute(NamespaceURIs.VCARD_TEMP).endInnerElement();
<br>+ stanzaBuilder.startInnerElement("vCard", NamespaceURIs.VCARD_TEMP).endInnerElement();
<br> if (returnEmptyVCardWhenNonExistent) {
<br> // keep it like it is
<br> } else {
<br> stanzaBuilder.
<br> startInnerElement("error").addAttribute("type", "cancel").
<br>- startInnerElement("item-not-found").addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS).
<br>+ startInnerElement("item-not-found", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS).
<br> endInnerElement().
<br> endInnerElement();
<br> }
<br><br>Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionIQHandler.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionIQHandler.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionIQHandler.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionIQHandler.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionIQHandler.java Fri Dec 4 12:30:06 2009
<br>@@ -55,12 +55,11 @@
<br> protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
<br>
<br> StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(stanza.getTo(), stanza.getFrom(), IQStanzaType.RESULT, stanza.getID()).
<br>- startInnerElement("query").
<br>- addNamespaceAttribute(NamespaceURIs.JABBER_IQ_VERSION).
<br>+ startInnerElement("query", NamespaceURIs.JABBER_IQ_VERSION).
<br>
<br>- startInnerElement("name").addText("Apache Vysper XMPP Server").endInnerElement().
<br>- startInnerElement("version").addText("0.1 beta").endInnerElement().
<br>- startInnerElement("os").addText(OS_VERSION).endInnerElement().
<br>+ startInnerElement("name", NamespaceURIs.JABBER_IQ_VERSION).addText("Apache Vysper XMPP Server").endInnerElement().
<br>+ startInnerElement("version", NamespaceURIs.JABBER_IQ_VERSION).addText("0.1 beta").endInnerElement().
<br>+ startInnerElement("os", NamespaceURIs.JABBER_IQ_VERSION).addText(OS_VERSION).endInnerElement().
<br>
<br> endInnerElement();
<br>
<br><br>Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeIQHandler.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeIQHandler.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeIQHandler.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeIQHandler.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeIQHandler.java Fri Dec 4 12:30:06 2009
<br>@@ -64,11 +64,10 @@
<br> String utcTime = DateTimeProfile.getInstance().getDateTimeInUTC(now);
<br>
<br> StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(stanza.getTo(), stanza.getFrom(), IQStanzaType.RESULT, stanza.getID()).
<br>- startInnerElement("time").
<br>- addNamespaceAttribute(NamespaceURIs.URN_XMPP_TIME).
<br>+ startInnerElement("time", NamespaceURIs.URN_XMPP_TIME).
<br>
<br>- startInnerElement("tzo").addText(timeZone).endInnerElement().
<br>- startInnerElement("utc").addText(utcTime).endInnerElement().
<br>+ startInnerElement("tzo", NamespaceURIs.URN_XMPP_TIME).addText(timeZone).endInnerElement().
<br>+ startInnerElement("utc", NamespaceURIs.URN_XMPP_TIME).addText(utcTime).endInnerElement().
<br>
<br> endInnerElement();
<br>
<br><br>Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeXEP0090IQHandler.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeXEP0090IQHandler.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeXEP0090IQHandler.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeXEP0090IQHandler.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeXEP0090IQHandler.java Fri Dec 4 12:30:06 2009
<br>@@ -74,12 +74,11 @@
<br> String displayTime = localDateFormatter.format(now);
<br>
<br> StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(stanza.getTo(), stanza.getFrom(), IQStanzaType.RESULT, stanza.getID()).
<br>- startInnerElement("query").
<br>- addNamespaceAttribute(NamespaceURIs.JABBER_IQ_TIME).
<br>+ startInnerElement("query", NamespaceURIs.JABBER_IQ_TIME).
<br>
<br>- startInnerElement("utc").addText(utcTime).endInnerElement().
<br>- startInnerElement("tz").addText(timeZone).endInnerElement().
<br>- startInnerElement("display").addText(displayTime).endInnerElement().
<br>+ startInnerElement("utc", NamespaceURIs.JABBER_IQ_TIME).addText(utcTime).endInnerElement().
<br>+ startInnerElement("tz", NamespaceURIs.JABBER_IQ_TIME).addText(timeZone).endInnerElement().
<br>+ startInnerElement("display", NamespaceURIs.JABBER_IQ_TIME).addText(displayTime).endInnerElement().
<br>
<br> endInnerElement();
<br>
<br><br>Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterStanzaUtils.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterStanzaUtils.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterStanzaUtils.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterStanzaUtils.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterStanzaUtils.java Fri Dec 4 12:30:06 2009
<br>@@ -36,8 +36,7 @@
<br>
<br> public static StanzaBuilder createRosterItemsIQ(Entity to, String id, IQStanzaType type, Iterable<RosterItem> rosterItems) {
<br> StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(null, to, type, id).
<br>- startInnerElement("query").
<br>- addNamespaceAttribute(NamespaceURIs.JABBER_IQ_ROSTER);
<br>+ startInnerElement("query", NamespaceURIs.JABBER_IQ_ROSTER);
<br>
<br> for (RosterItem rosterItem : rosterItems) {
<br> createRosterItem(stanzaBuilder, rosterItem);
<br>@@ -59,7 +58,7 @@
<br> }
<br>
<br> public static void createRosterItem(StanzaBuilder stanzaBuilder, RosterItem rosterItem) {
<br>- stanzaBuilder.startInnerElement("item").
<br>+ stanzaBuilder.startInnerElement("item", NamespaceURIs.JABBER_IQ_ROSTER).
<br> addAttribute("jid", rosterItem.getJid().getFullQualifiedName());
<br> if (rosterItem.getName() != null) {
<br> stanzaBuilder.addAttribute("name", rosterItem.getName());
<br>@@ -73,7 +72,7 @@
<br> List<RosterGroup> groupList = rosterItem.getGroups();
<br> if (groupList != null) {
<br> for (RosterGroup rosterGroup : groupList) {
<br>- stanzaBuilder.startInnerElement("group").
<br>+ stanzaBuilder.startInnerElement("group", NamespaceURIs.JABBER_IQ_ROSTER).
<br> addText(rosterGroup.getName()).
<br> endInnerElement();
<br> }
<br><br>Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java Fri Dec 4 12:30:06 2009
<br>@@ -137,8 +137,7 @@
<br>
<br> // render the stanza with information collected
<br> StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(to, stanza.getFrom(), IQStanzaType.RESULT, stanza.getID()).
<br>- startInnerElement("query").
<br>- addNamespaceAttribute(NamespaceURIs.XEP0030_SERVICE_DISCOVERY_INFO);
<br>+ startInnerElement("query", NamespaceURIs.XEP0030_SERVICE_DISCOVERY_INFO);
<br> if (node != null) {
<br> stanzaBuilder.addAttribute("node", node);
<br> }
<br><br>Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java Fri Dec 4 12:30:06 2009
<br>@@ -118,8 +118,7 @@
<br>
<br> // render the stanza with information collected
<br> StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(to, stanza.getFrom(), IQStanzaType.RESULT, stanza.getID()).
<br>- startInnerElement("query").
<br>- addNamespaceAttribute(NamespaceURIs.XEP0030_SERVICE_DISCOVERY_ITEMS);
<br>+ startInnerElement("query", NamespaceURIs.XEP0030_SERVICE_DISCOVERY_ITEMS);
<br> if (node != null) {
<br> stanzaBuilder.addAttribute("node", node);
<br> }
<br><br>Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java Fri Dec 4 12:30:06 2009
<br>@@ -121,14 +121,12 @@
<br> .addAttribute("type", type.value());
<br>
<br> // insert defined error condition relating to the stanza error type
<br>- responseBuilder.startInnerElement(errorCondition.value());
<br>- responseBuilder.addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS);
<br>+ responseBuilder.startInnerElement(errorCondition.value(), NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS);
<br> responseBuilder.endInnerElement();
<br>
<br> // optional error text
<br> if (errorText != null && errorLang != null) {
<br>- responseBuilder.startInnerElement("text")
<br>- .addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS)
<br>+ responseBuilder.startInnerElement("text", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS)
<br> .addAttribute(NamespaceURIs.XML, "lang", errorLang)
<br> .addText(errorText);
<br> }
<br>@@ -139,14 +137,12 @@
<br> }
<br>
<br> public Stanza getTLSFailure() {
<br>- StanzaBuilder stanzaBuilder = new StanzaBuilder("failure");
<br>- stanzaBuilder.addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_TLS);
<br>+ StanzaBuilder stanzaBuilder = new StanzaBuilder("failure", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_TLS);
<br> return stanzaBuilder.build();
<br> }
<br>
<br> public Stanza getSASLFailure(SASLFailureType failureType) {
<br>- StanzaBuilder stanzaBuilder = new StanzaBuilder("failure");
<br>- stanzaBuilder.addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
<br>+ StanzaBuilder stanzaBuilder = new StanzaBuilder("failure", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
<br> if (failureType != null) {
<br> stanzaBuilder.startInnerElement(failureType.toString()).endInnerElement();
<br> }
<br><br>Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerResponses.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerResponses.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerResponses.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerResponses.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerResponses.java Fri Dec 4 12:30:06 2009
<br>@@ -119,15 +119,13 @@
<br>
<br> public Stanza getTLSProceed() {
<br>
<br>- StanzaBuilder stanzaBuilder = new StanzaBuilder("proceed");
<br>- stanzaBuilder.addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_TLS);
<br>+ StanzaBuilder stanzaBuilder = new StanzaBuilder("proceed", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_TLS);
<br> return stanzaBuilder.build();
<br> }
<br>
<br> public Stanza getAuthAborted() {
<br>
<br>- StanzaBuilder stanzaBuilder = new StanzaBuilder("aborted");
<br>- stanzaBuilder.addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_TLS);
<br>+ StanzaBuilder stanzaBuilder = new StanzaBuilder("aborted", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_TLS);
<br> return stanzaBuilder.build();
<br> }
<br>
<br><br>Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/stanzasession/StanzaSessionTestCase.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/stanzasession/StanzaSessionTestCase.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/stanzasession/StanzaSessionTestCase.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/stanzasession/StanzaSessionTestCase.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/stanzasession/StanzaSessionTestCase.java Fri Dec 4 12:30:06 2009
<br>@@ -78,9 +78,8 @@
<br> assertNotNull(stanza);
<br> System.out.println(DenseStanzaLogRenderer.render(stanza));
<br> session.send(
<br>- new StanzaBuilder("starttls")
<br>+ new StanzaBuilder("starttls", "urn:ietf:params:xml:ns:xmpp-tls")
<br> .addAttribute("from", "<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26641880&i=0" target="_top" rel="nofollow">me@...</a>")
<br>- .addNamespaceAttribute("urn:ietf:params:xml:ns:xmpp-tls")
<br> .build()
<br> );
<br> stanza = waitForStanza(session);
<br><br>Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/authorization/PlainTestCase.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/authorization/PlainTestCase.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/authorization/PlainTestCase.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/authorization/PlainTestCase.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/authorization/PlainTestCase.java Fri Dec 4 12:30:06 2009
<br>@@ -36,7 +36,7 @@
<br>
<br> public void testPlainEmpty() throws XMLSemanticError {
<br>
<br>- Stanza stanza = new StanzaBuilder("plain").addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL).build();
<br>+ Stanza stanza = new StanzaBuilder("plain", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL).build();
<br>
<br> Stanza response = startMechanism(stanza);
<br> assertResponse(response, "malformed-request");
<br>@@ -44,7 +44,7 @@
<br>
<br> public void testPlainNonBASE64() throws XMLSemanticError {
<br>
<br>- Stanza stanza = new StanzaBuilder("plain").addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL)
<br>+ Stanza stanza = new StanzaBuilder("plain", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL)
<br> .addText("aEflkejidkj==")
<br> .build();
<br>
<br>@@ -54,7 +54,7 @@
<br>
<br> public void testPlainNonExistingUser() throws XMLSemanticError {
<br>
<br>- Stanza stanza = new StanzaBuilder("plain").addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL)
<br>+ Stanza stanza = new StanzaBuilder("plain", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL)
<br> .addText(encode("dieter", "schluppkoweit"))
<br> .build();
<br>
<br>@@ -64,7 +64,7 @@
<br>
<br> public void testPlainNotExistingUser() throws XMLSemanticError {
<br>
<br>- Stanza stanza = new StanzaBuilder("plain").addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL)
<br>+ Stanza stanza = new StanzaBuilder("plain", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL)
<br> .addText(encode("dieter", "schluppkoweit"))
<br> .build();
<br>
<br>@@ -76,7 +76,7 @@
<br>
<br> String innerText = new String(Base64.encodeBase64("continuous".getBytes()));
<br>
<br>- Stanza stanza = new StanzaBuilder("plain").addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL)
<br>+ Stanza stanza = new StanzaBuilder("plain", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL)
<br> .addText(innerText).build();
<br>
<br> Stanza response = startMechanism(stanza);
<br><br>Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java Fri Dec 4 12:30:06 2009
<br>@@ -70,8 +70,7 @@
<br> StanzaBuilder stanzaBuilder = createAbort();
<br> Stanza abortPlainStanza = stanzaBuilder.build();
<br>
<br>- stanzaBuilder = new StanzaBuilder("auth");
<br>- stanzaBuilder.addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
<br>+ stanzaBuilder = new StanzaBuilder("auth", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
<br> stanzaBuilder.addAttribute("mechanism", "PLAIN");
<br> stanzaBuilder.addText(new String(Base64.encodeBase64("dummy\0user007\0pass007".getBytes())));
<br> Stanza authPlainStanza = stanzaBuilder.build();
<br><br>Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerPlainMechanismTestCase.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerPlainMechanismTestCase.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerPlainMechanismTestCase.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerPlainMechanismTestCase.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerPlainMechanismTestCase.java Fri Dec 4 12:30:06 2009
<br>@@ -155,8 +155,7 @@
<br> }
<br>
<br> private StanzaBuilder createAuthPlain() {
<br>- StanzaBuilder stanzaBuilder = new StanzaBuilder("auth");
<br>- stanzaBuilder.addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
<br>+ StanzaBuilder stanzaBuilder = new StanzaBuilder("auth", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
<br> stanzaBuilder.addAttribute("mechanism", "PLAIN");
<br> return stanzaBuilder;
<br> }
<br><br>Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerUnavailableMechanismTestCase.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerUnavailableMechanismTestCase.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerUnavailableMechanismTestCase.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerUnavailableMechanismTestCase.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerUnavailableMechanismTestCase.java Fri Dec 4 12:30:06 2009
<br>@@ -55,8 +55,7 @@
<br> }
<br>
<br> public void testAuthPlainWrongCase() throws AuthorizationFailedException {
<br>- StanzaBuilder stanzaBuilder = new StanzaBuilder("auth");
<br>- stanzaBuilder.addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
<br>+ StanzaBuilder stanzaBuilder = new StanzaBuilder("auth", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
<br> stanzaBuilder.addAttribute("mechanism", "plain"); // 'PLAIN' would be correct
<br> Stanza authPlainStanza = stanzaBuilder.build();
<br>
<br>@@ -71,8 +70,7 @@
<br> }
<br>
<br> public void testAuthPlainUnavailableMechanism() throws AuthorizationFailedException {
<br>- StanzaBuilder stanzaBuilder = new StanzaBuilder("auth");
<br>- stanzaBuilder.addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
<br>+ StanzaBuilder stanzaBuilder = new StanzaBuilder("auth", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
<br> stanzaBuilder.addAttribute("mechanism", "EXTERNAL");
<br> Stanza authPlainStanza = stanzaBuilder.build();
<br>
<br><br>Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java Fri Dec 4 12:30:06 2009
<br>@@ -44,8 +44,7 @@
<br> }
<br>
<br> public void testAppropriateSessionState() {
<br>- StanzaBuilder stanzaBuilder = new StanzaBuilder("starttls");
<br>- stanzaBuilder.addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_TLS);
<br>+ StanzaBuilder stanzaBuilder = new StanzaBuilder("starttls", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_TLS);
<br> Stanza starttlsStanza = stanzaBuilder.build();
<br>
<br> TestSessionContext sessionContext = this.sessionContext;
<br>@@ -81,12 +80,10 @@
<br> public void testNamespace() {
<br> sessionContext.setSessionState(SessionState.STARTED);
<br>
<br>- StanzaBuilder stanzaBuilder = new StanzaBuilder("starttls");
<br>- stanzaBuilder.addNamespaceAttribute(NamespaceURIs.HTTP_ETHERX_JABBER_ORG_STREAMS);
<br>+ StanzaBuilder stanzaBuilder = new StanzaBuilder("starttls", NamespaceURIs.HTTP_ETHERX_JABBER_ORG_STREAMS);
<br> Stanza wrongNSStanza = stanzaBuilder.build();
<br>
<br>- stanzaBuilder = new StanzaBuilder("starttls");
<br>- stanzaBuilder.addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_TLS);
<br>+ stanzaBuilder = new StanzaBuilder("starttls", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_TLS);
<br> Stanza correctNSStanza = stanzaBuilder.build();
<br>
<br> TestSessionContext sessionContext = this.sessionContext;
<br><br>Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandlerTestCase.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandlerTestCase.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandlerTestCase.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandlerTestCase.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandlerTestCase.java Fri Dec 4 12:30:06 2009
<br>@@ -66,7 +66,7 @@
<br>
<br> private StanzaBuilder createRosterGet() {
<br> StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(new EntityImpl(client, boundResourceId), null, IQStanzaType.GET, "id1");
<br>- stanzaBuilder.startInnerElement("query").addNamespaceAttribute(NamespaceURIs.JABBER_IQ_ROSTER).endInnerElement();
<br>+ stanzaBuilder.startInnerElement("query", NamespaceURIs.JABBER_IQ_ROSTER).endInnerElement();
<br> return stanzaBuilder;
<br> }
<br>
<br><br>Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java Fri Dec 4 12:30:06 2009
<br>@@ -197,7 +197,7 @@
<br>
<br> StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(null, null, IQStanzaType.GET, "test");
<br> stanzaBuilder.addAttribute("from", new EntityImpl("charlotte", server.getDomain(), onlyBoundResource).getFullQualifiedName());
<br>- stanzaBuilder.startInnerElement("query").addNamespaceAttribute("testNSURI").endInnerElement();
<br>+ stanzaBuilder.startInnerElement("query", "testNSURI").endInnerElement();
<br>
<br> protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
<br>
<br>@@ -220,7 +220,7 @@
<br> StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(null, null, IQStanzaType.GET, "test");
<br>
<br> stanzaBuilder.addAttribute("from", new EntityImpl("charlotte", server.getDomain(), arbitraryUnboundResource).getFullQualifiedName());
<br>- stanzaBuilder.startInnerElement("query").addNamespaceAttribute("testNSURI").endInnerElement();
<br>+ stanzaBuilder.startInnerElement("query", "testNSURI").endInnerElement();
<br>
<br> protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
<br>
<br>@@ -252,7 +252,7 @@
<br>
<br> StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(null, null, IQStanzaType.GET, "test");
<br> stanzaBuilder.addAttribute("from", new EntityImpl("lea", server.getDomain(), null).getFullQualifiedName());
<br>- stanzaBuilder.startInnerElement("query").addNamespaceAttribute("testNSURI").endInnerElement();
<br>+ stanzaBuilder.startInnerElement("query", "testNSURI").endInnerElement();
<br>
<br> protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
<br> Stanza recordedResponse = sessionContext.getNextRecordedResponse();
<br>@@ -266,7 +266,7 @@
<br> // bare id allowed, only one resource is bound
<br> stanzaBuilder = StanzaBuilder.createIQStanza(null, null, IQStanzaType.GET, "test");
<br> stanzaBuilder.addAttribute("from", new EntityImpl("lea", server.getDomain(), null).getFullQualifiedName());
<br>- stanzaBuilder.startInnerElement("query").addNamespaceAttribute("testNSURI").endInnerElement();
<br>+ stanzaBuilder.startInnerElement("query", "testNSURI").endInnerElement();
<br> protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
<br> stanzaHandler.assertHandlerCalled();
<br> sessionContext.reset();
<br>@@ -274,7 +274,7 @@
<br> // second resource is now invalid and cannot be used anymore in a full qualified entity
<br> stanzaBuilder = StanzaBuilder.createIQStanza(null, null, IQStanzaType.GET, "test");
<br> stanzaBuilder.addAttribute("from", new EntityImpl("lea", server.getDomain(), secondBoundResource).getFullQualifiedName());
<br>- stanzaBuilder.startInnerElement("query").addNamespaceAttribute("testNSURI").endInnerElement();
<br>+ stanzaBuilder.startInnerElement("query", "testNSURI").endInnerElement();
<br> protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
<br> recordedResponse = sessionContext.getNextRecordedResponse();
<br> assertUnknownSenderError(recordedResponse);
<br><br>Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/SubscriberPayloadNotificationVisitor.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/SubscriberPayloadNotificationVisitor.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/SubscriberPayloadNotificationVisitor.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/SubscriberPayloadNotificationVisitor.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/SubscriberPayloadNotificationVisitor.java Fri Dec 4 12:30:06 2009
<br>@@ -89,12 +89,11 @@
<br> * @return the prepared Stanza object.
<br> */
<br> private Stanza createMessageEventStanza(String nodeName, Entity to, String lang, XMLElement item) {
<br>- StanzaBuilder stanzaBuilder = new StanzaBuilder("message");
<br>+ StanzaBuilder stanzaBuilder = new StanzaBuilder("message", NamespaceURIs.XEP0060_PUBSUB_EVENT);
<br> stanzaBuilder.addAttribute("from", serverJID.getFullQualifiedName());
<br> stanzaBuilder.addAttribute("to", to.getFullQualifiedName());
<br> stanzaBuilder.addAttribute(NamespaceURIs.XML, "lang", lang);
<br> stanzaBuilder.startInnerElement("event");
<br>- stanzaBuilder.addNamespaceAttribute(NamespaceURIs.XEP0060_PUBSUB_EVENT);
<br> stanzaBuilder.startInnerElement("items");
<br> stanzaBuilder.addAttribute("node", nodeName);
<br> stanzaBuilder.addPreparedElement(item);
<br><br>Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java Fri Dec 4 12:30:06 2009
<br>@@ -90,8 +90,7 @@
<br> String iqStanzaID = stanza.getAttributeValue("id");
<br>
<br> StanzaBuilder sb = StanzaBuilder.createIQStanza(serverJID, sender, IQStanzaType.RESULT, iqStanzaID);
<br>- sb.startInnerElement("pubsub");
<br>- sb.addNamespaceAttribute(NamespaceURIs.XEP0060_PUBSUB);
<br>+ sb.startInnerElement("pubsub", NamespaceURIs.XEP0060_PUBSUB);
<br>
<br> XMLElement publish = stanza.getFirstInnerElement().getFirstInnerElement(); // pubsub/publish
<br> String nodeName = publish.getAttributeValue("node"); // MUST
<br><br>Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsHandler.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsHandler.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsHandler.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsHandler.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsHandler.java Fri Dec 4 12:30:06 2009
<br>@@ -77,8 +77,7 @@
<br> String iqStanzaID = stanza.getAttributeValue("id");
<br>
<br> StanzaBuilder sb = StanzaBuilder.createIQStanza(serverJID, sender, IQStanzaType.RESULT, iqStanzaID);
<br>- sb.startInnerElement("pubsub");
<br>- sb.addNamespaceAttribute(NamespaceURIs.XEP0060_PUBSUB);
<br>+ sb.startInnerElement("pubsub", NamespaceURIs.XEP0060_PUBSUB);
<br>
<br> List<AffiliationItem> subscriptions = collectAffiliations(root, sender);
<br>
<br><br>Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsHandler.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsHandler.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsHandler.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsHandler.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsHandler.java Fri Dec 4 12:30:06 2009
<br>@@ -79,8 +79,7 @@
<br> String iqStanzaID = stanza.getAttributeValue("id");
<br>
<br> StanzaBuilder sb = StanzaBuilder.createIQStanza(serverJID, sender, IQStanzaType.RESULT, iqStanzaID);
<br>- sb.startInnerElement("pubsub");
<br>- sb.addNamespaceAttribute(NamespaceURIs.XEP0060_PUBSUB);
<br>+ sb.startInnerElement("pubsub", NamespaceURIs.XEP0060_PUBSUB);
<br> String nodeName = extractNodeName(stanza);
<br>
<br> List<SubscriptionItem> subscriptions = collectSubscriptions(root, sender, nodeName);
<br><br>Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java Fri Dec 4 12:30:06 2009
<br>@@ -94,8 +94,7 @@
<br> String iqStanzaID = stanza.getAttributeValue("id");
<br>
<br> StanzaBuilder sb = StanzaBuilder.createIQStanza(serverJID, sender, IQStanzaType.RESULT, iqStanzaID);
<br>- sb.startInnerElement("pubsub");
<br>- sb.addNamespaceAttribute(NamespaceURIs.XEP0060_PUBSUB);
<br>+ sb.startInnerElement("pubsub", NamespaceURIs.XEP0060_PUBSUB);
<br>
<br> XMLElement sub = stanza.getFirstInnerElement().getFirstInnerElement(); // pubsub/subscribe
<br> String strSubJID = sub.getAttributeValue("jid"); // MUST
<br><br>Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java Fri Dec 4 12:30:06 2009
<br>@@ -89,8 +89,7 @@
<br> String iqStanzaID = stanza.getAttributeValue("id");
<br>
<br> StanzaBuilder sb = StanzaBuilder.createIQStanza(serverJID, sender, IQStanzaType.RESULT, iqStanzaID);
<br>- sb.startInnerElement("pubsub");
<br>- sb.addNamespaceAttribute(NamespaceURIs.XEP0060_PUBSUB);
<br>+ sb.startInnerElement("pubsub", NamespaceURIs.XEP0060_PUBSUB);
<br>
<br> XMLElement unsub = stanza.getFirstInnerElement().getFirstInnerElement(); // pubsub/unsubscribe
<br> String strSubJID = unsub.getAttributeValue("jid"); // MUST
<br><br>Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerManageAffiliationsHandler.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerManageAffiliationsHandler.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerManageAffiliationsHandler.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerManageAffiliationsHandler.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerManageAffiliationsHandler.java Fri Dec 4 12:30:06 2009
<br>@@ -89,8 +89,7 @@
<br>
<br> String iqStanzaID = stanza.getAttributeValue("id");
<br> StanzaBuilder sb = StanzaBuilder.createIQStanza(serverJID, sender, IQStanzaType.RESULT, iqStanzaID);
<br>- sb.startInnerElement("pubsub");
<br>- sb.addNamespaceAttribute(NamespaceURIs.XEP0060_PUBSUB_OWNER);
<br>+ sb.startInnerElement("pubsub", NamespaceURIs.XEP0060_PUBSUB_OWNER);
<br>
<br> String nodeName = extractNodeName(stanza);
<br> LeafNode node = root.find(nodeName);
<br>@@ -130,8 +129,7 @@
<br>
<br> String iqStanzaID = stanza.getAttributeValue("id");
<br> StanzaBuilder sb = StanzaBuilder.createIQStanza(serverJID, sender, IQStanzaType.RESULT, iqStanzaID);
<br>- sb.startInnerElement("pubsub");
<br>- sb.addNamespaceAttribute(NamespaceURIs.XEP0060_PUBSUB_OWNER);
<br>+ sb.startInnerElement("pubsub", NamespaceURIs.XEP0060_PUBSUB_OWNER);
<br>
<br> String nodeName = extractNodeName(stanza);
<br> LeafNode node = root.find(nodeName);
<br><br>Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoInfoTestCase.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoInfoTestCase.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoInfoTestCase.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoInfoTestCase.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoInfoTestCase.java Fri Dec 4 12:30:06 2009
<br>@@ -163,8 +163,7 @@
<br>
<br> public Stanza getStanza(Entity client, Entity pubsub, String id) {
<br> StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(client, pubsub, getStanzaType(), id);
<br>- stanzaBuilder.startInnerElement("query");
<br>- stanzaBuilder.addNamespaceAttribute(getNamespace());
<br>+ stanzaBuilder.startInnerElement("query", getNamespace());
<br>
<br> return stanzaBuilder.build();
<br> }
<br>@@ -172,8 +171,7 @@
<br> @Override
<br> public Stanza getStanza(Entity client, Entity pubsub, String id, String node) {
<br> StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(client, pubsub, getStanzaType(), id);
<br>- stanzaBuilder.startInnerElement("query");
<br>- stanzaBuilder.addNamespaceAttribute(getNamespace());
<br>+ stanzaBuilder.startInnerElement("query", getNamespace());
<br> stanzaBuilder.addAttribute("node", node);
<br>
<br> stanzaBuilder.endInnerElement();
<br><br>Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java Fri Dec 4 12:30:06 2009
<br>@@ -201,8 +201,7 @@
<br>
<br> public Stanza getStanza(Entity client, Entity pubsub, String id) {
<br> StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(client, pubsub, getStanzaType(), id);
<br>- stanzaBuilder.startInnerElement("query");
<br>- stanzaBuilder.addNamespaceAttribute(getNamespace());
<br>+ stanzaBuilder.startInnerElement("query", getNamespace());
<br>
<br> stanzaBuilder.endInnerElement();
<br>
<br>@@ -212,8 +211,7 @@
<br> @Override
<br> public Stanza getStanza(Entity client, Entity pubsub, String id, String node) {
<br> StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(client, pubsub, getStanzaType(), id);
<br>- stanzaBuilder.startInnerElement("query");
<br>- stanzaBuilder.addNamespaceAttribute(getNamespace());
<br>+ stanzaBuilder.startInnerElement("query", getNamespace());
<br> stanzaBuilder.addAttribute("node", node);
<br>
<br> stanzaBuilder.endInnerElement();
<br><br>Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/AbstractStanzaGenerator.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/AbstractStanzaGenerator.java?rev=887171&r1=887170&r2=887171&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/AbstractStanzaGenerator.java?rev=887171&r1=887170&r2=887171&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/AbstractStanzaGenerator.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/AbstractStanzaGenerator.java Fri Dec 4 12:30:06 2009
<br>@@ -66,8 +66,7 @@
<br> */
<br> public Stanza getStanza(Entity client, Entity pubsub, String id, String node) {
<br> StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(client, pubsub, getStanzaType(), id);
<br>- stanzaBuilder.startInnerElement("pubsub");
<br>- stanzaBuilder.addNamespaceAttribute(getNamespace());
<br>+ stanzaBuilder.startInnerElement("pubsub", getNamespace());
<br>
<br> buildInnerElement(client, pubsub, stanzaBuilder, node);
<br>
<br><br><br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Commits-f16870.html" embed="fixTarget[16870]" target="_top" >Apache MINA Commits</a></p>
tag:old.nabble.com,2006:post-26641823
Re: Version 2.x - Norweigian Wood
2009-12-04T04:25:15Z
2009-12-04T04:25:15Z
Emmanuel Lcharny
Glenn Ivar Klausen a écrit :
<div class='shrinkable-quote'><br>> Emmanuel Lcharny wrote:
<br>>> Well, less than "dead wood"...
<br>>>
<br>>> This name was picked by someone who was at the origin of the project,
<br>>> at a time he was pretty alone working on it (since then, he quit). I
<br>>> personnaly don't think it's a good idea to attach a name with a
<br>>> version, à la Ubuntu (I have always been totally lost with Intrepid
<br>>> Jakal or Laughable Vampire, not being able to make a connection with
<br>>> 8.04 or 9.10).
<br>>>
<br>>> Anyway, I think we should get rid of those useless nicknames.
<br>>>
<br>>>
<br>>
<br>> Ok, ... I was just referring to the fact that Norwegian is spelled
<br>> wrong, however, its a good point regarding the nick names.
<br>>
<br>> G (Norwegian)
</div><br>Wikipedia, about "Norwegian wood" :
<br><br>"This exchange took place in a press conference in Los Angeles on 24
<br>August 1966:
<br><br> Reporter: I'd like to direct this question to messrs. Lennon and
<br>McCartney. In a recent article, Time magazine put down pop music. And
<br>they referred to "Day Tripper" as being about a prostitute...
<br> Paul: Oh yeah.
<br> Reporter: ...and "Norwegian Wood" as being about a lesbian.
<br> Paul: Oh yeah."
<br><br> :)
<br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Developer-Forum-f16869.html" embed="fixTarget[16869]" target="_top" >Apache MINA Developer Forum</a></p>
tag:old.nabble.com,2006:post-26641763
Re: Version 2.x - Norweigian Wood
2009-12-04T04:19:15Z
2009-12-04T04:19:15Z
Glenn Ivar Klausen
Emmanuel Lcharny wrote:
<div class='shrinkable-quote'><br>> Well, less than "dead wood"...
<br>>
<br>> This name was picked by someone who was at the origin of the project,
<br>> at a time he was pretty alone working on it (since then, he quit). I
<br>> personnaly don't think it's a good idea to attach a name with a
<br>> version, à la Ubuntu (I have always been totally lost with Intrepid
<br>> Jakal or Laughable Vampire, not being able to make a connection with
<br>> 8.04 or 9.10).
<br>>
<br>> Anyway, I think we should get rid of those useless nicknames.
<br>>
<br>>
</div><br>Ok, ... I was just referring to the fact that Norwegian is spelled
<br>wrong, however, its a good point regarding the nick names.
<br><br>G (Norwegian)
<br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Developer-Forum-f16869.html" embed="fixTarget[16869]" target="_top" >Apache MINA Developer Forum</a></p>
tag:old.nabble.com,2006:post-26641749
[CONF] Apache MINA > Mailing Lists
2009-12-04T04:18:00Z
2009-12-04T04:18:00Z
confluence-2
<html>
<head>
<base href="http://cwiki.apache.org/confluence">
<link rel="stylesheet" href="/confluence/s/1519/1/1/_/styles/combined.css?spaceKey=MINA&forWysiwyg=true" type="text/css">
</head>
<body style="background-color: white" bgcolor="white">
<div id="pageContent">
<div id="notificationFormat">
<div class="wiki-content">
<div class="email">
<h2><a href="http://cwiki.apache.org/confluence/display/MINA/Mailing+Lists" target="_top" rel="nofollow">Mailing Lists</a></h2>
<h4>Page <b>edited</b> by <a href="http://cwiki.apache.org/confluence/display/~elecharny" target="_top" rel="nofollow">Emmanuel Lécharny</a>
</h4>
<br />
<div class="notificationGreySide">
<p>The Apache MINA team interacts with MINA developers and users via <a href="http://en.wikipedia.org/wiki/Mailing_list" rel="nofollow" target="_top">mailing lists</a>. If you have any questions or something to say to us, please subscribe to our user mailing list and post a message. If you would like to contribute to the development of MINA, please subscribe to the developer mailing list.</p>
<div class='panelMacro'><table class='noteMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b>Before sending a mail</b><br /><p>Take a few minutes to read this page : <a href="http://www.catb.org/~esr/faqs/smart-questions.html" rel="nofollow" target="_top">http://www.catb.org/~esr/faqs/smart-questions.html</a></p>
<p>More specifically, follow those simple rules :</p>
<ul>
<li>Do <b>not</b> cross post (ie mail to users <b>and</b> dev). Pick the right list.</li>
<li>No need to send a mail every hour if you don't get an answer. We don't have an answer to every question ...</li>
<li>Use meaningful subject headers. <b>HELP PLEASE HELP ME</b> is just plain useless...</li>
<li>Be precise about your problem.</li>
<li><b>Always</b> give some information about the version you are using, the OS, the Java version.</li>
<li>You may have find a bug in MINA, but it's way more likely that <b>your</b> code is buggy.</li>
<li>Don't be afraid to post, even if you think your english suck. Most of us are not english native speakers, anyways ...</li>
</ul>
<p>Thanks for listening !</p></td></tr></table></div>
<h2><a name="MailingLists-Usersmailinglist" target="_top"></a>Users mailing list</h2>
<p>This list is for any questions related to MINA. It's where you need to post for requesting support, or asking question about API usage.</p>
<h3><a name="MailingLists-Subscribing" target="_top"></a>Subscribing</h3>
<p>Send a message to <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26641749&i=0" target="_top" rel="nofollow">users-subscribe@...</a> with a subject and body containg '<b>subscribe</b>'. You can actually send an empty or rich text message to unsubscribe, but our spam filter might reject your message. After sending your initial email, you will be sent a confirmation email. Simply reply to the confirmation email and you will be subscribed.</p>
<h3><a name="MailingLists-Postingamessage" target="_top"></a>Posting a message</h3>
<p>You can ask any questions or provide feedback by sending an email to <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26641749&i=1" target="_top" rel="nofollow">users@...</a> <b>after subscribing to the mailing list</b>. Your message can be sent even if you didn't subscribe to the mailing list, but it will take some time for your message to be in our mail box because of the moderation process.</p>
<h3><a name="MailingLists-Unsubscribing" target="_top"></a>Unsubscribing</h3>
<p>Oh, did you lose your interest in MINA? Please let us know what made so if MINA couldn't solve your problem and give it a chance! Sending a message whose subject and body contains '<b>unsubscribe</b>' to <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26641749&i=2" target="_top" rel="nofollow">users-unsubscribe@...</a> in plain text format will unsubscribe you from the mailing list though. You can actually send an empty or rich text message to unsubscribe, but our spam filter might reject your message.</p>
<h2><a name="MailingLists-Developersmailinglist." target="_top"></a>Developers mailing list.</h2>
<p>This mailing list is used for discussions about the actual development of MINA and sub-projects (Ftpserver, Asyncweb).</p>
<h3><a name="MailingLists-Subscribing" target="_top"></a>Subscribing</h3>
<p>Similar to subscribing to the user mailing list, please send a message whose subject and body contains '<b>subscribe</b>' to <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26641749&i=3" target="_top" rel="nofollow">dev-subscribe@...</a> in plain text format. Again, you can actually send an empty or rich text message to subscribe, but our spam filter might reject your message.</p>
<h3><a name="MailingLists-Postingamessage" target="_top"></a>Posting a message</h3>
<p>You can ask any questions or feedback to <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26641749&i=4" target="_top" rel="nofollow">dev@...</a> <b>after subscribing to the mailing list</b>. Your message can be sent even if you didn't subscribe to the mailing list, but it will take for some time for your message to be in our mail box because of moderation process.</p>
<p>Alternatively, you can use <a href="http://www.nabble.com/mina-dev-f16869.html" rel="nofollow" target="_top">the web forum interface</a>.</p>
<h3><a name="MailingLists-Unsubscribingfromthemailinglist." target="_top"></a>Unsubscribing from the mailing list.</h3>
<p>To unsubscribe, send a message whose subject and body contains '<b>unsubscribe</b>' to <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26641749&i=5" target="_top" rel="nofollow">dev-unsubscribe@...</a> in plain text format will unsubscribe you from the mailing list though. You can actually send an empty or rich text message to unsubscribe, but our spam filter might reject your message.</p>
<h2><a name="MailingLists-Commitsmailinglist." target="_top"></a>Commits mailing list.</h2>
<p>This mailing list is tracking all the code modifications realised in MINA subversion repository. It's an useful tool for knowing what is going on MINA development and giving feeback on last modifications using the development mailing list.</p>
<h3><a name="MailingLists-Subscribing" target="_top"></a>Subscribing</h3>
<p>Similar to subscribing to the user and developer mailing lists, please send a message whose subject and body contains '<b>subscribe</b>' to <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26641749&i=6" target="_top" rel="nofollow">commits-subscribe@...</a> in plain text format. Again, you can actually send an empty or rich text message to subscribe, but our spam filter might reject your message.</p>
<h3><a name="MailingLists-Unsubscribingfromthemailinglist." target="_top"></a>Unsubscribing from the mailing list.</h3>
<p>To unsubscribe, send a message whose subject and body contains '<b>unsubscribe</b>' to <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26641749&i=7" target="_top" rel="nofollow">commits-unsubscribe@...</a> in plain text format will unsubscribe you from the mailing list though. You can actually send an empty or rich text message to unsubscribe, but our spam filter might reject your message.</p>
<h2><a name="MailingLists-Archive" target="_top"></a>Archive</h2>
<p>All previous messages are archived in the following site:</p>
<ul>
<li><a href="http://www.nabble.com/Apache-MINA-f16868.html" rel="nofollow" target="_top">Nabble.com</a></li>
<li><a href="http://mina.markmail.org/" rel="nofollow" target="_top">MarkMail.org</a></li>
<li><a href="http://dir.gmane.org/search.php?match=mina." rel="nofollow" target="_top">Gmane.org</a></li>
<li>Mail-Archive.com - <a href="http://www.mail-archive.com/dev%40mina.apache.org/" rel="nofollow" target="_top">dev</a>, <a href="http://www.mail-archive.com/users%40mina.apache.org/" rel="nofollow" target="_top">users</a> <a href="http://www.mail-archive.com/commits%40mina.apache.org/" rel="nofollow" target="_top">commits</a></li>
<li>Apache.org - <a href="http://mail-archives.apache.org/mod_mbox/mina-dev/" rel="nofollow" target="_top">dev</a>, <a href="http://mail-archives.apache.org/mod_mbox/mina-users/" rel="nofollow" target="_top">users</a>, <a href="http://mail-archives.apache.org/mod_mbox/mina-commits/" rel="nofollow" target="_top">commits</a></li>
</ul>
</div>
<div id="commentsSection" class="wiki-content pageSection">
<div style="float: right;">
<a href="http://cwiki.apache.org/confluence/users/viewnotifications.action" class="grey" target="_top" rel="nofollow">Change Notification Preferences</a>
</div>
<a href="http://cwiki.apache.org/confluence/display/MINA/Mailing+Lists" target="_top" rel="nofollow">View Online</a>
|
<a href="http://cwiki.apache.org/confluence/pages/diffpagesbyversion.action?pageId=29023&revisedVersion=24&originalVersion=23" target="_top" rel="nofollow">View Change</a>
|
<a href="http://cwiki.apache.org/confluence/display/MINA/Mailing+Lists?showComments=true&showCommentArea=true#addcomment" target="_top" rel="nofollow">Add Comment</a>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
<p>From forum: <a href="http://old.nabble.com/Apache-MINA-Commits-f16870.html" embed="fixTarget[16870]" target="_top" >Apache MINA Commits</a></p>
tag:old.nabble.com,2006:post-26641645
Re: Does SSHD support call back methods before providing a password
2009-12-04T04:06:19Z
2009-12-04T04:06:19Z
Emmanuel Lcharny
Prasad Shindikar a écrit :
<br>> Hi SSHD Users,
<br>>
<br><br>If this is for users, why did you cross posted this mail to the dev list
<br>??? Please read <a href="http://www.catb.org/~esr/faqs/smart-questions.html#asking" target="_top" rel="nofollow">http://www.catb.org/~esr/faqs/smart-questions.html#asking</a>.
<br><br>Thanks.
<br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Developer-Forum-f16869.html" embed="fixTarget[16869]" target="_top" >Apache MINA Developer Forum</a></p>
tag:old.nabble.com,2006:post-26641599
Does SSHD support call back methods before providing a password
2009-12-04T03:56:35Z
2009-12-04T03:56:35Z
Prasad Shindikar
Hi SSHD Users,
<br><br>I have a business scenario where I cannot provide passwords directly to the
<br>SSHD client code.
<br><br>I have a security gateway which kicks in whenever I SSH (using SSHD) into a
<br>given remote machine. This gateway, does not directly accept a simple clear
<br>text password.
<br><br>Instead it outputs a few things on the console, and a combination of these
<br>things gives me a unique password which if entered will successfully login
<br>to the machine.
<br><br>So, my question here is can I in someway access the console (to get the
<br>above mentioned things) using SSHD, so that I can calculate the unique
<br>response and set it as password before the SSHD client code connects to the
<br>remote machine.
<br><br>Hope I am being clear here. :-)
<br><br>Is there some call back mechanism while connecting, using which I can hook
<br>the required authentication ?
<br><br>Any help or pointers for the same will be appreciated.
<br><br>Regards,
<br><br>Prasad Shindikar
<br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Developer-Forum-f16869.html" embed="fixTarget[16869]" target="_top" >Apache MINA Developer Forum</a></p>
tag:old.nabble.com,2006:post-26641597
Does SSHD support call back methods before providing a password
2009-12-04T03:55:05Z
2009-12-04T03:55:05Z
Prasad Shindikar
Hi SSHD Users,
<br><br>I have a business scenario where I cannot provide passwords directly to the
<br>SSHD client code.
<br><br>I have a security gateway which kicks in whenever I SSH (using SSHD) into a
<br>given remote machine. This gateway, does not directly accept a simple clear
<br>text password.
<br><br>Instead it outputs a few things on the console, and a combination of these
<br>things gives me a unique password which if entered will successfully login
<br>to the machine.
<br><br>So, my question here is can I in someway access the console (to get the
<br>above mentioned things) using SSHD, so that I can calculate the unique
<br>response and set it as password before the SSHD client code connects to the
<br>remote machine.
<br><br>Hope I am being clear here. :-)
<br><br>Is there some call back mechanism while connecting, using which I can hook
<br>the required authentication ?
<br><br>Any help or pointers for the same will be appreciated.
<br><br>Regards,
<br><br>Prasad Shindikar
<br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-User-Forum-f32104.html" embed="fixTarget[32104]" target="_top" >Apache MINA User Forum</a></p>
tag:old.nabble.com,2006:post-26641352
Hudson build became unstable: vysper-trunk-jdk1.6-solaris » Apache Vysper Core #166
2009-12-04T03:40:09Z
2009-12-04T03:40:09Z
Apache Hudson Server
See <<a href="http://hudson.zones.apache.org/hudson/job/vysper-trunk-jdk1.6-solaris/org.apache.vysper$vysper-core/166/changes" target="_top" rel="nofollow">http://hudson.zones.apache.org/hudson/job/vysper-trunk-jdk1.6-solaris/org.apache.vysper$vysper-core/166/changes</a>>
<br><br><br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Developer-Forum-f16869.html" embed="fixTarget[16869]" target="_top" >Apache MINA Developer Forum</a></p>
tag:old.nabble.com,2006:post-26640825
svn commit: r887153 - /mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java
2009-12-04T02:46:37Z
2009-12-04T02:46:37Z
ngn
Author: ngn
<br>Date: Fri Dec 4 10:46:37 2009
<br>New Revision: 887153
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=887153&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=887153&view=rev</a><br>Log:
<br>Allow for some extra time for setting up the server for integration tests
<br><br>Modified:
<br> mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java
<br><br>Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java
<br>URL: <a href="http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java?rev=887153&r1=887152&r2=887153&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java?rev=887153&r1=887152&r2=887153&view=diff</a><br>==============================================================================
<br>--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java (original)
<br>+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java Fri Dec 4 10:46:37 2009
<br>@@ -93,6 +93,9 @@
<br> server.start();
<br>
<br> addModules(server);
<br>+
<br>+ // allow for the server to bootstrap
<br>+ Thread.sleep(200);
<br> }
<br>
<br> protected XMPPConnection connectClient(int port, String username, String password) throws Exception {
<br>@@ -167,6 +170,7 @@
<br> }
<br>
<br> try {
<br>+ System.out.println("Test teardown, stopping server");
<br> server.stop();
<br> } catch(Exception ignored) {
<br> ;
<br><br><br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Commits-f16870.html" embed="fixTarget[16870]" target="_top" >Apache MINA Commits</a></p>
tag:old.nabble.com,2006:post-26640505
[jira] Commented: (DIRMINA-668) Modify the way we use IoProcessors
2009-12-04T02:20:20Z
2009-12-04T02:20:20Z
JIRA jira@apache.org
<br> [ <a href="https://issues.apache.org/jira/browse/DIRMINA-668?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12785852#action_12785852" target="_top" rel="nofollow">https://issues.apache.org/jira/browse/DIRMINA-668?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12785852#action_12785852</a> ]
<br><br>Emmanuel Lecharny commented on DIRMINA-668:
<br>-------------------------------------------
<br><br>AFAIR, when a new message arrives, as it is associated with a session, it's beng processed by a IoProcessor. As an IoProcessor also holds the selector, we can't process more than one message at a time in a single IoProcessor (hopefully, we have more than one IoProcessor). So if the message is costly to process (ie, yu access a database in the middle), in a loaded system, messages can be blocked a long time before being processed, waiing for the crrent message to be completed.
<br><br>This is what I meant. Hope it's clearer.
<br><div class='shrinkable-quote'><br>> Modify the way we use IoProcessors
<br>> ----------------------------------
<br>>
<br>> Key: DIRMINA-668
<br>> URL: <a href="https://issues.apache.org/jira/browse/DIRMINA-668" target="_top" rel="nofollow">https://issues.apache.org/jira/browse/DIRMINA-668</a><br>> Project: MINA
<br>> Issue Type: Improvement
<br>> Affects Versions: 2.0.0-M4
<br>> Reporter: Emmanuel Lecharny
<br>> Fix For: 3.0.0-M1
<br>>
<br>>
<br>> In the current code base, when accepting new connections, we pick a processor and register the news connection within the internal selector. In other words, we have as many selectors as we have IoProcessors.
<br>> This is a potential problem if some request cost a lot to be executed, as every requests waiting on this IoProcessor will be blocked.
<br>> It would be way better to use a single selector which dispatches requests to an Executor, as we will always have available threads ready to process the requests (unless the pool is saturated, but then we have a bigger issue ...)
</div><br>--
<br>This message is automatically generated by JIRA.
<br>-
<br>You can reply to this email to add a comment to the issue online.
<br><br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Developer-Forum-f16869.html" embed="fixTarget[16869]" target="_top" >Apache MINA Developer Forum</a></p>
tag:old.nabble.com,2006:post-26640462
Re: Version 2.x - Norweigian Wood
2009-12-04T02:17:04Z
2009-12-04T02:17:04Z
Niklas Gustavsson
On Fri, Dec 4, 2009 at 11:15 AM, Emmanuel LŽcharny <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26640462&i=0" target="_top" rel="nofollow">elecharny@...</a>> wrote:
<br>> Anyway, I think we should get rid of those useless nicknames.
<br><br>+1
<br><br>/niklas
<br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Developer-Forum-f16869.html" embed="fixTarget[16869]" target="_top" >Apache MINA Developer Forum</a></p>
tag:old.nabble.com,2006:post-26640439
Re: Version 2.x - Norweigian Wood
2009-12-04T02:15:33Z
2009-12-04T02:15:33Z
Emmanuel Lcharny
Glenn Ivar Klausen a écrit :
<br>>
<br>> This is my first post to the MINA mailing list, and I don't want to
<br>> step on any toes, but I could not help it.
<br>>
<br>> Seriously, isn't "Version 2.x - Norweigian Wood" embarrassing.
<br><br>Well, less than "dead wood"...
<br><br>This name was picked by someone who was at the origin of the project, at
<br>a time he was pretty alone working on it (since then, he quit). I
<br>personnaly don't think it's a good idea to attach a name with a version,
<br>à la Ubuntu (I have always been totally lost with Intrepid Jakal or
<br>Laughable Vampire, not being able to make a connection with 8.04 or 9.10).
<br><br>Anyway, I think we should get rid of those useless nicknames.
<br><br>Team ?
<br><br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Developer-Forum-f16869.html" embed="fixTarget[16869]" target="_top" >Apache MINA Developer Forum</a></p>
tag:old.nabble.com,2006:post-26639468
Version 2.x - Norweigian Wood
2009-12-04T00:51:58Z
2009-12-04T00:51:58Z
Glenn Ivar Klausen
<br>This is my first post to the MINA mailing list, and I don't want to step
<br>on any toes, but I could not help it.
<br><br>Seriously, isn't "Version 2.x - Norweigian Wood" embarrassing.
<br><br>G
<br><p>From forum: <a href="http://old.nabble.com/Apache-MINA-Developer-Forum-f16869.html" embed="fixTarget[16869]" target="_top" >Apache MINA Developer Forum</a></p>