Author: rajith
Date: Fri Jun 15 17:23:48 2012
New Revision: 1350711
URL: http://svn.apache.org/viewvc?rev=1350711&view=rev
Log:
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.
Modified:
qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/java.i
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppConnection.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppMessageFactory.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppReceiver.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSender.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSession.java
qpid/branches/address-refactor2/qpid/java/lib/qpid_cpp_jni.jar
Modified: qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/java.i
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/java.i?rev=1350711&r1=1350710&r2=1350711&view=diff
==============================================================================
--- qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/java.i
(original)
+++ qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/java.i Fri Jun
15 17:23:48 2012
@@ -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"
Modified:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppConnection.java
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppConnection.java?rev=1350711&r1=1350710&r2=1350711&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppConnection.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppConnection.java
Fri Jun 15 17:23:48 2012
@@ -21,6 +21,7 @@ import org.apache.qpid.messaging.Connect
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 Co
{
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
Modified:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppMessageFactory.java
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppMessageFactory.java?rev=1350711&r1=1350710&r2=1350711&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppMessageFactory.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppMessageFactory.java
Fri Jun 15 17:23:48 2012
@@ -30,6 +30,7 @@ import org.apache.qpid.messaging.Messagi
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 M
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 M
_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 M
return null; // The delegate is only for the headers
}
- public org.apache.qpid.messaging.cpp.jni.Message getNativeMessage()
+ public NativeMessage getNativeMessage()
{
return _cppMessage;
}
Modified:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppReceiver.java
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppReceiver.java?rev=1350711&r1=1350710&r2=1350711&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppReceiver.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppReceiver.java
Fri Jun 15 17:23:48 2012
@@ -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 Rece
@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);
}
Modified:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSender.java
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSender.java?rev=1350711&r1=1350710&r2=1350711&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSender.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSender.java
Fri Jun 15 17:23:48 2012
@@ -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;
}
-
}
Modified:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSession.java
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSession.java?rev=1350711&r1=1350710&r2=1350711&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSession.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSession.java
Fri Jun 15 17:23:48 2012
@@ -25,6 +25,8 @@ import org.apache.qpid.messaging.Receive
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
*/
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 Sessi
@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
Modified: qpid/branches/address-refactor2/qpid/java/lib/qpid_cpp_jni.jar
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/lib/qpid_cpp_jni.jar?rev=1350711&r1=1350710&r2=1350711&view=diff
==============================================================================
Files qpid/branches/address-refactor2/qpid/java/lib/qpid_cpp_jni.jar (original)
and qpid/branches/address-refactor2/qpid/java/lib/qpid_cpp_jni.jar Fri Jun 15
17:23:48 2012 differ
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
