You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/03/09 22:11:47 UTC
svn commit: r384616 [8/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...
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/DestinationInfoMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/DestinationInfoMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/DestinationInfoMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/DestinationInfoMarshaller.cpp Thu Mar 9 13:11:16 2006
@@ -38,12 +38,12 @@
-DataStructure* DestinationInfoMarshaller::createObject()
+IDataStructure* DestinationInfoMarshaller::createObject()
{
return new DestinationInfo();
}
-byte DestinationInfoMarshaller::getDataStructureType()
+char DestinationInfoMarshaller::getDataStructureType()
{
return DestinationInfo.ID_DestinationInfo;
}
@@ -51,7 +51,7 @@
/*
* Un-marshal an object instance from the data input stream
*/
-void DestinationInfoMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs)
+void DestinationInfoMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs)
{
base.unmarshal(wireFormat, o, dataIn, bs);
@@ -79,7 +79,7 @@
/*
* Write the booleans that this object uses to a BooleanStream
*/
-int DestinationInfoMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int DestinationInfoMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
DestinationInfo& info = (DestinationInfo&) o;
int rc = base.marshal1(wireFormat, info, bs);
@@ -94,7 +94,7 @@
/*
* Write a object instance to data output stream
*/
-void DestinationInfoMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void DestinationInfoMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
base.marshal2(wireFormat, o, dataOut, bs);
DestinationInfo& info = (DestinationInfo&) o;
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/DestinationInfoMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/DestinationInfoMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/DestinationInfoMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/DestinationInfoMarshaller.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 DestinationInfoMarshaller_hpp_
-#define DestinationInfoMarshaller_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 DestinationInfoMarshaller : public BaseCommandMarshaller
-{
-public:
- DestinationInfoMarshaller() ;
- virtual ~DestinationInfoMarshaller() ;
-
- 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 /*DestinationInfoMarshaller_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 DestinationInfoMarshaller_hpp_
#define DestinationInfoMarshaller_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 DestinationInfoMarshaller : public BaseCommandMarshaller
{
public:
DestinationInfoMarshaller() ;
virtual ~DestinationInfoMarshaller() ;
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 /*DestinationInfoMarshaller_hpp_*/
\ No newline at end of file
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/DiscoveryEventMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/DiscoveryEventMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/DiscoveryEventMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/DiscoveryEventMarshaller.cpp Thu Mar 9 13:11:16 2006
@@ -38,12 +38,12 @@
-DataStructure* DiscoveryEventMarshaller::createObject()
+IDataStructure* DiscoveryEventMarshaller::createObject()
{
return new DiscoveryEvent();
}
-byte DiscoveryEventMarshaller::getDataStructureType()
+char DiscoveryEventMarshaller::getDataStructureType()
{
return DiscoveryEvent.ID_DiscoveryEvent;
}
@@ -51,7 +51,7 @@
/*
* Un-marshal an object instance from the data input stream
*/
-void DiscoveryEventMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs)
+void DiscoveryEventMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs)
{
base.unmarshal(wireFormat, o, dataIn, bs);
@@ -65,7 +65,7 @@
/*
* Write the booleans that this object uses to a BooleanStream
*/
-int DiscoveryEventMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int DiscoveryEventMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
DiscoveryEvent& info = (DiscoveryEvent&) o;
int rc = base.marshal1(wireFormat, info, bs);
@@ -78,7 +78,7 @@
/*
* Write a object instance to data output stream
*/
-void DiscoveryEventMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void DiscoveryEventMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
base.marshal2(wireFormat, o, dataOut, bs);
DiscoveryEvent& info = (DiscoveryEvent&) o;
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/DiscoveryEventMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/DiscoveryEventMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/DiscoveryEventMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/DiscoveryEventMarshaller.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 DiscoveryEventMarshaller_hpp_
-#define DiscoveryEventMarshaller_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 DiscoveryEventMarshaller : public BaseDataStreamMarshaller
-{
-public:
- DiscoveryEventMarshaller() ;
- virtual ~DiscoveryEventMarshaller() ;
-
- 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 /*DiscoveryEventMarshaller_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 DiscoveryEventMarshaller_hpp_
#define DiscoveryEventMarshaller_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 DiscoveryEventMarshaller : public BaseDataStreamMarshaller
{
public:
DiscoveryEventMarshaller() ;
virtual ~DiscoveryEventMarshaller() ;
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 /*DiscoveryEventMarshaller_hpp_*/
\ No newline at end of file
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ExceptionResponseMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ExceptionResponseMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ExceptionResponseMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ExceptionResponseMarshaller.cpp Thu Mar 9 13:11:16 2006
@@ -38,12 +38,12 @@
-DataStructure* ExceptionResponseMarshaller::createObject()
+IDataStructure* ExceptionResponseMarshaller::createObject()
{
return new ExceptionResponse();
}
-byte ExceptionResponseMarshaller::getDataStructureType()
+char ExceptionResponseMarshaller::getDataStructureType()
{
return ExceptionResponse.ID_ExceptionResponse;
}
@@ -51,7 +51,7 @@
/*
* Un-marshal an object instance from the data input stream
*/
-void ExceptionResponseMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs)
+void ExceptionResponseMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs)
{
base.unmarshal(wireFormat, o, dataIn, bs);
@@ -64,7 +64,7 @@
/*
* Write the booleans that this object uses to a BooleanStream
*/
-int ExceptionResponseMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int ExceptionResponseMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
ExceptionResponse& info = (ExceptionResponse&) o;
int rc = base.marshal1(wireFormat, info, bs);
@@ -76,7 +76,7 @@
/*
* Write a object instance to data output stream
*/
-void ExceptionResponseMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void ExceptionResponseMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
base.marshal2(wireFormat, o, dataOut, bs);
ExceptionResponse& info = (ExceptionResponse&) o;
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ExceptionResponseMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ExceptionResponseMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ExceptionResponseMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ExceptionResponseMarshaller.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 ExceptionResponseMarshaller_hpp_
-#define ExceptionResponseMarshaller_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/ResponseMarshaller.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 ExceptionResponseMarshaller : public ResponseMarshaller
-{
-public:
- ExceptionResponseMarshaller() ;
- virtual ~ExceptionResponseMarshaller() ;
-
- 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 /*ExceptionResponseMarshaller_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 ExceptionResponseMarshaller_hpp_
#define ExceptionResponseMarshaller_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/ResponseMarshaller.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 ExceptionResponseMarshaller : public ResponseMarshaller
{
public:
ExceptionResponseMarshaller() ;
virtual ~ExceptionResponseMarshaller() ;
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 /*ExceptionResponseMarshaller_hpp_*/
\ No newline at end of file
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/FlushCommandMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/FlushCommandMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/FlushCommandMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/FlushCommandMarshaller.cpp Thu Mar 9 13:11:16 2006
@@ -38,12 +38,12 @@
-DataStructure* FlushCommandMarshaller::createObject()
+IDataStructure* FlushCommandMarshaller::createObject()
{
return new FlushCommand();
}
-byte FlushCommandMarshaller::getDataStructureType()
+char FlushCommandMarshaller::getDataStructureType()
{
return FlushCommand.ID_FlushCommand;
}
@@ -51,7 +51,7 @@
/*
* Un-marshal an object instance from the data input stream
*/
-void FlushCommandMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs)
+void FlushCommandMarshaller::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 FlushCommandMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int FlushCommandMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
FlushCommand& info = (FlushCommand&) o;
int rc = base.marshal1(wireFormat, info, bs);
@@ -72,7 +72,7 @@
/*
* Write a object instance to data output stream
*/
-void FlushCommandMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void FlushCommandMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
base.marshal2(wireFormat, o, dataOut, bs);
}
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/FlushCommandMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/FlushCommandMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/FlushCommandMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/FlushCommandMarshaller.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 FlushCommandMarshaller_hpp_
-#define FlushCommandMarshaller_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 FlushCommandMarshaller : public BaseCommandMarshaller
-{
-public:
- FlushCommandMarshaller() ;
- virtual ~FlushCommandMarshaller() ;
-
- 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 /*FlushCommandMarshaller_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 FlushCommandMarshaller_hpp_
#define FlushCommandMarshaller_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 FlushCommandMarshaller : public BaseCommandMarshaller
{
public:
FlushCommandMarshaller() ;
virtual ~FlushCommandMarshaller() ;
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 /*FlushCommandMarshaller_hpp_*/
\ No newline at end of file
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/IntegerResponseMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/IntegerResponseMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/IntegerResponseMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/IntegerResponseMarshaller.cpp Thu Mar 9 13:11:16 2006
@@ -38,12 +38,12 @@
-DataStructure* IntegerResponseMarshaller::createObject()
+IDataStructure* IntegerResponseMarshaller::createObject()
{
return new IntegerResponse();
}
-byte IntegerResponseMarshaller::getDataStructureType()
+char IntegerResponseMarshaller::getDataStructureType()
{
return IntegerResponse.ID_IntegerResponse;
}
@@ -51,7 +51,7 @@
/*
* Un-marshal an object instance from the data input stream
*/
-void IntegerResponseMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs)
+void IntegerResponseMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs)
{
base.unmarshal(wireFormat, o, dataIn, bs);
@@ -64,7 +64,7 @@
/*
* Write the booleans that this object uses to a BooleanStream
*/
-int IntegerResponseMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int IntegerResponseMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
IntegerResponse& info = (IntegerResponse&) o;
int rc = base.marshal1(wireFormat, info, bs);
@@ -75,7 +75,7 @@
/*
* Write a object instance to data output stream
*/
-void IntegerResponseMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void IntegerResponseMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
base.marshal2(wireFormat, o, dataOut, bs);
IntegerResponse& info = (IntegerResponse&) o;
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/IntegerResponseMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/IntegerResponseMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/IntegerResponseMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/IntegerResponseMarshaller.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 IntegerResponseMarshaller_hpp_
-#define IntegerResponseMarshaller_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/ResponseMarshaller.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 IntegerResponseMarshaller : public ResponseMarshaller
-{
-public:
- IntegerResponseMarshaller() ;
- virtual ~IntegerResponseMarshaller() ;
-
- 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 /*IntegerResponseMarshaller_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 IntegerResponseMarshaller_hpp_
#define IntegerResponseMarshaller_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/ResponseMarshaller.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 IntegerResponseMarshaller : public ResponseMarshaller
{
public:
IntegerResponseMarshaller() ;
virtual ~IntegerResponseMarshaller() ;
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& wi
reFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;
/* namespace */
}
}
}
}
#endif /*IntegerResponseMarshaller_hpp_*/
\ No newline at end of file
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/JournalQueueAckMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/JournalQueueAckMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/JournalQueueAckMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/JournalQueueAckMarshaller.cpp Thu Mar 9 13:11:16 2006
@@ -38,12 +38,12 @@
-DataStructure* JournalQueueAckMarshaller::createObject()
+IDataStructure* JournalQueueAckMarshaller::createObject()
{
return new JournalQueueAck();
}
-byte JournalQueueAckMarshaller::getDataStructureType()
+char JournalQueueAckMarshaller::getDataStructureType()
{
return JournalQueueAck.ID_JournalQueueAck;
}
@@ -51,7 +51,7 @@
/*
* Un-marshal an object instance from the data input stream
*/
-void JournalQueueAckMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs)
+void JournalQueueAckMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs)
{
base.unmarshal(wireFormat, o, dataIn, bs);
@@ -65,7 +65,7 @@
/*
* Write the booleans that this object uses to a BooleanStream
*/
-int JournalQueueAckMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int JournalQueueAckMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
JournalQueueAck& info = (JournalQueueAck&) o;
int rc = base.marshal1(wireFormat, info, bs);
@@ -78,7 +78,7 @@
/*
* Write a object instance to data output stream
*/
-void JournalQueueAckMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void JournalQueueAckMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
base.marshal2(wireFormat, o, dataOut, bs);
JournalQueueAck& info = (JournalQueueAck&) o;
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/JournalQueueAckMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/JournalQueueAckMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/JournalQueueAckMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/JournalQueueAckMarshaller.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 JournalQueueAckMarshaller_hpp_
-#define JournalQueueAckMarshaller_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 JournalQueueAckMarshaller : public BaseDataStreamMarshaller
-{
-public:
- JournalQueueAckMarshaller() ;
- virtual ~JournalQueueAckMarshaller() ;
-
- 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 /*JournalQueueAckMarshaller_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 JournalQueueAckMarshaller_hpp_
#define JournalQueueAckMarshaller_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/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 JournalQueueAckMarshaller : public BaseDataStreamMarshaller
{
public:
JournalQueueAckMarshaller() ;
virtual ~JournalQueueAckMarshaller() ;
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(Protoc
olFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;
/* namespace */
}
}
}
}
#endif /*JournalQueueAckMarshaller_hpp_*/
\ No newline at end of file
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTopicAckMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTopicAckMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTopicAckMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTopicAckMarshaller.cpp Thu Mar 9 13:11:16 2006
@@ -38,12 +38,12 @@
-DataStructure* JournalTopicAckMarshaller::createObject()
+IDataStructure* JournalTopicAckMarshaller::createObject()
{
return new JournalTopicAck();
}
-byte JournalTopicAckMarshaller::getDataStructureType()
+char JournalTopicAckMarshaller::getDataStructureType()
{
return JournalTopicAck.ID_JournalTopicAck;
}
@@ -51,7 +51,7 @@
/*
* Un-marshal an object instance from the data input stream
*/
-void JournalTopicAckMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs)
+void JournalTopicAckMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs)
{
base.unmarshal(wireFormat, o, dataIn, bs);
@@ -69,7 +69,7 @@
/*
* Write the booleans that this object uses to a BooleanStream
*/
-int JournalTopicAckMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int JournalTopicAckMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
JournalTopicAck& info = (JournalTopicAck&) o;
int rc = base.marshal1(wireFormat, info, bs);
@@ -86,7 +86,7 @@
/*
* Write a object instance to data output stream
*/
-void JournalTopicAckMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void JournalTopicAckMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
base.marshal2(wireFormat, o, dataOut, bs);
JournalTopicAck& info = (JournalTopicAck&) o;
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTopicAckMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTopicAckMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTopicAckMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTopicAckMarshaller.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 JournalTopicAckMarshaller_hpp_
-#define JournalTopicAckMarshaller_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 JournalTopicAckMarshaller : public BaseDataStreamMarshaller
-{
-public:
- JournalTopicAckMarshaller() ;
- virtual ~JournalTopicAckMarshaller() ;
-
- 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 /*JournalTopicAckMarshaller_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 JournalTopicAckMarshaller_hpp_
#define JournalTopicAckMarshaller_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/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 JournalTopicAckMarshaller : public BaseDataStreamMarshaller
{
public:
JournalTopicAckMarshaller() ;
virtual ~JournalTopicAckMarshaller() ;
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(Protoc
olFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;
/* namespace */
}
}
}
}
#endif /*JournalTopicAckMarshaller_hpp_*/
\ No newline at end of file
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTraceMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTraceMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTraceMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTraceMarshaller.cpp Thu Mar 9 13:11:16 2006
@@ -38,12 +38,12 @@
-DataStructure* JournalTraceMarshaller::createObject()
+IDataStructure* JournalTraceMarshaller::createObject()
{
return new JournalTrace();
}
-byte JournalTraceMarshaller::getDataStructureType()
+char JournalTraceMarshaller::getDataStructureType()
{
return JournalTrace.ID_JournalTrace;
}
@@ -51,7 +51,7 @@
/*
* Un-marshal an object instance from the data input stream
*/
-void JournalTraceMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs)
+void JournalTraceMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs)
{
base.unmarshal(wireFormat, o, dataIn, bs);
@@ -64,7 +64,7 @@
/*
* Write the booleans that this object uses to a BooleanStream
*/
-int JournalTraceMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int JournalTraceMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
JournalTrace& info = (JournalTrace&) o;
int rc = base.marshal1(wireFormat, info, bs);
@@ -76,7 +76,7 @@
/*
* Write a object instance to data output stream
*/
-void JournalTraceMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void JournalTraceMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
base.marshal2(wireFormat, o, dataOut, bs);
JournalTrace& info = (JournalTrace&) o;
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTraceMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTraceMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTraceMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTraceMarshaller.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 JournalTraceMarshaller_hpp_
-#define JournalTraceMarshaller_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 JournalTraceMarshaller : public BaseDataStreamMarshaller
-{
-public:
- JournalTraceMarshaller() ;
- virtual ~JournalTraceMarshaller() ;
-
- 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 /*JournalTraceMarshaller_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 JournalTraceMarshaller_hpp_
#define JournalTraceMarshaller_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 JournalTraceMarshaller : public BaseDataStreamMarshaller
{
public:
JournalTraceMarshaller() ;
virtual ~JournalTraceMarshaller() ;
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& wireF
ormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;
/* namespace */
}
}
}
}
#endif /*JournalTraceMarshaller_hpp_*/
\ No newline at end of file
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTransactionMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTransactionMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTransactionMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTransactionMarshaller.cpp Thu Mar 9 13:11:16 2006
@@ -38,12 +38,12 @@
-DataStructure* JournalTransactionMarshaller::createObject()
+IDataStructure* JournalTransactionMarshaller::createObject()
{
return new JournalTransaction();
}
-byte JournalTransactionMarshaller::getDataStructureType()
+char JournalTransactionMarshaller::getDataStructureType()
{
return JournalTransaction.ID_JournalTransaction;
}
@@ -51,7 +51,7 @@
/*
* Un-marshal an object instance from the data input stream
*/
-void JournalTransactionMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs)
+void JournalTransactionMarshaller::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 JournalTransactionMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int JournalTransactionMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
JournalTransaction& info = (JournalTransaction&) o;
int rc = base.marshal1(wireFormat, info, bs);
@@ -79,7 +79,7 @@
/*
* Write a object instance to data output stream
*/
-void JournalTransactionMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void JournalTransactionMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
base.marshal2(wireFormat, o, dataOut, bs);
JournalTransaction& info = (JournalTransaction&) o;
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTransactionMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTransactionMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTransactionMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTransactionMarshaller.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 JournalTransactionMarshaller_hpp_
-#define JournalTransactionMarshaller_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 JournalTransactionMarshaller : public BaseDataStreamMarshaller
-{
-public:
- JournalTransactionMarshaller() ;
- virtual ~JournalTransactionMarshaller() ;
-
- 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 /*JournalTransactionMarshaller_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 JournalTransactionMarshaller_hpp_
#define JournalTransactionMarshaller_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"
#inclu
de "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 JournalTransactionMarshaller : public BaseDataStreamMarshaller
{
public:
JournalTransactionMarshaller() ;
virtual ~JournalTransactionMarshaller() ;
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 /*JournalTransactionMarshaller_hpp_*/
\ No newline at end of file
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/KeepAliveInfoMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/KeepAliveInfoMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/KeepAliveInfoMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/KeepAliveInfoMarshaller.cpp Thu Mar 9 13:11:16 2006
@@ -38,12 +38,12 @@
-DataStructure* KeepAliveInfoMarshaller::createObject()
+IDataStructure* KeepAliveInfoMarshaller::createObject()
{
return new KeepAliveInfo();
}
-byte KeepAliveInfoMarshaller::getDataStructureType()
+char KeepAliveInfoMarshaller::getDataStructureType()
{
return KeepAliveInfo.ID_KeepAliveInfo;
}
@@ -51,7 +51,7 @@
/*
* Un-marshal an object instance from the data input stream
*/
-void KeepAliveInfoMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs)
+void KeepAliveInfoMarshaller::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 KeepAliveInfoMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int KeepAliveInfoMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
KeepAliveInfo& info = (KeepAliveInfo&) o;
int rc = base.marshal1(wireFormat, info, bs);
@@ -72,7 +72,7 @@
/*
* Write a object instance to data output stream
*/
-void KeepAliveInfoMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void KeepAliveInfoMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
base.marshal2(wireFormat, o, dataOut, bs);
}
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/KeepAliveInfoMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/KeepAliveInfoMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/KeepAliveInfoMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/KeepAliveInfoMarshaller.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 KeepAliveInfoMarshaller_hpp_
-#define KeepAliveInfoMarshaller_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 KeepAliveInfoMarshaller : public BaseDataStreamMarshaller
-{
-public:
- KeepAliveInfoMarshaller() ;
- virtual ~KeepAliveInfoMarshaller() ;
-
- 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 /*KeepAliveInfoMarshaller_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 KeepAliveInfoMarshaller_hpp_
#define KeepAliveInfoMarshaller_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 KeepAliveInfoMarshaller : public BaseDataStreamMarshaller
{
public:
KeepAliveInfoMarshaller() ;
virtual ~KeepAliveInfoMarshaller() ;
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 /*KeepAliveInfoMarshaller_hpp_*/
\ No newline at end of file
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/LocalTransactionIdMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/LocalTransactionIdMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/LocalTransactionIdMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/LocalTransactionIdMarshaller.cpp Thu Mar 9 13:11:16 2006
@@ -38,12 +38,12 @@
-DataStructure* LocalTransactionIdMarshaller::createObject()
+IDataStructure* LocalTransactionIdMarshaller::createObject()
{
return new LocalTransactionId();
}
-byte LocalTransactionIdMarshaller::getDataStructureType()
+char LocalTransactionIdMarshaller::getDataStructureType()
{
return LocalTransactionId.ID_LocalTransactionId;
}
@@ -51,7 +51,7 @@
/*
* Un-marshal an object instance from the data input stream
*/
-void LocalTransactionIdMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs)
+void LocalTransactionIdMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs)
{
base.unmarshal(wireFormat, o, dataIn, bs);
@@ -65,7 +65,7 @@
/*
* Write the booleans that this object uses to a BooleanStream
*/
-int LocalTransactionIdMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int LocalTransactionIdMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
LocalTransactionId& info = (LocalTransactionId&) o;
int rc = base.marshal1(wireFormat, info, bs);
@@ -78,7 +78,7 @@
/*
* Write a object instance to data output stream
*/
-void LocalTransactionIdMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void LocalTransactionIdMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
base.marshal2(wireFormat, o, dataOut, bs);
LocalTransactionId& info = (LocalTransactionId&) o;
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/LocalTransactionIdMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/LocalTransactionIdMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/LocalTransactionIdMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/LocalTransactionIdMarshaller.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 LocalTransactionIdMarshaller_hpp_
-#define LocalTransactionIdMarshaller_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 LocalTransactionIdMarshaller : public TransactionIdMarshaller
-{
-public:
- LocalTransactionIdMarshaller() ;
- virtual ~LocalTransactionIdMarshaller() ;
-
- 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 /*LocalTransactionIdMarshaller_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 LocalTransactionIdMarshaller_hpp_
#define LocalTransactionIdMarshaller_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"
#inclu
de "command/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 LocalTransactionIdMarshaller : public TransactionIdMarshaller
{
public:
LocalTransactionIdMarshaller() ;
virtual ~LocalTransactionIdMarshaller() ;
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 ma
rshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;
/* namespace */
}
}
}
}
#endif /*LocalTransactionIdMarshaller_hpp_*/
\ No newline at end of file
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/MarshallerFactory.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/MarshallerFactory.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/MarshallerFactory.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/MarshallerFactory.cpp Thu Mar 9 13:11:16 2006
@@ -79,7 +79,7 @@
using namespace apache::activemq::client::marshal;
-void MarshallerFactory::configure(OpenWireFormat& format)
+void MarshallerFactory::configure(ProtocolFormat& format)
{
format.addMarshaller(new LocalTransactionIdMarshaller());
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/MarshallerFactory.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/MarshallerFactory.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/MarshallerFactory.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/MarshallerFactory.hpp Thu Mar 9 13:11:16 2006
@@ -50,7 +50,7 @@
MarshallerFactory() ;
virtual ~MarshallerFactory() ;
- virtual void configure(OpenWireFormat& format) ;
+ virtual void configure(ProtocolFormat& format) ;
} ;
/* namespace */
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/MessageAckMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/MessageAckMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/MessageAckMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/MessageAckMarshaller.cpp Thu Mar 9 13:11:16 2006
@@ -38,12 +38,12 @@
-DataStructure* MessageAckMarshaller::createObject()
+IDataStructure* MessageAckMarshaller::createObject()
{
return new MessageAck();
}
-byte MessageAckMarshaller::getDataStructureType()
+char MessageAckMarshaller::getDataStructureType()
{
return MessageAck.ID_MessageAck;
}
@@ -51,7 +51,7 @@
/*
* Un-marshal an object instance from the data input stream
*/
-void MessageAckMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs)
+void MessageAckMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs)
{
base.unmarshal(wireFormat, o, dataIn, bs);
@@ -70,7 +70,7 @@
/*
* Write the booleans that this object uses to a BooleanStream
*/
-int MessageAckMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int MessageAckMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
MessageAck& info = (MessageAck&) o;
int rc = base.marshal1(wireFormat, info, bs);
@@ -86,7 +86,7 @@
/*
* Write a object instance to data output stream
*/
-void MessageAckMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void MessageAckMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
base.marshal2(wireFormat, o, dataOut, bs);
MessageAck& info = (MessageAck&) o;
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/MessageAckMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/MessageAckMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/MessageAckMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/MessageAckMarshaller.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 MessageAckMarshaller_hpp_
-#define MessageAckMarshaller_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 MessageAckMarshaller : public BaseCommandMarshaller
-{
-public:
- MessageAckMarshaller() ;
- virtual ~MessageAckMarshaller() ;
-
- 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 /*MessageAckMarshaller_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 MessageAckMarshaller_hpp_
#define MessageAckMarshaller_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/Sess
ionId.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 MessageAckMarshaller : public BaseCommandMarshaller
{
public:
MessageAckMarshaller() ;
virtual ~MessageAckMarshaller() ;
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 /*MessageAckMarshaller_hpp_*/
\ No newline at end of file
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/MessageDispatchMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/MessageDispatchMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/MessageDispatchMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/MessageDispatchMarshaller.cpp Thu Mar 9 13:11:16 2006
@@ -38,12 +38,12 @@
-DataStructure* MessageDispatchMarshaller::createObject()
+IDataStructure* MessageDispatchMarshaller::createObject()
{
return new MessageDispatch();
}
-byte MessageDispatchMarshaller::getDataStructureType()
+char MessageDispatchMarshaller::getDataStructureType()
{
return MessageDispatch.ID_MessageDispatch;
}
@@ -51,7 +51,7 @@
/*
* Un-marshal an object instance from the data input stream
*/
-void MessageDispatchMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs)
+void MessageDispatchMarshaller::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 MessageDispatchMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int MessageDispatchMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
MessageDispatch& info = (MessageDispatch&) o;
int rc = base.marshal1(wireFormat, info, bs);
@@ -81,7 +81,7 @@
/*
* Write a object instance to data output stream
*/
-void MessageDispatchMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void MessageDispatchMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
base.marshal2(wireFormat, o, dataOut, bs);
MessageDispatch& info = (MessageDispatch&) o;