activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r384616 [10/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/ActiveM...
Date Thu, 09 Mar 2006 21:11:47 GMT
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/SessionInfoMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/SessionInfoMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/SessionInfoMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/SessionInfoMarshaller.hpp Thu Mar  9 13:11:16 2006
@@ -1,71 +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 SessionInfoMarshaller_hpp_
-#define SessionInfoMarshaller_hpp_
-
-#include <string>
-
-#include "command/DataStructure.hpp"
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
-#include "io/BinaryReader.hpp"
-#include "io/BinaryWriter.hpp"
-
-#include "command/BaseCommandMarshaller.hpp"
-#include "util/ifr/p.hpp"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace client
-    {
-      namespace marshal
-      {
-        using namespace ifr ;
-        using namespace apache::activemq::client::command;
-        using namespace apache::activemq::client::io;
-
-/*
- *
- */
-class SessionInfoMarshaller : public BaseCommandMarshaller
-{
-public:
-    SessionInfoMarshaller() ;
-    virtual ~SessionInfoMarshaller() ;
-
-    virtual DataStructure* createCommand() ;
-    virtual byte getDataStructureType() ;
-    
-    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
-    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
-    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
-} ;
-
-/* namespace */
-     }
-    }
-  }
-}
-#endif /*SessionInfoMarshaller_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 SessionInfoMarshaller_hpp_
#define SessionInfoMarshaller_hpp_

#include <string>

#include "command/IDataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "command/Se
 ssionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/BaseCommandMarshaller.hpp"
#include "util/ifr/p.hpp"

#include "protocol/ProtocolFormat.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;
        using namespace apache::activemq::client::protocol;

/*
 *
 */
class SessionInfoMarshaller : public BaseCommandMarshaller
{
public:
    SessionInfoMarshaller() ;
    virtual ~SessionInfoMarshaller() ;

    virtual IDataStructure* createCommand() ;
    virtual char getDataStructureType() ;
    
    virtual void unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(ProtocolFormat& wireFormat, Obje
 ct& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*SessionInfoMarshaller_hpp_*/
\ No newline at end of file

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ShutdownInfoMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ShutdownInfoMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ShutdownInfoMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ShutdownInfoMarshaller.cpp Thu Mar  9 13:11:16 2006
@@ -38,12 +38,12 @@
 
 
 
-DataStructure* ShutdownInfoMarshaller::createObject() 
+IDataStructure* ShutdownInfoMarshaller::createObject() 
 {
     return new ShutdownInfo();
 }
 
-byte ShutdownInfoMarshaller::getDataStructureType() 
+char ShutdownInfoMarshaller::getDataStructureType() 
 {
     return ShutdownInfo.ID_ShutdownInfo;
 }
@@ -51,7 +51,7 @@
     /* 
      * Un-marshal an object instance from the data input stream
      */ 
-void ShutdownInfoMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
+void ShutdownInfoMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
 {
     base.unmarshal(wireFormat, o, dataIn, bs);
 
@@ -61,7 +61,7 @@
 /*
  * Write the booleans that this object uses to a BooleanStream
  */
-int ShutdownInfoMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int ShutdownInfoMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
     ShutdownInfo& info = (ShutdownInfo&) o;
 
     int rc = base.marshal1(wireFormat, info, bs);
@@ -72,7 +72,7 @@
 /* 
  * Write a object instance to data output stream
  */
-void ShutdownInfoMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void ShutdownInfoMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
     base.marshal2(wireFormat, o, dataOut, bs);
 
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ShutdownInfoMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ShutdownInfoMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ShutdownInfoMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ShutdownInfoMarshaller.hpp Thu Mar  9 13:11:16 2006
@@ -1,71 +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 ShutdownInfoMarshaller_hpp_
-#define ShutdownInfoMarshaller_hpp_
-
-#include <string>
-
-#include "command/DataStructure.hpp"
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
-#include "io/BinaryReader.hpp"
-#include "io/BinaryWriter.hpp"
-
-#include "command/BaseCommandMarshaller.hpp"
-#include "util/ifr/p.hpp"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace client
-    {
-      namespace marshal
-      {
-        using namespace ifr ;
-        using namespace apache::activemq::client::command;
-        using namespace apache::activemq::client::io;
-
-/*
- *
- */
-class ShutdownInfoMarshaller : public BaseCommandMarshaller
-{
-public:
-    ShutdownInfoMarshaller() ;
-    virtual ~ShutdownInfoMarshaller() ;
-
-    virtual DataStructure* createCommand() ;
-    virtual byte getDataStructureType() ;
-    
-    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
-    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
-    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
-} ;
-
-/* namespace */
-     }
-    }
-  }
-}
-#endif /*ShutdownInfoMarshaller_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 ShutdownInfoMarshaller_hpp_
#define ShutdownInfoMarshaller_hpp_

#include <string>

#include "command/IDataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "command/
 SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/BaseCommandMarshaller.hpp"
#include "util/ifr/p.hpp"

#include "protocol/ProtocolFormat.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;
        using namespace apache::activemq::client::protocol;

/*
 *
 */
class ShutdownInfoMarshaller : public BaseCommandMarshaller
{
public:
    ShutdownInfoMarshaller() ;
    virtual ~ShutdownInfoMarshaller() ;

    virtual IDataStructure* createCommand() ;
    virtual char getDataStructureType() ;
    
    virtual void unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(ProtocolFormat& wireFormat,
  Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ShutdownInfoMarshaller_hpp_*/
\ No newline at end of file

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/SubscriptionInfoMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/SubscriptionInfoMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/SubscriptionInfoMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/SubscriptionInfoMarshaller.cpp Thu Mar  9 13:11:16 2006
@@ -38,12 +38,12 @@
 
 
 
-DataStructure* SubscriptionInfoMarshaller::createObject() 
+IDataStructure* SubscriptionInfoMarshaller::createObject() 
 {
     return new SubscriptionInfo();
 }
 
-byte SubscriptionInfoMarshaller::getDataStructureType() 
+char SubscriptionInfoMarshaller::getDataStructureType() 
 {
     return SubscriptionInfo.ID_SubscriptionInfo;
 }
@@ -51,7 +51,7 @@
     /* 
      * Un-marshal an object instance from the data input stream
      */ 
-void SubscriptionInfoMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
+void SubscriptionInfoMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
 {
     base.unmarshal(wireFormat, o, dataIn, bs);
 
@@ -67,7 +67,7 @@
 /*
  * Write the booleans that this object uses to a BooleanStream
  */
-int SubscriptionInfoMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int SubscriptionInfoMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
     SubscriptionInfo& info = (SubscriptionInfo&) o;
 
     int rc = base.marshal1(wireFormat, info, bs);
@@ -82,7 +82,7 @@
 /* 
  * Write a object instance to data output stream
  */
-void SubscriptionInfoMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void SubscriptionInfoMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
     base.marshal2(wireFormat, o, dataOut, bs);
 
     SubscriptionInfo& info = (SubscriptionInfo&) o;

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/SubscriptionInfoMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/SubscriptionInfoMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/SubscriptionInfoMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/SubscriptionInfoMarshaller.hpp Thu Mar  9 13:11:16 2006
@@ -1,71 +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 SubscriptionInfoMarshaller_hpp_
-#define SubscriptionInfoMarshaller_hpp_
-
-#include <string>
-
-#include "command/DataStructure.hpp"
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
-#include "io/BinaryReader.hpp"
-#include "io/BinaryWriter.hpp"
-
-#include "command/BaseDataStreamMarshaller.hpp"
-#include "util/ifr/p.hpp"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace client
-    {
-      namespace marshal
-      {
-        using namespace ifr ;
-        using namespace apache::activemq::client::command;
-        using namespace apache::activemq::client::io;
-
-/*
- *
- */
-class SubscriptionInfoMarshaller : public BaseDataStreamMarshaller
-{
-public:
-    SubscriptionInfoMarshaller() ;
-    virtual ~SubscriptionInfoMarshaller() ;
-
-    virtual DataStructure* createCommand() ;
-    virtual byte getDataStructureType() ;
-    
-    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
-    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
-    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
-} ;
-
-/* namespace */
-     }
-    }
-  }
-}
-#endif /*SubscriptionInfoMarshaller_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 SubscriptionInfoMarshaller_hpp_
#define SubscriptionInfoMarshaller_hpp_

#include <string>

#include "command/IDataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "
 command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/BaseDataStreamMarshaller.hpp"
#include "util/ifr/p.hpp"

#include "protocol/ProtocolFormat.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;
        using namespace apache::activemq::client::protocol;

/*
 *
 */
class SubscriptionInfoMarshaller : public BaseDataStreamMarshaller
{
public:
    SubscriptionInfoMarshaller() ;
    virtual ~SubscriptionInfoMarshaller() ;

    virtual IDataStructure* createCommand() ;
    virtual char getDataStructureType() ;
    
    virtual void unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(P
 rotocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*SubscriptionInfoMarshaller_hpp_*/
\ No newline at end of file

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/TransactionIdMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/TransactionIdMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/TransactionIdMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/TransactionIdMarshaller.cpp Thu Mar  9 13:11:16 2006
@@ -40,7 +40,7 @@
     /* 
      * Un-marshal an object instance from the data input stream
      */ 
-void TransactionIdMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
+void TransactionIdMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
 {
     base.unmarshal(wireFormat, o, dataIn, bs);
 
@@ -50,7 +50,7 @@
 /*
  * Write the booleans that this object uses to a BooleanStream
  */
-int TransactionIdMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int TransactionIdMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
     TransactionId& info = (TransactionId&) o;
 
     int rc = base.marshal1(wireFormat, info, bs);
@@ -61,7 +61,7 @@
 /* 
  * Write a object instance to data output stream
  */
-void TransactionIdMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void TransactionIdMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
     base.marshal2(wireFormat, o, dataOut, bs);
 
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/TransactionIdMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/TransactionIdMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/TransactionIdMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/TransactionIdMarshaller.hpp Thu Mar  9 13:11:16 2006
@@ -1,71 +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 TransactionIdMarshaller_hpp_
-#define TransactionIdMarshaller_hpp_
-
-#include <string>
-
-#include "command/DataStructure.hpp"
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
-#include "io/BinaryReader.hpp"
-#include "io/BinaryWriter.hpp"
-
-#include "command/BaseDataStreamMarshaller.hpp"
-#include "util/ifr/p.hpp"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace client
-    {
-      namespace marshal
-      {
-        using namespace ifr ;
-        using namespace apache::activemq::client::command;
-        using namespace apache::activemq::client::io;
-
-/*
- *
- */
-class TransactionIdMarshaller : public BaseDataStreamMarshaller
-{
-public:
-    TransactionIdMarshaller() ;
-    virtual ~TransactionIdMarshaller() ;
-
-    virtual DataStructure* createCommand() ;
-    virtual byte getDataStructureType() ;
-    
-    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
-    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
-    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
-} ;
-
-/* namespace */
-     }
-    }
-  }
-}
-#endif /*TransactionIdMarshaller_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 TransactionIdMarshaller_hpp_
#define TransactionIdMarshaller_hpp_

#include <string>

#include "command/IDataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "comman
 d/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/BaseDataStreamMarshaller.hpp"
#include "util/ifr/p.hpp"

#include "protocol/ProtocolFormat.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;
        using namespace apache::activemq::client::protocol;

/*
 *
 */
class TransactionIdMarshaller : public BaseDataStreamMarshaller
{
public:
    TransactionIdMarshaller() ;
    virtual ~TransactionIdMarshaller() ;

    virtual IDataStructure* createCommand() ;
    virtual char getDataStructureType() ;
    
    virtual void unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(ProtocolFormat& 
 wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*TransactionIdMarshaller_hpp_*/
\ No newline at end of file

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/TransactionInfoMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/TransactionInfoMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/TransactionInfoMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/TransactionInfoMarshaller.cpp Thu Mar  9 13:11:16 2006
@@ -38,12 +38,12 @@
 
 
 
-DataStructure* TransactionInfoMarshaller::createObject() 
+IDataStructure* TransactionInfoMarshaller::createObject() 
 {
     return new TransactionInfo();
 }
 
-byte TransactionInfoMarshaller::getDataStructureType() 
+char TransactionInfoMarshaller::getDataStructureType() 
 {
     return TransactionInfo.ID_TransactionInfo;
 }
@@ -51,7 +51,7 @@
     /* 
      * Un-marshal an object instance from the data input stream
      */ 
-void TransactionInfoMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
+void TransactionInfoMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
 {
     base.unmarshal(wireFormat, o, dataIn, bs);
 
@@ -66,7 +66,7 @@
 /*
  * Write the booleans that this object uses to a BooleanStream
  */
-int TransactionInfoMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int TransactionInfoMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
     TransactionInfo& info = (TransactionInfo&) o;
 
     int rc = base.marshal1(wireFormat, info, bs);
@@ -79,7 +79,7 @@
 /* 
  * Write a object instance to data output stream
  */
-void TransactionInfoMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void TransactionInfoMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
     base.marshal2(wireFormat, o, dataOut, bs);
 
     TransactionInfo& info = (TransactionInfo&) o;

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/TransactionInfoMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/TransactionInfoMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/TransactionInfoMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/TransactionInfoMarshaller.hpp Thu Mar  9 13:11:16 2006
@@ -1,71 +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 TransactionInfoMarshaller_hpp_
-#define TransactionInfoMarshaller_hpp_
-
-#include <string>
-
-#include "command/DataStructure.hpp"
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
-#include "io/BinaryReader.hpp"
-#include "io/BinaryWriter.hpp"
-
-#include "command/BaseCommandMarshaller.hpp"
-#include "util/ifr/p.hpp"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace client
-    {
-      namespace marshal
-      {
-        using namespace ifr ;
-        using namespace apache::activemq::client::command;
-        using namespace apache::activemq::client::io;
-
-/*
- *
- */
-class TransactionInfoMarshaller : public BaseCommandMarshaller
-{
-public:
-    TransactionInfoMarshaller() ;
-    virtual ~TransactionInfoMarshaller() ;
-
-    virtual DataStructure* createCommand() ;
-    virtual byte getDataStructureType() ;
-    
-    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
-    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
-    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
-} ;
-
-/* namespace */
-     }
-    }
-  }
-}
-#endif /*TransactionInfoMarshaller_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 TransactionInfoMarshaller_hpp_
#define TransactionInfoMarshaller_hpp_

#include <string>

#include "command/IDataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "co
 mmand/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/BaseCommandMarshaller.hpp"
#include "util/ifr/p.hpp"

#include "protocol/ProtocolFormat.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;
        using namespace apache::activemq::client::protocol;

/*
 *
 */
class TransactionInfoMarshaller : public BaseCommandMarshaller
{
public:
    TransactionInfoMarshaller() ;
    virtual ~TransactionInfoMarshaller() ;

    virtual IDataStructure* createCommand() ;
    virtual char getDataStructureType() ;
    
    virtual void unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(ProtocolForm
 at& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*TransactionInfoMarshaller_hpp_*/
\ No newline at end of file

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/WireFormatInfoMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/WireFormatInfoMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/WireFormatInfoMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/WireFormatInfoMarshaller.cpp Thu Mar  9 13:11:16 2006
@@ -38,12 +38,12 @@
 
 
 
-DataStructure* WireFormatInfoMarshaller::createObject() 
+IDataStructure* WireFormatInfoMarshaller::createObject() 
 {
     return new WireFormatInfo();
 }
 
-byte WireFormatInfoMarshaller::getDataStructureType() 
+char WireFormatInfoMarshaller::getDataStructureType() 
 {
     return WireFormatInfo.ID_WireFormatInfo;
 }
@@ -51,7 +51,7 @@
     /* 
      * Un-marshal an object instance from the data input stream
      */ 
-void WireFormatInfoMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
+void WireFormatInfoMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
 {
     base.unmarshal(wireFormat, o, dataIn, bs);
 
@@ -71,7 +71,7 @@
 /*
  * Write the booleans that this object uses to a BooleanStream
  */
-int WireFormatInfoMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int WireFormatInfoMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
     WireFormatInfo& info = (WireFormatInfo&) o;
 
     info.beforeMarshall(wireFormat);
@@ -86,7 +86,7 @@
 /* 
  * Write a object instance to data output stream
  */
-void WireFormatInfoMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void WireFormatInfoMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
     base.marshal2(wireFormat, o, dataOut, bs);
 
     WireFormatInfo& info = (WireFormatInfo&) o;

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/WireFormatInfoMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/WireFormatInfoMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/WireFormatInfoMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/WireFormatInfoMarshaller.hpp Thu Mar  9 13:11:16 2006
@@ -1,71 +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 WireFormatInfoMarshaller_hpp_
-#define WireFormatInfoMarshaller_hpp_
-
-#include <string>
-
-#include "command/DataStructure.hpp"
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
-#include "io/BinaryReader.hpp"
-#include "io/BinaryWriter.hpp"
-
-#include "command/BaseDataStreamMarshaller.hpp"
-#include "util/ifr/p.hpp"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace client
-    {
-      namespace marshal
-      {
-        using namespace ifr ;
-        using namespace apache::activemq::client::command;
-        using namespace apache::activemq::client::io;
-
-/*
- *
- */
-class WireFormatInfoMarshaller : public BaseDataStreamMarshaller
-{
-public:
-    WireFormatInfoMarshaller() ;
-    virtual ~WireFormatInfoMarshaller() ;
-
-    virtual DataStructure* createCommand() ;
-    virtual byte getDataStructureType() ;
-    
-    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
-    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
-    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
-} ;
-
-/* namespace */
-     }
-    }
-  }
-}
-#endif /*WireFormatInfoMarshaller_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 WireFormatInfoMarshaller_hpp_
#define WireFormatInfoMarshaller_hpp_

#include <string>

#include "command/IDataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "comm
 and/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/BaseDataStreamMarshaller.hpp"
#include "util/ifr/p.hpp"

#include "protocol/ProtocolFormat.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;
        using namespace apache::activemq::client::protocol;

/*
 *
 */
class WireFormatInfoMarshaller : public BaseDataStreamMarshaller
{
public:
    WireFormatInfoMarshaller() ;
    virtual ~WireFormatInfoMarshaller() ;

    virtual IDataStructure* createCommand() ;
    virtual char getDataStructureType() ;
    
    virtual void unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(ProtocolFor
 mat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*WireFormatInfoMarshaller_hpp_*/
\ No newline at end of file

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/XATransactionIdMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/XATransactionIdMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/XATransactionIdMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/XATransactionIdMarshaller.cpp Thu Mar  9 13:11:16 2006
@@ -38,12 +38,12 @@
 
 
 
-DataStructure* XATransactionIdMarshaller::createObject() 
+IDataStructure* XATransactionIdMarshaller::createObject() 
 {
     return new XATransactionId();
 }
 
-byte XATransactionIdMarshaller::getDataStructureType() 
+char XATransactionIdMarshaller::getDataStructureType() 
 {
     return XATransactionId.ID_XATransactionId;
 }
@@ -51,7 +51,7 @@
     /* 
      * Un-marshal an object instance from the data input stream
      */ 
-void XATransactionIdMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
+void XATransactionIdMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
 {
     base.unmarshal(wireFormat, o, dataIn, bs);
 
@@ -66,7 +66,7 @@
 /*
  * Write the booleans that this object uses to a BooleanStream
  */
-int XATransactionIdMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int XATransactionIdMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
     XATransactionId& info = (XATransactionId&) o;
 
     int rc = base.marshal1(wireFormat, info, bs);
@@ -81,7 +81,7 @@
 /* 
  * Write a object instance to data output stream
  */
-void XATransactionIdMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void XATransactionIdMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
     base.marshal2(wireFormat, o, dataOut, bs);
 
     XATransactionId& info = (XATransactionId&) o;

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/XATransactionIdMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/XATransactionIdMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/XATransactionIdMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/XATransactionIdMarshaller.hpp Thu Mar  9 13:11:16 2006
@@ -1,71 +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 XATransactionIdMarshaller_hpp_
-#define XATransactionIdMarshaller_hpp_
-
-#include <string>
-
-#include "command/DataStructure.hpp"
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
-#include "io/BinaryReader.hpp"
-#include "io/BinaryWriter.hpp"
-
-#include "command/TransactionIdMarshaller.hpp"
-#include "util/ifr/p.hpp"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace client
-    {
-      namespace marshal
-      {
-        using namespace ifr ;
-        using namespace apache::activemq::client::command;
-        using namespace apache::activemq::client::io;
-
-/*
- *
- */
-class XATransactionIdMarshaller : public TransactionIdMarshaller
-{
-public:
-    XATransactionIdMarshaller() ;
-    virtual ~XATransactionIdMarshaller() ;
-
-    virtual DataStructure* createCommand() ;
-    virtual byte getDataStructureType() ;
-    
-    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
-    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
-    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
-} ;
-
-/* namespace */
-     }
-    }
-  }
-}
-#endif /*XATransactionIdMarshaller_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 XATransactionIdMarshaller_hpp_
#define XATransactionIdMarshaller_hpp_

#include <string>

#include "command/IDataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "co
 mmand/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/TransactionIdMarshaller.hpp"
#include "util/ifr/p.hpp"

#include "protocol/ProtocolFormat.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;
        using namespace apache::activemq::client::protocol;

/*
 *
 */
class XATransactionIdMarshaller : public TransactionIdMarshaller
{
public:
    XATransactionIdMarshaller() ;
    virtual ~XATransactionIdMarshaller() ;

    virtual IDataStructure* createCommand() ;
    virtual char getDataStructureType() ;
    
    virtual void unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(Protocol
 Format& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*XATransactionIdMarshaller_hpp_*/
\ No newline at end of file

Modified: incubator/activemq/trunk/openwire-cpp/src/transport/ITransport.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/transport/ITransport.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/transport/ITransport.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/transport/ITransport.hpp Thu Mar  9 13:11:16 2006
@@ -36,8 +36,11 @@
 /*
  * Represents the logical networking transport layer
  */
-struct ITransport
+class ITransport
 {
+public:
+
+	virtual ~ITransport(){}
 	virtual void oneway(p<ICommand> command) = 0 ;
 	virtual p<FutureResponse> asyncRequest(p<ICommand> command) = 0 ;
 	virtual p<Response> request(p<ICommand> command) = 0 ;

Modified: incubator/activemq/trunk/openwire-cpp/src/transport/SocketTransport.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/transport/SocketTransport.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/transport/SocketTransport.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/transport/SocketTransport.cpp Thu Mar  9 13:11:16 2006
@@ -17,14 +17,12 @@
 #include <iostream>
 #include <exception>
 #include <typeinfo>
-#include "transport/SocketTransport.hpp"
+#include "SocketTransport.hpp"
 
 using namespace std;
 using namespace apache::activemq::client::transport;
 
 
-// --- Constructors -------------------------------------------------
-
 /*
  *
  */
@@ -116,12 +114,12 @@
 	// Initialize APR framework
     rc = apr_initialize() ;
     if( rc != APR_SUCCESS )
-        throw exception("Failed to initialize APR framework.") ;
+        throw OpenWireException("Failed to initialize APR framework.") ;
    
     // Create APR memory pool
     rc = apr_pool_create(&memoryPool, NULL) ;
     if( rc != APR_SUCCESS )
-	    throw exception("Failed to allocate APR memory pool.") ;
+	    throw OpenWireException("Failed to allocate APR memory pool.") ;
 
     // Create transmission mutex
     apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_UNNESTED, memoryPool) ;
@@ -187,31 +185,31 @@
 	// Look up the remote address
 	rc = apr_sockaddr_info_get(&remote_sa, host, APR_UNSPEC, port, 0, memoryPool) ;
     if( rc != APR_SUCCESS )
-        throw exception("Failed to lookup remote address") ;
+        throw OpenWireException("Failed to lookup remote address") ;
 	
 	// Create socket
 	rc = apr_socket_create(&sock, remote_sa->sa.sin.sin_family, SOCK_STREAM, APR_PROTO_TCP, memoryPool) ;
     if( rc != APR_SUCCESS )
-        throw exception("Failed to create socket") ;
+        throw OpenWireException("Failed to create socket") ;
 
 	// Connect socket
     rc = apr_socket_connect(sock, remote_sa) ;
     if( rc != APR_SUCCESS )
-        throw exception("Failed to connect socket") ;
+        throw OpenWireException("Failed to connect socket") ;
    
     // Get socket info
     rc = apr_socket_addr_get(&remote_sa, APR_REMOTE, sock) ;
     if( rc != APR_SUCCESS )
-        throw exception("Failed to fetch remote socket address") ;
+        throw OpenWireException("Failed to fetch remote socket address") ;
     rc = apr_sockaddr_ip_get(&remote_ip, remote_sa) ;
     if( rc != APR_SUCCESS )
-        throw exception("Failed to fetch remote IP address") ;
+        throw OpenWireException("Failed to fetch remote IP address") ;
     rc = apr_socket_addr_get(&local_sa, APR_LOCAL, sock) ;
     if( rc != APR_SUCCESS )
-        throw exception("Failed to fetch local socket address") ;
+        throw OpenWireException("Failed to fetch local socket address") ;
     rc = apr_sockaddr_ip_get(&local_ip, local_sa) ;
     if( rc != APR_SUCCESS )
-        throw exception("Failed to fetch local IP address") ;
+        throw OpenWireException("Failed to fetch local IP address") ;
    
 	return sock ;
 }

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

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

Modified: incubator/activemq/trunk/openwire-cpp/src/util/Guid.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/util/Guid.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/util/Guid.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/util/Guid.cpp Thu Mar  9 13:11:16 2006
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "util/guid.hpp"
+#include "Guid.hpp"
 
 using namespace apache::activemq::client::util;
 
@@ -81,7 +81,7 @@
    result = new char[36] ;
 
 	// Format into a string
-   sprintf(result, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\0",
+   sprintf(result, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
            buffer[0],  buffer[1],  buffer[2],  buffer[3],
            buffer[4],  buffer[5],  buffer[6],  buffer[7],
            buffer[8],  buffer[9],  buffer[10], buffer[11],

Modified: incubator/activemq/trunk/openwire-cpp/src/util/Guid.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/util/Guid.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/util/Guid.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/util/Guid.hpp Thu Mar  9 13:11:16 2006
@@ -42,7 +42,7 @@
       namespace util
       {
         using namespace std ;
-        using namespace ifr ;
+        using namespace ifr::v1 ;
 
 /*
  * Helper class that generates global unique identifiers.
@@ -53,7 +53,7 @@
     Guid() ;
 
 public:
-    ~Guid() ;
+    virtual ~Guid() ;
 
     static unsigned char* getGuid() ;
     static p<string> getGuidString() ;

Modified: incubator/activemq/trunk/openwire-cpp/src/util/MapItemHolder.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/util/MapItemHolder.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/util/MapItemHolder.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/util/MapItemHolder.cpp Thu Mar  9 13:11:16 2006
@@ -181,7 +181,12 @@
             return retval ;
 
         case LONG:
-            sprintf(buffer, "%I64d", getLong() ) ;
+        
+        	#ifdef unix
+        		sprintf(buffer, "%ld", getLong() );
+        	#else
+            	sprintf(buffer, "%I64d", getLong() ) ;            
+            #endif
             retval = new string(buffer) ;
             return retval ;
 

Modified: incubator/activemq/trunk/openwire-cpp/src/util/MapItemHolder.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/util/MapItemHolder.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/util/MapItemHolder.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/util/MapItemHolder.hpp Thu Mar  9 13:11:16 2006
@@ -21,7 +21,7 @@
 #include "command/ActiveMQDestination.hpp"
 #include "util/ConversionException.hpp"
 #include "util/ifr/ap.hpp"
-#include "util/ifr/p/hpp"
+#include "util/ifr/p.hpp"
 
 // Turn off warning message for ignored exception specification
 #ifdef _MSC_VER
@@ -36,7 +36,7 @@
     {
       namespace util
       {
-        using namespace ifr;
+        using namespace ifr::v1;
 
 /*
  * 
@@ -67,7 +67,7 @@
     MapItemHolder(long long value) ;
     MapItemHolder(short value) ;
     MapItemHolder(p<string> value) ;
-    ~MapItemHolder() ;
+    virtual ~MapItemHolder() ;
 
     bool getBoolean() throw (ConversionException) ;
     char getByte() throw (ConversionException) ;
@@ -86,4 +86,4 @@
   }
 }
 
-#endif /*MapItemHolder_hpp_*/
\ No newline at end of file
+#endif /*MapItemHolder_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/util/SimpleMutex.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/util/SimpleMutex.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/util/SimpleMutex.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/util/SimpleMutex.hpp Thu Mar  9 13:11:16 2006
@@ -18,8 +18,10 @@
 #define SIMPLE_MUTEX_HPP
 
 #if (defined(__unix__) || defined(unix) || defined(MACOSX)) && !defined(USG)
-#define unix
-#include <pthread.h>
+	#ifndef unix
+		#define unix
+	#endif
+	#include <pthread.h>
 #endif
 #if defined(WIN32) || defined(__CYGWIN__)
 #if ( !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0400)

Modified: incubator/activemq/trunk/openwire-cpp/src/util/ifr/ap.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/util/ifr/ap.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/util/ifr/ap.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/util/ifr/ap.hpp Thu Mar  9 13:11:16 2006
@@ -72,7 +72,8 @@
     return a->array_[pos];
   }
   const p<T>& operator [] (size_t pos) const {
-  }
+  	return a->array_[pos];
+  }
   size_t size() const {
     return a->size_;
   }

Modified: incubator/activemq/trunk/openwire-cpp/src/util/ifr/p.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/util/ifr/p.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/util/ifr/p.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/util/ifr/p.hpp Thu Mar  9 13:11:16 2006
@@ -29,6 +29,7 @@
 #define IFR_V1_P_HPP_
 
 #include "atomic.hpp"
+#include <stdlib.h>
 
 namespace ifr {
   namespace v1 {
@@ -76,7 +77,7 @@
 
       /** Destructor. Decrements reference count and eventually deletes the object.
       */
-      ~p () {
+      virtual ~p () {
         if (obj_) smartptr_release (reinterpret_cast<T*>(obj_), reinterpret_cast<T*>(NULL));
       }
       /** Copy Constructor. Increments reference count since we also own the object now.
@@ -96,6 +97,7 @@
           (DerivedClass*)NULL);
         if (obj_) smartptr_addref (reinterpret_cast<T*>(obj_), reinterpret_cast<T*>(NULL));
       }
+      
       /** Assignment operator. Increments reference count since we also own the object now.
           Decrements refcount of the old object because we don't own that anymore.
       */



Mime
View raw message