From 2b60feb22a0b53fa92282328f0d19430aa9cb3f5 Mon Sep 17 00:00:00 2001 From: Rajith Muditha Attapattu Date: Fri, 15 Jun 2012 17:23:48 +0000 Subject: QPID-4027 Renamed the generated JNI wrapper files to use the Prefix Native. This allows me to just use NativeMessage instead of o.a.q.messaging.cpp.jni.Message to prevent a clash with Java Message interface. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/address-refactor2@1350711 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bindings/qpid/java/java.i | 5 +++++ .../apache/qpid/messaging/cpp/CppConnection.java | 5 +++-- .../qpid/messaging/cpp/CppMessageFactory.java | 13 +++++++------ .../org/apache/qpid/messaging/cpp/CppReceiver.java | 11 ++++++----- .../org/apache/qpid/messaging/cpp/CppSender.java | 15 +++++++-------- .../org/apache/qpid/messaging/cpp/CppSession.java | 13 +++++++------ qpid/java/lib/qpid_cpp_jni.jar | Bin 25073 -> 25276 bytes 7 files changed, 35 insertions(+), 27 deletions(-) diff --git a/qpid/cpp/bindings/qpid/java/java.i b/qpid/cpp/bindings/qpid/java/java.i index be7b51ee8b..56ae6227ba 100644 --- a/qpid/cpp/bindings/qpid/java/java.i +++ b/qpid/cpp/bindings/qpid/java/java.i @@ -64,6 +64,11 @@ std::string toString() } } +%rename(NativeConnection) qpid::messaging::Connection; +%rename(NativeSession) qpid::messaging::Session; +%rename(NativeSender) qpid::messaging::Sender; +%rename(NativeReceiver) qpid::messaging::Receiver; +%rename(NativeMessage) qpid::messaging::Message; %include "../qpid.i" diff --git a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppConnection.java b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppConnection.java index 3ec833b6cc..2c9cfb801b 100644 --- a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppConnection.java +++ b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppConnection.java @@ -21,6 +21,7 @@ import org.apache.qpid.messaging.Connection; import org.apache.qpid.messaging.MessageFactory; import org.apache.qpid.messaging.MessagingException; import org.apache.qpid.messaging.Session; +import org.apache.qpid.messaging.cpp.jni.NativeConnection; /** * This class relies on the ConnectionManagementDecorator for @@ -32,11 +33,11 @@ public class CppConnection implements Connection { private static MessageFactory _MSG_FACTORY = new CppMessageFactory(); - private org.apache.qpid.messaging.cpp.jni.Connection _cppConn; + private NativeConnection _cppConn; public CppConnection(String url) { - _cppConn = new org.apache.qpid.messaging.cpp.jni.Connection(url); + _cppConn = new NativeConnection(url); } @Override diff --git a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppMessageFactory.java b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppMessageFactory.java index 4fddcaa326..9bd8724014 100644 --- a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppMessageFactory.java +++ b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppMessageFactory.java @@ -30,6 +30,7 @@ import org.apache.qpid.messaging.MessagingException; import org.apache.qpid.messaging.StringMessage; import org.apache.qpid.messaging.cpp.jni.Address; import org.apache.qpid.messaging.cpp.jni.Duration; +import org.apache.qpid.messaging.cpp.jni.NativeMessage; import org.apache.qpid.messaging.util.MessageFactory_AMQP_0_10; /** @@ -49,21 +50,21 @@ public class CppMessageFactory extends MessageFactory_AMQP_0_10 return new CppMessageDelegate(); } - public Message createMessage(org.apache.qpid.messaging.cpp.jni.Message m) throws MessagingException + public Message createMessage(NativeMessage m) throws MessagingException { return createMessage(new CppMessageDelegate(m), m.getContentAsByteBuffer()); } class CppMessageDelegate implements Message { - private org.apache.qpid.messaging.cpp.jni.Message _cppMessage; + private NativeMessage _cppMessage; public CppMessageDelegate() { - this(new org.apache.qpid.messaging.cpp.jni.Message()); + this(new NativeMessage()); } - public CppMessageDelegate(org.apache.qpid.messaging.cpp.jni.Message msg) + public CppMessageDelegate(NativeMessage msg) { _cppMessage = msg; } @@ -214,7 +215,7 @@ public class CppMessageFactory extends MessageFactory_AMQP_0_10 _cppMessage.setProperty(key, value); } - protected org.apache.qpid.messaging.cpp.jni.Message getCppMessage() + protected NativeMessage getCppMessage() { return _cppMessage; } @@ -231,7 +232,7 @@ public class CppMessageFactory extends MessageFactory_AMQP_0_10 return null; // The delegate is only for the headers } - public org.apache.qpid.messaging.cpp.jni.Message getNativeMessage() + public NativeMessage getNativeMessage() { return _cppMessage; } diff --git a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppReceiver.java b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppReceiver.java index be2cf0993f..66827b107e 100644 --- a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppReceiver.java +++ b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppReceiver.java @@ -21,15 +21,16 @@ import org.apache.qpid.messaging.Message; import org.apache.qpid.messaging.MessagingException; import org.apache.qpid.messaging.Receiver; import org.apache.qpid.messaging.Session; +import org.apache.qpid.messaging.cpp.jni.NativeMessage; +import org.apache.qpid.messaging.cpp.jni.NativeReceiver; public class CppReceiver implements Receiver { private CppSession _ssn; - private org.apache.qpid.messaging.cpp.jni.Receiver _cppReceiver; + private NativeReceiver _cppReceiver; private CppMessageFactory _msgFactory; - public CppReceiver(CppSession ssn, - org.apache.qpid.messaging.cpp.jni.Receiver cppReceiver) throws MessagingException + public CppReceiver(CppSession ssn, NativeReceiver cppReceiver) throws MessagingException { _ssn = ssn; _cppReceiver = cppReceiver; @@ -39,14 +40,14 @@ public class CppReceiver implements Receiver @Override public Message get(long timeout) throws MessagingException { - org.apache.qpid.messaging.cpp.jni.Message m = _cppReceiver.get(CppDuration.getDuration(timeout)); + NativeMessage m = _cppReceiver.get(CppDuration.getDuration(timeout)); return _msgFactory.createMessage(m); } @Override public Message fetch(long timeout) throws MessagingException { - org.apache.qpid.messaging.cpp.jni.Message m = _cppReceiver.fetch(CppDuration.getDuration(timeout)); + NativeMessage m = _cppReceiver.fetch(CppDuration.getDuration(timeout)); return _msgFactory.createMessage(m); } diff --git a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSender.java b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSender.java index bb981b2c25..9054b92e07 100644 --- a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSender.java +++ b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSender.java @@ -21,16 +21,17 @@ import org.apache.qpid.messaging.Message; import org.apache.qpid.messaging.MessagingException; import org.apache.qpid.messaging.Sender; import org.apache.qpid.messaging.Session; +import org.apache.qpid.messaging.cpp.jni.NativeMessage; +import org.apache.qpid.messaging.cpp.jni.NativeSender; import org.apache.qpid.messaging.ext.MessageInternal; public class CppSender implements Sender { private CppSession _ssn; - private org.apache.qpid.messaging.cpp.jni.Sender _cppSender; + private NativeSender _cppSender; private CppMessageFactory _msgFactory; - public CppSender(CppSession ssn, - org.apache.qpid.messaging.cpp.jni.Sender cppSender) throws MessagingException + public CppSender(CppSession ssn, NativeSender cppSender) throws MessagingException { _ssn = ssn; _cppSender = cppSender; @@ -40,18 +41,17 @@ public class CppSender implements Sender @Override public void send(Message message, boolean sync) throws MessagingException { - org.apache.qpid.messaging.cpp.jni.Message m = convertForSending(message); + NativeMessage m = convertForSending(message); _cppSender.send(m,true); } - private org.apache.qpid.messaging.cpp.jni.Message convertForSending(Message m) throws MessagingException + private NativeMessage convertForSending(Message m) throws MessagingException { if((m instanceof MessageInternal) && (_msgFactory.getClass() == ((MessageInternal)m).getMessageFactoryClass()) ) { - org.apache.qpid.messaging.cpp.jni.Message msg = - (org.apache.qpid.messaging.cpp.jni.Message)((MessageInternal)m).getFactorySpecificMessageDelegate(); + NativeMessage msg = (NativeMessage)((MessageInternal)m).getFactorySpecificMessageDelegate(); msg.setContentAsByteBuffer(m.getContent()); return msg; } @@ -119,5 +119,4 @@ public class CppSender implements Sender _ssn.checkError(); return _ssn; } - } diff --git a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSession.java b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSession.java index 80a306a425..579725e6ff 100644 --- a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSession.java +++ b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSession.java @@ -25,6 +25,8 @@ import org.apache.qpid.messaging.Receiver; import org.apache.qpid.messaging.Sender; import org.apache.qpid.messaging.Session; import org.apache.qpid.messaging.cpp.jni.Duration; +import org.apache.qpid.messaging.cpp.jni.NativeMessage; +import org.apache.qpid.messaging.cpp.jni.NativeSession; /** * This class relies on the SessionManagementDecorator for @@ -34,11 +36,10 @@ import org.apache.qpid.messaging.cpp.jni.Duration; */ public class CppSession implements Session { - private org.apache.qpid.messaging.cpp.jni.Session _cppSession; + private NativeSession _cppSession; private CppConnection _conn; - public CppSession(CppConnection conn, - org.apache.qpid.messaging.cpp.jni.Session cppSsn) + public CppSession(CppConnection conn,NativeSession cppSsn) { _cppSession = cppSsn; _conn = conn; @@ -84,19 +85,19 @@ public class CppSession implements Session @Override public void acknowledge(Message message, boolean sync) throws MessagingException { - _cppSession.acknowledge((org.apache.qpid.messaging.cpp.jni.Message)message, sync); + _cppSession.acknowledge((NativeMessage)message, sync); } @Override public void reject(Message message) throws MessagingException { - _cppSession.reject((org.apache.qpid.messaging.cpp.jni.Message)message); + _cppSession.reject((NativeMessage)message); } @Override public void release(Message message) throws MessagingException { - _cppSession.release((org.apache.qpid.messaging.cpp.jni.Message)message); + _cppSession.release((NativeMessage)message); } @Override diff --git a/qpid/java/lib/qpid_cpp_jni.jar b/qpid/java/lib/qpid_cpp_jni.jar index 142ce1c77c..798fd84971 100644 Binary files a/qpid/java/lib/qpid_cpp_jni.jar and b/qpid/java/lib/qpid_cpp_jni.jar differ -- cgit v1.2.1