You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/03/07 03:33:12 UTC
svn commit: r383749 [1/13] - in /incubator/activemq/trunk: activemq-core/
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...
Author: chirino
Date: Mon Mar 6 18:32:50 2006
New Revision: 383749
URL: http://svn.apache.org/viewcvs?rev=383749&view=rev
Log:
- Since we WireFormatInfo needs to be flexible and extensible so that feilds can be added witout changing it's on the wire encoding, we are now using a primitive map to store it's data.
- Extracted the NetworkBridgeFilter out of the Demand based forwarding bridge and made it a serializable class so that a bridge can be used with a remote broker.
- Cleaned up many of the warnings gram was spewing out by having it suck in more files.
Added:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterTest.java
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BooleanExpression.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageReference.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/NetworkBridgeFilter.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Xid.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/NetworkBridgeFilterMarshaller.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/CommonAssemblyInfo.cs
incubator/activemq/trunk/activemq-dotnet/src/test/csharp/CommonAssemblyInfo.cs
incubator/activemq/trunk/openwire-cpp/src/command/NetworkBridgeFilter.cpp
incubator/activemq/trunk/openwire-cpp/src/command/NetworkBridgeFilter.hpp
incubator/activemq/trunk/openwire-cpp/src/marshal/NetworkBridgeFilterMarshaller.cpp
incubator/activemq/trunk/openwire-cpp/src/marshal/NetworkBridgeFilterMarshaller.hpp
Modified:
incubator/activemq/trunk/activemq-core/maven.xml
incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpClassesScript.java
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/OpenWireClassesScript.java
incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireJavaMarshallingScript.java
incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCMarshalling.groovy
incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCSharpClasses.groovy
incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/CommandTypes.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java
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/network/DemandForwardingBridge.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.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/ActiveMQMapMessageMarshaller.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.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/FlushCommandMarshaller.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/KeepAliveInfoMarshaller.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/MarshallerFactory.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/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/ShutdownInfoMarshaller.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/TransactionIdMarshaller.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/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransport.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerInfoTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java
incubator/activemq/trunk/activemq-dotnet/activemq-dotnet.csproj
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/AbstractCommand.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMessage.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQObjectMessage.cs
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/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/BaseDataStreamMarshaller.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/ConnectionInfoMarshaller.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/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/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/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/MarshallerFactory.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/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/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/openwire-c/src/libopenwire/ow_commands_v1.c
incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h
incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQObjectMessage.hpp
incubator/activemq/trunk/openwire-cpp/src/command/ConnectionError.hpp
incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.cpp
incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.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/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/WireFormatInfo.cpp
incubator/activemq/trunk/openwire-cpp/src/command/WireFormatInfo.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/BrokerInfoMarshaller.cpp
incubator/activemq/trunk/openwire-cpp/src/marshal/ConnectionErrorMarshaller.cpp
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.cpp
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.cpp
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.cpp
incubator/activemq/trunk/openwire-cpp/src/marshal/DataArrayResponseMarshaller.hpp
incubator/activemq/trunk/openwire-cpp/src/marshal/DataResponseMarshaller.cpp
incubator/activemq/trunk/openwire-cpp/src/marshal/DataResponseMarshaller.hpp
incubator/activemq/trunk/openwire-cpp/src/marshal/DestinationInfoMarshaller.cpp
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.cpp
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.cpp
incubator/activemq/trunk/openwire-cpp/src/marshal/JournalQueueAckMarshaller.hpp
incubator/activemq/trunk/openwire-cpp/src/marshal/JournalTopicAckMarshaller.cpp
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.cpp
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.cpp
incubator/activemq/trunk/openwire-cpp/src/marshal/LocalTransactionIdMarshaller.hpp
incubator/activemq/trunk/openwire-cpp/src/marshal/MarshallerFactory.cpp
incubator/activemq/trunk/openwire-cpp/src/marshal/MessageAckMarshaller.cpp
incubator/activemq/trunk/openwire-cpp/src/marshal/MessageAckMarshaller.hpp
incubator/activemq/trunk/openwire-cpp/src/marshal/MessageDispatchMarshaller.cpp
incubator/activemq/trunk/openwire-cpp/src/marshal/MessageDispatchMarshaller.hpp
incubator/activemq/trunk/openwire-cpp/src/marshal/MessageDispatchNotificationMarshaller.cpp
incubator/activemq/trunk/openwire-cpp/src/marshal/MessageDispatchNotificationMarshaller.hpp
incubator/activemq/trunk/openwire-cpp/src/marshal/MessageIdMarshaller.cpp
incubator/activemq/trunk/openwire-cpp/src/marshal/MessageIdMarshaller.hpp
incubator/activemq/trunk/openwire-cpp/src/marshal/MessageMarshaller.cpp
incubator/activemq/trunk/openwire-cpp/src/marshal/MessageMarshaller.hpp
incubator/activemq/trunk/openwire-cpp/src/marshal/ProducerIdMarshaller.hpp
incubator/activemq/trunk/openwire-cpp/src/marshal/ProducerInfoMarshaller.cpp
incubator/activemq/trunk/openwire-cpp/src/marshal/ProducerInfoMarshaller.hpp
incubator/activemq/trunk/openwire-cpp/src/marshal/RemoveInfoMarshaller.cpp
incubator/activemq/trunk/openwire-cpp/src/marshal/RemoveInfoMarshaller.hpp
incubator/activemq/trunk/openwire-cpp/src/marshal/RemoveSubscriptionInfoMarshaller.cpp
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.cpp
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.cpp
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.cpp
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/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/maven.xml?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/maven.xml (original)
+++ incubator/activemq/trunk/activemq-core/maven.xml Mon Mar 6 18:32:50 2006
@@ -110,7 +110,7 @@
<java classname="org.codehaus.gram.Gram" fork="true">
<classpath refid="openwire.classpath" />
<sysproperty key="openwire.version" value="${openwire.version}" />
- <arg value="src/main/java/org/apache/activemq/command" />
+ <arg value="src/main/java" />
<arg value="src/gram/script/GenerateCppMarshallingClasses.groovy" />
<arg value="src/gram/script/GenerateCppMarshallingHeaders.groovy" />
<arg value="src/gram/script/GenerateJavaMarshalling.groovy" />
Modified: incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpClassesScript.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpClassesScript.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpClassesScript.java (original)
+++ incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpClassesScript.java Mon Mar 6 18:32:50 2006
@@ -16,12 +16,13 @@
*/
package org.apache.activemq.openwire.tool;
-import org.codehaus.jam.JClass;
-import org.codehaus.jam.JProperty;
-
-import java.io.*;
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.util.Iterator;
+import org.codehaus.jam.JProperty;
+
/**
*
* @version $Revision$
@@ -31,7 +32,7 @@
public Object run() {
filePostFix = ".cs";
if (destDir == null) {
- destDir = new File("../openwire-dotnet/src/ActiveMQ/Commands");
+ destDir = new File("../activemq-dotnet/src/main/csharp/ActiveMQ/Commands");
}
return super.run();
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=383749&r1=383748&r2=383749&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 18:32:50 2006
@@ -33,7 +33,7 @@
public Object run() {
filePostFix = ".cs";
if (destDir == null) {
- destDir = new File("../openwire-dotnet/src/ActiveMQ/OpenWire/V"+getOpenwireVersion());
+ destDir = new File("../activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V"+getOpenwireVersion());
}
return super.run();
@@ -49,16 +49,16 @@
out.println("info." + propertyName + " = bs.ReadBoolean();");
}
else if (type.equals("byte")) {
- out.println("info." + propertyName + " = BaseDataStreamMarshaller.ReadByte(dataIn);");
+ out.println("info." + propertyName + " = dataIn.ReadByte();");
}
else if (type.equals("char")) {
- out.println("info." + propertyName + " = BaseDataStreamMarshaller.ReadChar(dataIn);");
+ out.println("info." + propertyName + " = dataIn.ReadChar();");
}
else if (type.equals("short")) {
- out.println("info." + propertyName + " = BaseDataStreamMarshaller.ReadShort(dataIn);");
+ out.println("info." + propertyName + " = dataIn.ReadInt16();");
}
else if (type.equals("int")) {
- out.println("info." + propertyName + " = BaseDataStreamMarshaller.ReadInt(dataIn);");
+ out.println("info." + propertyName + " = dataIn.ReadInt32();");
}
else if (type.equals("long")) {
out.println("info." + propertyName + " = TightUnmarshalLong(wireFormat, dataIn, bs);");
@@ -101,7 +101,7 @@
}
else {
out.println(" if (bs.ReadBoolean()) {");
- out.println(" short size = BaseDataStreamMarshaller.ReadShort(dataIn);");
+ out.println(" short size = dataIn.ReadInt16();");
out.println(" " + arrayType + "[] value = new " + arrayType + "[size];");
out.println(" for( int i=0; i < size; i++ ) {");
out.println(" value[i] = (" + arrayType + ") TightUnmarshalNestedObject(wireFormat,dataIn, bs);");
@@ -169,10 +169,10 @@
}
else {
if (isCachedProperty(property)) {
- out.println("rc += TightMarshalCachedObject1(wireFormat, " + getter + ", bs);");
+ out.println("rc += TightMarshalCachedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
}
else {
- out.println("rc += TightMarshalNestedObject1(wireFormat, " + getter + ", bs);");
+ out.println("rc += TightMarshalNestedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
}
}
}
@@ -194,16 +194,16 @@
out.println("bs.ReadBoolean();");
}
else if (type.equals("byte")) {
- out.println("BaseDataStreamMarshaller.WriteByte(" + getter + ", dataOut);");
+ out.println("dataOut.Write(" + getter + ");");
}
else if (type.equals("char")) {
- out.println("BaseDataStreamMarshaller.WriteChar(" + getter + ", dataOut);");
+ out.println("dataOut.Write(" + getter + ");");
}
else if (type.equals("short")) {
- out.println("BaseDataStreamMarshaller.WriteShort(" + getter + ", dataOut);");
+ out.println("dataOut.Write(" + getter + ");");
}
else if (type.equals("int")) {
- out.println("BaseDataStreamMarshaller.WriteInt(" + getter + ", dataOut);");
+ out.println("dataOut.Write(" + getter + ");");
}
else if (type.equals("long")) {
out.println("TightMarshalLong2(wireFormat, " + getter + ", dataOut, bs);");
@@ -217,7 +217,7 @@
}
else {
out.println("if(bs.ReadBoolean()) {");
- out.println(" BaseDataStreamMarshaller.WriteInt(" + getter + ".Length, dataOut);");
+ out.println(" dataOut.Write(" + getter + ".Length);");
out.println(" dataOut.Write(" + getter + ");");
out.println(" }");
}
@@ -235,10 +235,10 @@
}
else {
if (isCachedProperty(property)) {
- out.println("TightMarshalCachedObject2(wireFormat, " + getter + ", dataOut, bs);");
+ out.println("TightMarshalCachedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
}
else {
- out.println("TightMarshalNestedObject2(wireFormat, " + 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/OpenWireClassesScript.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireClassesScript.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireClassesScript.java (original)
+++ incubator/activemq/trunk/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireClassesScript.java Mon Mar 6 18:32:50 2006
@@ -159,7 +159,7 @@
protected void initialiseManuallyMaintainedClasses() {
String[] names = { "ActiveMQDestination", "ActiveMQTempDestination", "ActiveMQQueue", "ActiveMQTopic", "ActiveMQTempQueue", "ActiveMQTempTopic",
"BaseCommand", "ActiveMQMessage", "ActiveMQTextMessage", "ActiveMQMapMessage", "ActiveMQBytesMessage", "ActiveMQStreamMessage",
- "ActiveMQStreamMessage", "DataStructureSupport" };
+ "ActiveMQStreamMessage", "DataStructureSupport", "WireFormatInfo", "ActiveMQObjectMessage" };
for (int i = 0; i < names.length; i++) {
manuallyMaintainedClasses.add(names[i]);
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=383749&r1=383748&r2=383749&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 18:32:50 2006
@@ -152,19 +152,19 @@
out.println("info." + setter + "(tightUnmarshalByteSequence(dataIn, bs));");
}
else if (isThrowable(property.getType())) {
- out.println("info." + setter + "((" + type + ") tightUnmarsalThrowable(wireFormat, dataIn, bs));");
+ out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") tightUnmarsalThrowable(wireFormat, dataIn, bs));");
}
else if (isCachedProperty(property)) {
- out.println("info." + setter + "((" + type + ") tightUnmarsalCachedObject(wireFormat, dataIn, bs));");
+ out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") tightUnmarsalCachedObject(wireFormat, dataIn, bs));");
}
else {
- out.println("info." + setter + "((" + type + ") tightUnmarsalNestedObject(wireFormat, dataIn, bs));");
+ out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") tightUnmarsalNestedObject(wireFormat, dataIn, bs));");
}
}
protected void generateTightUnmarshalBodyForArrayProperty(PrintWriter out, JProperty property, JAnnotationValue size) {
JClass propertyType = property.getType();
- String arrayType = propertyType.getArrayComponentType().getSimpleName();
+ String arrayType = propertyType.getArrayComponentType().getQualifiedName();
String setter = property.getSetter().getSimpleName();
out.println();
if (size != null) {
@@ -248,10 +248,10 @@
}
else {
if (isCachedProperty(property)) {
- out.println("rc += tightMarshalCachedObject1(wireFormat, " + getter + ", bs);");
+ out.println("rc += tightMarshalCachedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
}
else {
- out.println("rc += tightMarshalNestedObject1(wireFormat, " + getter + ", bs);");
+ out.println("rc += tightMarshalNestedObject1(wireFormat, (DataStructure)" + getter + ", bs);");
}
}
}
@@ -314,10 +314,10 @@
}
else {
if (isCachedProperty(property)) {
- out.println("tightMarshalCachedObject2(wireFormat, " + getter + ", dataOut, bs);");
+ out.println("tightMarshalCachedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
}
else {
- out.println("tightMarshalNestedObject2(wireFormat, " + getter + ", dataOut, bs);");
+ out.println("tightMarshalNestedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);");
}
}
}
@@ -381,10 +381,10 @@
}
else {
if (isCachedProperty(property)) {
- out.println("looseMarshalCachedObject(wireFormat, " + getter + ", dataOut);");
+ out.println("looseMarshalCachedObject(wireFormat, (DataStructure)" + getter + ", dataOut);");
}
else {
- out.println("looseMarshalNestedObject(wireFormat, " + getter + ", dataOut);");
+ out.println("looseMarshalNestedObject(wireFormat, (DataStructure)" + getter + ", dataOut);");
}
}
}
@@ -447,19 +447,19 @@
out.println("info." + setter + "(looseUnmarshalByteSequence(dataIn));");
}
else if (isThrowable(property.getType())) {
- out.println("info." + setter + "((" + type + ") looseUnmarsalThrowable(wireFormat, dataIn));");
+ out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") looseUnmarsalThrowable(wireFormat, dataIn));");
}
else if (isCachedProperty(property)) {
- out.println("info." + setter + "((" + type + ") looseUnmarsalCachedObject(wireFormat, dataIn));");
+ out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") looseUnmarsalCachedObject(wireFormat, dataIn));");
}
else {
- out.println("info." + setter + "((" + type + ") looseUnmarsalNestedObject(wireFormat, dataIn));");
+ out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") looseUnmarsalNestedObject(wireFormat, dataIn));");
}
}
protected void generateLooseUnmarshalBodyForArrayProperty(PrintWriter out, JProperty property, JAnnotationValue size) {
JClass propertyType = property.getType();
- String arrayType = propertyType.getArrayComponentType().getSimpleName();
+ String arrayType = propertyType.getArrayComponentType().getQualifiedName();
String setter = property.getSetter().getSimpleName();
out.println();
if (size != null) {
Modified: incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCMarshalling.groovy
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCMarshalling.groovy?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCMarshalling.groovy (original)
+++ incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCMarshalling.groovy Mon Mar 6 18:32:50 2006
@@ -74,7 +74,7 @@
def generateFields(out, jclass) {
- println("getting fields for: ${jclass.simpleName}");
+// println("getting fields for: ${jclass.simpleName}");
if( jclass.superclass == null || jclass.superclass.simpleName.equals("Object") ) {
out << """
ow_byte structType;
Modified: incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCSharpClasses.groovy
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCSharpClasses.groovy?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCSharpClasses.groovy (original)
+++ incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCSharpClasses.groovy Mon Mar 6 18:32:50 2006
@@ -57,7 +57,13 @@
// if you need to make a change, please see the Groovy scripts in the
// activemq-core module
//
- public class ${jclass.simpleName} : $baseClass
+ public class ${jclass.simpleName} : $baseClass"""
+
+ for( i in jclass.interfaces ) {
+ out << ", ${i.simpleName}";
+ }
+
+out << """
{
public const byte ID_${jclass.simpleName} = ${getOpenWireOpCode(jclass)};
Modified: incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy (original)
+++ incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy Mon Mar 6 18:32:50 2006
@@ -49,6 +49,7 @@
import org.apache.activemq.openwire.*;
import org.apache.activemq.command.*;
+
"""
for (pkg in jclass.importedPackages) {
for (clazz in pkg.classes) {
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/CommandTypes.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/CommandTypes.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/CommandTypes.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/CommandTypes.java Mon Mar 6 18:32:50 2006
@@ -117,6 +117,7 @@
///////////////////////////////////////////////////
byte MESSAGE_DISPATCH_NOTIFICATION = 90;
+ byte NETWORK_BRIDGE_FILTER = 91;
///////////////////////////////////////////////////
//
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java Mon Mar 6 18:32:50 2006
@@ -49,7 +49,7 @@
protected byte priority;
protected BrokerId[] brokerPath;
- protected transient BooleanExpression additionalPredicate;
+ protected BooleanExpression additionalPredicate;
protected transient boolean networkSubscription; //this subscription originated from a network connection
public ConsumerInfo() {
@@ -278,7 +278,7 @@
* into the selector on the fly. Handy if if say a Security Broker interceptor wants to
* filter out messages based on security level of the consumer.
*
- * @return
+ * @openwire:property version=1
*/
public BooleanExpression getAdditionalPredicate() {
return additionalPredicate;
Added: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java?rev=383749&view=auto
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java (added)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java Mon Mar 6 18:32:50 2006
@@ -0,0 +1,137 @@
+/**
+ * <a href="http://activemq.org">ActiveMQ: The Open Source Message Fabric</a>
+ *
+ * Copyright 2005 Hiram Chirino
+ *
+ * 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.
+ *
+ **/
+
+package org.apache.activemq.command;
+
+import java.io.IOException;
+
+import javax.jms.JMSException;
+
+import org.apache.activemq.filter.BooleanExpression;
+import org.apache.activemq.filter.MessageEvaluationContext;
+import org.apache.activemq.util.JMSExceptionSupport;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @openwire:marshaller code="91"
+ * @version $Revision: 1.12 $
+ */
+public class NetworkBridgeFilter implements DataStructure, BooleanExpression {
+
+ static final Log log=LogFactory.getLog(NetworkBridgeFilter.class);
+ public static final byte DATA_STRUCTURE_TYPE=CommandTypes.NETWORK_BRIDGE_FILTER;
+
+ private BrokerId networkBrokerId;
+ private int networkTTL;
+
+ public NetworkBridgeFilter() {
+ }
+
+ public NetworkBridgeFilter(BrokerId remoteBrokerPath, int networkTTL) {
+ this.networkBrokerId = remoteBrokerPath;
+ this.networkTTL = networkTTL;
+ }
+
+ public byte getDataStructureType() {
+ return DATA_STRUCTURE_TYPE;
+ }
+
+ public boolean isMarshallAware() {
+ return false;
+ }
+
+
+ public boolean matches(MessageEvaluationContext message) throws JMSException{
+ try{
+ return matchesForwardingFilter(message.getMessage());
+ }catch(IOException e){
+ throw JMSExceptionSupport.create(e);
+ }
+ }
+
+ public Object evaluate(MessageEvaluationContext message) throws JMSException{
+ return matches(message)?Boolean.TRUE:Boolean.FALSE;
+ }
+
+ protected boolean matchesForwardingFilter(Message message){
+
+ if ( contains(message.getBrokerPath(), networkBrokerId) ){
+ if (log.isTraceEnabled()){
+ log.trace("Message all ready routed once through this broker - ignoring: " + message);
+ }
+ return false;
+ }
+
+ int hops = message.getBrokerPath() == null ? 0 : message.getBrokerPath().length;
+
+ if(hops >= networkTTL){
+ if (log.isTraceEnabled()){
+ log.trace("Message restricted to " + networkTTL + " network hops ignoring: " + message);
+ }
+ return false;
+ }
+
+ // Don't propagate advisory messages about network subscriptions
+ if(message.isAdvisory()&&message.getDataStructure()!=null
+ &&message.getDataStructure().getDataStructureType()==CommandTypes.CONSUMER_INFO){
+ ConsumerInfo info=(ConsumerInfo) message.getDataStructure();
+ hops = info.getBrokerPath() == null ? 0 : message.getBrokerPath().length;
+ if(hops >= networkTTL ){
+ if (log.isTraceEnabled()){
+ log.trace("ConsumerInfo advisory restricted to " + networkTTL + " network hops ignoring: " + message);
+ }
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public static boolean contains(BrokerId[] brokerPath,BrokerId brokerId){
+ if(brokerPath!=null){
+ for(int i=0;i<brokerPath.length;i++){
+ if(brokerId.equals(brokerPath[i]))
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * @openwire:property version=1
+ */
+ public int getNetworkTTL() {
+ return networkTTL;
+ }
+ public void setNetworkTTL(int networkTTL) {
+ this.networkTTL = networkTTL;
+ }
+
+ /**
+ * @openwire:property version=1 cache=true
+ */
+ public BrokerId getNetworkBrokerId() {
+ return networkBrokerId;
+ }
+
+ public void setNetworkBrokerId(BrokerId remoteBrokerPath) {
+ this.networkBrokerId = remoteBrokerPath;
+ }
+
+}
\ No newline at end of file
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=383749&r1=383748&r2=383749&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 18:32:50 2006
@@ -16,29 +16,36 @@
*/
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;
import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
/**
*
* @openwire:marshaller code="1"
* @version $Revision$
*/
-public class WireFormatInfo implements Command {
+public class WireFormatInfo implements Command, MarshallAware {
public static final byte DATA_STRUCTURE_TYPE = CommandTypes.WIREFORMAT_INFO;
static final private byte MAGIC[] = new byte[] { 'A', 'c', 't', 'i', 'v', 'e', 'M', 'Q' };
- protected int version;
protected byte magic[] = MAGIC;
-
- protected boolean stackTraceEnabled;
- protected boolean tcpNoDelayEnabled;
- protected boolean cacheEnabled;
- protected boolean tightEncodingEnabled;
- protected boolean prefixPacketSize;
+ protected int version;
+ protected transient HashMap properties;
+ protected ByteSequence marshalledProperties;
public byte getDataStructureType() {
return DATA_STRUCTURE_TYPE;
@@ -48,13 +55,17 @@
return true;
}
+ public boolean isMarshallAware() {
+ return true;
+ }
+
+
/**
* @openwire:property version=1 size=8 testSize=-1
*/
public byte[] getMagic() {
return magic;
}
-
public void setMagic(byte[] magic) {
this.magic = magic;
}
@@ -65,119 +76,194 @@
public int getVersion() {
return version;
}
-
public void setVersion(int version) {
this.version = version;
}
-
- public boolean isValid() {
- return magic != null && Arrays.equals(magic, MAGIC);
+
+ /**
+ * @openwire:property version=1
+ */
+ public ByteSequence getMarshalledProperties() {
+ return marshalledProperties;
}
-
- public void setCommandId(short value) {
+ public void setMarshalledProperties(ByteSequence marshalledProperties) {
+ this.marshalledProperties = marshalledProperties;
}
- public short getCommandId() {
- return 0;
+ //////////////////////
+ //
+ // Implementation Methods.
+ //
+ //////////////////////
+
+ public Object getProperty(String name) throws IOException {
+ if( properties == null ) {
+ if( marshalledProperties ==null )
+ return null;
+ properties = unmarsallProperties(marshalledProperties);
+ }
+ return properties.get(name);
}
-
- public boolean isResponseRequired() {
- return false;
+
+ public Map getProperties() throws IOException {
+ if( properties == null ) {
+ if( marshalledProperties==null )
+ return Collections.EMPTY_MAP;
+ properties = unmarsallProperties(marshalledProperties);
+ }
+ return Collections.unmodifiableMap(properties);
+ }
+
+ public void clearProperties() {
+ marshalledProperties = null;
+ properties=null;
+ }
+
+ public void setProperty(String name, Object value) throws IOException {
+ lazyCreateProperties();
+ properties.put(name, value);
+ }
+
+ protected void lazyCreateProperties() throws IOException {
+ if( properties == null ) {
+ if( marshalledProperties == null ) {
+ properties = new HashMap();
+ } else {
+ properties = unmarsallProperties(marshalledProperties);
+ marshalledProperties = null;
+ }
+ }
+ }
+
+ private HashMap unmarsallProperties(ByteSequence marshalledProperties) throws IOException {
+ return MarshallingSupport.unmarshalPrimitiveMap(new DataInputStream(new ByteArrayInputStream(marshalledProperties)));
}
- public boolean isResponse() {
- return false;
+ public void beforeMarshall(WireFormat wireFormat) throws IOException {
+ // Need to marshal the properties.
+ if( marshalledProperties==null && properties!=null ) {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ DataOutputStream os = new DataOutputStream(baos);
+ MarshallingSupport.marshalPrimitiveMap(properties, os);
+ os.close();
+ marshalledProperties = baos.toByteSequence();
+ }
}
- public boolean isBrokerInfo() {
- return false;
+ public void afterMarshall(WireFormat wireFormat) throws IOException {
}
- public boolean isMessageDispatch() {
- return false;
+ public void beforeUnmarshall(WireFormat wireFormat) throws IOException {
}
- public boolean isMessage() {
- return false;
+ public void afterUnmarshall(WireFormat wireFormat) throws IOException {
}
- public boolean isMessageAck() {
- return false;
+
+ public boolean isValid() {
+ return magic != null && Arrays.equals(magic, MAGIC);
}
public void setResponseRequired(boolean responseRequired) {
}
/**
- * @openwire:property version=1
+ * @throws IOException
*/
- public boolean isCacheEnabled() {
- return cacheEnabled;
+ public boolean isCacheEnabled() throws IOException {
+ return Boolean.TRUE == getProperty("cache");
}
-
- public void setCacheEnabled(boolean cacheEnabled) {
- this.cacheEnabled = cacheEnabled;
+ public void setCacheEnabled(boolean cacheEnabled) throws IOException {
+ setProperty("cache", cacheEnabled ? Boolean.TRUE : Boolean.FALSE);
}
/**
- * @openwire:property version=1
+ * @throws IOException
*/
- public boolean isStackTraceEnabled() {
- return stackTraceEnabled;
+ public boolean isStackTraceEnabled() throws IOException {
+ return Boolean.TRUE == getProperty("stackTrace");
}
-
- public void setStackTraceEnabled(boolean stackTraceEnabled) {
- this.stackTraceEnabled = stackTraceEnabled;
+ public void setStackTraceEnabled(boolean stackTraceEnabled) throws IOException {
+ setProperty("stackTrace", stackTraceEnabled ? Boolean.TRUE : Boolean.FALSE);
}
/**
- * @openwire:property version=1
+ * @throws IOException
*/
- public boolean isTcpNoDelayEnabled() {
- return tcpNoDelayEnabled;
+ public boolean isTcpNoDelayEnabled() throws IOException {
+ return Boolean.TRUE == getProperty("tcpNoDelay");
}
-
- public void setTcpNoDelayEnabled(boolean tcpNoDelayEnabled) {
- this.tcpNoDelayEnabled = tcpNoDelayEnabled;
+ public void setTcpNoDelayEnabled(boolean tcpNoDelayEnabled) throws IOException {
+ setProperty("tcpNoDelay", tcpNoDelayEnabled ? Boolean.TRUE : Boolean.FALSE);
}
/**
- * @openwire:property version=1
+ * @throws IOException
*/
- public boolean isPrefixPacketSize() {
- return prefixPacketSize;
+ public boolean isPrefixPacketSize() throws IOException {
+ return Boolean.TRUE == getProperty("prefixPacketSize");
}
- public void setPrefixPacketSize(boolean prefixPacketSize) {
- this.prefixPacketSize = prefixPacketSize;
+ public void setPrefixPacketSize(boolean prefixPacketSize) throws IOException {
+ setProperty("prefixPacketSize", prefixPacketSize ? Boolean.TRUE : Boolean.FALSE);
}
/**
- * @openwire:property version=1
+ * @throws IOException
*/
- public boolean isTightEncodingEnabled() {
- return tightEncodingEnabled;
+ public boolean isTightEncodingEnabled() throws IOException {
+ return Boolean.TRUE == getProperty("tightEncoding");
}
- public void setTightEncodingEnabled(boolean tightEncodingEnabled) {
- this.tightEncodingEnabled = tightEncodingEnabled;
+ public void setTightEncodingEnabled(boolean tightEncodingEnabled) throws IOException {
+ setProperty("tightEncoding", tightEncodingEnabled ? Boolean.TRUE : Boolean.FALSE);
}
public Response visit(CommandVisitor visitor) throws Exception {
return visitor.processWireFormat(this);
}
- public boolean isMarshallAware() {
- return false;
+ public String toString() {
+ return IntrospectionSupport.toString(this, WireFormatInfo.class);
}
+ ///////////////////////////////////////////////////////////////
+ //
+ // This are not implemented.
+ //
+ ///////////////////////////////////////////////////////////////
+
+ public void setCommandId(short value) {
+ }
+ public short getCommandId() {
+ return 0;
+ }
+ public boolean isResponseRequired() {
+ return false;
+ }
+ public boolean isResponse() {
+ return false;
+ }
+ public boolean isBrokerInfo() {
+ return false;
+ }
+ public boolean isMessageDispatch() {
+ return false;
+ }
+ public boolean isMessage() {
+ return false;
+ }
+ public boolean isMessageAck() {
+ return false;
+ }
public boolean isMessageDispatchNotification(){
return false;
}
-
public boolean isShutdownInfo(){
return false;
}
-
- public String toString() {
- return IntrospectionSupport.toString(this, WireFormatInfo.class);
+ public void setCachedMarshalledForm(WireFormat wireFormat, ByteSequence data) {
}
+ public ByteSequence getCachedMarshalledForm(WireFormat wireFormat) {
+ return null;
+ }
+
}
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridge.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridge.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridge.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridge.java Mon Mar 6 18:32:50 2006
@@ -14,14 +14,12 @@
package org.apache.activemq.network;
import java.io.IOException;
-import javax.jms.JMSException;
import org.apache.activemq.advisory.AdvisorySupport;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.command.BrokerId;
import org.apache.activemq.command.BrokerInfo;
import org.apache.activemq.command.Command;
-import org.apache.activemq.command.CommandTypes;
import org.apache.activemq.command.ConnectionId;
import org.apache.activemq.command.ConnectionInfo;
import org.apache.activemq.command.ConsumerId;
@@ -31,20 +29,18 @@
import org.apache.activemq.command.Message;
import org.apache.activemq.command.MessageAck;
import org.apache.activemq.command.MessageDispatch;
+import org.apache.activemq.command.NetworkBridgeFilter;
import org.apache.activemq.command.ProducerInfo;
import org.apache.activemq.command.RemoveInfo;
import org.apache.activemq.command.Response;
import org.apache.activemq.command.SessionInfo;
import org.apache.activemq.command.ShutdownInfo;
import org.apache.activemq.command.WireFormatInfo;
-import org.apache.activemq.filter.BooleanExpression;
import org.apache.activemq.filter.DestinationFilter;
-import org.apache.activemq.filter.MessageEvaluationContext;
import org.apache.activemq.transport.DefaultTransportListener;
import org.apache.activemq.transport.Transport;
import org.apache.activemq.transport.TransportListener;
import org.apache.activemq.util.IdGenerator;
-import org.apache.activemq.util.JMSExceptionSupport;
import org.apache.activemq.util.LongSequenceGenerator;
import org.apache.activemq.util.ServiceStopper;
import org.apache.activemq.util.ServiceSupport;
@@ -61,7 +57,7 @@
* @version $Revision$
*/
public class DemandForwardingBridge implements Bridge{
- static final private Log log=LogFactory.getLog(DemandForwardingBridge.class);
+ static final Log log=LogFactory.getLog(DemandForwardingBridge.class);
protected final Transport localBroker;
protected final Transport remoteBroker;
protected IdGenerator idGenerator=new IdGenerator();
@@ -610,7 +606,7 @@
- private boolean contains(BrokerId[] brokerPath,BrokerId brokerId){
+ public static boolean contains(BrokerId[] brokerPath,BrokerId brokerId){
if(brokerPath!=null){
for(int i=0;i<brokerPath.length;i++){
if(brokerId.equals(brokerPath[i]))
@@ -718,19 +714,7 @@
// This works for now since we use a VM connection to the local broker.
// may need to change if we ever subscribe to a remote broker.
- sub.getLocalInfo().setAdditionalPredicate(new BooleanExpression(){
- public boolean matches(MessageEvaluationContext message) throws JMSException{
- try{
- return matchesForwardingFilter(message.getMessage());
- }catch(IOException e){
- throw JMSExceptionSupport.create(e);
- }
- }
-
- public Object evaluate(MessageEvaluationContext message) throws JMSException{
- return matches(message)?Boolean.TRUE:Boolean.FALSE;
- }
- });
+ sub.getLocalInfo().setAdditionalPredicate(new NetworkBridgeFilter(remoteBrokerPath[0], networkTTL));
}
protected void removeDemandSubscription(ConsumerId id) throws IOException{
@@ -742,34 +726,6 @@
}
}
- protected boolean matchesForwardingFilter(Message message){
- if (contains(message.getBrokerPath(),remoteBrokerPath[0])){
- if (log.isTraceEnabled()){
- log.trace("Message all ready routed once through this broker - ignoring: " + message);
- }
- return false;
- }
- int hops = message.getBrokerPath() == null ? 0 : message.getBrokerPath().length;
- if(hops >= networkTTL){
- if (log.isTraceEnabled()){
- log.trace("Message restricted to " + networkTTL + " network hops ignoring: " + message);
- }
- return false;
- }
- // Don't propagate advisory messages about network subscriptions
- if(message.isAdvisory()&&message.getDataStructure()!=null
- &&message.getDataStructure().getDataStructureType()==CommandTypes.CONSUMER_INFO){
- ConsumerInfo info=(ConsumerInfo) message.getDataStructure();
- hops = info.getBrokerPath() == null ? 0 : message.getBrokerPath().length;
- if(hops >= networkTTL){
- if (log.isTraceEnabled()){
- log.trace("ConsumerInfo advisory restricted to " + networkTTL + " network hops ignoring: " + message);
- }
- return false;
- }
- }
- return true;
- }
protected void waitStarted() throws InterruptedException {
startedLatch.await();
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java Mon Mar 6 18:32:50 2006
@@ -25,6 +25,7 @@
import org.apache.activemq.command.*;
+
/**
* Marshalling code for Open Wire Format for ActiveMQBytesMessageMarshaller
*
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=383749&r1=383748&r2=383749&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 18:32:50 2006
@@ -25,6 +25,7 @@
import org.apache.activemq.command.*;
+
/**
* Marshalling code for Open Wire Format for ActiveMQDestinationMarshaller
*
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java Mon Mar 6 18:32:50 2006
@@ -25,6 +25,7 @@
import org.apache.activemq.command.*;
+
/**
* Marshalling code for Open Wire Format for ActiveMQMapMessageMarshaller
*
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java Mon Mar 6 18:32:50 2006
@@ -25,6 +25,7 @@
import org.apache.activemq.command.*;
+
/**
* Marshalling code for Open Wire Format for ActiveMQMessageMarshaller
*
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java Mon Mar 6 18:32:50 2006
@@ -25,6 +25,7 @@
import org.apache.activemq.command.*;
+
/**
* Marshalling code for Open Wire Format for ActiveMQObjectMessageMarshaller
*
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java Mon Mar 6 18:32:50 2006
@@ -25,6 +25,7 @@
import org.apache.activemq.command.*;
+
/**
* Marshalling code for Open Wire Format for ActiveMQQueueMarshaller
*
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java Mon Mar 6 18:32:50 2006
@@ -25,6 +25,7 @@
import org.apache.activemq.command.*;
+
/**
* Marshalling code for Open Wire Format for ActiveMQStreamMessageMarshaller
*
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java Mon Mar 6 18:32:50 2006
@@ -25,6 +25,7 @@
import org.apache.activemq.command.*;
+
/**
* Marshalling code for Open Wire Format for ActiveMQTempDestinationMarshaller
*
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java Mon Mar 6 18:32:50 2006
@@ -25,6 +25,7 @@
import org.apache.activemq.command.*;
+
/**
* Marshalling code for Open Wire Format for ActiveMQTempQueueMarshaller
*
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java Mon Mar 6 18:32:50 2006
@@ -25,6 +25,7 @@
import org.apache.activemq.command.*;
+
/**
* Marshalling code for Open Wire Format for ActiveMQTempTopicMarshaller
*
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java Mon Mar 6 18:32:50 2006
@@ -25,6 +25,7 @@
import org.apache.activemq.command.*;
+
/**
* Marshalling code for Open Wire Format for ActiveMQTextMessageMarshaller
*
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java Mon Mar 6 18:32:50 2006
@@ -25,6 +25,7 @@
import org.apache.activemq.command.*;
+
/**
* Marshalling code for Open Wire Format for ActiveMQTopicMarshaller
*
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=383749&r1=383748&r2=383749&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 18:32:50 2006
@@ -25,6 +25,7 @@
import org.apache.activemq.command.*;
+
/**
* Marshalling code for Open Wire Format for BaseCommandMarshaller
*
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=383749&r1=383748&r2=383749&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 18:32:50 2006
@@ -25,6 +25,7 @@
import org.apache.activemq.command.*;
+
/**
* Marshalling code for Open Wire Format for BrokerIdMarshaller
*
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=383749&r1=383748&r2=383749&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 18:32:50 2006
@@ -25,6 +25,7 @@
import org.apache.activemq.command.*;
+
/**
* Marshalling code for Open Wire Format for BrokerInfoMarshaller
*
@@ -64,14 +65,14 @@
super.tightUnmarshal(wireFormat, o, dataIn, bs);
BrokerInfo info = (BrokerInfo)o;
- info.setBrokerId((BrokerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+ info.setBrokerId((org.apache.activemq.command.BrokerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
info.setBrokerURL(tightUnmarshalString(dataIn, bs));
if (bs.readBoolean()) {
short size = dataIn.readShort();
- BrokerInfo value[] = new BrokerInfo[size];
+ org.apache.activemq.command.BrokerInfo value[] = new org.apache.activemq.command.BrokerInfo[size];
for( int i=0; i < size; i++ ) {
- value[i] = (BrokerInfo) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
+ value[i] = (org.apache.activemq.command.BrokerInfo) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
}
info.setPeerBrokerInfos(value);
}
@@ -92,7 +93,7 @@
BrokerInfo info = (BrokerInfo)o;
int rc = super.tightMarshal1(wireFormat, o, bs);
- rc += tightMarshalCachedObject1(wireFormat, info.getBrokerId(), bs);
+ rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getBrokerId(), bs);
rc += tightMarshalString1(info.getBrokerURL(), bs);
rc += tightMarshalObjectArray1(wireFormat, info.getPeerBrokerInfos(), bs);
rc += tightMarshalString1(info.getBrokerName(), bs);
@@ -112,7 +113,7 @@
super.tightMarshal2(wireFormat, o, dataOut, bs);
BrokerInfo info = (BrokerInfo)o;
- tightMarshalCachedObject2(wireFormat, info.getBrokerId(), dataOut, bs);
+ tightMarshalCachedObject2(wireFormat, (DataStructure)info.getBrokerId(), dataOut, bs);
tightMarshalString2(info.getBrokerURL(), dataOut, bs);
tightMarshalObjectArray2(wireFormat, info.getPeerBrokerInfos(), dataOut, bs);
tightMarshalString2(info.getBrokerName(), dataOut, bs);
@@ -131,14 +132,14 @@
super.looseUnmarshal(wireFormat, o, dataIn);
BrokerInfo info = (BrokerInfo)o;
- info.setBrokerId((BrokerId) looseUnmarsalCachedObject(wireFormat, dataIn));
+ info.setBrokerId((org.apache.activemq.command.BrokerId) looseUnmarsalCachedObject(wireFormat, dataIn));
info.setBrokerURL(looseUnmarshalString(dataIn));
if (dataIn.readBoolean()) {
short size = dataIn.readShort();
- BrokerInfo value[] = new BrokerInfo[size];
+ org.apache.activemq.command.BrokerInfo value[] = new org.apache.activemq.command.BrokerInfo[size];
for( int i=0; i < size; i++ ) {
- value[i] = (BrokerInfo) looseUnmarsalNestedObject(wireFormat,dataIn);
+ value[i] = (org.apache.activemq.command.BrokerInfo) looseUnmarsalNestedObject(wireFormat,dataIn);
}
info.setPeerBrokerInfos(value);
}
@@ -159,7 +160,7 @@
BrokerInfo info = (BrokerInfo)o;
super.looseMarshal(wireFormat, o, dataOut);
- looseMarshalCachedObject(wireFormat, info.getBrokerId(), dataOut);
+ looseMarshalCachedObject(wireFormat, (DataStructure)info.getBrokerId(), dataOut);
looseMarshalString(info.getBrokerURL(), dataOut);
looseMarshalObjectArray(wireFormat, info.getPeerBrokerInfos(), dataOut);
looseMarshalString(info.getBrokerName(), dataOut);
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=383749&r1=383748&r2=383749&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 18:32:50 2006
@@ -25,6 +25,7 @@
import org.apache.activemq.command.*;
+
/**
* Marshalling code for Open Wire Format for ConnectionErrorMarshaller
*
@@ -64,8 +65,8 @@
super.tightUnmarshal(wireFormat, o, dataIn, bs);
ConnectionError info = (ConnectionError)o;
- info.setException((Throwable) tightUnmarsalThrowable(wireFormat, dataIn, bs));
- info.setConnectionId((ConnectionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+ info.setException((java.lang.Throwable) tightUnmarsalThrowable(wireFormat, dataIn, bs));
+ info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
}
@@ -79,7 +80,7 @@
int rc = super.tightMarshal1(wireFormat, o, bs);
rc += tightMarshalThrowable1(wireFormat, info.getException(), bs);
- rc += tightMarshalNestedObject1(wireFormat, info.getConnectionId(), bs);
+ rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs);
return rc + 0;
}
@@ -96,7 +97,7 @@
ConnectionError info = (ConnectionError)o;
tightMarshalThrowable2(wireFormat, info.getException(), dataOut, bs);
- tightMarshalNestedObject2(wireFormat, info.getConnectionId(), dataOut, bs);
+ tightMarshalNestedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs);
}
@@ -111,8 +112,8 @@
super.looseUnmarshal(wireFormat, o, dataIn);
ConnectionError info = (ConnectionError)o;
- info.setException((Throwable) looseUnmarsalThrowable(wireFormat, dataIn));
- info.setConnectionId((ConnectionId) looseUnmarsalNestedObject(wireFormat, dataIn));
+ info.setException((java.lang.Throwable) looseUnmarsalThrowable(wireFormat, dataIn));
+ info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalNestedObject(wireFormat, dataIn));
}
@@ -126,7 +127,7 @@
super.looseMarshal(wireFormat, o, dataOut);
looseMarshalThrowable(wireFormat, info.getException(), dataOut);
- looseMarshalNestedObject(wireFormat, info.getConnectionId(), 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=383749&r1=383748&r2=383749&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 18:32:50 2006
@@ -25,6 +25,7 @@
import org.apache.activemq.command.*;
+
/**
* Marshalling code for Open Wire Format for ConnectionIdMarshaller
*
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=383749&r1=383748&r2=383749&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 18:32:50 2006
@@ -25,6 +25,7 @@
import org.apache.activemq.command.*;
+
/**
* Marshalling code for Open Wire Format for ConnectionInfoMarshaller
*
@@ -64,16 +65,16 @@
super.tightUnmarshal(wireFormat, o, dataIn, bs);
ConnectionInfo info = (ConnectionInfo)o;
- info.setConnectionId((ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+ info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
info.setClientId(tightUnmarshalString(dataIn, bs));
info.setPassword(tightUnmarshalString(dataIn, bs));
info.setUserName(tightUnmarshalString(dataIn, bs));
if (bs.readBoolean()) {
short size = dataIn.readShort();
- BrokerId value[] = new BrokerId[size];
+ org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
for( int i=0; i < size; i++ ) {
- value[i] = (BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
+ value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
}
info.setBrokerPath(value);
}
@@ -92,7 +93,7 @@
ConnectionInfo info = (ConnectionInfo)o;
int rc = super.tightMarshal1(wireFormat, o, bs);
- rc += tightMarshalCachedObject1(wireFormat, info.getConnectionId(), bs);
+ rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs);
rc += tightMarshalString1(info.getClientId(), bs);
rc += tightMarshalString1(info.getPassword(), bs);
rc += tightMarshalString1(info.getUserName(), bs);
@@ -112,7 +113,7 @@
super.tightMarshal2(wireFormat, o, dataOut, bs);
ConnectionInfo info = (ConnectionInfo)o;
- tightMarshalCachedObject2(wireFormat, info.getConnectionId(), dataOut, bs);
+ tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs);
tightMarshalString2(info.getClientId(), dataOut, bs);
tightMarshalString2(info.getPassword(), dataOut, bs);
tightMarshalString2(info.getUserName(), dataOut, bs);
@@ -131,16 +132,16 @@
super.looseUnmarshal(wireFormat, o, dataIn);
ConnectionInfo info = (ConnectionInfo)o;
- info.setConnectionId((ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
+ info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
info.setClientId(looseUnmarshalString(dataIn));
info.setPassword(looseUnmarshalString(dataIn));
info.setUserName(looseUnmarshalString(dataIn));
if (dataIn.readBoolean()) {
short size = dataIn.readShort();
- BrokerId value[] = new BrokerId[size];
+ org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
for( int i=0; i < size; i++ ) {
- value[i] = (BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
+ value[i] = (org.apache.activemq.command.BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
}
info.setBrokerPath(value);
}
@@ -159,7 +160,7 @@
ConnectionInfo info = (ConnectionInfo)o;
super.looseMarshal(wireFormat, o, dataOut);
- looseMarshalCachedObject(wireFormat, info.getConnectionId(), dataOut);
+ looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut);
looseMarshalString(info.getClientId(), dataOut);
looseMarshalString(info.getPassword(), dataOut);
looseMarshalString(info.getUserName(), dataOut);