activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r384616 [4/10] - in /incubator/activemq/trunk: activemq-core/src/gram/script/ activemq-core/src/main/java/org/apache/activemq/openwire/v1/ activemq-core/src/test/java/org/apache/activemq/openwire/v1/ activemq-dotnet/src/main/csharp/ActiveMQ...
Date Thu, 09 Mar 2006 21:11:47 GMT
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/NetworkBridgeFilterMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/NetworkBridgeFilterMarshaller.cs?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/NetworkBridgeFilterMarshaller.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/NetworkBridgeFilterMarshaller.cs Thu Mar  9 13:11:16 2006
@@ -1,115 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-//
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-core module
-//
-
-using System;
-using System.Collections;
-using System.IO;
-
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
-
-namespace ActiveMQ.OpenWire.V1
-{
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for NetworkBridgeFilter
-  /// </summary>
-  class NetworkBridgeFilterMarshaller : BaseDataStreamMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
-    {
-        return new NetworkBridgeFilter();
-    }
-
-    public override byte GetDataStructureType() 
-    {
-        return NetworkBridgeFilter.ID_NetworkBridgeFilter;
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
-    {
-        base.TightUnmarshal(wireFormat, o, dataIn, bs);
-
-        NetworkBridgeFilter info = (NetworkBridgeFilter)o;
-        info.NetworkTTL = dataIn.ReadInt32();
-        info.NetworkBrokerId = (BrokerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-
-    }
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        NetworkBridgeFilter info = (NetworkBridgeFilter)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.NetworkBrokerId, bs);
-
-        return rc + 4;
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-        NetworkBridgeFilter info = (NetworkBridgeFilter)o;
-        dataOut.Write(info.NetworkTTL);
-        TightMarshalCachedObject2(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut, bs);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-        NetworkBridgeFilter info = (NetworkBridgeFilter)o;
-        info.NetworkTTL = dataIn.ReadInt32();
-        info.NetworkBrokerId = (BrokerId) LooseUnmarshalCachedObject(wireFormat, dataIn);
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        NetworkBridgeFilter info = (NetworkBridgeFilter)o;
-
-        base.LooseMarshal(wireFormat, o, dataOut);
-        dataOut.Write(info.NetworkTTL);
-        LooseMarshalCachedObject(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut);
-
-    }
-    
-  }
-}
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
// NOTE!: This file is autogenerated - do not modify!
//        if you need to make a change, please see the Groovy scripts in the
//        activemq-core module
//

using System;
using System.Collections;
using System.IO;

using ActiveMQ.Commands;
using ActiveMQ.OpenWire;
using ActiveMQ.OpenWire.V1;

namespace ActiveMQ.OpenWire.V1
{
  /// <summary
 >
  ///  Marshalling code for Open Wire Format for NetworkBridgeFilter
  /// </summary>
  class NetworkBridgeFilterMarshaller : BaseDataStreamMarshaller
  {


    public override DataStructure CreateObject() 
    {
        return new NetworkBridgeFilter();
    }

    public override byte GetDataStructureType() 
    {
        return NetworkBridgeFilter.ID_NetworkBridgeFilter;
    }

    // 
    // Un-marshal an object instance from the data input stream
    // 
    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
    {
        base.TightUnmarshal(wireFormat, o, dataIn, bs);

        NetworkBridgeFilter info = (NetworkBridgeFilter)o;
        info.NetworkTTL = dataIn.ReadInt32();
        info.NetworkBrokerId = (BrokerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);

    }

    //
    // Write the booleans that this object uses to a BooleanStream
    //
    public override int TightMarshal1(OpenWireFormat wir
 eFormat, Object o, BooleanStream bs) {
        NetworkBridgeFilter info = (NetworkBridgeFilter)o;

        int rc = base.TightMarshal1(wireFormat, info, bs);
        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.NetworkBrokerId, bs);

        return rc + 4;
    }

    // 
    // Write a object instance to data output stream
    //
    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
        base.TightMarshal2(wireFormat, o, dataOut, bs);

        NetworkBridgeFilter info = (NetworkBridgeFilter)o;
        dataOut.Write(info.NetworkTTL);
        TightMarshalCachedObject2(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut, bs);

    }

    // 
    // Un-marshal an object instance from the data input stream
    // 
    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
    {
        base.LooseUnmarshal(wireFormat, o, dataIn);

        NetworkBridge
 Filter info = (NetworkBridgeFilter)o;
        info.NetworkTTL = dataIn.ReadInt32();
        info.NetworkBrokerId = (BrokerId) LooseUnmarshalCachedObject(wireFormat, dataIn);

    }

    // 
    // Write a object instance to data output stream
    //
    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {

        NetworkBridgeFilter info = (NetworkBridgeFilter)o;

        base.LooseMarshal(wireFormat, o, dataOut);
        dataOut.Write(info.NetworkTTL);
        LooseMarshalCachedObject(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut);

    }
    
  }
}
\ No newline at end of file

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ReplayCommandMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ReplayCommandMarshaller.cs?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ReplayCommandMarshaller.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ReplayCommandMarshaller.cs Thu Mar  9 13:11:16 2006
@@ -1,98 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-//
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-core module
-//
-
-using System;
-using System.Collections;
-using System.IO;
-
-using ActiveMQ.Commands;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.V1;
-
-namespace ActiveMQ.OpenWire.V1
-{
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for ReplayCommand
-  /// </summary>
-  class ReplayCommandMarshaller : BaseCommandMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
-    {
-        return new ReplayCommand();
-    }
-
-    public override byte GetDataStructureType() 
-    {
-        return ReplayCommand.ID_ReplayCommand;
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
-    {
-        base.TightUnmarshal(wireFormat, o, dataIn, bs);
-
-    }
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        ReplayCommand info = (ReplayCommand)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-
-        return rc + 0;
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        base.LooseMarshal(wireFormat, o, dataOut);
-
-    }
-    
-  }
-}
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
// NOTE!: This file is autogenerated - do not modify!
//        if you need to make a change, please see the Groovy scripts in the
//        activemq-core module
//

using System;
using System.Collections;
using System.IO;

using ActiveMQ.Commands;
using ActiveMQ.OpenWire;
using ActiveMQ.OpenWire.V1;

namespace ActiveMQ.OpenWire.V1
{
  /// <summary
 >
  ///  Marshalling code for Open Wire Format for ReplayCommand
  /// </summary>
  class ReplayCommandMarshaller : BaseCommandMarshaller
  {


    public override DataStructure CreateObject() 
    {
        return new ReplayCommand();
    }

    public override byte GetDataStructureType() 
    {
        return ReplayCommand.ID_ReplayCommand;
    }

    // 
    // Un-marshal an object instance from the data input stream
    // 
    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
    {
        base.TightUnmarshal(wireFormat, o, dataIn, bs);

    }

    //
    // Write the booleans that this object uses to a BooleanStream
    //
    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
        ReplayCommand info = (ReplayCommand)o;

        int rc = base.TightMarshal1(wireFormat, info, bs);

        return rc + 0;
    }

    // 
    // Write a object instance to data output st
 ream
    //
    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
        base.TightMarshal2(wireFormat, o, dataOut, bs);

    }

    // 
    // Un-marshal an object instance from the data input stream
    // 
    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
    {
        base.LooseUnmarshal(wireFormat, o, dataIn);

    }

    // 
    // Write a object instance to data output stream
    //
    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {

        base.LooseMarshal(wireFormat, o, dataOut);

    }
    
  }
}
\ No newline at end of file

Modified: incubator/activemq/trunk/openwire-cpp/src/BrokerError.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/BrokerError.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/BrokerError.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/BrokerError.hpp Thu Mar  9 13:11:16 2006
@@ -27,7 +27,7 @@
   {
     namespace client
     {
-      using namespace ifr ;
+      using namespace ifr::v1 ;
       using namespace std ;
 
 /*

Modified: incubator/activemq/trunk/openwire-cpp/src/BrokerException.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/BrokerException.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/BrokerException.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/BrokerException.cpp Thu Mar  9 13:11:16 2006
@@ -35,7 +35,7 @@
     message.append( cause->getStackTrace()->c_str() ) ;
 }
 
-BrokerException::~BrokerException()
+BrokerException::~BrokerException() throw()
 {
     // no-op
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/BrokerException.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/BrokerException.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/BrokerException.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/BrokerException.hpp Thu Mar  9 13:11:16 2006
@@ -29,7 +29,7 @@
     namespace client
     {
       using namespace std;
-      using namespace ifr ;
+      using namespace ifr::v1 ;
 
 /*
  * 
@@ -41,7 +41,7 @@
     
 public:
     BrokerException(p<BrokerError> cause) ;
-    virtual ~BrokerException() ;
+    virtual ~BrokerException() throw();
 
     virtual p<BrokerError> getCause() ;
 };

Modified: incubator/activemq/trunk/openwire-cpp/src/Connection.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/Connection.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/Connection.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/Connection.cpp Thu Mar  9 13:11:16 2006
@@ -19,8 +19,6 @@
 using namespace apache::activemq::client;
 
 
-// --- Constructors -------------------------------------------------
-
 /*
  *
  */
@@ -62,7 +60,7 @@
 /*
  *
  */
-p<string> Connection::getClientId()
+const char* Connection::getClientId()
 {
     return connectionInfo->getClientId() ;
 }
@@ -176,7 +174,7 @@
     p<SessionInfo> sessionInfo = new SessionInfo() ;
     p<SessionId>   sessionId   = new SessionId() ;
     
-    sessionId->setConnectionId ( connectionInfo->getConnectionId()->getValue()->c_str() ) ;
+    sessionId->setConnectionId ( connectionInfo->getConnectionId()->getValue() ) ;
 
     mutex.lock() ;
     sessionId->setValue( ++sessionCounter ) ; 

Modified: incubator/activemq/trunk/openwire-cpp/src/Connection.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/Connection.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/Connection.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/Connection.hpp Thu Mar  9 13:11:16 2006
@@ -31,7 +31,7 @@
 #include "command/SessionId.hpp"
 #include "transport/ITransport.hpp"
 #include "util/SimpleMutex.hpp"
-#include "util/ifr/p"
+#include "util/ifr/p.hpp"
 
 // Turn off warning message for ignored exception specification
 #ifdef _MSC_VER
@@ -45,7 +45,7 @@
     namespace client
     {
       using namespace std;
-      using namespace ifr;
+      using namespace ifr::v1;
       using namespace apache::activemq::client::command;
       using namespace apache::activemq::client::transport;
       using namespace apache::activemq::client::util;
@@ -56,25 +56,25 @@
 class Connection : public IConnection
 {
 private:
-    p<ConnectionInfo>   connectionInfo ;
-    p<ITransport>       transport ;
-    list< p<ISession> > sessions ;
-    bool                transacted,
-                        connected,
-                        closed ;
-    AcknowledgementMode acknowledgementMode ;
-    long                sessionCounter ;
-    SimpleMutex         mutex ;
+    p<ConnectionInfo>   connectionInfo;
+    p<ITransport>       transport;
+    list< p<ISession> > sessions;
+    bool                transacted;
+    bool	            connected;
+    bool                closed;
+    AcknowledgementMode acknowledgementMode;
+    long                sessionCounter;
+    SimpleMutex         mutex;
 
 public:
     // Constructors
     Connection(p<ITransport> transport, p<ConnectionInfo> connectionInfo) ;
-    ~Connection() ;
+    virtual ~Connection() ;
 
     // Attribute methods
     virtual AcknowledgementMode getAcknowledgementMode() ;
     virtual void setAcknowledgementMode(AcknowledgementMode mode) ;
-    virtual p<string> getClientId() ;
+    virtual const char* getClientId() ;
     virtual void setClientId(const char* value) ;
     virtual bool getTransacted() ;
     virtual void setTransacted(bool tx) ;
@@ -97,4 +97,4 @@
   }
 }
 
-#endif /*Connection_hpp_*/
\ No newline at end of file
+#endif /*Connection_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/ConnectionClosedException.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/ConnectionClosedException.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/ConnectionClosedException.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/ConnectionClosedException.cpp Thu Mar  9 13:11:16 2006
@@ -27,7 +27,7 @@
     // no-op
 }
 
-ConnectionClosedException::~ConnectionClosedException()
+ConnectionClosedException::~ConnectionClosedException() throw()
 {
     // no-op
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/ConnectionClosedException.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/ConnectionClosedException.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/ConnectionClosedException.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/ConnectionClosedException.hpp Thu Mar  9 13:11:16 2006
@@ -33,7 +33,7 @@
 {
 public:
     ConnectionClosedException(const char* message) ;
-    virtual ~ConnectionClosedException() ;
+    virtual ~ConnectionClosedException() throw();
 };
 
 /* namespace */
@@ -41,4 +41,4 @@
   }
 }
 
-#endif /*ConnectionClosedException_hpp_*/
\ No newline at end of file
+#endif /*ConnectionClosedException_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/ConnectionFactory.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/ConnectionFactory.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/ConnectionFactory.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/ConnectionFactory.cpp Thu Mar  9 13:11:16 2006
@@ -177,7 +177,7 @@
 
     connectionId->setValue( createNewConnectionId()->c_str() ) ;
     connectionInfo->setConnectionId( connectionId ) ;
-    connectionInfo->setUsername( username ) ;
+    connectionInfo->setUserName( username ) ;
     connectionInfo->setPassword( password ) ;
 
     return connectionInfo ;

Modified: incubator/activemq/trunk/openwire-cpp/src/ConnectionFactory.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/ConnectionFactory.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/ConnectionFactory.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/ConnectionFactory.hpp Thu Mar  9 13:11:16 2006
@@ -27,7 +27,7 @@
 #include "command/ConnectionId.hpp"
 #include "transport/ITransport.hpp"
 #include "transport/SocketTransport.hpp"
-#include "util/ifr/p"
+#include "util/ifr/p.hpp"
 
 namespace apache
 {
@@ -38,7 +38,7 @@
         using namespace apache::activemq::client::command;
         using namespace apache::activemq::client::transport;
         using namespace apache::activemq::client::util;
-        using namespace ifr;
+        using namespace ifr::v1;
 
 /*
  * 
@@ -86,4 +86,4 @@
   }
 }
 
-#endif /*ConnectionFactory_hpp_*/
\ No newline at end of file
+#endif /*ConnectionFactory_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/ConsumerClosedException.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/ConsumerClosedException.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/ConsumerClosedException.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/ConsumerClosedException.cpp Thu Mar  9 13:11:16 2006
@@ -27,7 +27,7 @@
     // no-op
 }
 
-ConsumerClosedException::~ConsumerClosedException()
+ConsumerClosedException::~ConsumerClosedException() throw()
 {
     // no-op
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/ConsumerClosedException.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/ConsumerClosedException.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/ConsumerClosedException.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/ConsumerClosedException.hpp Thu Mar  9 13:11:16 2006
@@ -33,7 +33,7 @@
 {
 public:
     ConsumerClosedException(const char* message) ;
-    ~ConsumerClosedException() ;
+    virtual ~ConsumerClosedException() throw();
 };
 
 /* namespace */
@@ -41,4 +41,4 @@
   }
 }
 
-#endif /*ConsumerClosedException_hpp_*/
\ No newline at end of file
+#endif /*ConsumerClosedException_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/DestinationFilter.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/DestinationFilter.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/DestinationFilter.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/DestinationFilter.hpp Thu Mar  9 13:11:16 2006
@@ -19,7 +19,7 @@
 
 #include "command/ActiveMQMessage.hpp"
 #include "command/ActiveMQDestination.hpp"
-#include "util/ifr/p"
+#include "util/ifr/p.hpp"
 
 namespace apache
 {
@@ -27,7 +27,7 @@
   {
     namespace client
     {
-      using namespace ifr;
+      using namespace ifr::v1;
       using namespace apache::activemq::client::command;
 
 /*

Modified: incubator/activemq/trunk/openwire-cpp/src/FutureResponse.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/FutureResponse.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/FutureResponse.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/FutureResponse.hpp Thu Mar  9 13:11:16 2006
@@ -27,7 +27,7 @@
   {
     namespace client
     {
-      using namespace ifr;
+      using namespace ifr::v1;
       using namespace apache::activemq::client::command;
 
 /*

Modified: incubator/activemq/trunk/openwire-cpp/src/IBytesMessage.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/IBytesMessage.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/IBytesMessage.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/IBytesMessage.hpp Thu Mar  9 13:11:16 2006
@@ -27,7 +27,7 @@
 #include "MessageEOFException.hpp"
 #include "MessageNotReadableException.hpp"
 #include "MessageNotWritableException.hpp"
-#include "util/ifr/p"
+#include "util/ifr/p.hpp"
 
 namespace apache
 {
@@ -36,13 +36,16 @@
     namespace client
     {
         using namespace std;
-        using namespace ifr;
+        using namespace ifr::v1;
 
 /*
  * 
  */
-struct IBytesMessage //: IMessage
+class IBytesMessage //: IMessage
 {
+public:
+
+	virtual ~IBytesMessage(){}
     virtual int getBodyLength() = 0;
     virtual void reset() = 0 ;
     virtual char readByte() throw (MessageNotReadableException, MessageEOFException) = 0 ;
@@ -70,4 +73,4 @@
   }
 }
 
-#endif /*IBytesMessage_hpp_*/
\ No newline at end of file
+#endif /*IBytesMessage_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/IConnection.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/IConnection.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/IConnection.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/IConnection.hpp Thu Mar  9 13:11:16 2006
@@ -19,7 +19,7 @@
 
 #include "ISession.hpp"
 #include "OpenWireException.hpp"
-#include "util/ifr/p"
+#include "util/ifr/p.hpp"
 
 // Turn off warning message for ignored exception specification
 #ifdef _MSC_VER
@@ -33,7 +33,7 @@
   {
     namespace client
     {
-        using namespace ifr;
+        using namespace ifr::v1;
 
 enum AcknowledgementMode {
     UnknownMode, AutoMode, ClientMode, TransactionalMode 
@@ -42,8 +42,11 @@
 /*
  * 
  */
-struct IConnection
+class IConnection
 {
+public:
+
+	virtual ~IConnection(){}
     virtual p<ISession> createSession() throw(OpenWireException) = 0 ;
     virtual p<ISession> createSession(bool transacted, AcknowledgementMode ackMode) throw(OpenWireException) = 0 ;
     virtual bool getTransacted() = 0 ;
@@ -57,4 +60,4 @@
   }
 }
 
-#endif /*IConnection_hpp_*/
\ No newline at end of file
+#endif /*IConnection_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/IConnectionFactory.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/IConnectionFactory.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/IConnectionFactory.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/IConnectionFactory.hpp Thu Mar  9 13:11:16 2006
@@ -19,7 +19,7 @@
 
 #include <string>
 #include "IConnection.hpp"
-#include "util/ifr/p"
+#include "util/ifr/p.hpp"
 
 namespace apache
 {
@@ -27,13 +27,16 @@
   {
     namespace client
     {
-      using namespace ifr;
+      using namespace ifr::v1;
 
 /*
  * 
  */
-struct IConnectionFactory
+class IConnectionFactory
 {
+public:
+
+	virtual ~IConnectionFactory(){}
     virtual p<IConnection> createConnection() = 0 ;
     virtual p<IConnection> createConnection(const char* username, const char* password) = 0 ;
 } ;

Modified: incubator/activemq/trunk/openwire-cpp/src/IDestination.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/IDestination.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/IDestination.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/IDestination.hpp Thu Mar  9 13:11:16 2006
@@ -30,9 +30,12 @@
 /*
  * 
  */
-struct IDestination
-{
+class IDestination
+{	
+public:
+
     // Empty marker interface
+    virtual ~IDestination(){}
 } ;
 
 /* namespace */
@@ -40,4 +43,4 @@
   }
 }
 
-#endif /*IDestination_hpp_*/
\ No newline at end of file
+#endif /*IDestination_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/IMessage.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/IMessage.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/IMessage.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/IMessage.hpp Thu Mar  9 13:11:16 2006
@@ -18,7 +18,7 @@
 #define IMessage_hpp_
 
 #include "IDestination.hpp"
-#include "util/ifr/p"
+#include "util/ifr/p.hpp"
 
 namespace apache
 {
@@ -26,13 +26,16 @@
   {
     namespace client
     {
-      using namespace ifr;
+      using namespace ifr::v1;
 
 /*
  * 
  */
-struct IMessage
+class IMessage
 {
+public:
+
+	virtual ~IMessage(){}
     virtual p<IDestination> getFromDestination() = 0 ;
     virtual void setFromDestination(p<IDestination> destination) = 0 ;
 } ;
@@ -42,4 +45,4 @@
   }
 }
 
-#endif /*IMessage_hpp_*/
\ No newline at end of file
+#endif /*IMessage_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/IMessageConsumer.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/IMessageConsumer.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/IMessageConsumer.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/IMessageConsumer.hpp Thu Mar  9 13:11:16 2006
@@ -19,7 +19,7 @@
 
 #include <string>
 #include "IMessage.hpp"
-#include "util/ifr/p"
+#include "util/ifr/p.hpp"
 
 namespace apache
 {
@@ -27,13 +27,16 @@
   {
     namespace client
     {
-      using namespace ifr;
+      using namespace ifr::v1;
 
 /*
  * 
  */
-struct IMessageConsumer
+class IMessageConsumer
 {
+public:
+
+	virtual ~IMessageConsumer(){}
     virtual p<IMessage> receive() = 0 ;
     virtual p<IMessage> receiveNoWait() = 0 ;
 } ;
@@ -43,4 +46,4 @@
   }
 }
 
-#endif /*IMessageConsumer_hpp_*/
\ No newline at end of file
+#endif /*IMessageConsumer_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/IMessageProducer.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/IMessageProducer.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/IMessageProducer.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/IMessageProducer.hpp Thu Mar  9 13:11:16 2006
@@ -20,7 +20,7 @@
 #include <string>
 #include "IDestination.hpp"
 #include "IMessage.hpp"
-#include "util/ifr/p"
+#include "util/ifr/p.hpp"
 
 namespace apache
 {
@@ -28,13 +28,16 @@
   {
     namespace client
     {
-      using namespace ifr;
+      using namespace ifr::v1;
 
 /*
  * 
  */
-struct IMessageProducer
+class IMessageProducer
 {
+public:
+
+	virtual ~IMessageProducer(){}
     virtual void send(p<IMessage> message) = 0 ;
     virtual void send(p<IDestination> destination, p<IMessage> message) = 0 ;
 } ;
@@ -44,4 +47,4 @@
   }
 }
 
-#endif /*IMessageProducer_hpp_*/
\ No newline at end of file
+#endif /*IMessageProducer_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/IQueue.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/IQueue.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/IQueue.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/IQueue.hpp Thu Mar  9 13:11:16 2006
@@ -19,7 +19,7 @@
 
 #include <string>
 #include "IDestination.hpp"
-#include "util/ifr/p"
+#include "util/ifr/p.hpp"
 
 namespace apache
 {
@@ -27,14 +27,17 @@
   {
     namespace client
     {
-      using namespace ifr;
+      using namespace ifr::v1;
       using namespace std;
 
 /*
  * 
  */
-struct IQueue : IDestination
+class IQueue : public IDestination
 {
+public:
+
+	virtual ~IQueue(){}
     virtual p<string> getQueueName() = 0 ;
     virtual void setQueueName(const char* name) = 0 ;
 } ;
@@ -44,4 +47,4 @@
   }
 }
 
-#endif /*IQueue_hpp_*/
\ No newline at end of file
+#endif /*IQueue_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/ISession.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/ISession.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/ISession.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/ISession.hpp Thu Mar  9 13:11:16 2006
@@ -24,7 +24,7 @@
 #include "IQueue.hpp"
 #include "ITopic.hpp"
 #include "ITextMessage.hpp"
-#include "util/ifr/p"
+#include "util/ifr/p.hpp"
 
 namespace apache
 {
@@ -32,13 +32,16 @@
   {
     namespace client
     {
-      using namespace ifr;
+      using namespace ifr::v1;
 
 /*
  * 
  */
-struct ISession
+class ISession
 {
+public:
+
+	virtual ~ISession(){}
     virtual p<IMessageProducer> createProducer() = 0 ;
     virtual p<IMessageProducer> createProducer(p<IDestination> destination) = 0 ;
     virtual p<IMessageConsumer> createConsumer(p<IDestination> destination) = 0 ;
@@ -55,4 +58,4 @@
   }
 }
 
-#endif /*ISession_hpp_*/
\ No newline at end of file
+#endif /*ISession_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/ITemporaryQueue.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/ITemporaryQueue.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/ITemporaryQueue.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/ITemporaryQueue.hpp Thu Mar  9 13:11:16 2006
@@ -30,8 +30,10 @@
 /*
  * 
  */
-struct ITemporaryQueue : IDestination
+class ITemporaryQueue : public IDestination
 {
+public:
+	virtual ~ITemporaryQueue(){}
 } ;
 
 /* namespace */
@@ -39,4 +41,4 @@
   }
 }
 
-#endif /*ITemporaryQueue_hpp_*/
\ No newline at end of file
+#endif /*ITemporaryQueue_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/ITemporaryTopic.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/ITemporaryTopic.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/ITemporaryTopic.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/ITemporaryTopic.hpp Thu Mar  9 13:11:16 2006
@@ -30,8 +30,10 @@
 /*
  * 
  */
-struct ITemporaryTopic : IDestination
+class ITemporaryTopic : public IDestination
 {
+public:
+	virtual ~ITemporaryTopic(){}	
 } ;
 
 /* namespace */
@@ -39,4 +41,4 @@
   }
 }
 
-#endif /*ITemporaryTopic_hpp_*/
\ No newline at end of file
+#endif /*ITemporaryTopic_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/ITextMessage.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/ITextMessage.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/ITextMessage.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/ITextMessage.hpp Thu Mar  9 13:11:16 2006
@@ -31,8 +31,11 @@
 /*
  * 
  */
-struct ITextMessage : IMessage
+class ITextMessage : public IMessage
 {
+public:
+
+	virtual ~ITextMessage(){}
     virtual string* getText() = 0 ;
     virtual void setText(string* txt) = 0 ;
 } ;
@@ -42,4 +45,4 @@
   }
 }
 
-#endif /*ITextMessage_hpp_*/
\ No newline at end of file
+#endif /*ITextMessage_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/ITopic.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/ITopic.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/ITopic.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/ITopic.hpp Thu Mar  9 13:11:16 2006
@@ -19,7 +19,7 @@
 
 #include <string>
 #include "IDestination.hpp"
-#include "util/ifr/p"
+#include "util/ifr/p.hpp"
 
 namespace apache
 {
@@ -27,14 +27,17 @@
   {
     namespace client
     {
-      using namespace ifr;
+      using namespace ifr::v1;
       using namespace std;
 
 /*
  * 
  */
-struct ITopic : IDestination
+class ITopic : public IDestination
 {
+public:
+
+	virtual ~ITopic(){}
     virtual p<string> getTopicName() = 0 ;
     virtual void setTopicName(const char* name) = 0 ;
 } ;
@@ -44,4 +47,4 @@
   }
 }
 
-#endif /*ITopic_hpp_*/
\ No newline at end of file
+#endif /*ITopic_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/IllegalArgumentException.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/IllegalArgumentException.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/IllegalArgumentException.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/IllegalArgumentException.hpp Thu Mar  9 13:11:16 2006
@@ -46,4 +46,4 @@
   }
 }
 
-#endif /*IllegalArgumentException_hpp_*/
\ No newline at end of file
+#endif /*IllegalArgumentException_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/MessageConsumer.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/MessageConsumer.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/MessageConsumer.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/MessageConsumer.hpp Thu Mar  9 13:11:16 2006
@@ -25,7 +25,7 @@
 #include "OpenWireException.hpp"
 #include "ConnectionClosedException.hpp"
 #include "command/ConsumerInfo.hpp"
-#include "util/ifr/p"
+#include "util/ifr/p.hpp"
 
 // Turn off warning message for ignored exception specification
 #ifdef _MSC_VER
@@ -52,7 +52,7 @@
 
 public:
     MessageConsumer(p<Session> session, p<ConsumerInfo> consumerInfo) ;
-    ~MessageConsumer() ;
+    virtual ~MessageConsumer() ;
 
     /* TODO
     virtual void setMessageListener(p<IMessageListener> listener) ;
@@ -71,4 +71,4 @@
   }
 }
 
-#endif /*IMessageConsumer_hpp_*/
\ No newline at end of file
+#endif /*IMessageConsumer_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/MessageEOFException.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/MessageEOFException.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/MessageEOFException.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/MessageEOFException.hpp Thu Mar  9 13:11:16 2006
@@ -47,4 +47,4 @@
   }
 }
 
-#endif /*MessageEOFException_hpp_*/
\ No newline at end of file
+#endif /*MessageEOFException_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/MessageFormatException.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/MessageFormatException.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/MessageFormatException.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/MessageFormatException.hpp Thu Mar  9 13:11:16 2006
@@ -47,4 +47,4 @@
   }
 }
 
-#endif /*MessageFormatException_hpp_*/
\ No newline at end of file
+#endif /*MessageFormatException_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/MessageNotReadableException.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/MessageNotReadableException.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/MessageNotReadableException.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/MessageNotReadableException.hpp Thu Mar  9 13:11:16 2006
@@ -46,4 +46,4 @@
   }
 }
 
-#endif /*MessageNotReadableException_hpp_*/
\ No newline at end of file
+#endif /*MessageNotReadableException_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/MessageNotWritableException.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/MessageNotWritableException.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/MessageNotWritableException.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/MessageNotWritableException.hpp Thu Mar  9 13:11:16 2006
@@ -46,4 +46,4 @@
   }
 }
 
-#endif /*MessageNotWritableException_hpp_*/
\ No newline at end of file
+#endif /*MessageNotWritableException_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/MessageProducer.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/MessageProducer.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/MessageProducer.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/MessageProducer.hpp Thu Mar  9 13:11:16 2006
@@ -23,7 +23,7 @@
 #include "IMessageProducer.hpp"
 #include "Session.hpp"
 #include "command/ProducerInfo.hpp"
-#include "util/ifr/p"
+#include "util/ifr/p.hpp"
 
 namespace apache
 {
@@ -44,7 +44,7 @@
 
 public:
     MessageProducer(p<Session> session, p<ProducerInfo> producerInfo) ;
-    ~MessageProducer() ;
+    virtual ~MessageProducer() ;
 
     virtual void send(p<IMessage> message) ;
     virtual void send(p<IDestination> destination, p<IMessage> message) ;
@@ -55,4 +55,4 @@
   }
 }
 
-#endif /*IMessageProducer_hpp_*/
\ No newline at end of file
+#endif /*IMessageProducer_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/OpenWireException.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/OpenWireException.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/OpenWireException.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/OpenWireException.cpp Thu Mar  9 13:11:16 2006
@@ -22,12 +22,11 @@
  * 
  */
 OpenWireException::OpenWireException(const char* message)
-    : exception(message) 
 {
-    // no-op
+    msg = message;
 }
 
-OpenWireException::~OpenWireException()
+OpenWireException::~OpenWireException() throw()
 {
     // no-op
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/OpenWireException.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/OpenWireException.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/OpenWireException.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/OpenWireException.hpp Thu Mar  9 13:11:16 2006
@@ -18,6 +18,7 @@
 #define OpenWireException_hpp_
 
 #include <exception>
+#include <string>
 
 namespace apache
 {
@@ -36,6 +37,19 @@
 public:
     OpenWireException(const char* message) ;
     virtual ~OpenWireException() throw();
+    
+    OpenWireException& operator=( const OpenWireException& ex ){
+    	msg = ex.msg;
+    	return *this;
+    }
+    
+    virtual const char* what() const throw(){
+    	return msg.c_str();
+    }
+    
+protected:
+
+	string msg;
 } ;
 
 /* namespace */
@@ -43,4 +57,4 @@
   }
 }
 
-#endif /*OpenWireException_hpp_*/
\ No newline at end of file
+#endif /*OpenWireException_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/Session.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/Session.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/Session.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/Session.hpp Thu Mar  9 13:11:16 2006
@@ -20,13 +20,14 @@
 #include <string>
 #include "IMessage.hpp"
 #include "ISession.hpp"
+#include "IConnection.hpp"
 #include "command/IDataStructure.hpp"
 #include "command/ConsumerInfo.hpp"
 #include "command/ProducerInfo.hpp"
 #include "command/RemoveInfo.hpp"
 #include "command/SessionInfo.hpp"
 #include "util/SimpleMutex.hpp"
-#include "util/ifr/p"
+#include "util/ifr/p.hpp"
 
 namespace apache
 {
@@ -37,7 +38,6 @@
         using namespace ifr;
         using namespace apache::activemq::client::util;
         class Connection;
-        enum  AcknowledgementMode;
 
 /*
  * 
@@ -53,7 +53,7 @@
 
 public:
     Session(p<Connection> connection, p<SessionInfo> sessionInfo) ;
-    ~Session() ;
+    virtual ~Session() ;
     
     virtual p<IMessageProducer> createProducer() ;
     virtual p<IMessageProducer> createProducer(p<IDestination> destination) ;

Modified: incubator/activemq/trunk/openwire-cpp/src/TraceException.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/TraceException.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/TraceException.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/TraceException.cpp Thu Mar  9 13:11:16 2006
@@ -31,31 +31,27 @@
  * 
  */
 TraceException::TraceException(const char* msg)
-   : exception(msg)
 {
-    // no-op
+   this->msg = msg;
 } ;
 
 /*
  * 
  */
 TraceException::TraceException(const char* fileName, int lineNo, const char* message)
-    : exception(message)
 {
+	this->msg = message;
     char buf[10] ;
-
-    trace = new string() ;
-    trace->append(fileName) ;
-    trace->append(" at ") ;
-    trace->append( itoa(lineNo, buf, 10) ) ;
+	sprintf( buf, "%d", lineNo );	
+    trace = (string)fileName + " at " + buf ;
 }
 
-TraceException::~TraceException()
+TraceException::~TraceException() throw()
 {
     // no-op
 }
 
-p<string> TraceException::where()
+const char* TraceException::where()
 {
-    return trace ;
+    return trace.c_str();
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/TraceException.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/TraceException.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/TraceException.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/TraceException.hpp Thu Mar  9 13:11:16 2006
@@ -28,22 +28,35 @@
     namespace client
     {
       using namespace std ;
-      using namespace ifr ;
+      using namespace ifr::v1 ;
 
 /*
  * Base class for all exceptions containing trace information.
  */
 class TraceException : public exception
 {
-    p<string> trace ;
-
 public:
     TraceException() ;
     TraceException(const char* msg) ;
     TraceException(const char* fileName, int lineNo, const char* msg) ;
-    virtual ~TraceException() ;
+    virtual ~TraceException() throw();
+
+	TraceException& operator=( const TraceException& ex ){
+		msg = ex.msg;
+		trace = ex.trace;
+		return *this;
+	}
+	
+    const char* where();
+    
+    virtual const char* what() const throw(){
+    	return msg.c_str();
+    }
+    
+private:
 
-    p<string> where() ;
+	string msg;
+	string trace;
 } ;
 
 /* namespace */
@@ -51,4 +64,4 @@
   }
 }
 
-#endif /*TraceException_hpp_*/
\ No newline at end of file
+#endif /*TraceException_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/command/AbstractCommand.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/AbstractCommand.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/AbstractCommand.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/AbstractCommand.hpp Thu Mar  9 13:11:16 2006
@@ -29,7 +29,7 @@
     {
       namespace command
       {
-        using namespace ifr;
+        using namespace ifr::v1;
         using namespace std;
 
 /*
@@ -41,7 +41,7 @@
     AbstractCommand() ;
 
 public:
-    ~AbstractCommand() ;
+    virtual ~AbstractCommand() ;
 
     virtual int getCommandType() ;
 

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQBytesMessage.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQBytesMessage.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQBytesMessage.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQBytesMessage.cpp Thu Mar  9 13:11:16 2006
@@ -120,7 +120,7 @@
     result = readBytes((char*)&value, sizeof(bool)) ;
 
     // Check for EOF offset
-    if( result == -1 || result < sizeof(bool) )
+    if( result == -1 || result < (int)sizeof(bool) )
         throw MessageEOFException() ;
 
     return value ;
@@ -142,7 +142,7 @@
     result = readBytes((char*)&value, sizeof(double)) ;
 
     // Check for EOF offset
-    if( result == -1 || result < sizeof(double) )
+    if( result == -1 || result < (int)sizeof(double) )
         throw MessageEOFException() ;
 
     // Convert from big endian to little endian if necessary
@@ -165,7 +165,7 @@
     result = readBytes((char*)&value, sizeof(float)) ;
 
     // Check for EOF offset
-    if( result == -1 || result < sizeof(float) )
+    if( result == -1 || result < (int)sizeof(float) )
         throw MessageEOFException() ;
 
     // Convert from big endian to little endian if necessary
@@ -188,7 +188,7 @@
     result = readBytes((char*)&value, sizeof(short)) ;
 
     // Check for EOF offset
-    if( result == -1 || result < sizeof(short) )
+    if( result == -1 || result < (int)sizeof(short) )
         throw MessageEOFException() ;
 
     // Convert from big endian to little endian if necessary
@@ -211,7 +211,7 @@
     result = readBytes((char*)&value, sizeof(int)) ;
 
     // Check for EOF offset
-    if( result == -1 || result < sizeof(int) )
+    if( result == -1 || result < (int)sizeof(int) )
         throw MessageEOFException() ;
 
     // Convert from big endian to little endian if necessary
@@ -234,7 +234,7 @@
     result = readBytes((char*)&value, sizeof(long long)) ;
 
     // Check for EOF offset
-    if( result == -1 || result < sizeof(long long) )
+    if( result == -1 || result < (int)sizeof(long long) )
         throw MessageEOFException() ;
 
     // Convert from big endian to little endian if necessary

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQBytesMessage.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQBytesMessage.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQBytesMessage.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQBytesMessage.hpp Thu Mar  9 13:11:16 2006
@@ -29,7 +29,7 @@
 #include "MessageEOFException.hpp"
 #include "MessageNotWritableException.hpp"
 #include "util/Endian.hpp"
-#include "util/ifr/ap"
+#include "util/ifr/ap.hpp"
 #include "util/ifr/p.hpp"
 #include "util/MapItemHolder.hpp"
 
@@ -41,7 +41,7 @@
     {
       namespace command
       {
-        using namespace ifr;
+        using namespace ifr::v1;
         using namespace apache::activemq::client::util;
 
 /*
@@ -99,4 +99,4 @@
   }
 }
 
-#endif /*ActiveMQBytesMessage_hpp_*/
\ No newline at end of file
+#endif /*ActiveMQBytesMessage_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQDestination.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQDestination.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQDestination.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQDestination.cpp Thu Mar  9 13:11:16 2006
@@ -25,6 +25,11 @@
 {
 }
 
+ActiveMQDestination::ActiveMQDestination( const char* physicalName ){
+	
+	setPhysicalName( physicalName );
+}
+
 ActiveMQDestination::~ActiveMQDestination()
 {
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQDestination.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQDestination.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQDestination.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQDestination.hpp Thu Mar  9 13:11:16 2006
@@ -35,9 +35,32 @@
  */
 class ActiveMQDestination : public AbstractCommand, IDestination
 {
+private:
+
+	string physicalName;
+	
+public:
+
+	enum DestinationType{
+		ACTIVEMQ_QUEUE,
+		ACTIVEMQ_TEMP_QUEUE,
+		ACTIVEMQ_TOPIC,
+		ACTIVEMQ_TEMP_TOPIC
+	};
+	
 public:
-    ActiveMQDestination() ;
+
+    ActiveMQDestination();
+    ActiveMQDestination( const char* physicalName );
     virtual ~ActiveMQDestination() ;
+    
+    virtual const char* getPhysicalName(){
+    	return physicalName.c_str();
+    }
+    
+    virtual void setPhysicalName( const char* name ){
+    	physicalName = name;
+    }
 } ;
 
 /* namespace */
@@ -46,4 +69,4 @@
   }
 }
 
-#endif /*ActiveMQDestination_hpp_*/
\ No newline at end of file
+#endif /*ActiveMQDestination_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQMapMessage.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQMapMessage.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQMapMessage.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQMapMessage.hpp Thu Mar  9 13:11:16 2006
@@ -27,7 +27,7 @@
 #include "ActiveMQMessage.hpp"
 #include "IllegalArgumentException.hpp"
 #include "MessageFormatException.hpp"
-#include "util/ifr/ap"
+#include "util/ifr/ap.hpp"
 #include "util/ifr/p.hpp"
 #include "util/MapItemHolder.hpp"
 
@@ -39,7 +39,7 @@
     {
       namespace command
       {
-        using namespace ifr;
+        using namespace ifr::v1;
         using namespace apache::activemq::client::util;
 
 /*
@@ -88,4 +88,4 @@
   }
 }
 
-#endif /*ActiveMQMapMessage_hpp_*/
\ No newline at end of file
+#endif /*ActiveMQMapMessage_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQMessage.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQMessage.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQMessage.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQMessage.hpp Thu Mar  9 13:11:16 2006
@@ -31,7 +31,7 @@
     {
       namespace command
       {
-        using namespace ifr;
+        using namespace ifr::v1;
         using namespace apache::activemq::client;
 
 /*
@@ -62,4 +62,4 @@
   }
 }
 
-#endif /*ActiveMQMessage_hpp_*/
\ No newline at end of file
+#endif /*ActiveMQMessage_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQObjectMessage.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQObjectMessage.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQObjectMessage.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQObjectMessage.hpp Thu Mar  9 13:11:16 2006
@@ -1 +1,71 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef ActiveMQObjectMessage_hpp_
#define ActiveMQObjectMessage_hpp_

#include <string>
#include "command/ActiveMQMessage.hpp"
    

#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace command
      {
        using namespace ifr;
        using namespace std;
     
    using namespace apache::activemq::client;

/*
 *
 *  Marshalling code for Open Wire Format for ActiveMQObjectMessage
 *
 *
 *  NOTE!: This file is autogenerated - do not modify!
 *         if you need to make a change, please see the Groovy scripts in the
 *         activemq-core module
 *
 */
class ActiveMQObjectMessage : public ActiveMQMessage
{
private:

public:
    const static int TYPE = 26;

public:
    ActiveMQObjectMessage() ;
    virtual ~ActiveMQObjectMessage() ;

    virtual int getCommandType() ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*ActiveMQObjectMessage_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+#ifndef ActiveMQObjectMessage_hpp_
+#define ActiveMQObjectMessage_hpp_
+
+#include <string>
+#include "command/ActiveMQMessage.hpp"
+    
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace client
+    {
+      namespace command
+      {
+        using namespace ifr::v1;
+        using namespace std;
+        using namespace apache::activemq::client;
+
+/*
+ *
+ *  Marshalling code for Open Wire Format for ActiveMQObjectMessage
+ *
+ *
+ *  NOTE!: This file is autogenerated - do not modify!
+ *         if you need to make a change, please see the Groovy scripts in the
+ *         activemq-core module
+ *
+ */
+class ActiveMQObjectMessage : public ActiveMQMessage
+{
+private:
+
+public:
+    const static int TYPE = 26;
+
+public:
+    ActiveMQObjectMessage() ;
+    virtual ~ActiveMQObjectMessage() ;
+
+    virtual int getCommandType() ;
+
+
+} ;
+
+/* namespace */
+      }
+    }
+  }
+}
+
+#endif /*ActiveMQObjectMessage_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQQueue.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQQueue.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQQueue.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQQueue.hpp Thu Mar  9 13:11:16 2006
@@ -45,4 +45,4 @@
   }
 }
 
-#endif /*ActiveMQQueue_hpp_*/
\ No newline at end of file
+#endif /*ActiveMQQueue_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTempQueue.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTempQueue.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTempQueue.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTempQueue.cpp Thu Mar  9 13:11:16 2006
@@ -22,12 +22,12 @@
  * 
  */
 ActiveMQTempQueue::ActiveMQTempQueue()
-   : ActiveMQDestination()
 {
 }
 
 ActiveMQTempQueue::ActiveMQTempQueue(const char* name)
-   : ActiveMQDestination(name)
+:
+	ActiveMQDestination( name )
 {
 }
 
@@ -35,14 +35,14 @@
 {
 }
 
-p<string> ActiveMQTempQueue::getQueueName()
+const char* ActiveMQTempQueue::getQueueName()
 {
     return this->getPhysicalName() ;
 }
 
 int ActiveMQTempQueue::getDestinationType()
 {
-    return ActiveMQDestination::ACTIVEMQ_QUEUE ;
+    return ActiveMQDestination::ACTIVEMQ_TEMP_QUEUE ;
 }
 
 p<ActiveMQDestination> ActiveMQTempQueue::createDestination(const char* name)

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTempQueue.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTempQueue.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTempQueue.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTempQueue.hpp Thu Mar  9 13:11:16 2006
@@ -42,7 +42,7 @@
     ActiveMQTempQueue(const char* name) ;
     virtual ~ActiveMQTempQueue() ;
 
-    virtual p<string> getQueueName() ;
+    virtual const char* getQueueName() ;
     virtual int getDestinationType() ;
     virtual p<ActiveMQDestination> createDestination(const char* name) ;
 } ;
@@ -53,4 +53,4 @@
   }
 }
 
-#endif /*ActiveMQTempQueue_hpp_*/
\ No newline at end of file
+#endif /*ActiveMQTempQueue_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTempTopic.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTempTopic.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTempTopic.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTempTopic.cpp Thu Mar  9 13:11:16 2006
@@ -22,12 +22,12 @@
  * 
  */
 ActiveMQTempTopic::ActiveMQTempTopic()
-   : ActiveMQDestination()
 {
 }
 
 ActiveMQTempTopic::ActiveMQTempTopic(const char* name)
-   : ActiveMQDestination(name)
+:
+	ActiveMQDestination( name )
 {
 }
 
@@ -35,14 +35,14 @@
 {
 }
 
-p<string> ActiveMQTempTopic::getTopicName()
+const char* ActiveMQTempTopic::getTopicName()
 {
-    return this->getPhysicalName() ;
+    return this->getPhysicalName();
 }
 
 int ActiveMQTempTopic::getDestinationType()
 {
-    return ActiveMQDestination::ACTIVEMQ_QUEUE ;
+    return ActiveMQDestination::ACTIVEMQ_TEMP_TOPIC ;
 }
 
 p<ActiveMQDestination> ActiveMQTempTopic::createDestination(const char* name)

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTempTopic.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTempTopic.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTempTopic.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTempTopic.hpp Thu Mar  9 13:11:16 2006
@@ -42,7 +42,7 @@
     ActiveMQTempTopic(const char* name) ;
     virtual ~ActiveMQTempTopic() ;
 
-    virtual p<string> getTopicName() ;
+    virtual const char* getTopicName() ;
     virtual int getDestinationType() ;
     virtual p<ActiveMQDestination> createDestination(const char* name) ;
 } ;
@@ -53,4 +53,4 @@
   }
 }
 
-#endif /*ActiveMQTempTopic_hpp_*/
\ No newline at end of file
+#endif /*ActiveMQTempTopic_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTextMessage.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTextMessage.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTextMessage.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTextMessage.hpp Thu Mar  9 13:11:16 2006
@@ -48,4 +48,4 @@
   }
 }
 
-#endif /*ActiveMQTextMessage_hpp_*/
\ No newline at end of file
+#endif /*ActiveMQTextMessage_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTopic.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTopic.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTopic.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQTopic.hpp Thu Mar  9 13:11:16 2006
@@ -45,4 +45,4 @@
   }
 }
 
-#endif /*ActiveMQTopic_hpp_*/
\ No newline at end of file
+#endif /*ActiveMQTopic_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/command/BaseCommand.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/BaseCommand.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/BaseCommand.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/BaseCommand.cpp Thu Mar  9 13:11:16 2006
@@ -18,8 +18,6 @@
 
 using namespace apache::activemq::client::command;
 
-// Constructors -----------------------------------------------------
-
 /*
  * 
  */
@@ -89,7 +87,9 @@
         str->assign("") ;
 
     str->append(": id = ") ;
-    str->append( itoa(getCommandId(), buffer, 10) ) ;
+    
+    sprintf( buffer, "%d", getCommandId() );
+    str->append( buffer ) ;
 
     return str ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/BaseCommand.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/BaseCommand.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/BaseCommand.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/BaseCommand.hpp Thu Mar  9 13:11:16 2006
@@ -29,7 +29,7 @@
     {
       namespace command
       {
-        using namespace ifr;
+        using namespace ifr::v1;
         using namespace std;
 
 /*
@@ -66,4 +66,4 @@
   }
 }
 
-#endif /*BaseCommand_hpp_*/
\ No newline at end of file
+#endif /*BaseCommand_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConnectionError.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConnectionError.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConnectionError.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConnectionError.hpp Thu Mar  9 13:11:16 2006
@@ -1,81 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-#ifndef ConnectionError_hpp_
-#define ConnectionError_hpp_
-
-#include <string>
-#include "command/BaseCommand.hpp"
-    
-#include "BrokerError.hpp"
-#include "command/ConnectionId.hpp"
-
-#include "util/ifr/ap.hpp"
-#include "util/ifr/p.hpp"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace client
-    {
-      namespace command
-      {
-        using namespace ifr;
-        using namespace std;
-        using namespace apache::activemq::client;
-
-/*
- *
- *  Marshalling code for Open Wire Format for ConnectionError
- *
- *
- *  NOTE!: This file is autogenerated - do not modify!
- *         if you need to make a change, please see the Groovy scripts in the
- *         activemq-core module
- *
- */
-class ConnectionError : public BaseCommand
-{
-private:
-    p<BrokerError> exception ;
-    p<ConnectionId> connectionId ;
-
-public:
-    const static int TYPE = 16;
-
-public:
-    ConnectionError() ;
-    virtual ~ConnectionError() ;
-
-    virtual int getCommandType() ;
-
-    virtual p<BrokerError> getException() ;
-    virtual void setException(p<BrokerError> exception) ;
-
-    virtual p<ConnectionId> getConnectionId() ;
-    virtual void setConnectionId(p<ConnectionId> connectionId) ;
-
-
-} ;
-
-/* namespace */
-      }
-    }
-  }
-}
-
-#endif /*ConnectionError_hpp_*/
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef ConnectionError_hpp_
#define ConnectionError_hpp_

#include <string>
#include "command/BaseCommand.hpp"
    
#include "BrokerError.hpp"
#include "command/ConnectionId.hpp"

#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace command
      {
        using na
 mespace ifr;
        using namespace std;
        using namespace apache::activemq::client;

/*
 *
 *  Marshalling code for Open Wire Format for ConnectionError
 *
 *
 *  NOTE!: This file is autogenerated - do not modify!
 *         if you need to make a change, please see the Groovy scripts in the
 *         activemq-core module
 *
 */
class ConnectionError : public BaseCommand
{
private:
    p<BrokerError> exception ;
    p<ConnectionId> connectionId ;

public:
    const static int TYPE = 16;

public:
    ConnectionError() ;
    virtual ~ConnectionError() ;

    virtual int getCommandType() ;

    virtual p<BrokerError> getException() ;
    virtual void setException(p<BrokerError> exception) ;

    virtual p<ConnectionId> getConnectionId() ;
    virtual void setConnectionId(p<ConnectionId> connectionId) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*ConnectionError_hpp_*/
\ No newline at end of file

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ControlCommand.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ControlCommand.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ControlCommand.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ControlCommand.hpp Thu Mar  9 13:11:16 2006
@@ -1,75 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-#ifndef ControlCommand_hpp_
-#define ControlCommand_hpp_
-
-#include <string>
-#include "command/BaseCommand.hpp"
-    
-
-#include "util/ifr/ap.hpp"
-#include "util/ifr/p.hpp"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace client
-    {
-      namespace command
-      {
-        using namespace ifr;
-        using namespace std;
-        using namespace apache::activemq::client;
-
-/*
- *
- *  Marshalling code for Open Wire Format for ControlCommand
- *
- *
- *  NOTE!: This file is autogenerated - do not modify!
- *         if you need to make a change, please see the Groovy scripts in the
- *         activemq-core module
- *
- */
-class ControlCommand : public BaseCommand
-{
-private:
-    p<string> command ;
-
-public:
-    const static int TYPE = 14;
-
-public:
-    ControlCommand() ;
-    virtual ~ControlCommand() ;
-
-    virtual int getCommandType() ;
-
-    virtual p<string> getCommand() ;
-    virtual void setCommand(p<string> command) ;
-
-
-} ;
-
-/* namespace */
-      }
-    }
-  }
-}
-
-#endif /*ControlCommand_hpp_*/
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef ControlCommand_hpp_
#define ControlCommand_hpp_

#include <string>
#include "command/BaseCommand.hpp"
    

#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace command
      {
        using namespace ifr;
        using namespace std;
        using namespace
  apache::activemq::client;

/*
 *
 *  Marshalling code for Open Wire Format for ControlCommand
 *
 *
 *  NOTE!: This file is autogenerated - do not modify!
 *         if you need to make a change, please see the Groovy scripts in the
 *         activemq-core module
 *
 */
class ControlCommand : public BaseCommand
{
private:
    p<string> command ;

public:
    const static int TYPE = 14;

public:
    ControlCommand() ;
    virtual ~ControlCommand() ;

    virtual int getCommandType() ;

    virtual p<string> getCommand() ;
    virtual void setCommand(p<string> command) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*ControlCommand_hpp_*/
\ No newline at end of file

Modified: incubator/activemq/trunk/openwire-cpp/src/command/DataArrayResponse.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/DataArrayResponse.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/DataArrayResponse.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/DataArrayResponse.hpp Thu Mar  9 13:11:16 2006
@@ -1,76 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-#ifndef DataArrayResponse_hpp_
-#define DataArrayResponse_hpp_
-
-#include <string>
-#include "command/Response.hpp"
-    
-#include "command/IDataStructure.hpp"
-
-#include "util/ifr/ap.hpp"
-#include "util/ifr/p.hpp"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace client
-    {
-      namespace command
-      {
-        using namespace ifr;
-        using namespace std;
-        using namespace apache::activemq::client;
-
-/*
- *
- *  Marshalling code for Open Wire Format for DataArrayResponse
- *
- *
- *  NOTE!: This file is autogenerated - do not modify!
- *         if you need to make a change, please see the Groovy scripts in the
- *         activemq-core module
- *
- */
-class DataArrayResponse : public Response
-{
-private:
-    ap<IDataStructure> data ;
-
-public:
-    const static int TYPE = 33;
-
-public:
-    DataArrayResponse() ;
-    virtual ~DataArrayResponse() ;
-
-    virtual int getCommandType() ;
-
-    virtual ap<IDataStructure> getData() ;
-    virtual void setData(ap<IDataStructure> data) ;
-
-
-} ;
-
-/* namespace */
-      }
-    }
-  }
-}
-
-#endif /*DataArrayResponse_hpp_*/
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef DataArrayResponse_hpp_
#define DataArrayResponse_hpp_

#include <string>
#include "command/Response.hpp"
    
#include "command/IDataStructure.hpp"

#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace command
      {
        using namespace ifr;
        usi
 ng namespace std;
        using namespace apache::activemq::client;

/*
 *
 *  Marshalling code for Open Wire Format for DataArrayResponse
 *
 *
 *  NOTE!: This file is autogenerated - do not modify!
 *         if you need to make a change, please see the Groovy scripts in the
 *         activemq-core module
 *
 */
class DataArrayResponse : public Response
{
private:
    ap<IDataStructure> data ;

public:
    const static int TYPE = 33;

public:
    DataArrayResponse() ;
    virtual ~DataArrayResponse() ;

    virtual int getCommandType() ;

    virtual ap<IDataStructure> getData() ;
    virtual void setData(ap<IDataStructure> data) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*DataArrayResponse_hpp_*/
\ No newline at end of file

Modified: incubator/activemq/trunk/openwire-cpp/src/command/DataResponse.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/DataResponse.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/DataResponse.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/DataResponse.hpp Thu Mar  9 13:11:16 2006
@@ -1,76 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-#ifndef DataResponse_hpp_
-#define DataResponse_hpp_
-
-#include <string>
-#include "command/Response.hpp"
-    
-#include "command/IDataStructure.hpp"
-
-#include "util/ifr/ap.hpp"
-#include "util/ifr/p.hpp"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace client
-    {
-      namespace command
-      {
-        using namespace ifr;
-        using namespace std;
-        using namespace apache::activemq::client;
-
-/*
- *
- *  Marshalling code for Open Wire Format for DataResponse
- *
- *
- *  NOTE!: This file is autogenerated - do not modify!
- *         if you need to make a change, please see the Groovy scripts in the
- *         activemq-core module
- *
- */
-class DataResponse : public Response
-{
-private:
-    p<IDataStructure> data ;
-
-public:
-    const static int TYPE = 32;
-
-public:
-    DataResponse() ;
-    virtual ~DataResponse() ;
-
-    virtual int getCommandType() ;
-
-    virtual p<IDataStructure> getData() ;
-    virtual void setData(p<IDataStructure> data) ;
-
-
-} ;
-
-/* namespace */
-      }
-    }
-  }
-}
-
-#endif /*DataResponse_hpp_*/
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef DataResponse_hpp_
#define DataResponse_hpp_

#include <string>
#include "command/Response.hpp"
    
#include "command/IDataStructure.hpp"

#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace command
      {
        using namespace ifr;
        using namespa
 ce std;
        using namespace apache::activemq::client;

/*
 *
 *  Marshalling code for Open Wire Format for DataResponse
 *
 *
 *  NOTE!: This file is autogenerated - do not modify!
 *         if you need to make a change, please see the Groovy scripts in the
 *         activemq-core module
 *
 */
class DataResponse : public Response
{
private:
    p<IDataStructure> data ;

public:
    const static int TYPE = 32;

public:
    DataResponse() ;
    virtual ~DataResponse() ;

    virtual int getCommandType() ;

    virtual p<IDataStructure> getData() ;
    virtual void setData(p<IDataStructure> data) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*DataResponse_hpp_*/
\ No newline at end of file



Mime
View raw message