Author: trustin
Date: Thu Sep 27 02:55:26 2007
New Revision: 579962
URL: http://svn.apache.org/viewvc?rev=579962&view=rev
Log:
Moved transport.apr to transport.socket.apr
Added:
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/
- copied from r579448,
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRConnector.java
- copied, changed from r579961,
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRConnector.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRIoProcessor.java
- copied, changed from r579961,
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRIoProcessor.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRLibrary.java
- copied, changed from r579961,
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRLibrary.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRProtocol.java
- copied, changed from r579961,
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRProtocol.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSession.java
- copied, changed from r579961,
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRSession.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSessionConfig.java
- copied, changed from r579961,
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRSessionConfig.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSessionImpl.java
- copied, changed from r579961,
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRSessionImpl.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AbstractAPRSessionConfig.java
- copied, changed from r579961,
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/AbstractAPRSessionConfig.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/DefaultAPRSessionConfig.java
- copied, changed from r579961,
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/DefaultAPRSessionConfig.java
Removed:
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/
Copied:
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRConnector.java
(from r579961,
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRConnector.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRConnector.java?p2=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRConnector.java&p1=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRConnector.java&r1=579961&r2=579962&rev=579962&view=diff
==============================================================================
---
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRConnector.java
(original)
+++
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRConnector.java
Thu Sep 27 02:55:26 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.transport.apr;
+package org.apache.mina.transport.socket.apr;
import java.io.IOException;
import java.net.InetSocketAddress;
Copied:
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRIoProcessor.java
(from r579961,
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRIoProcessor.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRIoProcessor.java?p2=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRIoProcessor.java&p1=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRIoProcessor.java&r1=579961&r2=579962&rev=579962&view=diff
==============================================================================
---
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRIoProcessor.java
(original)
+++
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRIoProcessor.java
Thu Sep 27 02:55:26 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.transport.apr;
+package org.apache.mina.transport.socket.apr;
import java.util.Collection;
import java.util.HashMap;
Copied:
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRLibrary.java
(from r579961,
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRLibrary.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRLibrary.java?p2=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRLibrary.java&p1=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRLibrary.java&r1=579961&r2=579962&rev=579962&view=diff
==============================================================================
---
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRLibrary.java
(original)
+++
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRLibrary.java
Thu Sep 27 02:55:26 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.transport.apr;
+package org.apache.mina.transport.socket.apr;
import org.apache.tomcat.jni.Library;
import org.apache.tomcat.jni.Pool;
Copied:
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRProtocol.java
(from r579961,
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRProtocol.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRProtocol.java?p2=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRProtocol.java&p1=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRProtocol.java&r1=579961&r2=579962&rev=579962&view=diff
==============================================================================
---
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRProtocol.java
(original)
+++
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRProtocol.java
Thu Sep 27 02:55:26 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.transport.apr;
+package org.apache.mina.transport.socket.apr;
import org.apache.tomcat.jni.Socket;
Copied:
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSession.java
(from r579961,
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRSession.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSession.java?p2=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSession.java&p1=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRSession.java&r1=579961&r2=579962&rev=579962&view=diff
==============================================================================
---
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRSession.java
(original)
+++
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSession.java
Thu Sep 27 02:55:26 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.transport.apr;
+package org.apache.mina.transport.socket.apr;
import java.net.InetSocketAddress;
Copied:
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSessionConfig.java
(from r579961,
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRSessionConfig.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSessionConfig.java?p2=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSessionConfig.java&p1=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRSessionConfig.java&r1=579961&r2=579962&rev=579962&view=diff
==============================================================================
---
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRSessionConfig.java
(original)
+++
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSessionConfig.java
Thu Sep 27 02:55:26 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.transport.apr;
+package org.apache.mina.transport.socket.apr;
import java.net.Socket;
Copied:
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSessionImpl.java
(from r579961,
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRSessionImpl.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSessionImpl.java?p2=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSessionImpl.java&p1=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRSessionImpl.java&r1=579961&r2=579962&rev=579962&view=diff
==============================================================================
---
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/APRSessionImpl.java
(original)
+++
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSessionImpl.java
Thu Sep 27 02:55:26 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.transport.apr;
+package org.apache.mina.transport.socket.apr;
import java.net.InetSocketAddress;
Copied:
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AbstractAPRSessionConfig.java
(from r579961,
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/AbstractAPRSessionConfig.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AbstractAPRSessionConfig.java?p2=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AbstractAPRSessionConfig.java&p1=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/AbstractAPRSessionConfig.java&r1=579961&r2=579962&rev=579962&view=diff
==============================================================================
---
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/AbstractAPRSessionConfig.java
(original)
+++
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AbstractAPRSessionConfig.java
Thu Sep 27 02:55:26 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.transport.apr;
+package org.apache.mina.transport.socket.apr;
import org.apache.mina.common.AbstractIoSessionConfig;
import org.apache.mina.common.IoSessionConfig;
@@ -37,8 +37,8 @@
@Override
protected final void doSetAll(IoSessionConfig config) {
- if (config instanceof DefaultAPRSessionConfig) {
- DefaultAPRSessionConfig cfg = (DefaultAPRSessionConfig) config;
+ if (config instanceof APRSessionConfig) {
+ APRSessionConfig cfg = (APRSessionConfig) config;
setKeepAlive(cfg.isKeepAlive());
setOobInline(cfg.isOobInline());
setReceiveBufferSize(cfg.getReceiveBufferSize());
Copied:
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/DefaultAPRSessionConfig.java
(from r579961,
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/DefaultAPRSessionConfig.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/DefaultAPRSessionConfig.java?p2=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/DefaultAPRSessionConfig.java&p1=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/DefaultAPRSessionConfig.java&r1=579961&r2=579962&rev=579962&view=diff
==============================================================================
---
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/apr/DefaultAPRSessionConfig.java
(original)
+++
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/DefaultAPRSessionConfig.java
Thu Sep 27 02:55:26 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.transport.apr;
+package org.apache.mina.transport.socket.apr;
/**