activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r593301 - in /activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands: ActiveMQBytesMessage.h ActiveMQDestination.cpp ActiveMQMapMessage.cpp ActiveMQMapMessage.h ActiveMQMessageBase.h ActiveMQTextMessage.cpp
Date Thu, 08 Nov 2007 20:53:51 GMT
Author: tabish
Date: Thu Nov  8 12:53:50 2007
New Revision: 593301

URL: http://svn.apache.org/viewvc?rev=593301&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQCPP-103

Modified:
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.cpp

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.h?rev=593301&r1=593300&r2=593301&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.h
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.h
Thu Nov  8 12:53:50 2007
@@ -24,10 +24,10 @@
 #endif
 
 #include <activemq/connector/openwire/commands/ActiveMQMessageBase.h>
-#include <activemq/io/ByteArrayInputStream.h>
-#include <activemq/io/ByteArrayOutputStream.h>
-#include <activemq/io/DataInputStream.h>
-#include <activemq/io/DataOutputStream.h>
+#include <decaf/io/ByteArrayInputStream.h>
+#include <decaf/io/ByteArrayOutputStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
 #include <cms/BytesMessage.h>
 #include <vector>
 #include <string>
@@ -394,7 +394,7 @@
          */
         void checkWriteOnly() const throw (cms::CMSException){
             if( readOnly ){
-                throw exceptions::IllegalStateException( __FILE__, __LINE__,
+                throw decaf::lang::exceptions::IllegalStateException( __FILE__, __LINE__,
                     "message is in read-only mode and cannot be written to" );
             }
         }
@@ -405,7 +405,7 @@
          */
         void checkReadOnly() const throw (cms::CMSException){
             if( !readOnly ){
-                throw exceptions::IllegalStateException( __FILE__, __LINE__,
+                throw decaf::lang::exceptions::IllegalStateException( __FILE__, __LINE__,
                     "message is in write-only mode and cannot be read from" );
             }
         }
@@ -423,23 +423,23 @@
          * InputStream that wraps around the command's content when in
          * read-only mode.
          */
-        mutable io::ByteArrayInputStream inputStream;
+        mutable decaf::io::ByteArrayInputStream inputStream;
 
         /**
          * OutputStream that wraps around the command's content when in
          * write-only mode.
          */
-        io::ByteArrayOutputStream outputStream;
+        decaf::io::ByteArrayOutputStream outputStream;
 
         /**
          * DataInputStream wrapper around the input stream.
          */
-        mutable io::DataInputStream dataInputStream;
+        mutable decaf::io::DataInputStream dataInputStream;
 
         /**
          * DataOutputStream wrapper around the output stream.
          */
-        io::DataOutputStream dataOutputStream;
+        decaf::io::DataOutputStream dataOutputStream;
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp?rev=593301&r1=593300&r2=593301&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp
Thu Nov  8 12:53:50 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/ActiveMQDestination.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 #include <activemq/util/URISupport.h>
 
 using namespace std;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.cpp?rev=593301&r1=593300&r2=593301&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.cpp
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.cpp
Thu Nov  8 12:53:50 2007
@@ -47,7 +47,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 void ActiveMQMapMessage::beforeMarshal( OpenWireFormat* wireFormat )
-    throw ( io::IOException ) {
+    throw ( decaf::io::IOException ) {
 
     try{
 
@@ -80,7 +80,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 const util::PrimitiveMap& ActiveMQMapMessage::getMap() const
-    throw ( exceptions::NullPointerException ) {
+    throw ( decaf::lang::exceptions::NullPointerException ) {
 
     try{
 
@@ -93,7 +93,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 void ActiveMQMapMessage::checkMapIsUnmarshalled() const
-    throw ( exceptions::NullPointerException ) {
+    throw ( decaf::lang::exceptions::NullPointerException ) {
 
     try {
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h?rev=593301&r1=593300&r2=593301&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h
Thu Nov  8 12:53:50 2007
@@ -25,7 +25,7 @@
 
 #include <activemq/connector/openwire/commands/ActiveMQMessageBase.h>
 #include <activemq/util/PrimitiveMap.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 #include <cms/MapMessage.h>
 #include <vector>
 #include <string>
@@ -83,7 +83,7 @@
          * @param wireformat - the OpenWireFormat object in use.
          */
         virtual void beforeMarshal( OpenWireFormat* wireFormat )
-            throw ( io::IOException );
+            throw ( decaf::io::IOException );
 
         /**
          * Returns a string containing the information for this DataStructure
@@ -320,14 +320,14 @@
          * to be created or unmarshalled, this will perform the correct steps.
          * @returns reference to a PrimtiveMap.
          */
-        util::PrimitiveMap& getMap() throw ( exceptions::NullPointerException );
-        const util::PrimitiveMap& getMap() const throw ( exceptions::NullPointerException
);
+        util::PrimitiveMap& getMap() throw ( decaf::lang::exceptions::NullPointerException
);
+        const util::PrimitiveMap& getMap() const throw ( decaf::lang::exceptions::NullPointerException
);
 
         /**
          * Performs the unmarshal on the Map if needed, otherwise just returns
          */
         virtual void checkMapIsUnmarshalled() const
-            throw ( exceptions::NullPointerException );
+            throw ( decaf::lang::exceptions::NullPointerException );
 
     private:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h?rev=593301&r1=593300&r2=593301&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
Thu Nov  8 12:53:50 2007
@@ -23,7 +23,7 @@
 #include <activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h>
 #include <activemq/connector/openwire/marshal/PrimitiveMapMarshaller.h>
 #include <activemq/core/ActiveMQAckHandler.h>
-#include <activemq/util/Date.h>
+#include <decaf/util/Date.h>
 #include <activemq/util/PrimitiveMap.h>
 #include <cms/DeliveryMode.h>
 
@@ -84,7 +84,7 @@
          * @param wireFormat - the wireformatting controller
          */
         virtual void beforeMarshal( OpenWireFormat* wireFormat AMQCPP_UNUSED )
-            throw ( io::IOException ) {
+            throw ( decaf::io::IOException ) {
 
             try{
 
@@ -95,9 +95,9 @@
                         &properties, marshalledProperties );
                 }
             }
-            AMQ_CATCH_RETHROW( io::IOException )
-            AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, io::IOException )
-            AMQ_CATCHALL_THROW( io::IOException )
+            AMQ_CATCH_RETHROW( decaf::io::IOException )
+            AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException
)
+            AMQ_CATCHALL_THROW( decaf::io::IOException )
         }
 
         /**
@@ -106,16 +106,16 @@
          * @param wireFormat - the wireformat object to control unmarshaling
          */
         virtual void afterUnmarshal( OpenWireFormat* wireFormat AMQCPP_UNUSED )
-            throw ( io::IOException ) {
+            throw ( decaf::io::IOException ) {
 
             try{
 
                 marshal::PrimitiveMapMarshaller::unmarshal(
                     &properties, marshalledProperties );
             }
-            AMQ_CATCH_RETHROW( io::IOException )
-            AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, io::IOException )
-            AMQ_CATCHALL_THROW( io::IOException )
+            AMQ_CATCH_RETHROW( decaf::io::IOException )
+            AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException
)
+            AMQ_CATCHALL_THROW( decaf::io::IOException )
         }
 
         /**
@@ -214,7 +214,7 @@
          */
         virtual bool isExpired() const {
             long long expireTime = this->getCMSExpiration();
-            long long currentTime = util::Date::getCurrentTimeMilliseconds();
+            long long currentTime = decaf::util::Date::getCurrentTimeMilliseconds();
             if( expireTime > 0 && currentTime > expireTime ) {
                 return true;
             }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.cpp?rev=593301&r1=593300&r2=593301&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.cpp
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.cpp
Thu Nov  8 12:53:50 2007
@@ -16,8 +16,8 @@
  */
 #include <activemq/connector/openwire/commands/ActiveMQTextMessage.h>
 
-#include <activemq/io/ByteArrayOutputStream.h>
-#include <activemq/io/DataOutputStream.h>
+#include <decaf/io/ByteArrayOutputStream.h>
+#include <decaf/io/DataOutputStream.h>
 
 using namespace std;
 using namespace activemq;



Mime
View raw message