You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by tr...@apache.org on 2006/05/17 05:39:07 UTC
svn commit: r407140 - in /directory/trunks: apacheds/ daemon/ mina/
mina/examples/src/main/java/org/apache/mina/examples/proxy/
mina/examples/src/main/java/org/apache/mina/examples/sumup/
mina/examples/src/test/java/org/apache/mina/examples/echoserver/...
Author: trustin
Date: Tue May 16 20:39:05 2006
New Revision: 407140
URL: http://svn.apache.org/viewcvs?rev=407140&view=rev
Log:
* Made all sub-poms to depend on the latest version of root build pom.
* Changed cvs.apache.org to minotaur.apache.org
* Checking in changes in mina which had to be checked in before
Modified:
directory/trunks/apacheds/pom.xml
directory/trunks/daemon/pom.xml
directory/trunks/mina/examples/src/main/java/org/apache/mina/examples/proxy/ClientToProxyIoHandler.java
directory/trunks/mina/examples/src/main/java/org/apache/mina/examples/sumup/Client.java
directory/trunks/mina/examples/src/test/java/org/apache/mina/examples/echoserver/ConnectorTest.java
directory/trunks/mina/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
directory/trunks/mina/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java
directory/trunks/mina/pom.xml
directory/trunks/shared/pom.xml
directory/trunks/site/pom.xml
Modified: directory/trunks/apacheds/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/pom.xml?rev=407140&r1=407139&r2=407140&view=diff
==============================================================================
--- directory/trunks/apacheds/pom.xml (original)
+++ directory/trunks/apacheds/pom.xml Tue May 16 20:39:05 2006
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.directory</groupId>
<artifactId>build</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
</parent>
<groupId>org.apache.directory.server</groupId>
@@ -20,7 +20,7 @@
<pluginRepository>
<id>apache.snapshots</id>
<name>Apache Snapshot Plugins</name>
- <url>http://cvs.apache.org/maven-snapshot-repository</url>
+ <url>http://minotaur.apache.org/maven-snapshot-repository</url>
</pluginRepository>
</pluginRepositories>
Modified: directory/trunks/daemon/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/pom.xml?rev=407140&r1=407139&r2=407140&view=diff
==============================================================================
--- directory/trunks/daemon/pom.xml (original)
+++ directory/trunks/daemon/pom.xml Tue May 16 20:39:05 2006
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.directory</groupId>
<artifactId>build</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
</parent>
<groupId>org.apache.directory.daemon</groupId>
<artifactId>build</artifactId>
Modified: directory/trunks/mina/examples/src/main/java/org/apache/mina/examples/proxy/ClientToProxyIoHandler.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/examples/src/main/java/org/apache/mina/examples/proxy/ClientToProxyIoHandler.java?rev=407140&r1=407139&r2=407140&view=diff
==============================================================================
--- directory/trunks/mina/examples/src/main/java/org/apache/mina/examples/proxy/ClientToProxyIoHandler.java (original)
+++ directory/trunks/mina/examples/src/main/java/org/apache/mina/examples/proxy/ClientToProxyIoHandler.java Tue May 16 20:39:05 2006
@@ -18,13 +18,13 @@
*/
package org.apache.mina.examples.proxy;
-import java.io.IOException;
import java.net.InetSocketAddress;
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoFuture;
import org.apache.mina.common.IoSession;
+import org.apache.mina.common.RuntimeIOException;
import org.apache.mina.common.TrafficMask;
/**
@@ -62,7 +62,7 @@
session.setAttachment( future.getSession() );
future.getSession().setTrafficMask( TrafficMask.ALL );
}
- catch( IOException e )
+ catch( RuntimeIOException e )
{
// Connect failed
session.close();
Modified: directory/trunks/mina/examples/src/main/java/org/apache/mina/examples/sumup/Client.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/examples/src/main/java/org/apache/mina/examples/sumup/Client.java?rev=407140&r1=407139&r2=407140&view=diff
==============================================================================
--- directory/trunks/mina/examples/src/main/java/org/apache/mina/examples/sumup/Client.java (original)
+++ directory/trunks/mina/examples/src/main/java/org/apache/mina/examples/sumup/Client.java Tue May 16 20:39:05 2006
@@ -18,13 +18,13 @@
*/
package org.apache.mina.examples.sumup;
-import java.io.IOException;
import java.net.InetSocketAddress;
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoConnectorConfig;
import org.apache.mina.common.IoSession;
+import org.apache.mina.common.RuntimeIOException;
import org.apache.mina.transport.socket.nio.SocketConnector;
/**
@@ -73,7 +73,7 @@
session = future.getSession();
break;
}
- catch( IOException e )
+ catch( RuntimeIOException e )
{
System.err.println( "Failed to connect." );
e.printStackTrace();
Modified: directory/trunks/mina/examples/src/test/java/org/apache/mina/examples/echoserver/ConnectorTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/examples/src/test/java/org/apache/mina/examples/echoserver/ConnectorTest.java?rev=407140&r1=407139&r2=407140&view=diff
==============================================================================
--- directory/trunks/mina/examples/src/test/java/org/apache/mina/examples/echoserver/ConnectorTest.java (original)
+++ directory/trunks/mina/examples/src/test/java/org/apache/mina/examples/echoserver/ConnectorTest.java Tue May 16 20:39:05 2006
@@ -18,7 +18,6 @@
*/
package org.apache.mina.examples.echoserver;
-import java.io.IOException;
import java.net.InetSocketAddress;
import junit.framework.Assert;
@@ -28,6 +27,7 @@
import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
+import org.apache.mina.common.RuntimeIOException;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.examples.echoserver.ssl.BogusSSLContextFactory;
import org.apache.mina.filter.SSLFilter;
@@ -123,7 +123,7 @@
session = future.getSession();
break;
}
- catch( IOException e )
+ catch( RuntimeIOException e )
{
// Try again until we succeed to bind.
}
Modified: directory/trunks/mina/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java?rev=407140&r1=407139&r2=407140&view=diff
==============================================================================
--- directory/trunks/mina/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java (original)
+++ directory/trunks/mina/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java Tue May 16 20:39:05 2006
@@ -32,6 +32,7 @@
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.WriteFuture;
+import org.apache.mina.common.support.DefaultWriteFuture;
import org.apache.mina.filter.support.SSLHandler;
import org.apache.mina.util.SessionLog;
@@ -565,7 +566,7 @@
// if already shut down
if( !handler.closeOutbound() )
{
- return WriteFuture.newNotWrittenFuture();
+ return DefaultWriteFuture.newNotWrittenFuture( session );
}
// there might be data to write out here?
Modified: directory/trunks/mina/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java?rev=407140&r1=407139&r2=407140&view=diff
==============================================================================
--- directory/trunks/mina/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java (original)
+++ directory/trunks/mina/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java Tue May 16 20:39:05 2006
@@ -31,6 +31,7 @@
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.IoFilter.NextFilter;
import org.apache.mina.common.IoFilter.WriteRequest;
+import org.apache.mina.common.support.DefaultWriteFuture;
import org.apache.mina.filter.SSLFilter;
import org.apache.mina.util.Queue;
import org.apache.mina.util.SessionLog;
@@ -539,7 +540,7 @@
if( !getOutNetBuffer().hasRemaining() )
{
// no; bail out
- return WriteFuture.newNotWrittenFuture();
+ return DefaultWriteFuture.newNotWrittenFuture( session );
}
WriteFuture writeFuture = null;
@@ -563,7 +564,7 @@
}
//debug("outNetBuffer (after copy): {0}", sslHandler.getOutNetBuffer());
- writeFuture = new WriteFuture();
+ writeFuture = new DefaultWriteFuture( session );
parent.filterWrite( nextFilter, session, new WriteRequest( writeBuffer, writeFuture ) );
// loop while more writes required to complete handshake
@@ -587,7 +588,7 @@
SessionLog.debug( session, " write outNetBuffer2: " + getOutNetBuffer() );
}
org.apache.mina.common.ByteBuffer writeBuffer2 = copy( getOutNetBuffer() );
- writeFuture = new WriteFuture();
+ writeFuture = new DefaultWriteFuture( session );
parent.filterWrite( nextFilter, session, new WriteRequest( writeBuffer2, writeFuture ) );
}
}
@@ -603,7 +604,7 @@
}
else
{
- return WriteFuture.newNotWrittenFuture();
+ return DefaultWriteFuture.newNotWrittenFuture( session );
}
}
Modified: directory/trunks/mina/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/pom.xml?rev=407140&r1=407139&r2=407140&view=diff
==============================================================================
--- directory/trunks/mina/pom.xml (original)
+++ directory/trunks/mina/pom.xml Tue May 16 20:39:05 2006
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.directory</groupId>
<artifactId>build</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
</parent>
<groupId>org.apache.directory.mina</groupId>
<version>0.9.5-SNAPSHOT</version>
Modified: directory/trunks/shared/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/shared/pom.xml?rev=407140&r1=407139&r2=407140&view=diff
==============================================================================
--- directory/trunks/shared/pom.xml (original)
+++ directory/trunks/shared/pom.xml Tue May 16 20:39:05 2006
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.directory</groupId>
<artifactId>build</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
</parent>
<groupId>org.apache.directory.shared</groupId>
<artifactId>build</artifactId>
Modified: directory/trunks/site/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/site/pom.xml?rev=407140&r1=407139&r2=407140&view=diff
==============================================================================
--- directory/trunks/site/pom.xml (original)
+++ directory/trunks/site/pom.xml Tue May 16 20:39:05 2006
@@ -28,7 +28,7 @@
<repository>
<id>apache.snapshots</id>
<name>Apache Snapshot Repository</name>
- <url>http://cvs.apache.org/maven-snapshot-repository</url>
+ <url>http://minotaur.apache.org/maven-snapshot-repository</url>
</repository>
</repositories>