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/01 07:29:57 UTC
svn commit: r381926 [6/8] - in /incubator/activemq/trunk:
activemq-core/src/gram/java/org/apache/activemq/openwire/tool/
activemq-core/src/gram/script/
activemq-core/src/main/java/org/apache/activemq/command/
activemq-core/src/main/java/org/apache/acti...
Modified: incubator/activemq/trunk/openwire-cpp/src/command/MessageAck.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/MessageAck.hpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/MessageAck.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/MessageAck.hpp Tue Feb 28 22:29:45 2006
@@ -1,23 +1,34 @@
/*
- * 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.
- */
+* 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 MessageAck_hpp_
#define MessageAck_hpp_
+#include <string>
+
+/* we could cut this down - for now include all possible headers */
#include "command/BaseCommand.hpp"
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
+#include "command/BaseCommand.hpp"
+#include "util/ifr/p"
namespace apache
{
@@ -27,18 +38,60 @@
{
namespace command
{
+ using namespace ifr;
+ using namespace apache::activemq::client;
/*
- * Dummy, should be auto-generated.
+ *
+ * Marshalling code for Open Wire Format for MessageAck
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
*/
class MessageAck : public BaseCommand
{
+private:
+ ActiveMQDestination destination ;
+ p<TransactionId> transactionId ;
+ p<ConsumerId> consumerId ;
+ byte ackType ;
+ p<MessageId> firstMessageId ;
+ p<MessageId> lastMessageId ;
+ int messageCount ;
+
public:
- const static int TYPE = 22 ;
+ const static int TYPE = 22;
public:
MessageAck() ;
virtual ~MessageAck() ;
+
+
+ virtual ActiveMQDestination getDestination() ;
+ virtual void setDestination(ActiveMQDestination destination) ;
+
+ virtual p<TransactionId> getTransactionId() ;
+ virtual void setTransactionId(p<TransactionId> transactionId) ;
+
+ virtual p<ConsumerId> getConsumerId() ;
+ virtual void setConsumerId(p<ConsumerId> consumerId) ;
+
+ virtual byte getAckType() ;
+ virtual void setAckType(byte ackType) ;
+
+ virtual p<MessageId> getFirstMessageId() ;
+ virtual void setFirstMessageId(p<MessageId> firstMessageId) ;
+
+ virtual p<MessageId> getLastMessageId() ;
+ virtual void setLastMessageId(p<MessageId> lastMessageId) ;
+
+ virtual int getMessageCount() ;
+ virtual void setMessageCount(int messageCount) ;
+
+
} ;
/* namespace */
@@ -47,4 +100,4 @@
}
}
-#endif /*MessageAck_hpp_*/
\ No newline at end of file
+#endif /*MessageAck_hpp_*/
Modified: incubator/activemq/trunk/openwire-cpp/src/command/ProducerId.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ProducerId.cpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ProducerId.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ProducerId.cpp Tue Feb 28 22:29:45 2006
@@ -1,50 +1,67 @@
/*
- * 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.
- */
+* 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.
+*/
#include "command/ProducerId.hpp"
using namespace apache::activemq::client::command;
/*
- * Dummy, should be auto-generated
+ *
+ * Marshalling code for Open Wire Format for ProducerId
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
*/
ProducerId::ProducerId()
{
- connectionId = new string() ;
+ this->connectionId = NULL ;
+ this->value = NULL ;
+ this->sessionId = NULL ;
}
ProducerId::~ProducerId()
{
}
-int ProducerId::getCommandType()
+
+p<string> ProducerId::getConnectionId()
{
- return ProducerId::TYPE ;
+ return connectionId ;
}
-void ProducerId::setValue(long producerId)
+void ProducerId::setConnectionId(p<string> connectionId)
{
- this->producerId = producerId ;
+ this->connectionId = connectionId ;
}
+
long ProducerId::getValue()
{
- return producerId ;
+ return value ;
}
+void ProducerId::setValue(long value)
+{
+ this->value = value ;
+}
+
+
long ProducerId::getSessionId()
{
return sessionId ;
@@ -53,14 +70,4 @@
void ProducerId::setSessionId(long sessionId)
{
this->sessionId = sessionId ;
-}
-
-p<string> ProducerId::getConnectionId()
-{
- return connectionId ;
-}
-
-void ProducerId::setConnectionId(const char* connectionId)
-{
- this->connectionId->assign( connectionId ) ;
}
Modified: incubator/activemq/trunk/openwire-cpp/src/command/ProducerId.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ProducerId.hpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ProducerId.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ProducerId.hpp Tue Feb 28 22:29:45 2006
@@ -1,23 +1,32 @@
/*
- * 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.
- */
+* 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 ProducerId_hpp_
#define ProducerId_hpp_
#include <string>
+
+/* we could cut this down - for now include all possible headers */
+#include "command/BaseCommand.hpp"
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
#include "command/AbstractCommand.hpp"
#include "util/ifr/p"
@@ -30,31 +39,43 @@
namespace command
{
using namespace ifr;
- using namespace std;
+ using namespace apache::activemq::client;
/*
- * Dummy, should be auto-generated.
+ *
+ * Marshalling code for Open Wire Format for ProducerId
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
*/
class ProducerId : public AbstractCommand
{
private:
p<string> connectionId ;
- long sessionId,
- producerId ;
+ long value ;
+ long sessionId ;
- const static int TYPE = 123 ;
+public:
+ const static int TYPE = 123;
public:
ProducerId() ;
virtual ~ProducerId() ;
- virtual int getCommandType() ;
- virtual void setValue(long producerId) ;
+
+ virtual p<string> getConnectionId() ;
+ virtual void setConnectionId(p<string> connectionId) ;
+
virtual long getValue() ;
- virtual void setSessionId(long sessionId) ;
+ virtual void setValue(long value) ;
+
virtual long getSessionId() ;
- virtual void setConnectionId(const char* connectionId) ;
- virtual p<string> getConnectionId() ;
+ virtual void setSessionId(long sessionId) ;
+
+
} ;
/* namespace */
Modified: incubator/activemq/trunk/openwire-cpp/src/command/ProducerInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ProducerInfo.cpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ProducerInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ProducerInfo.cpp Tue Feb 28 22:29:45 2006
@@ -1,36 +1,45 @@
/*
- * 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.
- */
+* 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.
+*/
#include "command/ProducerInfo.hpp"
using namespace apache::activemq::client::command;
/*
- * Dummy, should be auto-generated
+ *
+ * Marshalling code for Open Wire Format for ProducerInfo
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
*/
ProducerInfo::ProducerInfo()
{
- this->producerId = NULL ;
+ this->producerId = NULL ;
this->destination = NULL ;
+ this->brokerPath = NULL ;
}
ProducerInfo::~ProducerInfo()
{
}
+
p<ProducerId> ProducerInfo::getProducerId()
{
return producerId ;
@@ -41,12 +50,24 @@
this->producerId = producerId ;
}
-p<IDestination> ProducerInfo::getDestination()
+
+ActiveMQDestination ProducerInfo::getDestination()
{
return destination ;
}
-void ProducerInfo::setDestination(p<IDestination> destination)
+void ProducerInfo::setDestination(ActiveMQDestination destination)
{
this->destination = destination ;
+}
+
+
+BrokerId[] ProducerInfo::getBrokerPath()
+{
+ return brokerPath ;
+}
+
+void ProducerInfo::setBrokerPath(BrokerId[] brokerPath)
+{
+ this->brokerPath = brokerPath ;
}
Modified: incubator/activemq/trunk/openwire-cpp/src/command/ProducerInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ProducerInfo.hpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ProducerInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ProducerInfo.hpp Tue Feb 28 22:29:45 2006
@@ -1,26 +1,33 @@
/*
- * 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.
- */
+* 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 ProducerInfo_hpp_
#define ProducerInfo_hpp_
#include <string>
-#include "IDestination.hpp"
+
+/* we could cut this down - for now include all possible headers */
#include "command/BaseCommand.hpp"
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
+#include "command/BaseCommand.hpp"
#include "util/ifr/p"
namespace apache
@@ -35,25 +42,40 @@
using namespace apache::activemq::client;
/*
- * Dummy, should be auto-generated.
+ *
+ * Marshalling code for Open Wire Format for ProducerInfo
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
*/
class ProducerInfo : public BaseCommand
{
private:
p<ProducerId> producerId ;
- p<IDestination> destination ;
+ ActiveMQDestination destination ;
+ BrokerId[] brokerPath ;
public:
- const static int TYPE = 6 ;
+ const static int TYPE = 6;
public:
ProducerInfo() ;
virtual ~ProducerInfo() ;
+
virtual p<ProducerId> getProducerId() ;
virtual void setProducerId(p<ProducerId> producerId) ;
- virtual p<IDestination> getDestination() ;
- virtual void setDestination(p<IDestination> destination) ;
+
+ virtual ActiveMQDestination getDestination() ;
+ virtual void setDestination(ActiveMQDestination destination) ;
+
+ virtual BrokerId[] getBrokerPath() ;
+ virtual void setBrokerPath(BrokerId[] brokerPath) ;
+
+
} ;
/* namespace */
Modified: incubator/activemq/trunk/openwire-cpp/src/command/RemoveInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/RemoveInfo.cpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/RemoveInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/RemoveInfo.cpp Tue Feb 28 22:29:45 2006
@@ -1,40 +1,49 @@
/*
- * 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.
- */
+* 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.
+*/
#include "command/RemoveInfo.hpp"
using namespace apache::activemq::client::command;
/*
- * Dummy, should be auto-generated
+ *
+ * Marshalling code for Open Wire Format for RemoveInfo
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
*/
RemoveInfo::RemoveInfo()
{
+ this->objectId = NULL ;
}
RemoveInfo::~RemoveInfo()
{
}
-p<IDataStructure> RemoveInfo::getObjectId()
+
+DataStructure RemoveInfo::getObjectId()
{
return objectId ;
}
-void RemoveInfo::setObjectId(p<IDataStructure> oid)
+void RemoveInfo::setObjectId(DataStructure objectId)
{
- this->objectId = oid ;
+ this->objectId = objectId ;
}
Modified: incubator/activemq/trunk/openwire-cpp/src/command/RemoveInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/RemoveInfo.hpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/RemoveInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/RemoveInfo.hpp Tue Feb 28 22:29:45 2006
@@ -1,24 +1,33 @@
/*
- * 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.
- */
+* 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 RemoveInfo_hpp_
#define RemoveInfo_hpp_
+#include <string>
+
+/* we could cut this down - for now include all possible headers */
+#include "command/BaseCommand.hpp"
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
#include "command/BaseCommand.hpp"
-#include "command/IDataStructure.hpp"
#include "util/ifr/p"
namespace apache
@@ -30,24 +39,35 @@
namespace command
{
using namespace ifr;
+ using namespace apache::activemq::client;
/*
- * Dummy, should be auto-generated.
+ *
+ * Marshalling code for Open Wire Format for RemoveInfo
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
*/
class RemoveInfo : public BaseCommand
{
private:
- p<IDataStructure> objectId ;
+ DataStructure objectId ;
public:
- const static int TYPE = 12 ;
+ const static int TYPE = 12;
public:
RemoveInfo() ;
virtual ~RemoveInfo() ;
- virtual p<IDataStructure> getObjectId() ;
- virtual void setObjectId(p<IDataStructure> oid) ;
+
+ virtual DataStructure getObjectId() ;
+ virtual void setObjectId(DataStructure objectId) ;
+
+
} ;
/* namespace */
Modified: incubator/activemq/trunk/openwire-cpp/src/command/Response.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/Response.cpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/Response.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/Response.cpp Tue Feb 28 22:29:45 2006
@@ -1,30 +1,49 @@
/*
- * 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.
- */
+* 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.
+*/
#include "command/Response.hpp"
using namespace apache::activemq::client::command;
/*
- *
+ *
+ * Marshalling code for Open Wire Format for Response
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
*/
Response::Response()
{
+ this->correlationId = NULL ;
}
Response::~Response()
{
+}
+
+
+short Response::getCorrelationId()
+{
+ return correlationId ;
+}
+
+void Response::setCorrelationId(short correlationId)
+{
+ this->correlationId = correlationId ;
}
Modified: incubator/activemq/trunk/openwire-cpp/src/command/Response.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/Response.hpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/Response.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/Response.hpp Tue Feb 28 22:29:45 2006
@@ -1,23 +1,34 @@
/*
- * 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.
- */
+* 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 Response_hpp_
#define Response_hpp_
+#include <string>
+
+/* we could cut this down - for now include all possible headers */
+#include "command/BaseCommand.hpp"
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
#include "command/BaseCommand.hpp"
+#include "util/ifr/p"
namespace apache
{
@@ -27,19 +38,37 @@
{
namespace command
{
+ using namespace ifr;
+ using namespace apache::activemq::client;
/*
- * Interface for commands.
+ *
+ * Marshalling code for Open Wire Format for Response
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
*/
class Response : public BaseCommand
{
+private:
+ short correlationId ;
+
public:
- const static int TYPE = 30 ;
+ const static int TYPE = 30;
public:
Response() ;
- ~Response() ;
-};
+ virtual ~Response() ;
+
+
+ virtual short getCorrelationId() ;
+ virtual void setCorrelationId(short correlationId) ;
+
+
+} ;
/* namespace */
}
@@ -47,4 +76,4 @@
}
}
-#endif /*Response_hpp_*/
\ No newline at end of file
+#endif /*Response_hpp_*/
Modified: incubator/activemq/trunk/openwire-cpp/src/command/SessionId.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/SessionId.cpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/SessionId.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/SessionId.cpp Tue Feb 28 22:29:45 2006
@@ -1,56 +1,61 @@
/*
- * 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.
- */
+* 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.
+*/
#include "command/SessionId.hpp"
using namespace apache::activemq::client::command;
/*
- * Dummy, should be auto-generated
+ *
+ * Marshalling code for Open Wire Format for SessionId
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
*/
SessionId::SessionId()
{
- connectionId = new string() ;
+ this->connectionId = NULL ;
+ this->value = NULL ;
}
SessionId::~SessionId()
{
}
-int SessionId::getCommandType()
+
+p<string> SessionId::getConnectionId()
{
- return SessionId::TYPE ;
+ return connectionId ;
}
-void SessionId::setValue(long sessionId)
+void SessionId::setConnectionId(p<string> connectionId)
{
- this->sessionId = sessionId ;
+ this->connectionId = connectionId ;
}
+
long SessionId::getValue()
{
- return sessionId ;
+ return value ;
}
-void SessionId::setConnectionId(const char* connectionId)
+void SessionId::setValue(long value)
{
- this->connectionId->assign( connectionId ) ;
-}
-
-p<string> SessionId::getConnectionId()
-{
- return connectionId ;
+ this->value = value ;
}
Modified: incubator/activemq/trunk/openwire-cpp/src/command/SessionId.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/SessionId.hpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/SessionId.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/SessionId.hpp Tue Feb 28 22:29:45 2006
@@ -1,23 +1,32 @@
/*
- * 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.
- */
+* 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 SessionId_hpp_
#define SessionId_hpp_
#include <string>
+
+/* we could cut this down - for now include all possible headers */
+#include "command/BaseCommand.hpp"
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
+#include "command/SessionId.hpp"
+
#include "command/AbstractCommand.hpp"
#include "util/ifr/p"
@@ -30,28 +39,39 @@
namespace command
{
using namespace ifr;
- using namespace std;
+ using namespace apache::activemq::client;
/*
- * Dummy, should be auto-generated.
+ *
+ * Marshalling code for Open Wire Format for SessionId
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
*/
class SessionId : public AbstractCommand
{
private:
p<string> connectionId ;
- long sessionId ;
+ long value ;
- const static int TYPE = 121 ;
+public:
+ const static int TYPE = 121;
public:
SessionId() ;
virtual ~SessionId() ;
- virtual int getCommandType() ;
- virtual void setValue(long id) ;
- virtual long getValue() ;
- virtual void setConnectionId(const char* cid) ;
+
virtual p<string> getConnectionId() ;
+ virtual void setConnectionId(p<string> connectionId) ;
+
+ virtual long getValue() ;
+ virtual void setValue(long value) ;
+
+
} ;
/* namespace */
Modified: incubator/activemq/trunk/openwire-cpp/src/command/SessionInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/SessionInfo.cpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/SessionInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/SessionInfo.cpp Tue Feb 28 22:29:45 2006
@@ -1,34 +1,43 @@
/*
- * 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.
- */
+* 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.
+*/
#include "command/SessionInfo.hpp"
using namespace apache::activemq::client::command;
/*
- * Dummy, should be auto-generated
+ *
+ * Marshalling code for Open Wire Format for SessionInfo
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
*/
SessionInfo::SessionInfo()
{
+ this->sessionId = NULL ;
}
SessionInfo::~SessionInfo()
{
}
+
p<SessionId> SessionInfo::getSessionId()
{
return sessionId ;
Modified: incubator/activemq/trunk/openwire-cpp/src/command/SessionInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/SessionInfo.hpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/SessionInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/SessionInfo.hpp Tue Feb 28 22:29:45 2006
@@ -1,24 +1,33 @@
/*
- * 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.
- */
+* 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 SessionInfo_hpp_
#define SessionInfo_hpp_
+#include <string>
+
+/* we could cut this down - for now include all possible headers */
#include "command/BaseCommand.hpp"
+#include "command/BrokerId.hpp"
+#include "command/ConnectionId.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/ProducerId.hpp"
#include "command/SessionId.hpp"
+
+#include "command/BaseCommand.hpp"
#include "util/ifr/p"
namespace apache
@@ -30,9 +39,17 @@
namespace command
{
using namespace ifr;
+ using namespace apache::activemq::client;
/*
- * Dummy, should be auto-generated.
+ *
+ * Marshalling code for Open Wire Format for SessionInfo
+ *
+ *
+ * NOTE!: This file is autogenerated - do not modify!
+ * if you need to make a change, please see the Groovy scripts in the
+ * activemq-core module
+ *
*/
class SessionInfo : public BaseCommand
{
@@ -40,14 +57,17 @@
p<SessionId> sessionId ;
public:
- const static int TYPE = 4 ;
+ const static int TYPE = 4;
public:
SessionInfo() ;
virtual ~SessionInfo() ;
+
virtual p<SessionId> getSessionId() ;
virtual void setSessionId(p<SessionId> sessionId) ;
+
+
} ;
/* namespace */
Modified: incubator/activemq/trunk/openwire-dotnet/activemq.sln
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/activemq.sln?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/activemq.sln (original)
+++ incubator/activemq/trunk/openwire-dotnet/activemq.sln Tue Feb 28 22:29:45 2006
@@ -1,30 +1,30 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "activemq", "activemq.csproj", "{E8825D2E-4EC5-43D3-9FAC-F16055294F49}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tests", "tests.csproj", "{3E5FA6F9-08E6-4F0D-86D9-77562D14F8AD}"
- ProjectSection(ProjectDependencies) = postProject
- {E8825D2E-4EC5-43D3-9FAC-F16055294F49} = {E8825D2E-4EC5-43D3-9FAC-F16055294F49}
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Release = Release
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {E8825D2E-4EC5-43D3-9FAC-F16055294F49}.Debug.ActiveCfg = Debug|.NET
- {E8825D2E-4EC5-43D3-9FAC-F16055294F49}.Debug.Build.0 = Debug|.NET
- {E8825D2E-4EC5-43D3-9FAC-F16055294F49}.Release.ActiveCfg = Release|.NET
- {E8825D2E-4EC5-43D3-9FAC-F16055294F49}.Release.Build.0 = Release|.NET
- {3E5FA6F9-08E6-4F0D-86D9-77562D14F8AD}.Debug.ActiveCfg = Debug|.NET
- {3E5FA6F9-08E6-4F0D-86D9-77562D14F8AD}.Debug.Build.0 = Debug|.NET
- {3E5FA6F9-08E6-4F0D-86D9-77562D14F8AD}.Release.ActiveCfg = Release|.NET
- {3E5FA6F9-08E6-4F0D-86D9-77562D14F8AD}.Release.Build.0 = Release|.NET
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "activemq", "activemq.csproj", "{E8825D2E-4EC5-43D3-9FAC-F16055294F49}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tests", "tests.csproj", "{3E5FA6F9-08E6-4F0D-86D9-77562D14F8AD}"
+ ProjectSection(ProjectDependencies) = postProject
+ {E8825D2E-4EC5-43D3-9FAC-F16055294F49} = {E8825D2E-4EC5-43D3-9FAC-F16055294F49}
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfiguration) = preSolution
+ Debug = Debug
+ Release = Release
+ EndGlobalSection
+ GlobalSection(ProjectConfiguration) = postSolution
+ {E8825D2E-4EC5-43D3-9FAC-F16055294F49}.Debug.ActiveCfg = Debug|.NET
+ {E8825D2E-4EC5-43D3-9FAC-F16055294F49}.Debug.Build.0 = Debug|.NET
+ {E8825D2E-4EC5-43D3-9FAC-F16055294F49}.Release.ActiveCfg = Release|.NET
+ {E8825D2E-4EC5-43D3-9FAC-F16055294F49}.Release.Build.0 = Release|.NET
+ {3E5FA6F9-08E6-4F0D-86D9-77562D14F8AD}.Debug.ActiveCfg = Debug|.NET
+ {3E5FA6F9-08E6-4F0D-86D9-77562D14F8AD}.Debug.Build.0 = Debug|.NET
+ {3E5FA6F9-08E6-4F0D-86D9-77562D14F8AD}.Release.ActiveCfg = Release|.NET
+ {3E5FA6F9-08E6-4F0D-86D9-77562D14F8AD}.Release.Build.0 = Release|.NET
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ EndGlobalSection
+ GlobalSection(ExtensibilityAddIns) = postSolution
+ EndGlobalSection
+EndGlobal
Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/ActiveMQMessage.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/ActiveMQMessage.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/ActiveMQMessage.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/ActiveMQMessage.cs Tue Feb 28 22:29:45 2006
@@ -124,7 +124,7 @@
public string JMSMessageId
{
get {
- return DataStreamMarshaller.ToString(MessageId);
+ return BaseDataStreamMarshaller.ToString(MessageId);
}
}
@@ -254,7 +254,7 @@
}
if (txnId != null)
{
- return DataStreamMarshaller.ToString(txnId);
+ return BaseDataStreamMarshaller.ToString(txnId);
}
return null;
}
Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/JournalQueueAck.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/JournalQueueAck.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/JournalQueueAck.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/JournalQueueAck.cs Tue Feb 28 22:29:45 2006
@@ -31,7 +31,7 @@
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
- public class JournalQueueAck : DataStructureSupport
+ public class JournalQueueAck : AbstractCommand
{
public const byte ID_JournalQueueAck = 52;
Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/JournalTopicAck.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/JournalTopicAck.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/JournalTopicAck.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/JournalTopicAck.cs Tue Feb 28 22:29:45 2006
@@ -31,7 +31,7 @@
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
- public class JournalTopicAck : DataStructureSupport
+ public class JournalTopicAck : AbstractCommand
{
public const byte ID_JournalTopicAck = 50;
Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/JournalTrace.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/JournalTrace.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/JournalTrace.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/JournalTrace.cs Tue Feb 28 22:29:45 2006
@@ -31,7 +31,7 @@
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
- public class JournalTrace : DataStructureSupport
+ public class JournalTrace : AbstractCommand
{
public const byte ID_JournalTrace = 53;
Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/JournalTransaction.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/JournalTransaction.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/JournalTransaction.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/JournalTransaction.cs Tue Feb 28 22:29:45 2006
@@ -31,7 +31,7 @@
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
- public class JournalTransaction : DataStructureSupport
+ public class JournalTransaction : AbstractCommand
{
public const byte ID_JournalTransaction = 54;
Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/KeepAliveInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/KeepAliveInfo.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/KeepAliveInfo.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/KeepAliveInfo.cs Tue Feb 28 22:29:45 2006
@@ -31,7 +31,7 @@
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
- public class KeepAliveInfo : DataStructureSupport
+ public class KeepAliveInfo : AbstractCommand
{
public const byte ID_KeepAliveInfo = 10;
Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/WireFormatInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/WireFormatInfo.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/WireFormatInfo.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Commands/WireFormatInfo.cs Tue Feb 28 22:29:45 2006
@@ -38,18 +38,20 @@
byte[] magic;
int version;
bool cacheEnabled;
- bool compressionEnabled;
bool stackTraceEnabled;
bool tcpNoDelayEnabled;
+ bool prefixPacketSize;
+ bool tightEncodingEnabled;
public override string ToString() {
return GetType().Name + "["
+ " Magic=" + Magic
+ " Version=" + Version
+ " CacheEnabled=" + CacheEnabled
- + " CompressionEnabled=" + CompressionEnabled
+ " StackTraceEnabled=" + StackTraceEnabled
+ " TcpNoDelayEnabled=" + TcpNoDelayEnabled
+ + " PrefixPacketSize=" + PrefixPacketSize
+ + " TightEncodingEnabled=" + TightEncodingEnabled
+ " ]";
}
@@ -81,12 +83,6 @@
set { this.cacheEnabled = value; }
}
- public bool CompressionEnabled
- {
- get { return compressionEnabled; }
- set { this.compressionEnabled = value; }
- }
-
public bool StackTraceEnabled
{
get { return stackTraceEnabled; }
@@ -97,6 +93,18 @@
{
get { return tcpNoDelayEnabled; }
set { this.tcpNoDelayEnabled = value; }
+ }
+
+ public bool PrefixPacketSize
+ {
+ get { return prefixPacketSize; }
+ set { this.prefixPacketSize = value; }
+ }
+
+ public bool TightEncodingEnabled
+ {
+ get { return tightEncodingEnabled; }
+ set { this.tightEncodingEnabled = value; }
}
}
Copied: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/BaseDataStreamMarshaller.cs (from r381665, incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/DataStreamMarshaller.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/BaseDataStreamMarshaller.cs?p2=incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/BaseDataStreamMarshaller.cs&p1=incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/DataStreamMarshaller.cs&r1=381665&r2=381926&rev=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/DataStreamMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/BaseDataStreamMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -30,7 +30,7 @@
/// A base class with useful implementation inheritence methods
/// for creating marshallers of the OpenWire protocol
/// </summary>
- public abstract class DataStreamMarshaller
+ public abstract class BaseDataStreamMarshaller
{
public const byte NULL = 0;
public const byte BOOLEAN_TYPE = 1;
@@ -66,11 +66,11 @@
public abstract DataStructure CreateObject();
public abstract byte GetDataStructureType();
- public virtual int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+ public virtual int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
{
return 0;
}
- public virtual void Marshal2(
+ public virtual void TightMarshal2(
OpenWireFormat wireFormat,
Object o,
BinaryWriter dataOut,
@@ -78,7 +78,7 @@
{
}
- public virtual void Unmarshal(
+ public virtual void TightUnmarshal(
OpenWireFormat wireFormat,
Object o,
BinaryReader dataIn,
@@ -87,32 +87,32 @@
}
- protected virtual DataStructure UnmarshalNestedObject(
+ protected virtual DataStructure TightUnmarshalNestedObject(
OpenWireFormat wireFormat,
BinaryReader dataIn,
BooleanStream bs)
{
- return wireFormat.UnmarshalNestedObject(dataIn, bs);
+ return wireFormat.TightUnmarshalNestedObject(dataIn, bs);
}
- protected virtual int Marshal1NestedObject(
+ protected virtual int TightMarshalNestedObject1(
OpenWireFormat wireFormat,
DataStructure o,
BooleanStream bs)
{
- return wireFormat.Marshal1NestedObject(o, bs);
+ return wireFormat.TightMarshalNestedObject1(o, bs);
}
- protected virtual void Marshal2NestedObject(
+ protected virtual void TightMarshalNestedObject2(
OpenWireFormat wireFormat,
DataStructure o,
BinaryWriter dataOut,
BooleanStream bs)
{
- wireFormat.Marshal2NestedObject(o, dataOut, bs);
+ wireFormat.TightMarshalNestedObject2(o, dataOut, bs);
}
- protected virtual DataStructure UnmarshalCachedObject(
+ protected virtual DataStructure TightUnmarshalCachedObject(
OpenWireFormat wireFormat,
BinaryReader dataIn,
BooleanStream bs)
@@ -132,10 +132,10 @@
return wireFormat.UnmarshalNestedObject(dataIn, bs);
}
*/
- return wireFormat.UnmarshalNestedObject(dataIn, bs);
+ return wireFormat.TightUnmarshalNestedObject(dataIn, bs);
}
- protected virtual int Marshal1CachedObject(
+ protected virtual int TightMarshalCachedObject1(
OpenWireFormat wireFormat,
DataStructure o,
BooleanStream bs)
@@ -155,10 +155,10 @@
return wireFormat.Marshal1NestedObject(o, bs);
}
*/
- return wireFormat.Marshal1NestedObject(o, bs);
+ return wireFormat.TightMarshalNestedObject1(o, bs);
}
- protected virtual void Marshal2CachedObject(
+ protected virtual void TightMarshalCachedObject2(
OpenWireFormat wireFormat,
DataStructure o,
BinaryWriter dataOut,
@@ -177,12 +177,12 @@
wireFormat.Marshal2NestedObject(o, dataOut, bs);
}
*/
- wireFormat.Marshal2NestedObject(o, dataOut, bs);
+ wireFormat.TightMarshalNestedObject2(o, dataOut, bs);
}
- protected virtual String ReadString(BinaryReader dataIn, BooleanStream bs)
+ protected virtual String TightUnmarshalString(BinaryReader dataIn, BooleanStream bs)
{
if (bs.ReadBoolean())
{
@@ -214,7 +214,7 @@
return new String(text);
}
- protected virtual int WriteString(String value, BooleanStream bs)
+ protected virtual int TightMarshalString1(String value, BooleanStream bs)
{
bs.WriteBoolean(value != null);
if (value != null)
@@ -263,7 +263,7 @@
}
}
- public static void WriteString(String value, BinaryWriter dataOut, BooleanStream bs)
+ public static void TightMarshalString2(String value, BinaryWriter dataOut, BooleanStream bs)
{
if (bs.ReadBoolean())
{
@@ -365,7 +365,7 @@
return answer;
}
- public virtual int Marshal1Long(OpenWireFormat wireFormat, long o, BooleanStream bs)
+ public virtual int TightMarshalLong1(OpenWireFormat wireFormat, long o, BooleanStream bs)
{
if (o == 0L)
{
@@ -397,7 +397,7 @@
}
}
- public virtual void Marshal2Long(
+ public virtual void TightMarshalLong2(
OpenWireFormat wireFormat,
long o,
BinaryWriter dataOut,
@@ -422,7 +422,7 @@
}
}
}
- public virtual long UnmarshalLong(OpenWireFormat wireFormat, BinaryReader dataIn, BooleanStream bs)
+ public virtual long TightUnmarshalLong(OpenWireFormat wireFormat, BinaryReader dataIn, BooleanStream bs)
{
if (bs.ReadBoolean())
{
@@ -447,7 +447,7 @@
}
}
}
- protected virtual int MarshalObjectArray(
+ protected virtual int TightMarshalObjectArray1(
OpenWireFormat wireFormat,
DataStructure[] objects,
BooleanStream bs)
@@ -459,7 +459,7 @@
rc += 2;
for (int i = 0; i < objects.Length; i++)
{
- rc += Marshal1NestedObject(wireFormat, objects[i], bs);
+ rc += TightMarshalNestedObject1(wireFormat, objects[i], bs);
}
return rc;
}
@@ -470,7 +470,7 @@
}
}
- protected virtual void MarshalObjectArray(
+ protected virtual void TightMarshalObjectArray2(
OpenWireFormat wireFormat,
DataStructure[] objects,
BinaryWriter dataOut,
@@ -481,7 +481,7 @@
WriteShort((short) objects.Length, dataOut);
for (int i = 0; i < objects.Length; i++)
{
- Marshal2NestedObject(wireFormat, objects[i], dataOut, bs);
+ TightMarshalNestedObject2(wireFormat, objects[i], dataOut, bs);
}
}
}
@@ -516,7 +516,7 @@
dataOut.Write(command);
}
- protected virtual BrokerError UnmarshalBrokerError(
+ protected virtual BrokerError TightUnmarshalBrokerError(
OpenWireFormat wireFormat,
BinaryReader dataIn,
BooleanStream bs)
@@ -525,8 +525,8 @@
{
BrokerError answer = new BrokerError();
- answer.ExceptionClass = ReadString(dataIn, bs);
- answer.Message = ReadString(dataIn, bs);
+ answer.ExceptionClass = TightUnmarshalString(dataIn, bs);
+ answer.Message = TightUnmarshalString(dataIn, bs);
if (wireFormat.StackTraceEnabled)
{
short length = ReadShort(dataIn);
@@ -534,14 +534,14 @@
for (int i = 0; i < stackTrace.Length; i++)
{
StackTraceElement element = new StackTraceElement();
- element.ClassName = ReadString(dataIn, bs);
- element.MethodName = ReadString(dataIn, bs);
- element.FileName = ReadString(dataIn, bs);
+ element.ClassName = TightUnmarshalString(dataIn, bs);
+ element.MethodName = TightUnmarshalString(dataIn, bs);
+ element.FileName = TightUnmarshalString(dataIn, bs);
element.LineNumber = ReadInt(dataIn);
stackTrace[i] = element;
}
answer.StackTraceElements = stackTrace;
- answer.Cause = UnmarshalBrokerError(wireFormat, dataIn, bs);
+ answer.Cause = TightUnmarshalBrokerError(wireFormat, dataIn, bs);
}
return answer;
}
@@ -551,7 +551,7 @@
}
}
- protected int MarshalBrokerError(OpenWireFormat wireFormat, BrokerError o, BooleanStream bs)
+ protected int TightMarshalBrokerError1(OpenWireFormat wireFormat, BrokerError o, BooleanStream bs)
{
if (o == null)
{
@@ -562,8 +562,8 @@
{
int rc = 0;
bs.WriteBoolean(true);
- rc += WriteString(o.ExceptionClass, bs);
- rc += WriteString(o.Message, bs);
+ rc += TightMarshalString1(o.ExceptionClass, bs);
+ rc += TightMarshalString1(o.Message, bs);
if (wireFormat.StackTraceEnabled)
{
rc += 2;
@@ -571,19 +571,19 @@
for (int i = 0; i < stackTrace.Length; i++)
{
StackTraceElement element = stackTrace[i];
- rc += WriteString(element.ClassName, bs);
- rc += WriteString(element.MethodName, bs);
- rc += WriteString(element.FileName, bs);
+ rc += TightMarshalString1(element.ClassName, bs);
+ rc += TightMarshalString1(element.MethodName, bs);
+ rc += TightMarshalString1(element.FileName, bs);
rc += 4;
}
- rc += MarshalBrokerError(wireFormat, o.Cause, bs);
+ rc += TightMarshalBrokerError1(wireFormat, o.Cause, bs);
}
return rc;
}
}
- protected void MarshalBrokerError(
+ protected void TightMarshalBrokerError2(
OpenWireFormat wireFormat,
BrokerError o,
BinaryWriter dataOut,
@@ -591,8 +591,8 @@
{
if (bs.ReadBoolean())
{
- WriteString(o.ExceptionClass, dataOut, bs);
- WriteString(o.Message, dataOut, bs);
+ TightMarshalString2(o.ExceptionClass, dataOut, bs);
+ TightMarshalString2(o.Message, dataOut, bs);
if (wireFormat.StackTraceEnabled)
{
StackTraceElement[] stackTrace = o.StackTraceElements;
@@ -601,12 +601,12 @@
for (int i = 0; i < stackTrace.Length; i++)
{
StackTraceElement element = stackTrace[i];
- WriteString(element.ClassName, dataOut, bs);
- WriteString(element.MethodName, bs);
- WriteString(element.FileName, bs);
+ TightMarshalString2(element.ClassName, dataOut, bs);
+ TightMarshalString2(element.MethodName, dataOut, bs);
+ TightMarshalString2(element.FileName, dataOut, bs);
WriteInt(element.LineNumber, dataOut);
}
- MarshalBrokerError(wireFormat, o.Cause, dataOut, bs);
+ TightMarshalBrokerError2(wireFormat, o.Cause, dataOut, bs);
}
}
}
Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/BooleanStream.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/BooleanStream.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/BooleanStream.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/BooleanStream.cs Tue Feb 28 22:29:45 2006
@@ -88,7 +88,7 @@
else
{
dataOut.Write((byte) 0xE0);
- DataStreamMarshaller.WriteShort(arrayLimit, dataOut);
+ BaseDataStreamMarshaller.WriteShort(arrayLimit, dataOut);
}
dataOut.Write(data, 0, arrayLimit);
@@ -97,14 +97,14 @@
public void Unmarshal(BinaryReader dataIn)
{
- arrayLimit = DataStreamMarshaller.ReadByte(dataIn);
+ arrayLimit = BaseDataStreamMarshaller.ReadByte(dataIn);
if ((arrayLimit & 0xE0) != 0)
{
- arrayLimit = DataStreamMarshaller.ReadShort(dataIn);
+ arrayLimit = BaseDataStreamMarshaller.ReadShort(dataIn);
}
else if ((arrayLimit & 0xC0) != 0)
{
- arrayLimit = (short) (DataStreamMarshaller.ReadByte(dataIn) & 0xFF);
+ arrayLimit = (short) (BaseDataStreamMarshaller.ReadByte(dataIn) & 0xFF);
}
if (data.Length < arrayLimit)
{
Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/OpenWireFormat.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/OpenWireFormat.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/OpenWireFormat.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/OpenWireFormat.cs Tue Feb 28 22:29:45 2006
@@ -30,7 +30,7 @@
{
static private char[] MAGIC = new char[] { 'A', 'c', 't', 'i', 'v', 'e', 'M', 'Q' };
- private DataStreamMarshaller[] dataMarshallers;
+ private BaseDataStreamMarshaller[] dataMarshallers;
private const byte NULL_TYPE = 0;
private WireFormatInfo wireFormatInfo = new WireFormatInfo();
@@ -41,8 +41,10 @@
wireFormatInfo.Version = 1;
wireFormatInfo.StackTraceEnabled = true;
wireFormatInfo.TcpNoDelayEnabled = true;
+ wireFormatInfo.PrefixPacketSize = true;
+ wireFormatInfo.TightEncodingEnabled = true;
- dataMarshallers = new DataStreamMarshaller[256];
+ dataMarshallers = new BaseDataStreamMarshaller[256];
MarshallerFactory factory = new MarshallerFactory();
factory.configure(this);
}
@@ -59,7 +61,7 @@
}
}
- public void addMarshaller(DataStreamMarshaller marshaller)
+ public void addMarshaller(BaseDataStreamMarshaller marshaller)
{
byte type = marshaller.GetDataStructureType();
dataMarshallers[type & 0xFF] = marshaller;
@@ -72,43 +74,43 @@
{
DataStructure c = (DataStructure) o;
byte type = c.GetDataStructureType();
- DataStreamMarshaller dsm = (DataStreamMarshaller) dataMarshallers[type & 0xFF];
+ BaseDataStreamMarshaller dsm = (BaseDataStreamMarshaller) dataMarshallers[type & 0xFF];
if (dsm == null)
throw new IOException("Unknown data type: " + type);
BooleanStream bs = new BooleanStream();
- size += dsm.Marshal1(this, c, bs);
+ size += dsm.TightMarshal1(this, c, bs);
size += bs.MarshalledSize();
- DataStreamMarshaller.WriteInt(size, ds);
- DataStreamMarshaller.WriteByte(type, ds);
+ BaseDataStreamMarshaller.WriteInt(size, ds);
+ BaseDataStreamMarshaller.WriteByte(type, ds);
bs.Marshal(ds);
- dsm.Marshal2(this, c, ds, bs);
+ dsm.TightMarshal2(this, c, ds, bs);
}
else
{
- DataStreamMarshaller.WriteInt(size, ds);
- DataStreamMarshaller.WriteByte(NULL_TYPE, ds);
+ BaseDataStreamMarshaller.WriteInt(size, ds);
+ BaseDataStreamMarshaller.WriteByte(NULL_TYPE, ds);
}
}
public Object Unmarshal(BinaryReader dis)
{
// lets ignore the size of the packet
- DataStreamMarshaller.ReadInt(dis);
+ BaseDataStreamMarshaller.ReadInt(dis);
// first byte is the type of the packet
- byte dataType = DataStreamMarshaller.ReadByte(dis);
+ byte dataType = BaseDataStreamMarshaller.ReadByte(dis);
if (dataType != NULL_TYPE)
{
- DataStreamMarshaller dsm = (DataStreamMarshaller) dataMarshallers[dataType & 0xFF];
+ BaseDataStreamMarshaller dsm = (BaseDataStreamMarshaller) dataMarshallers[dataType & 0xFF];
if (dsm == null)
throw new IOException("Unknown data type: " + dataType);
//Console.WriteLine("Parsing type: " + dataType + " with: " + dsm);
Object data = dsm.CreateObject();
BooleanStream bs = new BooleanStream();
bs.Unmarshal(dis);
- dsm.Unmarshal(this, data, dis, bs);
+ dsm.TightUnmarshal(this, data, dis, bs);
return data;
}
else
@@ -117,7 +119,7 @@
}
}
- public int Marshal1NestedObject(DataStructure o, BooleanStream bs)
+ public int TightMarshalNestedObject1(DataStructure o, BooleanStream bs)
{
bs.WriteBoolean(o != null);
if (o == null)
@@ -138,20 +140,20 @@
if (type == 0) {
throw new IOException("No valid data structure type for: " + o + " of type: " + o.GetType());
}
- DataStreamMarshaller dsm = (DataStreamMarshaller) dataMarshallers[type & 0xFF];
+ BaseDataStreamMarshaller dsm = (BaseDataStreamMarshaller) dataMarshallers[type & 0xFF];
if (dsm == null)
throw new IOException("Unknown data type: " + type);
//Console.WriteLine("Marshalling type: " + type + " with structure: " + o);
- return 1 + dsm.Marshal1(this, o, bs);
+ return 1 + dsm.TightMarshal1(this, o, bs);
}
- public void Marshal2NestedObject(DataStructure o, BinaryWriter ds, BooleanStream bs)
+ public void TightMarshalNestedObject2(DataStructure o, BinaryWriter ds, BooleanStream bs)
{
if (!bs.ReadBoolean())
return ;
byte type = o.GetDataStructureType();
- DataStreamMarshaller.WriteByte(type, ds);
+ BaseDataStreamMarshaller.WriteByte(type, ds);
if (o.IsMarshallAware() && bs.ReadBoolean())
{
@@ -162,32 +164,32 @@
else
{
- DataStreamMarshaller dsm = (DataStreamMarshaller) dataMarshallers[type & 0xFF];
+ BaseDataStreamMarshaller dsm = (BaseDataStreamMarshaller) dataMarshallers[type & 0xFF];
if (dsm == null)
throw new IOException("Unknown data type: " + type);
- dsm.Marshal2(this, o, ds, bs);
+ dsm.TightMarshal2(this, o, ds, bs);
}
}
- public DataStructure UnmarshalNestedObject(BinaryReader dis, BooleanStream bs)
+ public DataStructure TightUnmarshalNestedObject(BinaryReader dis, BooleanStream bs)
{
if (bs.ReadBoolean())
{
- byte dataType = DataStreamMarshaller.ReadByte(dis);
- DataStreamMarshaller dsm = (DataStreamMarshaller) dataMarshallers[dataType & 0xFF];
+ byte dataType = BaseDataStreamMarshaller.ReadByte(dis);
+ BaseDataStreamMarshaller dsm = (BaseDataStreamMarshaller) dataMarshallers[dataType & 0xFF];
if (dsm == null)
throw new IOException("Unknown data type: " + dataType);
DataStructure data = dsm.CreateObject();
if (data.IsMarshallAware() && bs.ReadBoolean())
{
- DataStreamMarshaller.ReadInt(dis);
- DataStreamMarshaller.ReadByte(dis);
+ BaseDataStreamMarshaller.ReadInt(dis);
+ BaseDataStreamMarshaller.ReadByte(dis);
BooleanStream bs2 = new BooleanStream();
bs2.Unmarshal(dis);
- dsm.Unmarshal(this, data, dis, bs2);
+ dsm.TightUnmarshal(this, data, dis, bs2);
// TODO: extract the sequence from the dis and associate it.
// MarshallAware ma = (MarshallAware)data
@@ -195,7 +197,7 @@
}
else
{
- dsm.Unmarshal(this, data, dis, bs);
+ dsm.TightUnmarshal(this, data, dis, bs);
}
return data;
Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/PrimitiveMap.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/PrimitiveMap.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/PrimitiveMap.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/PrimitiveMap.cs Tue Feb 28 22:29:45 2006
@@ -37,13 +37,13 @@
public static PrimitiveMap Unmarshal(byte[] data)
{
PrimitiveMap answer = new PrimitiveMap();
- answer.dictionary = DataStreamMarshaller.UnmarshalPrimitiveMap(data);
+ answer.dictionary = BaseDataStreamMarshaller.UnmarshalPrimitiveMap(data);
return answer;
}
public byte[] Marshal()
{
- return DataStreamMarshaller.MarshalPrimitiveMap(dictionary);
+ return BaseDataStreamMarshaller.MarshalPrimitiveMap(dictionary);
}
Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQBytesMessageMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQBytesMessageMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQBytesMessageMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQBytesMessageMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,9 +51,9 @@
//
// Un-marshal an object instance from the data input stream
//
- public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
+ public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
{
- base.Unmarshal(wireFormat, o, dataIn, bs);
+ base.TightUnmarshal(wireFormat, o, dataIn, bs);
}
@@ -61,10 +61,10 @@
//
// Write the booleans that this object uses to a BooleanStream
//
- public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+ public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
ActiveMQBytesMessage info = (ActiveMQBytesMessage)o;
- int rc = base.Marshal1(wireFormat, info, bs);
+ int rc = base.TightMarshal1(wireFormat, info, bs);
return rc + 0;
}
@@ -72,8 +72,8 @@
//
// Write a object instance to data output stream
//
- public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
- base.Marshal2(wireFormat, o, dataOut, bs);
+ public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+ base.TightMarshal2(wireFormat, o, dataOut, bs);
}
}
Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQDestinationMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQDestinationMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQDestinationMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQDestinationMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -34,18 +34,18 @@
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
- public abstract class ActiveMQDestinationMarshaller : DataStreamMarshaller
+ public abstract class ActiveMQDestinationMarshaller : BaseDataStreamMarshaller
{
//
// Un-marshal an object instance from the data input stream
//
- public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
+ public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
{
- base.Unmarshal(wireFormat, o, dataIn, bs);
+ base.TightUnmarshal(wireFormat, o, dataIn, bs);
ActiveMQDestination info = (ActiveMQDestination)o;
- info.PhysicalName = ReadString(dataIn, bs);
+ info.PhysicalName = TightUnmarshalString(dataIn, bs);
}
@@ -53,11 +53,11 @@
//
// Write the booleans that this object uses to a BooleanStream
//
- public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+ public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
ActiveMQDestination info = (ActiveMQDestination)o;
- int rc = base.Marshal1(wireFormat, info, bs);
- rc += WriteString(info.PhysicalName, bs);
+ int rc = base.TightMarshal1(wireFormat, info, bs);
+ rc += TightMarshalString1(info.PhysicalName, bs);
return rc + 0;
}
@@ -65,11 +65,11 @@
//
// Write a object instance to data output stream
//
- public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
- base.Marshal2(wireFormat, o, dataOut, bs);
+ public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+ base.TightMarshal2(wireFormat, o, dataOut, bs);
ActiveMQDestination info = (ActiveMQDestination)o;
- WriteString(info.PhysicalName, dataOut, bs);
+ TightMarshalString2(info.PhysicalName, dataOut, bs);
}
}
Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQMapMessageMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQMapMessageMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQMapMessageMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQMapMessageMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,9 +51,9 @@
//
// Un-marshal an object instance from the data input stream
//
- public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
+ public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
{
- base.Unmarshal(wireFormat, o, dataIn, bs);
+ base.TightUnmarshal(wireFormat, o, dataIn, bs);
}
@@ -61,10 +61,10 @@
//
// Write the booleans that this object uses to a BooleanStream
//
- public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+ public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
ActiveMQMapMessage info = (ActiveMQMapMessage)o;
- int rc = base.Marshal1(wireFormat, info, bs);
+ int rc = base.TightMarshal1(wireFormat, info, bs);
return rc + 0;
}
@@ -72,8 +72,8 @@
//
// Write a object instance to data output stream
//
- public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
- base.Marshal2(wireFormat, o, dataOut, bs);
+ public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+ base.TightMarshal2(wireFormat, o, dataOut, bs);
}
}
Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQMessageMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQMessageMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQMessageMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQMessageMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,9 +51,9 @@
//
// Un-marshal an object instance from the data input stream
//
- public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
+ public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
{
- base.Unmarshal(wireFormat, o, dataIn, bs);
+ base.TightUnmarshal(wireFormat, o, dataIn, bs);
ActiveMQMessage info = (ActiveMQMessage)o;
@@ -68,12 +68,12 @@
//
// Write the booleans that this object uses to a BooleanStream
//
- public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+ public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
ActiveMQMessage info = (ActiveMQMessage)o;
info.BeforeMarshall(wireFormat);
- int rc = base.Marshal1(wireFormat, info, bs);
+ int rc = base.TightMarshal1(wireFormat, info, bs);
return rc + 0;
}
@@ -81,8 +81,8 @@
//
// Write a object instance to data output stream
//
- public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
- base.Marshal2(wireFormat, o, dataOut, bs);
+ public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+ base.TightMarshal2(wireFormat, o, dataOut, bs);
ActiveMQMessage info = (ActiveMQMessage)o;
Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQObjectMessageMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQObjectMessageMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQObjectMessageMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQObjectMessageMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,9 +51,9 @@
//
// Un-marshal an object instance from the data input stream
//
- public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
+ public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
{
- base.Unmarshal(wireFormat, o, dataIn, bs);
+ base.TightUnmarshal(wireFormat, o, dataIn, bs);
}
@@ -61,10 +61,10 @@
//
// Write the booleans that this object uses to a BooleanStream
//
- public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+ public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
ActiveMQObjectMessage info = (ActiveMQObjectMessage)o;
- int rc = base.Marshal1(wireFormat, info, bs);
+ int rc = base.TightMarshal1(wireFormat, info, bs);
return rc + 0;
}
@@ -72,8 +72,8 @@
//
// Write a object instance to data output stream
//
- public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
- base.Marshal2(wireFormat, o, dataOut, bs);
+ public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+ base.TightMarshal2(wireFormat, o, dataOut, bs);
}
}
Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQQueueMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQQueueMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQQueueMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQQueueMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,9 +51,9 @@
//
// Un-marshal an object instance from the data input stream
//
- public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
+ public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
{
- base.Unmarshal(wireFormat, o, dataIn, bs);
+ base.TightUnmarshal(wireFormat, o, dataIn, bs);
}
@@ -61,10 +61,10 @@
//
// Write the booleans that this object uses to a BooleanStream
//
- public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+ public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
ActiveMQQueue info = (ActiveMQQueue)o;
- int rc = base.Marshal1(wireFormat, info, bs);
+ int rc = base.TightMarshal1(wireFormat, info, bs);
return rc + 0;
}
@@ -72,8 +72,8 @@
//
// Write a object instance to data output stream
//
- public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
- base.Marshal2(wireFormat, o, dataOut, bs);
+ public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+ base.TightMarshal2(wireFormat, o, dataOut, bs);
}
}