activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r381926 [5/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...
Date Wed, 01 Mar 2006 06:29:57 GMT
Modified: incubator/activemq/trunk/openwire-c/openwire.xcodeproj/project.pbxproj
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-c/openwire.xcodeproj/project.pbxproj?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/openwire.xcodeproj/project.pbxproj (original)
+++ incubator/activemq/trunk/openwire-c/openwire.xcodeproj/project.pbxproj Tue Feb 28 22:29:45 2006
@@ -381,6 +381,7 @@
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../apr/lib\"";
 				LIBRARY_STYLE = DYNAMIC;
+				MACH_O_TYPE = mh_dylib;
 				OPTIMIZATION_CFLAGS = "-O0";
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "";
@@ -407,6 +408,7 @@
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../apr/lib\"";
 				LIBRARY_STYLE = DYNAMIC;
+				MACH_O_TYPE = mh_dylib;
 				OPTIMIZATION_CFLAGS = "-O0";
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "";
@@ -432,6 +434,7 @@
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../apr/lib\"";
 				LIBRARY_STYLE = DYNAMIC;
+				MACH_O_TYPE = mh_dylib;
 				OPTIMIZATION_CFLAGS = "-O0";
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "";
@@ -458,6 +461,7 @@
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../apr/lib\"";
 				LIBRARY_STYLE = DYNAMIC;
+				MACH_O_TYPE = mh_dylib;
 				OPTIMIZATION_CFLAGS = "-O0";
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "";
@@ -484,6 +488,7 @@
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../apr/lib\"";
 				LIBRARY_STYLE = DYNAMIC;
+				MACH_O_TYPE = mh_dylib;
 				OPTIMIZATION_CFLAGS = "-O0";
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "";
@@ -509,6 +514,7 @@
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../apr/lib\"";
 				LIBRARY_STYLE = DYNAMIC;
+				MACH_O_TYPE = mh_dylib;
 				OPTIMIZATION_CFLAGS = "-O0";
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "";
@@ -630,6 +636,7 @@
 				53C445C808E4A3CB006387E9 /* Default */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
 		};
 		53C445D708E4A6F4006387E9 /* Build configuration list for PBXNativeTarget "activemq" */ = {
 			isa = XCConfigurationList;
@@ -639,6 +646,7 @@
 				53C445DA08E4A6F4006387E9 /* Default */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
 		};
 		53C445DB08E4A6F4006387E9 /* Build configuration list for PBXNativeTarget "main" */ = {
 			isa = XCConfigurationList;
@@ -648,6 +656,7 @@
 				53C445DE08E4A6F4006387E9 /* Default */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
 		};
 		53D4A41D08A8931000CAE09B /* Build configuration list for PBXProject "openwire" */ = {
 			isa = XCConfigurationList;

Modified: incubator/activemq/trunk/openwire-c/src/libactivemq/amqcs.c
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-c/src/libactivemq/amqcs.c?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/src/libactivemq/amqcs.c (original)
+++ incubator/activemq/trunk/openwire-c/src/libactivemq/amqcs.c Tue Feb 28 22:29:45 2006
@@ -94,23 +94,27 @@
             );
    
    rc = ow_ConnectionId_create(pool);   
-   rc->connectionId = ow_string_create_from_cstring(pool, buff);   
+   rc->value = ow_string_create_from_cstring(pool, buff);   
    return rc;
 }
 
 ow_ProducerId *create_ProducerId(amqcs_connection *connection, apr_pool_t *pool) {   
    ow_ProducerId *rc;
    rc = ow_ProducerId_create(pool);   
-   rc->connectionId = connection->info->connectionId->connectionId;
+   rc->connectionId = connection->info->connectionId->value;
    rc->sessionId = -1;
-   rc->producerId = 1;
+   rc->value = 1;
    return rc;
 }
 
 ow_WireFormatInfo *create_WireFormatInfo(apr_pool_t *pool) {
    ow_WireFormatInfo *info = ow_WireFormatInfo_create(pool);
    info->version = OW_WIREFORMAT_VERSION;
-   info->options = 0;
+   info->cacheEnabled = 0;
+   info->prefixPacketSize = 1;
+   info->tightEncodingEnabled = 1;
+   info->stackTraceEnabled = 0;
+   info->tcpNoDelayEnabled = 0;
    info->magic = ow_byte_array_create_with_data(pool, 8, ACTIVEMQ_MAGIC);
    return info;
 }
@@ -165,6 +169,9 @@
       connection->info->connectionId = create_ConnectionId(connection, pool);
       if( strlen(options->clientId)>0 ) {
          connection->info->clientId = ow_string_create_from_cstring(pool, options->clientId);
+      } else {
+         strncpy(options->clientId, connection->info->connectionId->value, sizeof(options->clientId));
+         connection->info->clientId = connection->info->connectionId->value;
       }
       if( strlen(options->userId)>0 ) {
          connection->info->userName = ow_string_create_from_cstring(pool, options->userId);

Modified: incubator/activemq/trunk/openwire-c/src/libopenwire/ow_command_types_v1.h
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-c/src/libopenwire/ow_command_types_v1.h?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/src/libopenwire/ow_command_types_v1.h (original)
+++ incubator/activemq/trunk/openwire-c/src/libopenwire/ow_command_types_v1.h Tue Feb 28 22:29:45 2006
@@ -44,7 +44,8 @@
 #define OW_REDELIVERYPOLICY_TYPE           13
 #define OW_CONTROLCOMMAND_TYPE             14
 #define OW_FLUSHCOMMAND_TYPE               15
-
+#define OW_CONNECTIONERROR_TYPE            16   
+   
 #define OW_MESSAGEDISPATCH_TYPE            21
 #define OW_MESSAGEACK_TYPE                 22
 
@@ -61,6 +62,8 @@
 #define OW_DATAARRAYRESPONSE_TYPE          33
 #define OW_INTEGERRESPONSE_TYPE            34  
 
+#define OW_DISCOVERYEVENT_TYPE             40
+
 #define OW_JOURNALTOPICACK_TYPE            50
 #define OW_JOURNALADD_TYPE                 51
 #define OW_JOURNALQUEUEACK_TYPE            52
@@ -79,6 +82,7 @@
 #define OW_BOOLEAN_TYPE                    78
 #define OW_BYTE_ARRAY_TYPE                 79
    
+#define OW_MESSAGEDISPATCHNOTIFICATION_TYPE 90
       
 #define OW_ACTIVEMQQUEUE_TYPE              100
 #define OW_ACTIVEMQTOPIC_TYPE              101

Modified: incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c (original)
+++ incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c Tue Feb 28 22:29:45 2006
@@ -669,7 +669,7 @@
 
 apr_status_t ow_marshal1_JournalQueueAck(ow_bit_buffer *buffer, ow_JournalQueueAck *object)
 {
-   ow_marshal1_DataStructureSupport(buffer, (ow_DataStructureSupport*)object);
+   ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
    SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->destination));
    SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->messageAck));
    
@@ -677,7 +677,7 @@
 }
 apr_status_t ow_marshal2_JournalQueueAck(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_JournalQueueAck *object)
 {
-   ow_marshal2_DataStructureSupport(buffer, bitbuffer, (ow_DataStructureSupport*)object);   
+   ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
    SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->destination));
    SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->messageAck));
    
@@ -686,7 +686,7 @@
 
 apr_status_t ow_unmarshal_JournalQueueAck(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_JournalQueueAck *object, apr_pool_t *pool)
 {
-   ow_unmarshal_DataStructureSupport(buffer, bitbuffer, (ow_DataStructureSupport*)object, pool);   
+   ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
    SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool));
    SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->messageAck, pool));
    
@@ -721,9 +721,10 @@
    
    
    ow_bit_buffer_append(buffer, object->cacheEnabled);
-   ow_bit_buffer_append(buffer, object->compressionEnabled);
    ow_bit_buffer_append(buffer, object->stackTraceEnabled);
    ow_bit_buffer_append(buffer, object->tcpNoDelayEnabled);
+   ow_bit_buffer_append(buffer, object->prefixPacketSize);
+   ow_bit_buffer_append(buffer, object->tightEncodingEnabled);
    
 	return APR_SUCCESS;
 }
@@ -736,6 +737,7 @@
    ow_bit_buffer_read(bitbuffer);
    ow_bit_buffer_read(bitbuffer);
    ow_bit_buffer_read(bitbuffer);
+   ow_bit_buffer_read(bitbuffer);
    
 	return APR_SUCCESS;
 }
@@ -746,9 +748,10 @@
    SUCCESS_CHECK(ow_unmarshal_byte_array_const_size(buffer, &object->magic, 8, pool));
    SUCCESS_CHECK(ow_byte_array_read_int(buffer, &object->version));
    object->cacheEnabled = ow_bit_buffer_read(bitbuffer);
-   object->compressionEnabled = ow_bit_buffer_read(bitbuffer);
    object->stackTraceEnabled = ow_bit_buffer_read(bitbuffer);
    object->tcpNoDelayEnabled = ow_bit_buffer_read(bitbuffer);
+   object->prefixPacketSize = ow_bit_buffer_read(bitbuffer);
+   object->tightEncodingEnabled = ow_bit_buffer_read(bitbuffer);
    
 	return APR_SUCCESS;
 }
@@ -1222,20 +1225,20 @@
 
 apr_status_t ow_marshal1_KeepAliveInfo(ow_bit_buffer *buffer, ow_KeepAliveInfo *object)
 {
-   ow_marshal1_DataStructureSupport(buffer, (ow_DataStructureSupport*)object);
+   ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
    
 	return APR_SUCCESS;
 }
 apr_status_t ow_marshal2_KeepAliveInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_KeepAliveInfo *object)
 {
-   ow_marshal2_DataStructureSupport(buffer, bitbuffer, (ow_DataStructureSupport*)object);   
+   ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
    
 	return APR_SUCCESS;
 }
 
 apr_status_t ow_unmarshal_KeepAliveInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_KeepAliveInfo *object, apr_pool_t *pool)
 {
-   ow_unmarshal_DataStructureSupport(buffer, bitbuffer, (ow_DataStructureSupport*)object, pool);   
+   ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
    
 	return APR_SUCCESS;
 }
@@ -1396,7 +1399,7 @@
 
 apr_status_t ow_marshal1_BaseCommand(ow_bit_buffer *buffer, ow_BaseCommand *object)
 {
-   ow_marshal1_DataStructureSupport(buffer, (ow_DataStructureSupport*)object);
+   ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
    
    ow_bit_buffer_append(buffer, object->responseRequired);
    
@@ -1404,7 +1407,7 @@
 }
 apr_status_t ow_marshal2_BaseCommand(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_BaseCommand *object)
 {
-   ow_marshal2_DataStructureSupport(buffer, bitbuffer, (ow_DataStructureSupport*)object);   
+   ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
    SUCCESS_CHECK(ow_byte_buffer_append_short(buffer, object->commandId));
    ow_bit_buffer_read(bitbuffer);
    
@@ -1413,7 +1416,7 @@
 
 apr_status_t ow_unmarshal_BaseCommand(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_BaseCommand *object, apr_pool_t *pool)
 {
-   ow_unmarshal_DataStructureSupport(buffer, bitbuffer, (ow_DataStructureSupport*)object, pool);   
+   ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
    SUCCESS_CHECK(ow_byte_array_read_short(buffer, &object->commandId));
    object->responseRequired = ow_bit_buffer_read(bitbuffer);
    
@@ -1499,14 +1502,14 @@
 
 apr_status_t ow_marshal1_JournalTrace(ow_bit_buffer *buffer, ow_JournalTrace *object)
 {
-   ow_marshal1_DataStructureSupport(buffer, (ow_DataStructureSupport*)object);
+   ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
    ow_marshal1_string(buffer, object->message);
    
 	return APR_SUCCESS;
 }
 apr_status_t ow_marshal2_JournalTrace(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_JournalTrace *object)
 {
-   ow_marshal2_DataStructureSupport(buffer, bitbuffer, (ow_DataStructureSupport*)object);   
+   ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
    SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->message));
    
 	return APR_SUCCESS;
@@ -1514,7 +1517,7 @@
 
 apr_status_t ow_unmarshal_JournalTrace(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_JournalTrace *object, apr_pool_t *pool)
 {
-   ow_unmarshal_DataStructureSupport(buffer, bitbuffer, (ow_DataStructureSupport*)object, pool);   
+   ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
    SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->message, pool));
    
 	return APR_SUCCESS;
@@ -1670,7 +1673,7 @@
 
 apr_status_t ow_marshal1_JournalTopicAck(ow_bit_buffer *buffer, ow_JournalTopicAck *object)
 {
-   ow_marshal1_DataStructureSupport(buffer, (ow_DataStructureSupport*)object);
+   ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
    SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->destination));
    SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->messageId));
    ow_marshal1_long(buffer, object->messageSequenceId);
@@ -1682,7 +1685,7 @@
 }
 apr_status_t ow_marshal2_JournalTopicAck(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_JournalTopicAck *object)
 {
-   ow_marshal2_DataStructureSupport(buffer, bitbuffer, (ow_DataStructureSupport*)object);   
+   ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
    SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->destination));
    SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->messageId));
    SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->messageSequenceId));
@@ -1695,7 +1698,7 @@
 
 apr_status_t ow_unmarshal_JournalTopicAck(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_JournalTopicAck *object, apr_pool_t *pool)
 {
-   ow_unmarshal_DataStructureSupport(buffer, bitbuffer, (ow_DataStructureSupport*)object, pool);   
+   ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
    SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool));
    SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->messageId, pool));
    SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->messageSequenceId, pool));
@@ -2250,14 +2253,14 @@
 
 apr_status_t ow_marshal1_ActiveMQDestination(ow_bit_buffer *buffer, ow_ActiveMQDestination *object)
 {
-   ow_marshal1_JNDIBaseStorable(buffer, (ow_JNDIBaseStorable*)object);
+   ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
    ow_marshal1_string(buffer, object->physicalName);
    
 	return APR_SUCCESS;
 }
 apr_status_t ow_marshal2_ActiveMQDestination(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQDestination *object)
 {
-   ow_marshal2_JNDIBaseStorable(buffer, bitbuffer, (ow_JNDIBaseStorable*)object);   
+   ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
    SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->physicalName));
    
 	return APR_SUCCESS;
@@ -2265,7 +2268,7 @@
 
 apr_status_t ow_unmarshal_ActiveMQDestination(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQDestination *object, apr_pool_t *pool)
 {
-   ow_unmarshal_JNDIBaseStorable(buffer, bitbuffer, (ow_JNDIBaseStorable*)object, pool);   
+   ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
    SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->physicalName, pool));
    
 	return APR_SUCCESS;
@@ -2451,7 +2454,7 @@
 
 apr_status_t ow_marshal1_JournalTransaction(ow_bit_buffer *buffer, ow_JournalTransaction *object)
 {
-   ow_marshal1_DataStructureSupport(buffer, (ow_DataStructureSupport*)object);
+   ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object);
    SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->transactionId));
    
    ow_bit_buffer_append(buffer, object->wasPrepared);
@@ -2460,7 +2463,7 @@
 }
 apr_status_t ow_marshal2_JournalTransaction(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_JournalTransaction *object)
 {
-   ow_marshal2_DataStructureSupport(buffer, bitbuffer, (ow_DataStructureSupport*)object);   
+   ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object);   
    SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->transactionId));
    SUCCESS_CHECK(ow_byte_buffer_append_byte(buffer, object->type));
    ow_bit_buffer_read(bitbuffer);
@@ -2470,7 +2473,7 @@
 
 apr_status_t ow_unmarshal_JournalTransaction(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_JournalTransaction *object, apr_pool_t *pool)
 {
-   ow_unmarshal_DataStructureSupport(buffer, bitbuffer, (ow_DataStructureSupport*)object, pool);   
+   ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool);   
    SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->transactionId, pool));
    SUCCESS_CHECK(ow_byte_array_read_byte(buffer, &object->type));
    object->wasPrepared = ow_bit_buffer_read(bitbuffer);

Modified: incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h (original)
+++ incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h Tue Feb 28 22:29:45 2006
@@ -228,9 +228,10 @@
    ow_byte_array *magic;
    ow_int version;
    ow_boolean cacheEnabled;
-   ow_boolean compressionEnabled;
    ow_boolean stackTraceEnabled;
    ow_boolean tcpNoDelayEnabled;
+   ow_boolean prefixPacketSize;
+   ow_boolean tightEncodingEnabled;
 
 } ow_WireFormatInfo;
 ow_WireFormatInfo *ow_WireFormatInfo_create(apr_pool_t *pool);

Modified: incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.cpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.cpp Tue Feb 28 22:29:45 2006
@@ -1,47 +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/BrokerId.hpp"
 
 using namespace apache::activemq::client::command;
 
 /*
  *
+ *  Marshalling code for Open Wire Format for BrokerId
+ *
+ *
+ *  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
+ *
  */
 BrokerId::BrokerId()
 {
-    value = new string() ;
+    this->value = NULL ;
 }
 
 BrokerId::~BrokerId()
 {
-    // no-op
-}
-
-int BrokerId::getCommandType()
-{
-    return BrokerId::TYPE ;
 }
 
+        
 p<string> BrokerId::getValue()
 {
     return value ;
 }
 
-void BrokerId::setValue(const char* brokerId)
+void BrokerId::setValue(p<string> value)
 {
-    this->value->assign( brokerId ) ;
+    this->value = value ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.hpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.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 BrokerId_hpp_
 #define BrokerId_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,10 +39,17 @@
       namespace command
       {
         using namespace ifr;
-        using namespace std ;
+        using namespace apache::activemq::client;
 
 /*
  *
+ *  Marshalling code for Open Wire Format for BrokerId
+ *
+ *
+ *  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 BrokerId : public AbstractCommand
 {
@@ -41,15 +57,17 @@
     p<string> value ;
 
 public:
-    const static char TYPE = 124 ;
+    const static int TYPE = 124;
 
 public:
     BrokerId() ;
     virtual ~BrokerId() ;
 
-    virtual int getCommandType() ;
+
     virtual p<string> getValue() ;
-    virtual void setValue(const char* brokerId) ;
+    virtual void setValue(p<string> value) ;
+
+
 } ;
 
 /* namespace */
@@ -58,4 +76,4 @@
   }
 }
 
-#endif /*BrokerId_hpp_*/
\ No newline at end of file
+#endif /*BrokerId_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.cpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.cpp Tue Feb 28 22:29:45 2006
@@ -1,80 +1,97 @@
 /*
- * 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/BrokerInfo.hpp"
 
 using namespace apache::activemq::client::command;
 
 /*
  *
+ *  Marshalling code for Open Wire Format for BrokerInfo
+ *
+ *
+ *  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
+ *
  */
 BrokerInfo::BrokerInfo()
 {
-    brokerId   = NULL ;
-    brokerURL  = new string() ;
-    brokerName = new string() ;
-    peerInfos  = NULL ;
+    this->brokerId = NULL ;
+    this->brokerURL = NULL ;
+    this->peerBrokerInfos = NULL ;
+    this->brokerName = NULL ;
+    this->slaveBroker = NULL ;
 }
 
 BrokerInfo::~BrokerInfo()
 {
-    // no-op
 }
 
-int BrokerInfo::getCommandType()
+        
+p<BrokerId> BrokerInfo::getBrokerId()
 {
-    return BrokerInfo::TYPE ;
+    return brokerId ;
 }
 
-p<string> BrokerInfo::getBrokerName()
+void BrokerInfo::setBrokerId(p<BrokerId> brokerId)
 {
-    return brokerName ;
+    this->brokerId = brokerId ;
 }
 
-void BrokerInfo::setBrokerName(const char* name)
+        
+p<string> BrokerInfo::getBrokerURL()
 {
-    brokerName->assign(name) ;
+    return brokerURL ;
 }
 
-p<BrokerId> BrokerInfo::getBrokerId()
+void BrokerInfo::setBrokerURL(p<string> brokerURL)
 {
-    return brokerId ;
+    this->brokerURL = brokerURL ;
 }
 
-void BrokerInfo::setBrokerId(p<BrokerId> brokerId)
+        
+BrokerInfo[] BrokerInfo::getPeerBrokerInfos()
 {
-    this->brokerId = brokerId ;
+    return peerBrokerInfos ;
 }
 
-p<string> BrokerInfo::getBrokerURL()
+void BrokerInfo::setPeerBrokerInfos(BrokerInfo[] peerBrokerInfos)
 {
-    return brokerURL ;
+    this->peerBrokerInfos = peerBrokerInfos ;
+}
+
+        
+p<string> BrokerInfo::getBrokerName()
+{
+    return brokerName ;
 }
 
-void BrokerInfo::setBrokerURL(const char* url)
+void BrokerInfo::setBrokerName(p<string> brokerName)
 {
-    this->brokerURL->assign(url) ;
+    this->brokerName = brokerName ;
 }
 
-ap<BrokerInfo> BrokerInfo::getPeerBrokerInfo()
+        
+bool BrokerInfo::getSlaveBroker()
 {
-    return peerInfos ;
+    return slaveBroker ;
 }
 
-void BrokerInfo::setPeerBrokerInfo(ap<BrokerInfo> info)
+void BrokerInfo::setSlaveBroker(bool slaveBroker)
 {
-    peerInfos = info ;
+    this->slaveBroker = slaveBroker ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.hpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.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 BrokerInfo_hpp_
 #define BrokerInfo_hpp_
 
 #include <string>
+
+/* we could cut this down  - for now include all possible headers */
 #include "command/BaseCommand.hpp"
 #include "command/BrokerId.hpp"
-#include "util/ifr/ap"
+#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
@@ -32,35 +39,51 @@
       namespace command
       {
         using namespace ifr;
-        using namespace std;
+        using namespace apache::activemq::client;
 
 /*
  *
+ *  Marshalling code for Open Wire Format for BrokerInfo
+ *
+ *
+ *  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 BrokerInfo : public BaseCommand
 {
 private:
-    p<BrokerId>    brokerId ;
-    p<string>      brokerURL,
-                   brokerName ;
-    ap<BrokerInfo> peerInfos ;
+    p<BrokerId> brokerId ;
+    p<string> brokerURL ;
+    BrokerInfo[] peerBrokerInfos ;
+    p<string> brokerName ;
+    bool slaveBroker ;
 
 public:
-    const static char TYPE = 2 ;
+    const static int TYPE = 2;
 
 public:
     BrokerInfo() ;
     virtual ~BrokerInfo() ;
 
-    virtual int getCommandType() ;
-    virtual p<string> getBrokerName() ;
-    virtual void setBrokerName(const char* name) ;
+
     virtual p<BrokerId> getBrokerId() ;
-    virtual void setBrokerId(p<BrokerId> id) ;
+    virtual void setBrokerId(p<BrokerId> brokerId) ;
+
     virtual p<string> getBrokerURL() ;
-    virtual void setBrokerURL(const char* url) ;
-    virtual ap<BrokerInfo> getPeerBrokerInfo() ;
-    virtual void setPeerBrokerInfo(ap<BrokerInfo> info) ;
+    virtual void setBrokerURL(p<string> brokerURL) ;
+
+    virtual BrokerInfo[] getPeerBrokerInfos() ;
+    virtual void setPeerBrokerInfos(BrokerInfo[] peerBrokerInfos) ;
+
+    virtual p<string> getBrokerName() ;
+    virtual void setBrokerName(p<string> brokerName) ;
+
+    virtual bool getSlaveBroker() ;
+    virtual void setSlaveBroker(bool slaveBroker) ;
+
+
 } ;
 
 /* namespace */
@@ -69,4 +92,4 @@
   }
 }
 
-#endif /*BrokerInfo_hpp_*/
\ No newline at end of file
+#endif /*BrokerInfo_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.cpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.cpp Tue Feb 28 22:29:45 2006
@@ -1,46 +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/ConnectionId.hpp"
 
 using namespace apache::activemq::client::command;
 
 /*
- * Dummy, should be auto-generated
+ *
+ *  Marshalling code for Open Wire Format for ConnectionId
+ *
+ *
+ *  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
+ *
  */
 ConnectionId::ConnectionId()
 {
-    value = new string() ;
+    this->value = NULL ;
 }
 
 ConnectionId::~ConnectionId()
 {
 }
 
-int ConnectionId::getCommandType()
-{
-    return ConnectionId::TYPE ;
-}
-
-void ConnectionId::setValue(const char* value)
+        
+p<string> ConnectionId::getValue()
 {
-    this->value->assign(value) ;
+    return value ;
 }
 
-p<string> ConnectionId::getValue()
+void ConnectionId::setValue(p<string> value)
 {
-    return value ;
+    this->value = value ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.hpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.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 ConnectionId_hpp_
 #define ConnectionId_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,25 +39,35 @@
       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 ConnectionId
+ *
+ *
+ *  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 ConnectionId : public AbstractCommand
 {
 private:
     p<string> value ;
 
-    const static int TYPE = 120 ;
+public:
+    const static int TYPE = 120;
 
 public:
     ConnectionId() ;
     virtual ~ConnectionId() ;
 
-    virtual int getCommandType() ;
-    virtual void setValue(const char* value) ;
+
     virtual p<string> getValue() ;
+    virtual void setValue(p<string> value) ;
+
+
 } ;
 
 /* namespace */

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.cpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.cpp Tue Feb 28 22:29:45 2006
@@ -1,39 +1,47 @@
 /*
- * 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/ConnectionInfo.hpp"
 
 using namespace apache::activemq::client::command;
 
 /*
- * Dummy, should be auto-generated
+ *
+ *  Marshalling code for Open Wire Format for ConnectionInfo
+ *
+ *
+ *  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
+ *
  */
 ConnectionInfo::ConnectionInfo()
 {
-    connectionId = NULL ;
-    brokerPath   = NULL ;
-    username     = new string() ;
-    password     = new string() ;
-    clientId     = new string() ;
+    this->connectionId = NULL ;
+    this->clientId = NULL ;
+    this->password = NULL ;
+    this->userName = NULL ;
+    this->brokerPath = NULL ;
 }
 
 ConnectionInfo::~ConnectionInfo()
 {
 }
 
+        
 p<ConnectionId> ConnectionInfo::getConnectionId()
 {
     return connectionId ;
@@ -44,42 +52,46 @@
     this->connectionId = connectionId ;
 }
 
-p<string> ConnectionInfo::getUsername()
+        
+p<string> ConnectionInfo::getClientId()
 {
-    return this->username ;
+    return clientId ;
 }
 
-void ConnectionInfo::setUsername(const char* username)
+void ConnectionInfo::setClientId(p<string> clientId)
 {
-    this->username->assign( username ) ;
+    this->clientId = clientId ;
 }
 
+        
 p<string> ConnectionInfo::getPassword()
 {
-    return this->password ;
+    return password ;
 }
 
-void ConnectionInfo::setPassword(const char* password)
+void ConnectionInfo::setPassword(p<string> password)
 {
-    this->password->assign( password ) ;
+    this->password = password ;
 }
 
-p<string> ConnectionInfo::getClientId()
+        
+p<string> ConnectionInfo::getUserName()
 {
-    return this->clientId ;
+    return userName ;
 }
 
-void ConnectionInfo::setClientId(const char* clientId)
+void ConnectionInfo::setUserName(p<string> userName)
 {
-    this->clientId->assign( clientId ) ;
+    this->userName = userName ;
 }
 
-p<BrokerId*> ConnectionInfo::getBrokerPath()
+        
+BrokerId[] ConnectionInfo::getBrokerPath()
 {
-    return this->brokerPath ;
+    return brokerPath ;
 }
 
-void ConnectionInfo::setBrokerPath(p<BrokerId*> brokerPath)
+void ConnectionInfo::setBrokerPath(BrokerId[] brokerPath)
 {
     this->brokerPath = brokerPath ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.hpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.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 ConnectionInfo_hpp_
 #define ConnectionInfo_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
@@ -32,36 +39,51 @@
       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 ConnectionInfo
+ *
+ *
+ *  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 ConnectionInfo : public BaseCommand
 {
 private:
     p<ConnectionId> connectionId ;
-    p<BrokerId*>    brokerPath ;
-    p<string>       username,
-                    password,
-                    clientId ;
+    p<string> clientId ;
+    p<string> password ;
+    p<string> userName ;
+    BrokerId[] brokerPath ;
+
 public:
-    const static int TYPE = 3 ;
+    const static int TYPE = 3;
 
 public:
     ConnectionInfo() ;
     virtual ~ConnectionInfo() ;
 
+
     virtual p<ConnectionId> getConnectionId() ;
     virtual void setConnectionId(p<ConnectionId> connectionId) ;
-    virtual p<string> getUsername() ;
-    virtual void setUsername(const char* username) ;
-    virtual p<string> getPassword() ;
-    virtual void setPassword(const char* password) ;
+
     virtual p<string> getClientId() ;
-    virtual void setClientId(const char* clientId) ;
-    virtual p<BrokerId*> getBrokerPath() ;
-    virtual void setBrokerPath(p<BrokerId*> brokerPath) ;
+    virtual void setClientId(p<string> clientId) ;
+
+    virtual p<string> getPassword() ;
+    virtual void setPassword(p<string> password) ;
+
+    virtual p<string> getUserName() ;
+    virtual void setUserName(p<string> userName) ;
+
+    virtual BrokerId[] getBrokerPath() ;
+    virtual void setBrokerPath(BrokerId[] brokerPath) ;
+
+
 } ;
 
 /* namespace */

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.cpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.cpp Tue Feb 28 22:29:45 2006
@@ -1,48 +1,59 @@
 /*
- * 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/ConsumerId.hpp"
 
 using namespace apache::activemq::client::command;
 
 /*
- * Dummy, should be auto-generated
+ *
+ *  Marshalling code for Open Wire Format for ConsumerId
+ *
+ *
+ *  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
+ *
  */
 ConsumerId::ConsumerId()
 {
-    connectionId = new string() ;
+    this->connectionId = NULL ;
+    this->sessionId = NULL ;
+    this->value = NULL ;
 }
 
 ConsumerId::~ConsumerId()
 {
 }
 
-int ConsumerId::getCommandType()
+        
+p<string> ConsumerId::getConnectionId()
 {
-    return ConsumerId::TYPE ;
+    return connectionId ;
 }
 
-void ConsumerId::setValue(long consumerId)
+void ConsumerId::setConnectionId(p<string> connectionId)
 {
-    this->consumerId = consumerId ;
+    this->connectionId = connectionId ;
 }
 
-long ConsumerId::getValue()
+        
+long ConsumerId::getSessionId()
 {
-    return consumerId ;
+    return sessionId ;
 }
 
 void ConsumerId::setSessionId(long sessionId)
@@ -50,17 +61,13 @@
     this->sessionId = sessionId ;
 }
 
-long ConsumerId::getSessionId()
-{
-    return sessionId ;
-}
-
-void ConsumerId::setConnectionId(const char* connectionId)
+        
+long ConsumerId::getValue()
 {
-    this->connectionId->assign( connectionId ) ;
+    return value ;
 }
 
-p<string> ConsumerId::getConnectionId()
+void ConsumerId::setValue(long value)
 {
-    return connectionId ;
+    this->value = value ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.hpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.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 ConsumerId_hpp_
 #define ConsumerId_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 ConsumerId
+ *
+ *
+ *  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 ConsumerId : public AbstractCommand
 {
 private:
     p<string> connectionId ;
-    long      sessionId,
-              consumerId ;
+    long sessionId ;
+    long value ;
 
-    const static int TYPE = 122 ;
+public:
+    const static int TYPE = 122;
 
 public:
     ConsumerId() ;
     virtual ~ConsumerId() ;
 
-    virtual int getCommandType() ;
-    virtual void setValue(long consumerId) ;
-    virtual long getValue() ;
-    virtual void setSessionId(long sessionId) ;
-    virtual long getSessionId() ;
-    virtual void setConnectionId(const char* connectionId) ;
+
     virtual p<string> getConnectionId() ;
+    virtual void setConnectionId(p<string> connectionId) ;
+
+    virtual long getSessionId() ;
+    virtual void setSessionId(long sessionId) ;
+
+    virtual long getValue() ;
+    virtual void setValue(long value) ;
+
+
 } ;
 
 /* namespace */

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.cpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.cpp Tue Feb 28 22:29:45 2006
@@ -1,40 +1,55 @@
 /*
- * 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/ConsumerInfo.hpp"
 
 using namespace apache::activemq::client::command;
 
 /*
- * Dummy, should be auto-generated
+ *
+ *  Marshalling code for Open Wire Format for ConsumerInfo
+ *
+ *
+ *  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
+ *
  */
 ConsumerInfo::ConsumerInfo()
 {
-    consumerId = NULL ;
-}
-
-ConsumerInfo::ConsumerInfo(const char* name)
-{
-    consumerId = NULL ;
+    this->consumerId = NULL ;
+    this->browser = NULL ;
+    this->destination = NULL ;
+    this->prefetchSize = NULL ;
+    this->dispatchAsync = NULL ;
+    this->selector = NULL ;
+    this->subcriptionName = NULL ;
+    this->noLocal = NULL ;
+    this->exclusive = NULL ;
+    this->retroactive = NULL ;
+    this->priority = NULL ;
+    this->brokerPath = NULL ;
+    this->networkSubscription = NULL ;
 }
 
 ConsumerInfo::~ConsumerInfo()
 {
 }
 
+        
 p<ConsumerId> ConsumerInfo::getConsumerId()
 {
     return consumerId ;
@@ -43,4 +58,136 @@
 void ConsumerInfo::setConsumerId(p<ConsumerId> consumerId)
 {
     this->consumerId = consumerId ;
+}
+
+        
+bool ConsumerInfo::getBrowser()
+{
+    return browser ;
+}
+
+void ConsumerInfo::setBrowser(bool browser)
+{
+    this->browser = browser ;
+}
+
+        
+ActiveMQDestination ConsumerInfo::getDestination()
+{
+    return destination ;
+}
+
+void ConsumerInfo::setDestination(ActiveMQDestination destination)
+{
+    this->destination = destination ;
+}
+
+        
+int ConsumerInfo::getPrefetchSize()
+{
+    return prefetchSize ;
+}
+
+void ConsumerInfo::setPrefetchSize(int prefetchSize)
+{
+    this->prefetchSize = prefetchSize ;
+}
+
+        
+bool ConsumerInfo::getDispatchAsync()
+{
+    return dispatchAsync ;
+}
+
+void ConsumerInfo::setDispatchAsync(bool dispatchAsync)
+{
+    this->dispatchAsync = dispatchAsync ;
+}
+
+        
+p<string> ConsumerInfo::getSelector()
+{
+    return selector ;
+}
+
+void ConsumerInfo::setSelector(p<string> selector)
+{
+    this->selector = selector ;
+}
+
+        
+p<string> ConsumerInfo::getSubcriptionName()
+{
+    return subcriptionName ;
+}
+
+void ConsumerInfo::setSubcriptionName(p<string> subcriptionName)
+{
+    this->subcriptionName = subcriptionName ;
+}
+
+        
+bool ConsumerInfo::getNoLocal()
+{
+    return noLocal ;
+}
+
+void ConsumerInfo::setNoLocal(bool noLocal)
+{
+    this->noLocal = noLocal ;
+}
+
+        
+bool ConsumerInfo::getExclusive()
+{
+    return exclusive ;
+}
+
+void ConsumerInfo::setExclusive(bool exclusive)
+{
+    this->exclusive = exclusive ;
+}
+
+        
+bool ConsumerInfo::getRetroactive()
+{
+    return retroactive ;
+}
+
+void ConsumerInfo::setRetroactive(bool retroactive)
+{
+    this->retroactive = retroactive ;
+}
+
+        
+byte ConsumerInfo::getPriority()
+{
+    return priority ;
+}
+
+void ConsumerInfo::setPriority(byte priority)
+{
+    this->priority = priority ;
+}
+
+        
+BrokerId[] ConsumerInfo::getBrokerPath()
+{
+    return brokerPath ;
+}
+
+void ConsumerInfo::setBrokerPath(BrokerId[] brokerPath)
+{
+    this->brokerPath = brokerPath ;
+}
+
+        
+bool ConsumerInfo::getNetworkSubscription()
+{
+    return networkSubscription ;
+}
+
+void ConsumerInfo::setNetworkSubscription(bool networkSubscription)
+{
+    this->networkSubscription = networkSubscription ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.hpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.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 ConsumerInfo_hpp_
 #define ConsumerInfo_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,25 +39,83 @@
       namespace command
       {
         using namespace ifr;
+        using namespace apache::activemq::client;
 
 /*
- * Dummy, should be auto-generated.
+ *
+ *  Marshalling code for Open Wire Format for ConsumerInfo
+ *
+ *
+ *  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 ConsumerInfo : public BaseCommand
 {
 private:
     p<ConsumerId> consumerId ;
+    bool browser ;
+    ActiveMQDestination destination ;
+    int prefetchSize ;
+    bool dispatchAsync ;
+    p<string> selector ;
+    p<string> subcriptionName ;
+    bool noLocal ;
+    bool exclusive ;
+    bool retroactive ;
+    byte priority ;
+    BrokerId[] brokerPath ;
+    bool networkSubscription ;
 
 public:
-    const static int TYPE = 5 ;
+    const static int TYPE = 5;
 
 public:
     ConsumerInfo() ;
-    ConsumerInfo(const char* name) ;
     virtual ~ConsumerInfo() ;
 
+
     virtual p<ConsumerId> getConsumerId() ;
     virtual void setConsumerId(p<ConsumerId> consumerId) ;
+
+    virtual bool getBrowser() ;
+    virtual void setBrowser(bool browser) ;
+
+    virtual ActiveMQDestination getDestination() ;
+    virtual void setDestination(ActiveMQDestination destination) ;
+
+    virtual int getPrefetchSize() ;
+    virtual void setPrefetchSize(int prefetchSize) ;
+
+    virtual bool getDispatchAsync() ;
+    virtual void setDispatchAsync(bool dispatchAsync) ;
+
+    virtual p<string> getSelector() ;
+    virtual void setSelector(p<string> selector) ;
+
+    virtual p<string> getSubcriptionName() ;
+    virtual void setSubcriptionName(p<string> subcriptionName) ;
+
+    virtual bool getNoLocal() ;
+    virtual void setNoLocal(bool noLocal) ;
+
+    virtual bool getExclusive() ;
+    virtual void setExclusive(bool exclusive) ;
+
+    virtual bool getRetroactive() ;
+    virtual void setRetroactive(bool retroactive) ;
+
+    virtual byte getPriority() ;
+    virtual void setPriority(byte priority) ;
+
+    virtual BrokerId[] getBrokerPath() ;
+    virtual void setBrokerPath(BrokerId[] brokerPath) ;
+
+    virtual bool getNetworkSubscription() ;
+    virtual void setNetworkSubscription(bool networkSubscription) ;
+
+
 } ;
 
 /* namespace */
@@ -57,4 +124,4 @@
   }
 }
 
-#endif /*ConsumerInfo_hpp_*/
\ No newline at end of file
+#endif /*ConsumerInfo_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ExceptionResponse.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ExceptionResponse.cpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ExceptionResponse.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ExceptionResponse.cpp Tue Feb 28 22:29:45 2006
@@ -1,45 +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/ExceptionResponse.hpp"
 
 using namespace apache::activemq::client::command;
 
 /*
- * 
+ *
+ *  Marshalling code for Open Wire Format for ExceptionResponse
+ *
+ *
+ *  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
+ *
  */
 ExceptionResponse::ExceptionResponse()
 {
+    this->exception = NULL ;
 }
 
 ExceptionResponse::~ExceptionResponse()
 {
 }
 
-int ExceptionResponse::getCommandType()
-{
-    return ExceptionResponse::TYPE ;
-}
-
-p<BrokerError> ExceptionResponse::getException()
+        
+BrokerError ExceptionResponse::getException()
 {
     return exception ;
 }
 
-void ExceptionResponse::setException(p<BrokerError> exception)
+void ExceptionResponse::setException(BrokerError exception)
 {
     this->exception = exception ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ExceptionResponse.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ExceptionResponse.hpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ExceptionResponse.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ExceptionResponse.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 ExceptionResponse_hpp_
 #define ExceptionResponse_hpp_
 
-#include "BrokerError.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/Response.hpp"
 #include "util/ifr/p"
 
@@ -33,24 +42,33 @@
         using namespace apache::activemq::client;
 
 /*
- * 
+ *
+ *  Marshalling code for Open Wire Format for ExceptionResponse
+ *
+ *
+ *  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 ExceptionResponse : public Response
 {
 private:
-    p<BrokerError> exception ;
+    BrokerError exception ;
 
 public:
-    static const int TYPE = 31 ;
+    const static int TYPE = 31;
 
 public:
     ExceptionResponse() ;
-    ~ExceptionResponse() ;
+    virtual ~ExceptionResponse() ;
+
+
+    virtual BrokerError getException() ;
+    virtual void setException(BrokerError exception) ;
+
 
-    virtual int getCommandType() ;
-    p<BrokerError> getException() ;
-    void setException(p<BrokerError> exception) ;
-};
+} ;
 
 /* namespace */
       }
@@ -58,4 +76,4 @@
   }
 }
 
-#endif /*ExceptionResponse_hpp_*/
\ No newline at end of file
+#endif /*ExceptionResponse_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/command/Message.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/Message.cpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/Message.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/Message.cpp Tue Feb 28 22:29:45 2006
@@ -1,40 +1,337 @@
 /*
- * 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/Message.hpp"
 
 using namespace apache::activemq::client::command;
 
 /*
- * Dummy, should be auto-generated
+ *
+ *  Marshalling code for Open Wire Format for Message
+ *
+ *
+ *  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
+ *
  */
 Message::Message()
 {
+    this->producerId = NULL ;
+    this->destination = NULL ;
+    this->transactionId = NULL ;
+    this->originalDestination = NULL ;
+    this->messageId = NULL ;
+    this->originalTransactionId = NULL ;
+    this->groupID = NULL ;
+    this->groupSequence = NULL ;
+    this->correlationId = NULL ;
+    this->persistent = NULL ;
+    this->expiration = NULL ;
+    this->priority = NULL ;
+    this->replyTo = NULL ;
+    this->timestamp = NULL ;
+    this->type = NULL ;
+    this->content = NULL ;
+    this->marshalledProperties = NULL ;
+    this->dataStructure = NULL ;
+    this->targetConsumerId = NULL ;
+    this->compressed = NULL ;
+    this->redeliveryCounter = NULL ;
+    this->brokerPath = NULL ;
+    this->arrival = NULL ;
+    this->userID = NULL ;
+    this->recievedByDFBridge = NULL ;
 }
 
 Message::~Message()
 {
 }
 
-p<ActiveMQDestination> Message::getDestination()
+        
+p<ProducerId> Message::getProducerId()
+{
+    return producerId ;
+}
+
+void Message::setProducerId(p<ProducerId> producerId)
+{
+    this->producerId = producerId ;
+}
+
+        
+ActiveMQDestination Message::getDestination()
 {
     return destination ;
 }
 
-void Message::setDestination(p<ActiveMQDestination> destination)
+void Message::setDestination(ActiveMQDestination destination)
 {
     this->destination = destination ;
+}
+
+        
+p<TransactionId> Message::getTransactionId()
+{
+    return transactionId ;
+}
+
+void Message::setTransactionId(p<TransactionId> transactionId)
+{
+    this->transactionId = transactionId ;
+}
+
+        
+ActiveMQDestination Message::getOriginalDestination()
+{
+    return originalDestination ;
+}
+
+void Message::setOriginalDestination(ActiveMQDestination originalDestination)
+{
+    this->originalDestination = originalDestination ;
+}
+
+        
+p<MessageId> Message::getMessageId()
+{
+    return messageId ;
+}
+
+void Message::setMessageId(p<MessageId> messageId)
+{
+    this->messageId = messageId ;
+}
+
+        
+p<TransactionId> Message::getOriginalTransactionId()
+{
+    return originalTransactionId ;
+}
+
+void Message::setOriginalTransactionId(p<TransactionId> originalTransactionId)
+{
+    this->originalTransactionId = originalTransactionId ;
+}
+
+        
+p<string> Message::getGroupID()
+{
+    return groupID ;
+}
+
+void Message::setGroupID(p<string> groupID)
+{
+    this->groupID = groupID ;
+}
+
+        
+int Message::getGroupSequence()
+{
+    return groupSequence ;
+}
+
+void Message::setGroupSequence(int groupSequence)
+{
+    this->groupSequence = groupSequence ;
+}
+
+        
+p<string> Message::getCorrelationId()
+{
+    return correlationId ;
+}
+
+void Message::setCorrelationId(p<string> correlationId)
+{
+    this->correlationId = correlationId ;
+}
+
+        
+bool Message::getPersistent()
+{
+    return persistent ;
+}
+
+void Message::setPersistent(bool persistent)
+{
+    this->persistent = persistent ;
+}
+
+        
+long Message::getExpiration()
+{
+    return expiration ;
+}
+
+void Message::setExpiration(long expiration)
+{
+    this->expiration = expiration ;
+}
+
+        
+byte Message::getPriority()
+{
+    return priority ;
+}
+
+void Message::setPriority(byte priority)
+{
+    this->priority = priority ;
+}
+
+        
+ActiveMQDestination Message::getReplyTo()
+{
+    return replyTo ;
+}
+
+void Message::setReplyTo(ActiveMQDestination replyTo)
+{
+    this->replyTo = replyTo ;
+}
+
+        
+long Message::getTimestamp()
+{
+    return timestamp ;
+}
+
+void Message::setTimestamp(long timestamp)
+{
+    this->timestamp = timestamp ;
+}
+
+        
+p<string> Message::getType()
+{
+    return type ;
+}
+
+void Message::setType(p<string> type)
+{
+    this->type = type ;
+}
+
+        
+void* Message::getContent()
+{
+    return content ;
+}
+
+void Message::setContent(void* content)
+{
+    this->content = content ;
+}
+
+        
+void* Message::getMarshalledProperties()
+{
+    return marshalledProperties ;
+}
+
+void Message::setMarshalledProperties(void* marshalledProperties)
+{
+    this->marshalledProperties = marshalledProperties ;
+}
+
+        
+DataStructure Message::getDataStructure()
+{
+    return dataStructure ;
+}
+
+void Message::setDataStructure(DataStructure dataStructure)
+{
+    this->dataStructure = dataStructure ;
+}
+
+        
+p<ConsumerId> Message::getTargetConsumerId()
+{
+    return targetConsumerId ;
+}
+
+void Message::setTargetConsumerId(p<ConsumerId> targetConsumerId)
+{
+    this->targetConsumerId = targetConsumerId ;
+}
+
+        
+bool Message::getCompressed()
+{
+    return compressed ;
+}
+
+void Message::setCompressed(bool compressed)
+{
+    this->compressed = compressed ;
+}
+
+        
+int Message::getRedeliveryCounter()
+{
+    return redeliveryCounter ;
+}
+
+void Message::setRedeliveryCounter(int redeliveryCounter)
+{
+    this->redeliveryCounter = redeliveryCounter ;
+}
+
+        
+BrokerId[] Message::getBrokerPath()
+{
+    return brokerPath ;
+}
+
+void Message::setBrokerPath(BrokerId[] brokerPath)
+{
+    this->brokerPath = brokerPath ;
+}
+
+        
+long Message::getArrival()
+{
+    return arrival ;
+}
+
+void Message::setArrival(long arrival)
+{
+    this->arrival = arrival ;
+}
+
+        
+p<string> Message::getUserID()
+{
+    return userID ;
+}
+
+void Message::setUserID(p<string> userID)
+{
+    this->userID = userID ;
+}
+
+        
+bool Message::getRecievedByDFBridge()
+{
+    return recievedByDFBridge ;
+}
+
+void Message::setRecievedByDFBridge(bool recievedByDFBridge)
+{
+    this->recievedByDFBridge = recievedByDFBridge ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/Message.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/Message.hpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/Message.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/Message.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 Message_hpp_
 #define Message_hpp_
 
 #include <string>
-#include "IMessage.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 "command/ActiveMQDestination.hpp"
 #include "util/ifr/p"
 
 namespace apache
@@ -32,21 +39,131 @@
       namespace command
       {
         using namespace ifr;
+        using namespace apache::activemq::client;
 
 /*
- * Dummy, should be auto-generated.
+ *
+ *  Marshalling code for Open Wire Format for Message
+ *
+ *
+ *  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 Message : public BaseCommand
 {
 private:
-    p<ActiveMQDestination> destination ;
+    p<ProducerId> producerId ;
+    ActiveMQDestination destination ;
+    p<TransactionId> transactionId ;
+    ActiveMQDestination originalDestination ;
+    p<MessageId> messageId ;
+    p<TransactionId> originalTransactionId ;
+    p<string> groupID ;
+    int groupSequence ;
+    p<string> correlationId ;
+    bool persistent ;
+    long expiration ;
+    byte priority ;
+    ActiveMQDestination replyTo ;
+    long timestamp ;
+    p<string> type ;
+    void* content ;
+    void* marshalledProperties ;
+    DataStructure dataStructure ;
+    p<ConsumerId> targetConsumerId ;
+    bool compressed ;
+    int redeliveryCounter ;
+    BrokerId[] brokerPath ;
+    long arrival ;
+    p<string> userID ;
+    bool recievedByDFBridge ;
+
+public:
+    const static int TYPE = 0;
 
 public:
     Message() ;
     virtual ~Message() ;
 
-    virtual p<ActiveMQDestination> getDestination() ;
-    virtual void setDestination(p<ActiveMQDestination> destination) ;
+
+    virtual p<ProducerId> getProducerId() ;
+    virtual void setProducerId(p<ProducerId> producerId) ;
+
+    virtual ActiveMQDestination getDestination() ;
+    virtual void setDestination(ActiveMQDestination destination) ;
+
+    virtual p<TransactionId> getTransactionId() ;
+    virtual void setTransactionId(p<TransactionId> transactionId) ;
+
+    virtual ActiveMQDestination getOriginalDestination() ;
+    virtual void setOriginalDestination(ActiveMQDestination originalDestination) ;
+
+    virtual p<MessageId> getMessageId() ;
+    virtual void setMessageId(p<MessageId> messageId) ;
+
+    virtual p<TransactionId> getOriginalTransactionId() ;
+    virtual void setOriginalTransactionId(p<TransactionId> originalTransactionId) ;
+
+    virtual p<string> getGroupID() ;
+    virtual void setGroupID(p<string> groupID) ;
+
+    virtual int getGroupSequence() ;
+    virtual void setGroupSequence(int groupSequence) ;
+
+    virtual p<string> getCorrelationId() ;
+    virtual void setCorrelationId(p<string> correlationId) ;
+
+    virtual bool getPersistent() ;
+    virtual void setPersistent(bool persistent) ;
+
+    virtual long getExpiration() ;
+    virtual void setExpiration(long expiration) ;
+
+    virtual byte getPriority() ;
+    virtual void setPriority(byte priority) ;
+
+    virtual ActiveMQDestination getReplyTo() ;
+    virtual void setReplyTo(ActiveMQDestination replyTo) ;
+
+    virtual long getTimestamp() ;
+    virtual void setTimestamp(long timestamp) ;
+
+    virtual p<string> getType() ;
+    virtual void setType(p<string> type) ;
+
+    virtual void* getContent() ;
+    virtual void setContent(void* content) ;
+
+    virtual void* getMarshalledProperties() ;
+    virtual void setMarshalledProperties(void* marshalledProperties) ;
+
+    virtual DataStructure getDataStructure() ;
+    virtual void setDataStructure(DataStructure dataStructure) ;
+
+    virtual p<ConsumerId> getTargetConsumerId() ;
+    virtual void setTargetConsumerId(p<ConsumerId> targetConsumerId) ;
+
+    virtual bool getCompressed() ;
+    virtual void setCompressed(bool compressed) ;
+
+    virtual int getRedeliveryCounter() ;
+    virtual void setRedeliveryCounter(int redeliveryCounter) ;
+
+    virtual BrokerId[] getBrokerPath() ;
+    virtual void setBrokerPath(BrokerId[] brokerPath) ;
+
+    virtual long getArrival() ;
+    virtual void setArrival(long arrival) ;
+
+    virtual p<string> getUserID() ;
+    virtual void setUserID(p<string> userID) ;
+
+    virtual bool getRecievedByDFBridge() ;
+    virtual void setRecievedByDFBridge(bool recievedByDFBridge) ;
+
+
 } ;
 
 /* namespace */
@@ -55,4 +172,4 @@
   }
 }
 
-#endif /*Message_hpp_*/
\ No newline at end of file
+#endif /*Message_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/command/MessageAck.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/MessageAck.cpp?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/MessageAck.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/MessageAck.cpp Tue Feb 28 22:29:45 2006
@@ -1,30 +1,121 @@
 /*
- * 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/MessageAck.hpp"
 
 using namespace apache::activemq::client::command;
 
 /*
- * 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
+ *
  */
 MessageAck::MessageAck()
 {
+    this->destination = NULL ;
+    this->transactionId = NULL ;
+    this->consumerId = NULL ;
+    this->ackType = NULL ;
+    this->firstMessageId = NULL ;
+    this->lastMessageId = NULL ;
+    this->messageCount = NULL ;
 }
 
 MessageAck::~MessageAck()
 {
+}
+
+        
+ActiveMQDestination MessageAck::getDestination()
+{
+    return destination ;
+}
+
+void MessageAck::setDestination(ActiveMQDestination destination)
+{
+    this->destination = destination ;
+}
+
+        
+p<TransactionId> MessageAck::getTransactionId()
+{
+    return transactionId ;
+}
+
+void MessageAck::setTransactionId(p<TransactionId> transactionId)
+{
+    this->transactionId = transactionId ;
+}
+
+        
+p<ConsumerId> MessageAck::getConsumerId()
+{
+    return consumerId ;
+}
+
+void MessageAck::setConsumerId(p<ConsumerId> consumerId)
+{
+    this->consumerId = consumerId ;
+}
+
+        
+byte MessageAck::getAckType()
+{
+    return ackType ;
+}
+
+void MessageAck::setAckType(byte ackType)
+{
+    this->ackType = ackType ;
+}
+
+        
+p<MessageId> MessageAck::getFirstMessageId()
+{
+    return firstMessageId ;
+}
+
+void MessageAck::setFirstMessageId(p<MessageId> firstMessageId)
+{
+    this->firstMessageId = firstMessageId ;
+}
+
+        
+p<MessageId> MessageAck::getLastMessageId()
+{
+    return lastMessageId ;
+}
+
+void MessageAck::setLastMessageId(p<MessageId> lastMessageId)
+{
+    this->lastMessageId = lastMessageId ;
+}
+
+        
+int MessageAck::getMessageCount()
+{
+    return messageCount ;
+}
+
+void MessageAck::setMessageCount(int messageCount)
+{
+    this->messageCount = messageCount ;
 }



Mime
View raw message