Author: rajith
Date: Mon Jun 23 21:04:10 2014
New Revision: 1604936
URL: http://svn.apache.org/r1604936
Log:
PROTON-589 Tinkering a bit with the interface to get the netty example
working.
Modified:
qpid/proton/branches/rajith-messenger-passive/proton-j/src/main/java/org/apache/qpid/proton/messenger/Messenger.java
qpid/proton/branches/rajith-messenger-passive/proton-j/src/main/java/org/apache/qpid/proton/messenger/Selectable.java
qpid/proton/branches/rajith-messenger-passive/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java
qpid/proton/branches/rajith-messenger-passive/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/SelectableImpl.java
Modified:
qpid/proton/branches/rajith-messenger-passive/proton-j/src/main/java/org/apache/qpid/proton/messenger/Messenger.java
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/rajith-messenger-passive/proton-j/src/main/java/org/apache/qpid/proton/messenger/Messenger.java?rev=1604936&r1=1604935&r2=1604936&view=diff
==============================================================================
---
qpid/proton/branches/rajith-messenger-passive/proton-j/src/main/java/org/apache/qpid/proton/messenger/Messenger.java
(original)
+++
qpid/proton/branches/rajith-messenger-passive/proton-j/src/main/java/org/apache/qpid/proton/messenger/Messenger.java
Mon Jun 23 21:04:10 2014
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.util.List;
import org.apache.qpid.proton.TimeoutException;
+import org.apache.qpid.proton.engine.Transport;
import org.apache.qpid.proton.message.Message;
import org.apache.qpid.proton.messenger.impl.MessengerImpl;
@@ -284,4 +285,6 @@ public interface Messenger
List<? extends Selectable> getSelectables();
List<? extends Listener> getListeners();
+
+ Selectable createConnection(Transport transport);
}
Modified:
qpid/proton/branches/rajith-messenger-passive/proton-j/src/main/java/org/apache/qpid/proton/messenger/Selectable.java
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/rajith-messenger-passive/proton-j/src/main/java/org/apache/qpid/proton/messenger/Selectable.java?rev=1604936&r1=1604935&r2=1604936&view=diff
==============================================================================
---
qpid/proton/branches/rajith-messenger-passive/proton-j/src/main/java/org/apache/qpid/proton/messenger/Selectable.java
(original)
+++
qpid/proton/branches/rajith-messenger-passive/proton-j/src/main/java/org/apache/qpid/proton/messenger/Selectable.java
Mon Jun 23 21:04:10 2014
@@ -30,6 +30,10 @@ public interface Selectable
Transport getTransport();
+ void setContext(Object ctx);
+
+ Object getContext();
+
boolean isConnected();
void markConnected();
Modified:
qpid/proton/branches/rajith-messenger-passive/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/rajith-messenger-passive/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java?rev=1604936&r1=1604935&r2=1604936&view=diff
==============================================================================
---
qpid/proton/branches/rajith-messenger-passive/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java
(original)
+++
qpid/proton/branches/rajith-messenger-passive/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java
Mon Jun 23 21:04:10 2014
@@ -719,8 +719,7 @@ public class MessengerImpl implements Me
@Override
public List<? extends Listener> getListeners()
{
- // TODO Auto-generated method stub
- return null;
+ return _listeners;
}
private int queued(boolean outgoing)
@@ -1686,29 +1685,13 @@ public class MessengerImpl implements Me
}
- /* ----------------------------------------
- * IO events for non passive mode
- * ----------------------------------------
- */
- void inboundConnection(Listener listener, IoConnection networkConnection)
+ public Selectable createConnection(Transport transport)
{
- _worked = true;
Connection connection = Proton.connection();
connection.collect(_collector);
connection.setContainer(_name);
- Transport transport = Proton.transport();
transport.bind(connection);
- SelectableImpl selectable = new SelectableImpl();
- selectable.markConnected();
- selectable.setTransport(transport);
- selectable.setConnection(connection);
- selectable.setNetworkConnection(networkConnection);
- _selectables.add(selectable);
-
- ListenerContext ctx = (ListenerContext)
((ListenerImpl)listener).getContext();
- connection.setContext(new ConnectionContext(ctx.getAddress(),
selectable));
- networkConnection.setSelectable(selectable);
//TODO: full SASL
Sasl sasl = transport.sasl();
@@ -1718,8 +1701,34 @@ public class MessengerImpl implements Me
sasl.setMechanisms(new String[]{"ANONYMOUS"});
sasl.done(Sasl.SaslOutcome.PN_SASL_OK);
}
- transport.ssl(ctx.getDomain());
+ //transport.ssl(ctx.getDomain());
connection.open();
+
+ SelectableImpl selectable = new SelectableImpl();
+ selectable.markConnected();
+ selectable.setTransport(transport);
+ selectable.setConnection(connection);
+ _selectables.add(selectable);
+ return selectable;
+ }
+
+ /* ----------------------------------------
+ * IO events for non passive mode
+ * ----------------------------------------
+ */
+ void inboundConnection(Listener listener, IoConnection networkConnection)
+ {
+ _worked = true;
+ Transport transport = Proton.transport();
+
+ ListenerContext ctx = (ListenerContext)
((ListenerImpl)listener).getContext();
+ transport.ssl(ctx.getDomain());
+
+ SelectableImpl selectable =
(SelectableImpl)createConnection(transport);
+ selectable.setNetworkConnection(networkConnection);
+ selectable.getConnection().setContext(new
ConnectionContext(ctx.getAddress(), selectable));
+
+ networkConnection.setSelectable(selectable);
networkConnection.registerForReadEvents(true);
networkConnection.registerForWriteEvents(true);
}
Modified:
qpid/proton/branches/rajith-messenger-passive/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/SelectableImpl.java
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/rajith-messenger-passive/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/SelectableImpl.java?rev=1604936&r1=1604935&r2=1604936&view=diff
==============================================================================
---
qpid/proton/branches/rajith-messenger-passive/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/SelectableImpl.java
(original)
+++
qpid/proton/branches/rajith-messenger-passive/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/SelectableImpl.java
Mon Jun 23 21:04:10 2014
@@ -56,12 +56,14 @@ public class SelectableImpl implements S
{
}
- Object getContext()
+ @Override
+ public Object getContext()
{
return _ctx;
}
- void setContext(Object ctx)
+ @Override
+ public void setContext(Object ctx)
{
_ctx = ctx;
}
@@ -135,7 +137,6 @@ public class SelectableImpl implements S
}
// Used in non passive mode.
-
void setNetworkConnection(IoConnection con)
{
_networkConnection = con;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
