activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r383767 [1/10] - 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/act...
Date Tue, 07 Mar 2006 04:14:38 GMT
Author: chirino
Date: Mon Mar  6 20:14:27 2006
New Revision: 383767

URL: http://svn.apache.org/viewcvs?rev=383767&view=rev
Log:
Adjusted openwire generators
 - Got .NET working again after bing WireFormat change
 - Fixed generated indenting for the java and csharp stuff.


Removed:
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire.Client.build
    incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/OpenWire.Client.build
Modified:
    incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpMarshallingScript.java
    incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireJavaMarshallingScript.java
    incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireScript.java
    incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterTest.java
    incubator/activemq/trunk/activemq-dotnet/activemq-dotnet.csproj
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerId.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionError.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionId.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionInfo.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerId.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerInfo.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ControlCommand.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataArrayResponse.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataResponse.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DestinationInfo.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DiscoveryEvent.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ExceptionResponse.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/FlushCommand.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/IntegerResponse.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalQueueAck.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTopicAck.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTrace.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTransaction.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/KeepAliveInfo.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/LocalTransactionId.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Message.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageAck.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageDispatch.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageDispatchNotification.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageId.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/NetworkBridgeFilter.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerId.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerInfo.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/RemoveInfo.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/RemoveSubscriptionInfo.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Response.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionId.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionInfo.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ShutdownInfo.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SubscriptionInfo.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionId.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionInfo.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/WireFormatInfo.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/XATransactionId.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQDestinationMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BaseCommandMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerIdMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionIdMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerIdMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ControlCommandMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DataArrayResponseMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DiscoveryEventMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ExceptionResponseMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/IntegerResponseMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTraceMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/NetworkBridgeFilterMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ProducerIdMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ResponseMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SessionIdMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/XATransactionIdMarshaller.cs
    incubator/activemq/trunk/activemq-dotnet/src/main/csharp/CommonAssemblyInfo.cs
    incubator/activemq/trunk/activemq-dotnet/src/test/csharp/CommonAssemblyInfo.cs
    incubator/activemq/trunk/assembly/pom.xml
    incubator/activemq/trunk/assembly/src/release/example/src/ConsumerTool.java
    incubator/activemq/trunk/assembly/src/test/resources/log4j.properties
    incubator/activemq/trunk/openwire-cpp/src/command/ConnectionError.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/ControlCommand.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/DataArrayResponse.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/DataResponse.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/DestinationInfo.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/DiscoveryEvent.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/FlushCommand.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/IntegerResponse.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/JournalQueueAck.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/JournalTopicAck.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/JournalTrace.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/JournalTransaction.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/KeepAliveInfo.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/LocalTransactionId.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/MessageDispatch.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/MessageDispatchNotification.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/MessageId.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/NetworkBridgeFilter.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/NetworkBridgeFilter.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/RemoveSubscriptionInfo.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/ShutdownInfo.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/SubscriptionInfo.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/TransactionId.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/TransactionInfo.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/XATransactionId.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQBytesMessageMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQDestinationMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQMapMessageMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQMessageMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQObjectMessageMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQQueueMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQStreamMessageMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempDestinationMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempQueueMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempTopicMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTextMessageMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTopicMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/BaseCommandMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ConnectionErrorMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ConnectionIdMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ConnectionInfoMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ConsumerIdMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ConsumerInfoMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ControlCommandMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/DataArrayResponseMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/DataResponseMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/DestinationInfoMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/DiscoveryEventMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ExceptionResponseMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/FlushCommandMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/IntegerResponseMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/JournalQueueAckMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTopicAckMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTraceMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTransactionMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/KeepAliveInfoMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/LocalTransactionIdMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/MessageAckMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/MessageDispatchMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/MessageDispatchNotificationMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/MessageIdMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/MessageMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/NetworkBridgeFilterMarshaller.cpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/NetworkBridgeFilterMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ProducerIdMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ProducerInfoMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/RemoveInfoMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/RemoveSubscriptionInfoMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ResponseMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/SessionIdMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/SessionInfoMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/ShutdownInfoMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/SubscriptionInfoMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/TransactionIdMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/TransactionInfoMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/WireFormatInfoMarshaller.cpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/WireFormatInfoMarshaller.hpp
    incubator/activemq/trunk/openwire-cpp/src/marshal/XATransactionIdMarshaller.hpp

Modified: incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpMarshallingScript.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpMarshallingScript.java?rev=383767&r1=383766&r2=383767&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpMarshallingScript.java (original)
+++ incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpMarshallingScript.java Mon Mar  6 20:14:27 2006
@@ -41,47 +41,47 @@
     
 
     protected void generateTightUnmarshalBodyForProperty(PrintWriter out, JProperty property, JAnnotationValue size) {
-        out.print("        ");
+
         String propertyName = property.getSimpleName();
         String type = property.getType().getSimpleName();
 
         if (type.equals("boolean")) {
-            out.println("info." + propertyName + " = bs.ReadBoolean();");
+            out.println("        info." + propertyName + " = bs.ReadBoolean();");
         }
         else if (type.equals("byte")) {
-            out.println("info." + propertyName + " = dataIn.ReadByte();");
+            out.println("        info." + propertyName + " = dataIn.ReadByte();");
         }
         else if (type.equals("char")) {
-            out.println("info." + propertyName + " = dataIn.ReadChar();");
+            out.println("        info." + propertyName + " = dataIn.ReadChar();");
         }
         else if (type.equals("short")) {
-            out.println("info." + propertyName + " = dataIn.ReadInt16();");
+            out.println("        info." + propertyName + " = dataIn.ReadInt16();");
         }
         else if (type.equals("int")) {
-            out.println("info." + propertyName + " = dataIn.ReadInt32();");
+            out.println("        info." + propertyName + " = dataIn.ReadInt32();");
         }
         else if (type.equals("long")) {
-            out.println("info." + propertyName + " = TightUnmarshalLong(wireFormat, dataIn, bs);");
+            out.println("        info." + propertyName + " = TightUnmarshalLong(wireFormat, dataIn, bs);");
         }
         else if (type.equals("String")) {
-            out.println("info." + propertyName + " = TightUnmarshalString(dataIn, bs);");
+            out.println("        info." + propertyName + " = TightUnmarshalString(dataIn, bs);");
         }
         else if (type.equals("byte[]") || type.equals("ByteSequence")) {
             if (size != null) {
-                out.println("info." + propertyName + " = ReadBytes(dataIn, " + size.asInt() + ");");
+                out.println("        info." + propertyName + " = ReadBytes(dataIn, " + size.asInt() + ");");
             }
             else {
-                out.println("info." + propertyName + " = ReadBytes(dataIn, bs.ReadBoolean());");
+                out.println("        info." + propertyName + " = ReadBytes(dataIn, bs.ReadBoolean());");
             }
         }
         else if (isThrowable(property.getType())) {
-            out.println("info." + propertyName + " = TightUnmarshalBrokerError(wireFormat, dataIn, bs);");
+            out.println("        info." + propertyName + " = TightUnmarshalBrokerError(wireFormat, dataIn, bs);");
         }
         else if (isCachedProperty(property)) {
-            out.println("info." + propertyName + " = (" + type + ") TightUnmarshalCachedObject(wireFormat, dataIn, bs);");
+            out.println("        info." + propertyName + " = (" + type + ") TightUnmarshalCachedObject(wireFormat, dataIn, bs);");
         }
         else {
-            out.println("info." + propertyName + " = (" + type + ") TightUnmarshalNestedObject(wireFormat, dataIn, bs);");
+            out.println("        info." + propertyName + " = (" + type + ") TightUnmarshalNestedObject(wireFormat, dataIn, bs);");
         }
     }
 
@@ -125,9 +125,8 @@
             String type = propertyType.getSimpleName();
             String getter = "info." + property.getSimpleName();
 
-            out.print(indent);
             if (type.equals("boolean")) {
-                out.println("bs.WriteBoolean(" + getter + ");");
+                out.println("        bs.WriteBoolean(" + getter + ");");
             }
             else if (type.equals("byte")) {
                 baseSize += 1;
@@ -142,14 +141,15 @@
                 baseSize += 4;
             }
             else if (type.equals("long")) {
-                out.println("rc += TightMarshalLong1(wireFormat, " + getter + ", bs);");
+                out.println("        rc += TightMarshalLong1(wireFormat, " + getter + ", bs);");
             }
             else if (type.equals("String")) {
-                out.println("rc += TightMarshalString1(" + getter + ", bs);");
+                out.print("");
+                out.println("        rc += TightMarshalString1(" + getter + ", bs);");
             }
             else if (type.equals("byte[]") || type.equals("ByteSequence")) {
                 if (size == null) {
-                    out.println("bs.WriteBoolean(" + getter + "!=null);");
+                    out.println("        bs.WriteBoolean(" + getter + "!=null);");
                     out.println("        rc += " + getter + "==null ? 0 : " + getter + ".Length+4;");
                 }
                 else {
@@ -158,21 +158,21 @@
             }
             else if (propertyType.isArrayType()) {
                 if (size != null) {
-                    out.println("rc += TightMarshalObjectArrayConstSize1(wireFormat, " + getter + ", bs, " + size.asInt() + ");");
+                    out.println("        rc += TightMarshalObjectArrayConstSize1(wireFormat, " + getter + ", bs, " + size.asInt() + ");");
                 }
                 else {
-                    out.println("rc += TightMarshalObjectArray1(wireFormat, " + getter + ", bs);");
+                    out.println("        rc += TightMarshalObjectArray1(wireFormat, " + getter + ", bs);");
                 }
             }
             else if (isThrowable(propertyType)) {
-                out.println("rc += TightMarshalBrokerError1(wireFormat, " + getter + ", bs);");
+                out.println("        rc += TightMarshalBrokerError1(wireFormat, " + getter + ", bs);");
             }
             else {
                 if (isCachedProperty(property)) {
-                    out.println("rc += TightMarshalCachedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
+                    out.println("        rc += TightMarshalCachedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
                 }
                 else {
-                    out.println("rc += TightMarshalNestedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
+                    out.println("        rc += TightMarshalNestedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
                 }
             }
         }
@@ -189,34 +189,33 @@
             String type = propertyType.getSimpleName();
             String getter = "info." + property.getSimpleName();
 
-            out.print(indent);
             if (type.equals("boolean")) {
-                out.println("bs.ReadBoolean();");
+                out.println("        bs.ReadBoolean();");
             }
             else if (type.equals("byte")) {
-                out.println("dataOut.Write(" + getter + ");");
+                out.println("        dataOut.Write(" + getter + ");");
             }
             else if (type.equals("char")) {
-                out.println("dataOut.Write(" + getter + ");");
+                out.println("        dataOut.Write(" + getter + ");");
             }
             else if (type.equals("short")) {
-                out.println("dataOut.Write(" + getter + ");");
+                out.println("        dataOut.Write(" + getter + ");");
             }
             else if (type.equals("int")) {
-                out.println("dataOut.Write(" + getter + ");");
+                out.println("        dataOut.Write(" + getter + ");");
             }
             else if (type.equals("long")) {
-                out.println("TightMarshalLong2(wireFormat, " + getter + ", dataOut, bs);");
+                out.println("        TightMarshalLong2(wireFormat, " + getter + ", dataOut, bs);");
             }
             else if (type.equals("String")) {
-                out.println("TightMarshalString2(" + getter + ", dataOut, bs);");
+                out.println("        TightMarshalString2(" + getter + ", dataOut, bs);");
             }
             else if (type.equals("byte[]") || type.equals("ByteSequence")) {
                 if (size != null) {
-                    out.println("dataOut.Write(" + getter + ", 0, " + size.asInt() + ");");
+                    out.println("        dataOut.Write(" + getter + ", 0, " + size.asInt() + ");");
                 }
                 else {
-                    out.println("if(bs.ReadBoolean()) {");
+                    out.println("        if(bs.ReadBoolean()) {");
                     out.println("           dataOut.Write(" + getter + ".Length);");
                     out.println("           dataOut.Write(" + getter + ");");
                     out.println("        }");
@@ -224,21 +223,21 @@
             }
             else if (propertyType.isArrayType()) {
                 if (size != null) {
-                    out.println("TightMarshalObjectArrayConstSize2(wireFormat, " + getter + ", dataOut, bs, " + size.asInt() + ");");
+                    out.println("        TightMarshalObjectArrayConstSize2(wireFormat, " + getter + ", dataOut, bs, " + size.asInt() + ");");
                 }
                 else {
-                    out.println("TightMarshalObjectArray2(wireFormat, " + getter + ", dataOut, bs);");
+                    out.println("        TightMarshalObjectArray2(wireFormat, " + getter + ", dataOut, bs);");
                 }
             }
             else if (isThrowable(propertyType)) {
-                out.println("TightMarshalBrokerError2(wireFormat, " + getter + ", dataOut, bs);");
+                out.println("        TightMarshalBrokerError2(wireFormat, " + getter + ", dataOut, bs);");
             }
             else {
                 if (isCachedProperty(property)) {
-                    out.println("TightMarshalCachedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
+                    out.println("        TightMarshalCachedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
                 }
                 else {
-                    out.println("TightMarshalNestedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
+                    out.println("        TightMarshalNestedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
                 }
             }
         }

Modified: incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireJavaMarshallingScript.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireJavaMarshallingScript.java?rev=383767&r1=383766&r2=383767&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireJavaMarshallingScript.java (original)
+++ incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireJavaMarshallingScript.java Mon Mar  6 20:14:27 2006
@@ -115,50 +115,49 @@
     }
 
     protected void generateTightUnmarshalBodyForProperty(PrintWriter out, JProperty property, JAnnotationValue size) {
-        out.print("        ");
         String setter = property.getSetter().getSimpleName();
         String type = property.getType().getSimpleName();
 
         if (type.equals("boolean")) {
-            out.println("info." + setter + "(bs.readBoolean());");
+            out.println("        info." + setter + "(bs.readBoolean());");
         }
         else if (type.equals("byte")) {
-            out.println("info." + setter + "(dataIn.readByte());");
+            out.println("        info." + setter + "(dataIn.readByte());");
         }
         else if (type.equals("char")) {
-            out.println("info." + setter + "(dataIn.readChar());");
+            out.println("        info." + setter + "(dataIn.readChar());");
         }
         else if (type.equals("short")) {
-            out.println("info." + setter + "(dataIn.readShort());");
+            out.println("        info." + setter + "(dataIn.readShort());");
         }
         else if (type.equals("int")) {
-            out.println("info." + setter + "(dataIn.readInt());");
+            out.println("        info." + setter + "(dataIn.readInt());");
         }
         else if (type.equals("long")) {
-            out.println("info." + setter + "(tightUnmarshalLong(wireFormat, dataIn, bs));");
+            out.println("        info." + setter + "(tightUnmarshalLong(wireFormat, dataIn, bs));");
         }
         else if (type.equals("String")) {
-            out.println("info." + setter + "(tightUnmarshalString(dataIn, bs));");
+            out.println("        info." + setter + "(tightUnmarshalString(dataIn, bs));");
         }
         else if (type.equals("byte[]")) {
             if (size != null) {
-                out.println("info." + setter + "(tightUnmarshalConstByteArray(dataIn, bs, "+ size.asInt() +"));");
+                out.println("        info." + setter + "(tightUnmarshalConstByteArray(dataIn, bs, "+ size.asInt() +"));");
             }
             else {
-                out.println("info." + setter + "(tightUnmarshalByteArray(dataIn, bs));");
+                out.println("        info." + setter + "(tightUnmarshalByteArray(dataIn, bs));");
             }
         }
         else if (type.equals("ByteSequence")) {
-            out.println("info." + setter + "(tightUnmarshalByteSequence(dataIn, bs));");
+            out.println("        info." + setter + "(tightUnmarshalByteSequence(dataIn, bs));");
         }
         else if (isThrowable(property.getType())) {
-            out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") tightUnmarsalThrowable(wireFormat, dataIn, bs));");
+            out.println("        info." + setter + "((" + property.getType().getQualifiedName() + ") tightUnmarsalThrowable(wireFormat, dataIn, bs));");
         }
         else if (isCachedProperty(property)) {
-            out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") tightUnmarsalCachedObject(wireFormat, dataIn, bs));");
+            out.println("        info." + setter + "((" + property.getType().getQualifiedName() + ") tightUnmarsalCachedObject(wireFormat, dataIn, bs));");
         }
         else {
-            out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") tightUnmarsalNestedObject(wireFormat, dataIn, bs));");
+            out.println("        info." + setter + "((" + property.getType().getQualifiedName() + ") tightUnmarsalNestedObject(wireFormat, dataIn, bs));");
         }
     }
 
@@ -202,9 +201,8 @@
             String type = propertyType.getSimpleName();
             String getter = "info." + property.getGetter().getSimpleName() + "()";
 
-            out.print(indent);
             if (type.equals("boolean")) {
-                out.println("bs.writeBoolean(" + getter + ");");
+                out.println("        bs.writeBoolean(" + getter + ");");
             }
             else if (type.equals("byte")) {
                 baseSize += 1;
@@ -219,39 +217,39 @@
                 baseSize += 4;
             }
             else if (type.equals("long")) {
-                out.println("rc+=tightMarshalLong1(wireFormat, " + getter + ", bs);");
+                out.println("        rc+=tightMarshalLong1(wireFormat, " + getter + ", bs);");
             }
             else if (type.equals("String")) {
-                out.println("rc += tightMarshalString1(" + getter + ", bs);");
+                out.println("        rc += tightMarshalString1(" + getter + ", bs);");
             }
             else if (type.equals("byte[]")) {
                 if (size == null) {
-                    out.println("rc += tightMarshalByteArray1(" + getter + ", bs);");
+                    out.println("        rc += tightMarshalByteArray1(" + getter + ", bs);");
                 }
                 else {
-                    out.println("rc += tightMarshalConstByteArray1(" + getter + ", bs, "+size.asInt()+");");
+                    out.println("        rc += tightMarshalConstByteArray1(" + getter + ", bs, "+size.asInt()+");");
                 }
             }
             else if (type.equals("ByteSequence")) {
-                out.println("rc += tightMarshalByteSequence1(" + getter + ", bs);");
+                out.println("        rc += tightMarshalByteSequence1(" + getter + ", bs);");
             }
             else if (propertyType.isArrayType()) {
                 if (size != null) {
-                    out.println("rc += tightMarshalObjectArrayConstSize1(wireFormat, " + getter + ", bs, " + size.asInt() + ");");
+                    out.println("        rc += tightMarshalObjectArrayConstSize1(wireFormat, " + getter + ", bs, " + size.asInt() + ");");
                 }
                 else {
-                    out.println("rc += tightMarshalObjectArray1(wireFormat, " + getter + ", bs);");
+                    out.println("        rc += tightMarshalObjectArray1(wireFormat, " + getter + ", bs);");
                 }
             }
             else if (isThrowable(propertyType)) {
-                out.println("rc += tightMarshalThrowable1(wireFormat, " + getter + ", bs);");
+                out.println("        rc += tightMarshalThrowable1(wireFormat, " + getter + ", bs);");
             }
             else {
                 if (isCachedProperty(property)) {
-                    out.println("rc += tightMarshalCachedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
+                    out.println("        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
                 }
                 else {
-                    out.println("rc += tightMarshalNestedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
+                    out.println("        rc += tightMarshalNestedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
                 }
             }
         }
@@ -268,56 +266,55 @@
             String type = propertyType.getSimpleName();
             String getter = "info." + property.getGetter().getSimpleName() + "()";
 
-            out.print(indent);
             if (type.equals("boolean")) {
-                out.println("bs.readBoolean();");
+                out.println("        bs.readBoolean();");
             }
             else if (type.equals("byte")) {
-                out.println("dataOut.writeByte(" + getter + ");");
+                out.println("        dataOut.writeByte(" + getter + ");");
             }
             else if (type.equals("char")) {
-                out.println("dataOut.writeChar(" + getter + ");");
+                out.println("        dataOut.writeChar(" + getter + ");");
             }
             else if (type.equals("short")) {
-                out.println("dataOut.writeShort(" + getter + ");");
+                out.println("        dataOut.writeShort(" + getter + ");");
             }
             else if (type.equals("int")) {
-                out.println("dataOut.writeInt(" + getter + ");");
+                out.println("        dataOut.writeInt(" + getter + ");");
             }
             else if (type.equals("long")) {
-                out.println("tightMarshalLong2(wireFormat, " + getter + ", dataOut, bs);");
+                out.println("        tightMarshalLong2(wireFormat, " + getter + ", dataOut, bs);");
             }
             else if (type.equals("String")) {
-                out.println("tightMarshalString2(" + getter + ", dataOut, bs);");
+                out.println("        tightMarshalString2(" + getter + ", dataOut, bs);");
             }
             else if (type.equals("byte[]")) {
                 if (size != null) {
-                    out.println("tightMarshalConstByteArray2(" + getter + ", dataOut, bs, " + size.asInt() + ");");
+                    out.println("        tightMarshalConstByteArray2(" + getter + ", dataOut, bs, " + size.asInt() + ");");
                 }
                 else {
-                    out.println("tightMarshalByteArray2(" + getter + ", dataOut, bs);");
+                    out.println("        tightMarshalByteArray2(" + getter + ", dataOut, bs);");
                 }
             }
             else if (type.equals("ByteSequence")) {
-                out.println("tightMarshalByteSequence2(" + getter + ", dataOut, bs);");
+                out.println("        tightMarshalByteSequence2(" + getter + ", dataOut, bs);");
             }
             else if (propertyType.isArrayType()) {
                 if (size != null) {
-                    out.println("tightMarshalObjectArrayConstSize2(wireFormat, " + getter + ", dataOut, bs, " + size.asInt() + ");");
+                    out.println("        tightMarshalObjectArrayConstSize2(wireFormat, " + getter + ", dataOut, bs, " + size.asInt() + ");");
                 }
                 else {
-                    out.println("tightMarshalObjectArray2(wireFormat, " + getter + ", dataOut, bs);");
+                    out.println("        tightMarshalObjectArray2(wireFormat, " + getter + ", dataOut, bs);");
                 }
             }
             else if (isThrowable(propertyType)) {
-                out.println("tightMarshalThrowable2(wireFormat, " + getter + ", dataOut, bs);");
+                out.println("        tightMarshalThrowable2(wireFormat, " + getter + ", dataOut, bs);");
             }
             else {
                 if (isCachedProperty(property)) {
-                    out.println("tightMarshalCachedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
+                    out.println("        tightMarshalCachedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
                 }
                 else {
-                    out.println("tightMarshalNestedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
+                    out.println("        tightMarshalNestedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
                 }
             }
         }
@@ -335,56 +332,55 @@
             String type = propertyType.getSimpleName();
             String getter = "info." + property.getGetter().getSimpleName() + "()";
 
-            out.print(indent);
             if (type.equals("boolean")) {
-                out.println("dataOut.writeBoolean("+ getter + ");");
+                out.println("        dataOut.writeBoolean("+ getter + ");");
             }
             else if (type.equals("byte")) {
-                out.println("dataOut.writeByte(" + getter + ");");
+                out.println("        dataOut.writeByte(" + getter + ");");
             }
             else if (type.equals("char")) {
-                out.println("dataOut.writeChar(" + getter + ");");
+                out.println("        dataOut.writeChar(" + getter + ");");
             }
             else if (type.equals("short")) {
-                out.println("dataOut.writeShort(" + getter + ");");
+                out.println("        dataOut.writeShort(" + getter + ");");
             }
             else if (type.equals("int")) {
-                out.println("dataOut.writeInt(" + getter + ");");
+                out.println("        dataOut.writeInt(" + getter + ");");
             }
             else if (type.equals("long")) {
-                out.println("looseMarshalLong(wireFormat, " + getter + ", dataOut);");
+                out.println("        looseMarshalLong(wireFormat, " + getter + ", dataOut);");
             }
             else if (type.equals("String")) {
-                out.println("looseMarshalString(" + getter + ", dataOut);");
+                out.println("        looseMarshalString(" + getter + ", dataOut);");
             }
             else if (type.equals("byte[]")) {
                 if (size != null) {
-                    out.println("looseMarshalConstByteArray(wireFormat, " + getter + ", dataOut, " + size.asInt() + ");");
+                    out.println("        looseMarshalConstByteArray(wireFormat, " + getter + ", dataOut, " + size.asInt() + ");");
                 }
                 else {
-                    out.println("looseMarshalByteArray(wireFormat, " + getter + ", dataOut);");
+                    out.println("        looseMarshalByteArray(wireFormat, " + getter + ", dataOut);");
                 }
             }
             else if (type.equals("ByteSequence")) {
-                out.println("looseMarshalByteSequence(wireFormat, " + getter + ", dataOut);");
+                out.println("        looseMarshalByteSequence(wireFormat, " + getter + ", dataOut);");
             }
             else if (propertyType.isArrayType()) {
                 if (size != null) {
-                    out.println("looseMarshalObjectArrayConstSize(wireFormat, " + getter + ", dataOut, " + size.asInt() + ");");
+                    out.println("        looseMarshalObjectArrayConstSize(wireFormat, " + getter + ", dataOut, " + size.asInt() + ");");
                 }
                 else {
-                    out.println("looseMarshalObjectArray(wireFormat, " + getter + ", dataOut);");
+                    out.println("        looseMarshalObjectArray(wireFormat, " + getter + ", dataOut);");
                 }
             }
             else if (isThrowable(propertyType)) {
-                out.println("looseMarshalThrowable(wireFormat, " + getter + ", dataOut);");
+                out.println("        looseMarshalThrowable(wireFormat, " + getter + ", dataOut);");
             }
             else {
                 if (isCachedProperty(property)) {
-                    out.println("looseMarshalCachedObject(wireFormat, (DataStructure)" + getter + ", dataOut);");
+                    out.println("        looseMarshalCachedObject(wireFormat, (DataStructure)" + getter + ", dataOut);");
                 }
                 else {
-                    out.println("looseMarshalNestedObject(wireFormat, (DataStructure)" + getter + ", dataOut);");
+                    out.println("        looseMarshalNestedObject(wireFormat, (DataStructure)" + getter + ", dataOut);");
                 }
             }
         }
@@ -410,50 +406,49 @@
     }
 
     protected void generateLooseUnmarshalBodyForProperty(PrintWriter out, JProperty property, JAnnotationValue size) {
-        out.print("        ");
         String setter = property.getSetter().getSimpleName();
         String type = property.getType().getSimpleName();
 
         if (type.equals("boolean")) {
-            out.println("info." + setter + "(dataIn.readBoolean());");
+            out.println("        info." + setter + "(dataIn.readBoolean());");
         }
         else if (type.equals("byte")) {
-            out.println("info." + setter + "(dataIn.readByte());");
+            out.println("        info." + setter + "(dataIn.readByte());");
         }
         else if (type.equals("char")) {
-            out.println("info." + setter + "(dataIn.readChar());");
+            out.println("        info." + setter + "(dataIn.readChar());");
         }
         else if (type.equals("short")) {
-            out.println("info." + setter + "(dataIn.readShort());");
+            out.println("        info." + setter + "(dataIn.readShort());");
         }
         else if (type.equals("int")) {
-            out.println("info." + setter + "(dataIn.readInt());");
+            out.println("        info." + setter + "(dataIn.readInt());");
         }
         else if (type.equals("long")) {
-            out.println("info." + setter + "(looseUnmarshalLong(wireFormat, dataIn));");
+            out.println("        info." + setter + "(looseUnmarshalLong(wireFormat, dataIn));");
         }
         else if (type.equals("String")) {
-            out.println("info." + setter + "(looseUnmarshalString(dataIn));");
+            out.println("        info." + setter + "(looseUnmarshalString(dataIn));");
         }
         else if (type.equals("byte[]")) {
             if (size != null) {
-                out.println("info." + setter + "(looseUnmarshalConstByteArray(dataIn, " + size.asInt() + "));");
+                out.println("        info." + setter + "(looseUnmarshalConstByteArray(dataIn, " + size.asInt() + "));");
             }
             else {
-                out.println("info." + setter + "(looseUnmarshalByteArray(dataIn));");
+                out.println("        info." + setter + "(looseUnmarshalByteArray(dataIn));");
             }
         }
         else if (type.equals("ByteSequence")) {
-            out.println("info." + setter + "(looseUnmarshalByteSequence(dataIn));");
+            out.println("        info." + setter + "(looseUnmarshalByteSequence(dataIn));");
         }
         else if (isThrowable(property.getType())) {
-            out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") looseUnmarsalThrowable(wireFormat, dataIn));");
+            out.println("        info." + setter + "((" + property.getType().getQualifiedName() + ") looseUnmarsalThrowable(wireFormat, dataIn));");
         }
         else if (isCachedProperty(property)) {
-            out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") looseUnmarsalCachedObject(wireFormat, dataIn));");
+            out.println("        info." + setter + "((" + property.getType().getQualifiedName() + ") looseUnmarsalCachedObject(wireFormat, dataIn));");
         }
         else {
-            out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") looseUnmarsalNestedObject(wireFormat, dataIn));");
+            out.println("        info." + setter + "((" + property.getType().getQualifiedName() + ") looseUnmarsalNestedObject(wireFormat, dataIn));");
         }
     }
 

Modified: incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireScript.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireScript.java?rev=383767&r1=383766&r2=383767&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireScript.java (original)
+++ incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireScript.java Mon Mar  6 20:14:27 2006
@@ -76,7 +76,7 @@
         }
         else {
             String simpleName = j.getSimpleName();
-            return simpleName.equals("ActiveMQMessage");
+            return simpleName.equals("ActiveMQMessage") || simpleName.equals("WireFormatInfo");
         }
         /*
          * else { // is it a message type String simpleName = j.getSimpleName();

Modified: incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy?rev=383767&r1=383766&r2=383767&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy (original)
+++ incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy Mon Mar  6 20:14:27 2006
@@ -111,7 +111,6 @@
         ${jclass.simpleName} info = (${jclass.simpleName})o;
 """
 
-
 if( marshallerAware ) out << """
         info.BeforeMarshall(wireFormat);
 """

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java?rev=383767&r1=383766&r2=383767&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java Mon Mar  6 20:14:27 2006
@@ -16,14 +16,6 @@
  */
 package org.apache.activemq.command;
 
-import org.activeio.ByteArrayInputStream;
-import org.activeio.ByteArrayOutputStream;
-import org.activeio.ByteSequence;
-import org.activeio.command.WireFormat;
-import org.apache.activemq.state.CommandVisitor;
-import org.apache.activemq.util.IntrospectionSupport;
-import org.apache.activemq.util.MarshallingSupport;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -31,6 +23,14 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+
+import org.activeio.ByteArrayInputStream;
+import org.activeio.ByteArrayOutputStream;
+import org.activeio.ByteSequence;
+import org.activeio.command.WireFormat;
+import org.apache.activemq.state.CommandVisitor;
+import org.apache.activemq.util.IntrospectionSupport;
+import org.apache.activemq.util.MarshallingSupport;
 
 /**
  * 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java Mon Mar  6 20:14:27 2006
@@ -63,7 +63,7 @@
         ActiveMQDestination info = (ActiveMQDestination)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalString1(info.getPhysicalName(), bs);
+        rc += tightMarshalString1(info.getPhysicalName(), bs);
 
         return rc + 0;
     }
@@ -79,7 +79,7 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         ActiveMQDestination info = (ActiveMQDestination)o;
-    tightMarshalString2(info.getPhysicalName(), dataOut, bs);
+        tightMarshalString2(info.getPhysicalName(), dataOut, bs);
 
     }
 
@@ -107,7 +107,7 @@
         ActiveMQDestination info = (ActiveMQDestination)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalString(info.getPhysicalName(), dataOut);
+        looseMarshalString(info.getPhysicalName(), dataOut);
 
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java Mon Mar  6 20:14:27 2006
@@ -80,8 +80,8 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         BaseCommand info = (BaseCommand)o;
-    dataOut.writeShort(info.getCommandId());
-    bs.readBoolean();
+        dataOut.writeShort(info.getCommandId());
+        bs.readBoolean();
 
     }
 
@@ -110,8 +110,8 @@
         BaseCommand info = (BaseCommand)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    dataOut.writeShort(info.getCommandId());
-    dataOut.writeBoolean(info.isResponseRequired());
+        dataOut.writeShort(info.getCommandId());
+        dataOut.writeBoolean(info.isResponseRequired());
 
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java Mon Mar  6 20:14:27 2006
@@ -78,7 +78,7 @@
         BrokerId info = (BrokerId)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalString1(info.getValue(), bs);
+        rc += tightMarshalString1(info.getValue(), bs);
 
         return rc + 0;
     }
@@ -94,7 +94,7 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         BrokerId info = (BrokerId)o;
-    tightMarshalString2(info.getValue(), dataOut, bs);
+        tightMarshalString2(info.getValue(), dataOut, bs);
 
     }
 
@@ -122,7 +122,7 @@
         BrokerId info = (BrokerId)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalString(info.getValue(), dataOut);
+        looseMarshalString(info.getValue(), dataOut);
 
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java Mon Mar  6 20:14:27 2006
@@ -93,11 +93,11 @@
         BrokerInfo info = (BrokerInfo)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getBrokerId(), bs);
-    rc += tightMarshalString1(info.getBrokerURL(), bs);
-    rc += tightMarshalObjectArray1(wireFormat, info.getPeerBrokerInfos(), bs);
-    rc += tightMarshalString1(info.getBrokerName(), bs);
-    bs.writeBoolean(info.isSlaveBroker());
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getBrokerId(), bs);
+        rc += tightMarshalString1(info.getBrokerURL(), bs);
+        rc += tightMarshalObjectArray1(wireFormat, info.getPeerBrokerInfos(), bs);
+        rc += tightMarshalString1(info.getBrokerName(), bs);
+        bs.writeBoolean(info.isSlaveBroker());
 
         return rc + 0;
     }
@@ -113,11 +113,11 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         BrokerInfo info = (BrokerInfo)o;
-    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getBrokerId(), dataOut, bs);
-    tightMarshalString2(info.getBrokerURL(), dataOut, bs);
-    tightMarshalObjectArray2(wireFormat, info.getPeerBrokerInfos(), dataOut, bs);
-    tightMarshalString2(info.getBrokerName(), dataOut, bs);
-    bs.readBoolean();
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getBrokerId(), dataOut, bs);
+        tightMarshalString2(info.getBrokerURL(), dataOut, bs);
+        tightMarshalObjectArray2(wireFormat, info.getPeerBrokerInfos(), dataOut, bs);
+        tightMarshalString2(info.getBrokerName(), dataOut, bs);
+        bs.readBoolean();
 
     }
 
@@ -160,11 +160,11 @@
         BrokerInfo info = (BrokerInfo)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, (DataStructure)info.getBrokerId(), dataOut);
-    looseMarshalString(info.getBrokerURL(), dataOut);
-    looseMarshalObjectArray(wireFormat, info.getPeerBrokerInfos(), dataOut);
-    looseMarshalString(info.getBrokerName(), dataOut);
-    dataOut.writeBoolean(info.isSlaveBroker());
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getBrokerId(), dataOut);
+        looseMarshalString(info.getBrokerURL(), dataOut);
+        looseMarshalObjectArray(wireFormat, info.getPeerBrokerInfos(), dataOut);
+        looseMarshalString(info.getBrokerName(), dataOut);
+        dataOut.writeBoolean(info.isSlaveBroker());
 
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java Mon Mar  6 20:14:27 2006
@@ -79,8 +79,8 @@
         ConnectionError info = (ConnectionError)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalThrowable1(wireFormat, info.getException(), bs);
-    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs);
+        rc += tightMarshalThrowable1(wireFormat, info.getException(), bs);
+        rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs);
 
         return rc + 0;
     }
@@ -96,8 +96,8 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         ConnectionError info = (ConnectionError)o;
-    tightMarshalThrowable2(wireFormat, info.getException(), dataOut, bs);
-    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs);
+        tightMarshalThrowable2(wireFormat, info.getException(), dataOut, bs);
+        tightMarshalNestedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs);
 
     }
 
@@ -126,8 +126,8 @@
         ConnectionError info = (ConnectionError)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalThrowable(wireFormat, info.getException(), dataOut);
-    looseMarshalNestedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut);
+        looseMarshalThrowable(wireFormat, info.getException(), dataOut);
+        looseMarshalNestedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut);
 
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java Mon Mar  6 20:14:27 2006
@@ -78,7 +78,7 @@
         ConnectionId info = (ConnectionId)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalString1(info.getValue(), bs);
+        rc += tightMarshalString1(info.getValue(), bs);
 
         return rc + 0;
     }
@@ -94,7 +94,7 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         ConnectionId info = (ConnectionId)o;
-    tightMarshalString2(info.getValue(), dataOut, bs);
+        tightMarshalString2(info.getValue(), dataOut, bs);
 
     }
 
@@ -122,7 +122,7 @@
         ConnectionId info = (ConnectionId)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalString(info.getValue(), dataOut);
+        looseMarshalString(info.getValue(), dataOut);
 
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java Mon Mar  6 20:14:27 2006
@@ -93,11 +93,11 @@
         ConnectionInfo info = (ConnectionInfo)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs);
-    rc += tightMarshalString1(info.getClientId(), bs);
-    rc += tightMarshalString1(info.getPassword(), bs);
-    rc += tightMarshalString1(info.getUserName(), bs);
-    rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs);
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs);
+        rc += tightMarshalString1(info.getClientId(), bs);
+        rc += tightMarshalString1(info.getPassword(), bs);
+        rc += tightMarshalString1(info.getUserName(), bs);
+        rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs);
 
         return rc + 0;
     }
@@ -113,11 +113,11 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         ConnectionInfo info = (ConnectionInfo)o;
-    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs);
-    tightMarshalString2(info.getClientId(), dataOut, bs);
-    tightMarshalString2(info.getPassword(), dataOut, bs);
-    tightMarshalString2(info.getUserName(), dataOut, bs);
-    tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs);
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs);
+        tightMarshalString2(info.getClientId(), dataOut, bs);
+        tightMarshalString2(info.getPassword(), dataOut, bs);
+        tightMarshalString2(info.getUserName(), dataOut, bs);
+        tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs);
 
     }
 
@@ -160,11 +160,11 @@
         ConnectionInfo info = (ConnectionInfo)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut);
-    looseMarshalString(info.getClientId(), dataOut);
-    looseMarshalString(info.getPassword(), dataOut);
-    looseMarshalString(info.getUserName(), dataOut);
-    looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut);
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut);
+        looseMarshalString(info.getClientId(), dataOut);
+        looseMarshalString(info.getPassword(), dataOut);
+        looseMarshalString(info.getUserName(), dataOut);
+        looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut);
 
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java Mon Mar  6 20:14:27 2006
@@ -80,9 +80,9 @@
         ConsumerId info = (ConsumerId)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalString1(info.getConnectionId(), bs);
-    rc+=tightMarshalLong1(wireFormat, info.getSessionId(), bs);
-    rc+=tightMarshalLong1(wireFormat, info.getValue(), bs);
+        rc += tightMarshalString1(info.getConnectionId(), bs);
+        rc+=tightMarshalLong1(wireFormat, info.getSessionId(), bs);
+        rc+=tightMarshalLong1(wireFormat, info.getValue(), bs);
 
         return rc + 0;
     }
@@ -98,9 +98,9 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         ConsumerId info = (ConsumerId)o;
-    tightMarshalString2(info.getConnectionId(), dataOut, bs);
-    tightMarshalLong2(wireFormat, info.getSessionId(), dataOut, bs);
-    tightMarshalLong2(wireFormat, info.getValue(), dataOut, bs);
+        tightMarshalString2(info.getConnectionId(), dataOut, bs);
+        tightMarshalLong2(wireFormat, info.getSessionId(), dataOut, bs);
+        tightMarshalLong2(wireFormat, info.getValue(), dataOut, bs);
 
     }
 
@@ -130,9 +130,9 @@
         ConsumerId info = (ConsumerId)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalString(info.getConnectionId(), dataOut);
-    looseMarshalLong(wireFormat, info.getSessionId(), dataOut);
-    looseMarshalLong(wireFormat, info.getValue(), dataOut);
+        looseMarshalString(info.getConnectionId(), dataOut);
+        looseMarshalLong(wireFormat, info.getSessionId(), dataOut);
+        looseMarshalLong(wireFormat, info.getValue(), dataOut);
 
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java Mon Mar  6 20:14:27 2006
@@ -103,18 +103,18 @@
         ConsumerInfo info = (ConsumerInfo)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConsumerId(), bs);
-    bs.writeBoolean(info.isBrowser());
-    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
-            bs.writeBoolean(info.isDispatchAsync());
-    rc += tightMarshalString1(info.getSelector(), bs);
-    rc += tightMarshalString1(info.getSubcriptionName(), bs);
-    bs.writeBoolean(info.isNoLocal());
-    bs.writeBoolean(info.isExclusive());
-    bs.writeBoolean(info.isRetroactive());
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConsumerId(), bs);
+        bs.writeBoolean(info.isBrowser());
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
+        bs.writeBoolean(info.isDispatchAsync());
+        rc += tightMarshalString1(info.getSelector(), bs);
+        rc += tightMarshalString1(info.getSubcriptionName(), bs);
+        bs.writeBoolean(info.isNoLocal());
+        bs.writeBoolean(info.isExclusive());
+        bs.writeBoolean(info.isRetroactive());
         rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs);
-    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getAdditionalPredicate(), bs);
-    bs.writeBoolean(info.isNetworkSubscription());
+        rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getAdditionalPredicate(), bs);
+        bs.writeBoolean(info.isNetworkSubscription());
 
         return rc + 9;
     }
@@ -130,21 +130,21 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         ConsumerInfo info = (ConsumerInfo)o;
-    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConsumerId(), dataOut, bs);
-    bs.readBoolean();
-    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
-    dataOut.writeInt(info.getPrefetchSize());
-    dataOut.writeInt(info.getMaximumPendingMessageLimit());
-    bs.readBoolean();
-    tightMarshalString2(info.getSelector(), dataOut, bs);
-    tightMarshalString2(info.getSubcriptionName(), dataOut, bs);
-    bs.readBoolean();
-    bs.readBoolean();
-    bs.readBoolean();
-    dataOut.writeByte(info.getPriority());
-    tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs);
-    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getAdditionalPredicate(), dataOut, bs);
-    bs.readBoolean();
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConsumerId(), dataOut, bs);
+        bs.readBoolean();
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
+        dataOut.writeInt(info.getPrefetchSize());
+        dataOut.writeInt(info.getMaximumPendingMessageLimit());
+        bs.readBoolean();
+        tightMarshalString2(info.getSelector(), dataOut, bs);
+        tightMarshalString2(info.getSubcriptionName(), dataOut, bs);
+        bs.readBoolean();
+        bs.readBoolean();
+        bs.readBoolean();
+        dataOut.writeByte(info.getPriority());
+        tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs);
+        tightMarshalNestedObject2(wireFormat, (DataStructure)info.getAdditionalPredicate(), dataOut, bs);
+        bs.readBoolean();
 
     }
 
@@ -197,21 +197,21 @@
         ConsumerInfo info = (ConsumerInfo)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, (DataStructure)info.getConsumerId(), dataOut);
-    dataOut.writeBoolean(info.isBrowser());
-    looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
-    dataOut.writeInt(info.getPrefetchSize());
-    dataOut.writeInt(info.getMaximumPendingMessageLimit());
-    dataOut.writeBoolean(info.isDispatchAsync());
-    looseMarshalString(info.getSelector(), dataOut);
-    looseMarshalString(info.getSubcriptionName(), dataOut);
-    dataOut.writeBoolean(info.isNoLocal());
-    dataOut.writeBoolean(info.isExclusive());
-    dataOut.writeBoolean(info.isRetroactive());
-    dataOut.writeByte(info.getPriority());
-    looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut);
-    looseMarshalNestedObject(wireFormat, (DataStructure)info.getAdditionalPredicate(), dataOut);
-    dataOut.writeBoolean(info.isNetworkSubscription());
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getConsumerId(), dataOut);
+        dataOut.writeBoolean(info.isBrowser());
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
+        dataOut.writeInt(info.getPrefetchSize());
+        dataOut.writeInt(info.getMaximumPendingMessageLimit());
+        dataOut.writeBoolean(info.isDispatchAsync());
+        looseMarshalString(info.getSelector(), dataOut);
+        looseMarshalString(info.getSubcriptionName(), dataOut);
+        dataOut.writeBoolean(info.isNoLocal());
+        dataOut.writeBoolean(info.isExclusive());
+        dataOut.writeBoolean(info.isRetroactive());
+        dataOut.writeByte(info.getPriority());
+        looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut);
+        looseMarshalNestedObject(wireFormat, (DataStructure)info.getAdditionalPredicate(), dataOut);
+        dataOut.writeBoolean(info.isNetworkSubscription());
 
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java Mon Mar  6 20:14:27 2006
@@ -78,7 +78,7 @@
         ControlCommand info = (ControlCommand)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalString1(info.getCommand(), bs);
+        rc += tightMarshalString1(info.getCommand(), bs);
 
         return rc + 0;
     }
@@ -94,7 +94,7 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         ControlCommand info = (ControlCommand)o;
-    tightMarshalString2(info.getCommand(), dataOut, bs);
+        tightMarshalString2(info.getCommand(), dataOut, bs);
 
     }
 
@@ -122,7 +122,7 @@
         ControlCommand info = (ControlCommand)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalString(info.getCommand(), dataOut);
+        looseMarshalString(info.getCommand(), dataOut);
 
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java Mon Mar  6 20:14:27 2006
@@ -89,7 +89,7 @@
         DataArrayResponse info = (DataArrayResponse)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalObjectArray1(wireFormat, info.getData(), bs);
+        rc += tightMarshalObjectArray1(wireFormat, info.getData(), bs);
 
         return rc + 0;
     }
@@ -105,7 +105,7 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         DataArrayResponse info = (DataArrayResponse)o;
-    tightMarshalObjectArray2(wireFormat, info.getData(), dataOut, bs);
+        tightMarshalObjectArray2(wireFormat, info.getData(), dataOut, bs);
 
     }
 
@@ -144,7 +144,7 @@
         DataArrayResponse info = (DataArrayResponse)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalObjectArray(wireFormat, info.getData(), dataOut);
+        looseMarshalObjectArray(wireFormat, info.getData(), dataOut);
 
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java Mon Mar  6 20:14:27 2006
@@ -78,7 +78,7 @@
         DataResponse info = (DataResponse)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getData(), bs);
+        rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getData(), bs);
 
         return rc + 0;
     }
@@ -94,7 +94,7 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         DataResponse info = (DataResponse)o;
-    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getData(), dataOut, bs);
+        tightMarshalNestedObject2(wireFormat, (DataStructure)info.getData(), dataOut, bs);
 
     }
 
@@ -122,7 +122,7 @@
         DataResponse info = (DataResponse)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalNestedObject(wireFormat, (DataStructure)info.getData(), dataOut);
+        looseMarshalNestedObject(wireFormat, (DataStructure)info.getData(), dataOut);
 
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java Mon Mar  6 20:14:27 2006
@@ -93,10 +93,10 @@
         DestinationInfo info = (DestinationInfo)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs);
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
         rc+=tightMarshalLong1(wireFormat, info.getTimeout(), bs);
-    rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs);
+        rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs);
 
         return rc + 1;
     }
@@ -112,11 +112,11 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         DestinationInfo info = (DestinationInfo)o;
-    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
-    dataOut.writeByte(info.getOperationType());
-    tightMarshalLong2(wireFormat, info.getTimeout(), dataOut, bs);
-    tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs);
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs);
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
+        dataOut.writeByte(info.getOperationType());
+        tightMarshalLong2(wireFormat, info.getTimeout(), dataOut, bs);
+        tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs);
 
     }
 
@@ -159,11 +159,11 @@
         DestinationInfo info = (DestinationInfo)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut);
-    looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
-    dataOut.writeByte(info.getOperationType());
-    looseMarshalLong(wireFormat, info.getTimeout(), dataOut);
-    looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut);
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut);
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
+        dataOut.writeByte(info.getOperationType());
+        looseMarshalLong(wireFormat, info.getTimeout(), dataOut);
+        looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut);
 
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java Mon Mar  6 20:14:27 2006
@@ -79,8 +79,8 @@
         DiscoveryEvent info = (DiscoveryEvent)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalString1(info.getServiceName(), bs);
-    rc += tightMarshalString1(info.getBrokerName(), bs);
+        rc += tightMarshalString1(info.getServiceName(), bs);
+        rc += tightMarshalString1(info.getBrokerName(), bs);
 
         return rc + 0;
     }
@@ -96,8 +96,8 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         DiscoveryEvent info = (DiscoveryEvent)o;
-    tightMarshalString2(info.getServiceName(), dataOut, bs);
-    tightMarshalString2(info.getBrokerName(), dataOut, bs);
+        tightMarshalString2(info.getServiceName(), dataOut, bs);
+        tightMarshalString2(info.getBrokerName(), dataOut, bs);
 
     }
 
@@ -126,8 +126,8 @@
         DiscoveryEvent info = (DiscoveryEvent)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalString(info.getServiceName(), dataOut);
-    looseMarshalString(info.getBrokerName(), dataOut);
+        looseMarshalString(info.getServiceName(), dataOut);
+        looseMarshalString(info.getBrokerName(), dataOut);
 
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java Mon Mar  6 20:14:27 2006
@@ -78,7 +78,7 @@
         ExceptionResponse info = (ExceptionResponse)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalThrowable1(wireFormat, info.getException(), bs);
+        rc += tightMarshalThrowable1(wireFormat, info.getException(), bs);
 
         return rc + 0;
     }
@@ -94,7 +94,7 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         ExceptionResponse info = (ExceptionResponse)o;
-    tightMarshalThrowable2(wireFormat, info.getException(), dataOut, bs);
+        tightMarshalThrowable2(wireFormat, info.getException(), dataOut, bs);
 
     }
 
@@ -122,7 +122,7 @@
         ExceptionResponse info = (ExceptionResponse)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalThrowable(wireFormat, info.getException(), dataOut);
+        looseMarshalThrowable(wireFormat, info.getException(), dataOut);
 
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java Mon Mar  6 20:14:27 2006
@@ -78,7 +78,7 @@
         IntegerResponse info = (IntegerResponse)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    
+
         return rc + 4;
     }
 
@@ -93,7 +93,7 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         IntegerResponse info = (IntegerResponse)o;
-    dataOut.writeInt(info.getResult());
+        dataOut.writeInt(info.getResult());
 
     }
 
@@ -121,7 +121,7 @@
         IntegerResponse info = (IntegerResponse)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    dataOut.writeInt(info.getResult());
+        dataOut.writeInt(info.getResult());
 
     }
 }



Mime
View raw message