You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2009/02/25 22:05:05 UTC
svn commit: r747922 [1/2] - in /activemq/activemq-cpp/trunk:
activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/
src/main/activemq/commands/
Author: tabish
Date: Wed Feb 25 21:05:02 2009
New Revision: 747922
URL: http://svn.apache.org/viewvc?rev=747922&view=rev
Log:
Refactored OpenWire Command generator code that allows for overrides of code generation for specific commands that need changes or additional methods that aren't part of the Transmitted command but are need for internal use by the CPP client.
Added:
activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConnectionIdSourceGenerator.java (with props)
Modified:
activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandCodeGenerator.java
activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandCodeGeneratorsFactory.java
activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandHeaderGenerator.java
activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConnectionIdHeaderGenerator.java
activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConsumerIdHeaderGenerator.java
activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConsumerIdSourceGenerator.java
activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ProducerIdHeaderGenerator.java
activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ProducerIdSourceGenerator.java
activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/SessionIdHeaderGenerator.java
activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/SessionIdSourceGenerator.java
activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerId.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerId.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerInfo.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerInfo.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionControl.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionControl.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionError.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionError.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionId.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionId.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionInfo.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionInfo.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerControl.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerControl.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerId.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerId.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerInfo.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerInfo.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/ControlCommand.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/ControlCommand.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/DataArrayResponse.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/DataArrayResponse.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/DataResponse.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/DataResponse.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/DestinationInfo.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/DestinationInfo.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/DiscoveryEvent.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/DiscoveryEvent.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/ExceptionResponse.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/ExceptionResponse.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/MessagePull.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/MessagePull.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/NetworkBridgeFilter.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/NetworkBridgeFilter.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/PartialCommand.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/PartialCommand.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerAck.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerAck.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerId.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerId.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerInfo.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerInfo.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveInfo.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveInfo.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveSubscriptionInfo.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveSubscriptionInfo.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/ReplayCommand.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/ReplayCommand.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/Response.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/Response.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionId.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionId.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionInfo.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionInfo.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/ShutdownInfo.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/ShutdownInfo.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/SubscriptionInfo.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/SubscriptionInfo.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionId.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionId.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionInfo.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionInfo.h
activemq/activemq-cpp/trunk/src/main/activemq/commands/XATransactionId.cpp
activemq/activemq-cpp/trunk/src/main/activemq/commands/XATransactionId.h
Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandCodeGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandCodeGenerator.java?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandCodeGenerator.java (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandCodeGenerator.java Wed Feb 25 21:05:02 2009
@@ -17,9 +17,9 @@
package org.apache.activemq.openwire.tool.commands;
import java.io.PrintWriter;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.TreeSet;
import org.codehaus.jam.JClass;
import org.codehaus.jam.JProperty;
@@ -31,7 +31,7 @@
private boolean marshalAware = false;
private String className;
private String baseClassName;
- private Set<String> includeFiles = new HashSet<String>();
+ private Set<String> includeFiles = new TreeSet<String>();
private String openWireOpCode;
private boolean comparable = false;
private boolean assignable = false;
Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandCodeGeneratorsFactory.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandCodeGeneratorsFactory.java?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandCodeGeneratorsFactory.java (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandCodeGeneratorsFactory.java Wed Feb 25 21:05:02 2009
@@ -61,14 +61,14 @@
CommandHeaderGenerator generator = null;
if( className.equals("Message") ) {
generator = new MessageHeaderGenerator();
-// } else if( className.equals("ConnectionId") ) {
-// generator = new ConnectionIdHeaderGenerator();
-// } else if( className.equals("ConsumerId") ) {
-// generator = new ConsumerIdHeaderGenerator();
-// } else if( className.equals("ProducerId") ) {
-// generator = new ProducerIdHeaderGenerator();
-// } else if( className.equals("SessionId") ) {
-// generator = new SessionIdHeaderGenerator();
+ } else if( className.equals("ConnectionId") ) {
+ generator = new ConnectionIdHeaderGenerator();
+ } else if( className.equals("ConsumerId") ) {
+ generator = new ConsumerIdHeaderGenerator();
+ } else if( className.equals("ProducerId") ) {
+ generator = new ProducerIdHeaderGenerator();
+ } else if( className.equals("SessionId") ) {
+ generator = new SessionIdHeaderGenerator();
} else {
generator = new CommandHeaderGenerator();
}
@@ -98,12 +98,14 @@
CommandSourceGenerator generator = null;
if( className.equals("Message") ) {
generator = new MessageSourceGenerator();
-// } else if( className.equals("ConsumerId") ) {
-// generator = new ConsumerIdSourceGenerator();
-// } else if( className.equals("ProducerId") ) {
-// generator = new ProducerIdSourceGenerator();
-// } else if( className.equals("SessionId") ) {
-// generator = new SessionIdSourceGenerator();
+ } else if( className.equals("ConnectionId") ) {
+ generator = new ConnectionIdSourceGenerator();
+ } else if( className.equals("ConsumerId") ) {
+ generator = new ConsumerIdSourceGenerator();
+ } else if( className.equals("ProducerId") ) {
+ generator = new ProducerIdSourceGenerator();
+ } else if( className.equals("SessionId") ) {
+ generator = new SessionIdSourceGenerator();
} else {
generator = new CommandSourceGenerator();
}
Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandHeaderGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandHeaderGenerator.java?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandHeaderGenerator.java (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandHeaderGenerator.java Wed Feb 25 21:05:02 2009
@@ -17,9 +17,6 @@
package org.apache.activemq.openwire.tool.commands;
import java.io.PrintWriter;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
import java.util.Set;
import org.codehaus.jam.JProperty;
@@ -31,7 +28,6 @@
// Start with the license.
generateLicence(out);
- out.println("");
out.println("#ifndef _ACTIVEMQ_COMMANDS_"+getClassName().toUpperCase()+"_H_");
out.println("#define _ACTIVEMQ_COMMANDS_"+getClassName().toUpperCase()+"_H_");
out.println("");
@@ -50,8 +46,9 @@
out.println("");
generateNamespaceWrapper( out );
+ generateForwardDeclarations( out );
- out.println(" using decaf::lang::Pointer;");
+ out.println(" using decaf::lang::Pointer;");
out.println("");
out.println(" /*");
out.println(" *");
@@ -208,6 +205,9 @@
out.println("");
}
+ protected void generateForwardDeclarations( PrintWriter out ) {
+ }
+
protected void generateClassDefinition( PrintWriter out ) {
out.print(" class AMQCPP_API "+getClassName()+" : " );
Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConnectionIdHeaderGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConnectionIdHeaderGenerator.java?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConnectionIdHeaderGenerator.java (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConnectionIdHeaderGenerator.java Wed Feb 25 21:05:02 2009
@@ -17,29 +17,22 @@
package org.apache.activemq.openwire.tool.commands;
import java.io.PrintWriter;
-import java.util.Set;
public class ConnectionIdHeaderGenerator extends CommandHeaderGenerator {
- protected void populateIncludeFilesSet() {
- Set<String> includes = getIncludeFiles();
- includes.add("<activemq/commands/SessionId.h>");
- includes.add("<activemq/commands/ProducerId.h>");
- includes.add("<activemq/commands/ConsumerId.h>");
-
- super.populateIncludeFilesSet();
+ protected void generateForwardDeclarations( PrintWriter out ) {
+ out.println(" class SessionId;");
+ out.println(" class ProducerId;");
+ out.println(" class ConsumerId;");
+ out.println("");
}
protected void generateAdditionalConstructors( PrintWriter out ) {
- out.println(" "+getClassName()+"( const SessionId& sessionId ) {");
- out.println(" this->value = sessionId.getConnectionId();");
- out.println(" }");
- out.println(" "+getClassName()+"( const ProducerId& producerId ) {");
- out.println(" this->value = producerId.getConnectionId();");
- out.println(" }");
- out.println(" "+getClassName()+"( const ConsumerId& consumerId ) {");
- out.println(" this->value = consumerId.getConnectionId();");
- out.println(" }");
+ out.println(" "+getClassName()+"( const SessionId* sessionId );");
+ out.println("");
+ out.println(" "+getClassName()+"( const ProducerId* producerId );");
+ out.println("");
+ out.println(" "+getClassName()+"( const ConsumerId* consumerId );");
out.println("");
super.generateAdditionalConstructors(out);
Added: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConnectionIdSourceGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConnectionIdSourceGenerator.java?rev=747922&view=auto
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConnectionIdSourceGenerator.java (added)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConnectionIdSourceGenerator.java Wed Feb 25 21:05:02 2009
@@ -0,0 +1,52 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.openwire.tool.commands;
+
+import java.io.PrintWriter;
+import java.util.Set;
+
+public class ConnectionIdSourceGenerator extends CommandSourceGenerator {
+
+ protected void populateIncludeFilesSet() {
+ Set<String> includes = getIncludeFiles();
+ includes.add("<activemq/commands/SessionId.h>");
+ includes.add("<activemq/commands/ProducerId.h>");
+ includes.add("<activemq/commands/ConsumerId.h>");
+
+ super.populateIncludeFilesSet();
+ }
+
+ protected void generateAdditionalConstructors( PrintWriter out ) {
+ out.println("////////////////////////////////////////////////////////////////////////////////");
+ out.println("ConnectionId::ConnectionId( const SessionId* sessionId ) {");
+ out.println(" this->value = sessionId->getConnectionId();");
+ out.println("}");
+ out.println("");
+ out.println("////////////////////////////////////////////////////////////////////////////////");
+ out.println("ConnectionId::ConnectionId( const ProducerId* producerId ) {");
+ out.println(" this->value = producerId->getConnectionId();");
+ out.println("}");
+ out.println("");
+ out.println("////////////////////////////////////////////////////////////////////////////////");
+ out.println("ConnectionId::ConnectionId( const ConsumerId* consumerId ) {");
+ out.println(" this->value = consumerId->getConnectionId();");
+ out.println("}");
+ out.println("");
+
+ super.generateAdditionalConstructors(out);
+ }
+}
Propchange: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConnectionIdSourceGenerator.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConsumerIdHeaderGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConsumerIdHeaderGenerator.java?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConsumerIdHeaderGenerator.java (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConsumerIdHeaderGenerator.java Wed Feb 25 21:05:02 2009
@@ -43,7 +43,7 @@
out.println(" private:");
out.println("");
- out.println(" Pointer<SessionId> parentId;");
+ out.println(" mutable Pointer<SessionId> parentId;");
out.println("");
super.generateProperties(out);
Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConsumerIdSourceGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConsumerIdSourceGenerator.java?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConsumerIdSourceGenerator.java (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConsumerIdSourceGenerator.java Wed Feb 25 21:05:02 2009
@@ -24,7 +24,7 @@
out.println("////////////////////////////////////////////////////////////////////////////////");
out.println("const Pointer<SessionId>& ConsumerId::getParentId() const {");
out.println(" if( this->parentId == NULL ) {");
- out.println(" this->parentId.reset( new SessionId( *this ) );");
+ out.println(" this->parentId.reset( new SessionId( this ) );");
out.println(" }");
out.println(" return this->parentId;");
out.println("}");
Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ProducerIdHeaderGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ProducerIdHeaderGenerator.java?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ProducerIdHeaderGenerator.java (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ProducerIdHeaderGenerator.java Wed Feb 25 21:05:02 2009
@@ -29,10 +29,10 @@
}
protected void generateAdditionalConstructors( PrintWriter out ) {
- out.println(" "+getClassName()+"( const SessionId& sessionId, long long consumerIdd ) {");
+ out.println(" "+getClassName()+"( const SessionId& sessionId, long long consumerId ) {");
out.println(" this->connectionId = sessionId.getConnectionId();");
out.println(" this->sessionId = sessionId.getValue();");
- out.println(" this->value = consumerIdd;");
+ out.println(" this->value = consumerId;");
out.println(" }");
out.println("");
@@ -43,7 +43,7 @@
out.println(" private:");
out.println("");
- out.println(" Pointer<SessionId> parentId;");
+ out.println(" mutable Pointer<SessionId> parentId;");
out.println("");
super.generateProperties(out);
Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ProducerIdSourceGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ProducerIdSourceGenerator.java?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ProducerIdSourceGenerator.java (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ProducerIdSourceGenerator.java Wed Feb 25 21:05:02 2009
@@ -24,7 +24,7 @@
out.println("////////////////////////////////////////////////////////////////////////////////");
out.println("const Pointer<SessionId>& ProducerId::getParentId() const {");
out.println(" if( this->parentId == NULL ) {");
- out.println(" this->parentId.reset( new SessionId( *this ) );");
+ out.println(" this->parentId.reset( new SessionId( this ) );");
out.println(" }");
out.println(" return this->parentId;");
out.println("}");
Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/SessionIdHeaderGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/SessionIdHeaderGenerator.java?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/SessionIdHeaderGenerator.java (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/SessionIdHeaderGenerator.java Wed Feb 25 21:05:02 2009
@@ -23,28 +23,24 @@
protected void populateIncludeFilesSet() {
Set<String> includes = getIncludeFiles();
- includes.add("<activemq/commands/SessionId.h>");
- includes.add("<activemq/commands/ProducerId.h>");
- includes.add("<activemq/commands/ConsumerId.h>");
includes.add("<activemq/commands/ConnectionId.h>");
super.populateIncludeFilesSet();
}
+ protected void generateForwardDeclarations( PrintWriter out ) {
+ out.println(" class ProducerId;");
+ out.println(" class ConsumerId;");
+ out.println("");
+ }
+
protected void generateAdditionalConstructors( PrintWriter out ) {
- out.println(" "+getClassName()+"( const ConnectionId& connectionId, long long sessionId ) {");
- out.println(" this->connectionId = connectionId.getValue();");
- out.println(" this->value = sessionId;");
- out.println(" }");
- out.println(" "+getClassName()+"( const ProducerId& producerId ) {");
- out.println(" this->connectionId = producerId.getConnectionId();");
- out.println(" this->value = producerId.getSessionId();");
- out.println(" }");
- out.println(" "+getClassName()+"( const ConsumerId& consumerId ) {");
- out.println(" this->connectionId = consumerId.getConnectionId();");
- out.println(" this->value = consumerId.getSessionId();");
- out.println(" }");
+ out.println(" "+getClassName()+"( const ConnectionId* connectionId, long long sessionId );");
+ out.println("");
+ out.println(" "+getClassName()+"( const ProducerId* producerId );");
+ out.println("");
+ out.println(" "+getClassName()+"( const ConsumerId* consumerId );");
out.println("");
super.generateAdditionalConstructors(out);
@@ -54,7 +50,7 @@
out.println(" private:");
out.println("");
- out.println(" Pointer<ConnectionId> parentId;");
+ out.println(" mutable Pointer<ConnectionId> parentId;");
out.println("");
super.generateProperties(out);
Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/SessionIdSourceGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/SessionIdSourceGenerator.java?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/SessionIdSourceGenerator.java (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/SessionIdSourceGenerator.java Wed Feb 25 21:05:02 2009
@@ -17,14 +17,48 @@
package org.apache.activemq.openwire.tool.commands;
import java.io.PrintWriter;
+import java.util.Set;
public class SessionIdSourceGenerator extends CommandSourceGenerator {
+ protected void populateIncludeFilesSet() {
+ Set<String> includes = getIncludeFiles();
+ includes.add("<activemq/commands/ProducerId.h>");
+ includes.add("<activemq/commands/ConsumerId.h>");
+ includes.add("<activemq/commands/ConnectionId.h>");
+
+ super.populateIncludeFilesSet();
+ }
+
+ protected void generateAdditionalConstructors( PrintWriter out ) {
+
+ out.println("////////////////////////////////////////////////////////////////////////////////");
+ out.println("SessionId::SessionId( const ConnectionId* connectionId, long long sessionId ) {");
+ out.println(" this->connectionId = connectionId->getValue();");
+ out.println(" this->value = sessionId;");
+ out.println("}");
+ out.println("");
+ out.println("////////////////////////////////////////////////////////////////////////////////");
+ out.println("SessionId::SessionId( const ProducerId* producerId ) {");
+ out.println(" this->connectionId = producerId->getConnectionId();");
+ out.println(" this->value = producerId->getSessionId();");
+ out.println("}");
+ out.println("");
+ out.println("////////////////////////////////////////////////////////////////////////////////");
+ out.println("SessionId::SessionId( const ConsumerId* consumerId ) {");
+ out.println(" this->connectionId = consumerId->getConnectionId();");
+ out.println(" this->value = consumerId->getSessionId();");
+ out.println("}");
+ out.println("");
+
+ super.generateAdditionalConstructors(out);
+ }
+
protected void generateAdditionalMethods( PrintWriter out ) {
out.println("////////////////////////////////////////////////////////////////////////////////");
out.println("const Pointer<ConnectionId>& SessionId::getParentId() const {");
out.println(" if( this->parentId == NULL ) {");
- out.println(" this->parentId.reset( new ConnectionId( *this ) );");
+ out.println(" this->parentId.reset( new ConnectionId( this ) );");
out.println(" }");
out.println(" return this->parentId;");
out.println("}");
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerId.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerId.cpp Wed Feb 25 21:05:02 2009
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/commands/BrokerId.h>
-#include <apr_strings.h>
+#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
+#include <apr_strings.h>
#include <decaf/lang/exceptions/NullPointerException.h>
using namespace std;
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerId.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerId.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerId.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_BROKERID_H_
#define _ACTIVEMQ_COMMANDS_BROKERID_H_
@@ -24,17 +23,17 @@
#pragma warning( disable : 4290 )
#endif
-#include <decaf/lang/Pointer.h>
-#include <decaf/lang/Comparable.h>
+#include <activemq/commands/BaseDataStructure.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Comparable.h>
+#include <decaf/lang/Pointer.h>
#include <string>
-#include <activemq/commands/BaseDataStructure.h>
#include <vector>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerInfo.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerInfo.cpp Wed Feb 25 21:05:02 2009
@@ -15,10 +15,10 @@
* limitations under the License.
*/
+#include <activemq/commands/BrokerInfo.h>
#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
#include <decaf/lang/exceptions/NullPointerException.h>
-#include <activemq/commands/BrokerInfo.h>
using namespace std;
using namespace activemq;
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerInfo.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerInfo.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_BROKERINFO_H_
#define _ACTIVEMQ_COMMANDS_BROKERINFO_H_
@@ -24,18 +23,18 @@
#pragma warning( disable : 4290 )
#endif
+#include <activemq/commands/BaseCommand.h>
#include <activemq/commands/BrokerId.h>
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/BrokerInfo.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
#include <string>
-#include <activemq/commands/BaseCommand.h>
#include <vector>
-#include <activemq/commands/BrokerInfo.h>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionControl.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionControl.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionControl.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionControl.cpp Wed Feb 25 21:05:02 2009
@@ -15,10 +15,10 @@
* limitations under the License.
*/
+#include <activemq/commands/ConnectionControl.h>
#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
#include <decaf/lang/exceptions/NullPointerException.h>
-#include <activemq/commands/ConnectionControl.h>
using namespace std;
using namespace activemq;
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionControl.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionControl.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionControl.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionControl.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_CONNECTIONCONTROL_H_
#define _ACTIVEMQ_COMMANDS_CONNECTIONCONTROL_H_
@@ -24,16 +23,16 @@
#pragma warning( disable : 4290 )
#endif
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/BaseCommand.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
#include <string>
-#include <activemq/commands/BaseCommand.h>
#include <vector>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionError.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionError.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionError.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionError.cpp Wed Feb 25 21:05:02 2009
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/commands/ConnectionError.h>
+#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
#include <decaf/lang/exceptions/NullPointerException.h>
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionError.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionError.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionError.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionError.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_CONNECTIONERROR_H_
#define _ACTIVEMQ_COMMANDS_CONNECTIONERROR_H_
@@ -24,18 +23,18 @@
#pragma warning( disable : 4290 )
#endif
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/BaseCommand.h>
+#include <activemq/commands/BrokerError.h>
#include <activemq/commands/ConnectionId.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
#include <string>
-#include <activemq/commands/BaseCommand.h>
-#include <activemq/commands/BrokerError.h>
#include <vector>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionId.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionId.cpp Wed Feb 25 21:05:02 2009
@@ -15,10 +15,13 @@
* limitations under the License.
*/
-#include <activemq/exceptions/ActiveMQException.h>
-#include <apr_strings.h>
#include <activemq/commands/ConnectionId.h>
+#include <activemq/commands/ConsumerId.h>
+#include <activemq/commands/ProducerId.h>
+#include <activemq/commands/SessionId.h>
+#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
+#include <apr_strings.h>
#include <decaf/lang/exceptions/NullPointerException.h>
using namespace std;
@@ -50,6 +53,21 @@
}
////////////////////////////////////////////////////////////////////////////////
+ConnectionId::ConnectionId( const SessionId* sessionId ) {
+ this->value = sessionId->getConnectionId();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+ConnectionId::ConnectionId( const ProducerId* producerId ) {
+ this->value = producerId->getConnectionId();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+ConnectionId::ConnectionId( const ConsumerId* consumerId ) {
+ this->value = consumerId->getConnectionId();
+}
+
+////////////////////////////////////////////////////////////////////////////////
ConnectionId::~ConnectionId() {
}
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionId.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionId.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionId.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_CONNECTIONID_H_
#define _ACTIVEMQ_COMMANDS_CONNECTIONID_H_
@@ -24,17 +23,21 @@
#pragma warning( disable : 4290 )
#endif
-#include <decaf/lang/Pointer.h>
-#include <decaf/lang/Comparable.h>
+#include <activemq/commands/BaseDataStructure.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Comparable.h>
+#include <decaf/lang/Pointer.h>
#include <string>
-#include <activemq/commands/BaseDataStructure.h>
#include <vector>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ class SessionId;
+ class ProducerId;
+ class ConsumerId;
+
+ using decaf::lang::Pointer;
/*
*
@@ -62,6 +65,12 @@
ConnectionId( const ConnectionId& other );
+ ConnectionId( const SessionId* sessionId );
+
+ ConnectionId( const ProducerId* producerId );
+
+ ConnectionId( const ConsumerId* consumerId );
+
virtual ~ConnectionId();
/**
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionInfo.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionInfo.cpp Wed Feb 25 21:05:02 2009
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/commands/ConnectionInfo.h>
+#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
#include <decaf/lang/exceptions/NullPointerException.h>
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionInfo.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionInfo.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_CONNECTIONINFO_H_
#define _ACTIVEMQ_COMMANDS_CONNECTIONINFO_H_
@@ -24,18 +23,18 @@
#pragma warning( disable : 4290 )
#endif
+#include <activemq/commands/BaseCommand.h>
#include <activemq/commands/BrokerId.h>
-#include <decaf/lang/Pointer.h>
#include <activemq/commands/ConnectionId.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
#include <string>
-#include <activemq/commands/BaseCommand.h>
#include <vector>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerControl.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerControl.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerControl.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerControl.cpp Wed Feb 25 21:05:02 2009
@@ -15,10 +15,10 @@
* limitations under the License.
*/
+#include <activemq/commands/ConsumerControl.h>
#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
#include <decaf/lang/exceptions/NullPointerException.h>
-#include <activemq/commands/ConsumerControl.h>
using namespace std;
using namespace activemq;
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerControl.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerControl.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerControl.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerControl.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_CONSUMERCONTROL_H_
#define _ACTIVEMQ_COMMANDS_CONSUMERCONTROL_H_
@@ -24,17 +23,17 @@
#pragma warning( disable : 4290 )
#endif
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/BaseCommand.h>
+#include <activemq/commands/ConsumerId.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
#include <string>
-#include <activemq/commands/BaseCommand.h>
#include <vector>
-#include <activemq/commands/ConsumerId.h>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerId.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerId.cpp Wed Feb 25 21:05:02 2009
@@ -15,11 +15,11 @@
* limitations under the License.
*/
+#include <activemq/commands/ConsumerId.h>
#include <activemq/exceptions/ActiveMQException.h>
-#include <apr_strings.h>
#include <activemq/state/CommandVisitor.h>
+#include <apr_strings.h>
#include <decaf/lang/exceptions/NullPointerException.h>
-#include <activemq/commands/ConsumerId.h>
using namespace std;
using namespace activemq;
@@ -220,3 +220,11 @@
this->copyDataStructure( &other );
}
+////////////////////////////////////////////////////////////////////////////////
+const Pointer<SessionId>& ConsumerId::getParentId() const {
+ if( this->parentId == NULL ) {
+ this->parentId.reset( new SessionId( this ) );
+ }
+ return this->parentId;
+}
+
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerId.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerId.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerId.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_CONSUMERID_H_
#define _ACTIVEMQ_COMMANDS_CONSUMERID_H_
@@ -24,17 +23,18 @@
#pragma warning( disable : 4290 )
#endif
-#include <decaf/lang/Pointer.h>
-#include <decaf/lang/Comparable.h>
+#include <activemq/commands/BaseDataStructure.h>
+#include <activemq/commands/SessionId.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Comparable.h>
+#include <decaf/lang/Pointer.h>
#include <string>
-#include <activemq/commands/BaseDataStructure.h>
#include <vector>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
@@ -46,6 +46,10 @@
*
*/
class AMQCPP_API ConsumerId : public BaseDataStructure, public decaf::lang::Comparable<ConsumerId> {
+ private:
+
+ mutable Pointer<SessionId> parentId;
+
protected:
std::string connectionId;
@@ -64,6 +68,12 @@
ConsumerId( const ConsumerId& other );
+ ConsumerId( const SessionId& sessionId, long long consumerIdd ) {
+ this->connectionId = sessionId.getConnectionId();
+ this->sessionId = sessionId.getValue();
+ this->value = consumerIdd;
+ }
+
virtual ~ConsumerId();
/**
@@ -102,6 +112,8 @@
*/
virtual bool equals( const DataStructure* value ) const;
+ const Pointer<SessionId>& getParentId() const;
+
virtual const std::string& getConnectionId() const;
virtual std::string& getConnectionId();
virtual void setConnectionId( const std::string& connectionId );
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerInfo.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerInfo.cpp Wed Feb 25 21:05:02 2009
@@ -15,10 +15,10 @@
* limitations under the License.
*/
+#include <activemq/commands/ConsumerInfo.h>
#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
#include <decaf/lang/exceptions/NullPointerException.h>
-#include <activemq/commands/ConsumerInfo.h>
using namespace std;
using namespace activemq;
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerInfo.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerInfo.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_CONSUMERINFO_H_
#define _ACTIVEMQ_COMMANDS_CONSUMERINFO_H_
@@ -24,20 +23,20 @@
#pragma warning( disable : 4290 )
#endif
-#include <activemq/commands/BrokerId.h>
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/ActiveMQDestination.h>
+#include <activemq/commands/BaseCommand.h>
#include <activemq/commands/BooleanExpression.h>
+#include <activemq/commands/BrokerId.h>
+#include <activemq/commands/ConsumerId.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
#include <string>
-#include <activemq/commands/BaseCommand.h>
#include <vector>
-#include <activemq/commands/ActiveMQDestination.h>
-#include <activemq/commands/ConsumerId.h>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ControlCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ControlCommand.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ControlCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ControlCommand.cpp Wed Feb 25 21:05:02 2009
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/commands/ControlCommand.h>
+#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
#include <decaf/lang/exceptions/NullPointerException.h>
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ControlCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ControlCommand.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ControlCommand.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ControlCommand.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_CONTROLCOMMAND_H_
#define _ACTIVEMQ_COMMANDS_CONTROLCOMMAND_H_
@@ -24,16 +23,16 @@
#pragma warning( disable : 4290 )
#endif
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/BaseCommand.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
#include <string>
-#include <activemq/commands/BaseCommand.h>
#include <vector>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/DataArrayResponse.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/DataArrayResponse.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/DataArrayResponse.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/DataArrayResponse.cpp Wed Feb 25 21:05:02 2009
@@ -15,10 +15,10 @@
* limitations under the License.
*/
+#include <activemq/commands/DataArrayResponse.h>
#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
#include <decaf/lang/exceptions/NullPointerException.h>
-#include <activemq/commands/DataArrayResponse.h>
using namespace std;
using namespace activemq;
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/DataArrayResponse.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/DataArrayResponse.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/DataArrayResponse.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/DataArrayResponse.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_DATAARRAYRESPONSE_H_
#define _ACTIVEMQ_COMMANDS_DATAARRAYRESPONSE_H_
@@ -25,16 +24,16 @@
#endif
#include <activemq/commands/DataStructure.h>
-#include <decaf/lang/Pointer.h>
#include <activemq/commands/Response.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
#include <string>
#include <vector>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/DataResponse.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/DataResponse.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/DataResponse.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/DataResponse.cpp Wed Feb 25 21:05:02 2009
@@ -15,10 +15,10 @@
* limitations under the License.
*/
+#include <activemq/commands/DataResponse.h>
#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
#include <decaf/lang/exceptions/NullPointerException.h>
-#include <activemq/commands/DataResponse.h>
using namespace std;
using namespace activemq;
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/DataResponse.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/DataResponse.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/DataResponse.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/DataResponse.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_DATARESPONSE_H_
#define _ACTIVEMQ_COMMANDS_DATARESPONSE_H_
@@ -25,16 +24,16 @@
#endif
#include <activemq/commands/DataStructure.h>
-#include <decaf/lang/Pointer.h>
#include <activemq/commands/Response.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
#include <string>
#include <vector>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/DestinationInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/DestinationInfo.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/DestinationInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/DestinationInfo.cpp Wed Feb 25 21:05:02 2009
@@ -15,10 +15,10 @@
* limitations under the License.
*/
+#include <activemq/commands/DestinationInfo.h>
#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
#include <decaf/lang/exceptions/NullPointerException.h>
-#include <activemq/commands/DestinationInfo.h>
using namespace std;
using namespace activemq;
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/DestinationInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/DestinationInfo.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/DestinationInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/DestinationInfo.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_DESTINATIONINFO_H_
#define _ACTIVEMQ_COMMANDS_DESTINATIONINFO_H_
@@ -24,19 +23,19 @@
#pragma warning( disable : 4290 )
#endif
+#include <activemq/commands/ActiveMQDestination.h>
+#include <activemq/commands/BaseCommand.h>
#include <activemq/commands/BrokerId.h>
-#include <decaf/lang/Pointer.h>
#include <activemq/commands/ConnectionId.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
#include <string>
-#include <activemq/commands/BaseCommand.h>
#include <vector>
-#include <activemq/commands/ActiveMQDestination.h>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/DiscoveryEvent.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/DiscoveryEvent.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/DiscoveryEvent.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/DiscoveryEvent.cpp Wed Feb 25 21:05:02 2009
@@ -15,10 +15,10 @@
* limitations under the License.
*/
+#include <activemq/commands/DiscoveryEvent.h>
#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
#include <decaf/lang/exceptions/NullPointerException.h>
-#include <activemq/commands/DiscoveryEvent.h>
using namespace std;
using namespace activemq;
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/DiscoveryEvent.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/DiscoveryEvent.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/DiscoveryEvent.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/DiscoveryEvent.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_DISCOVERYEVENT_H_
#define _ACTIVEMQ_COMMANDS_DISCOVERYEVENT_H_
@@ -24,16 +23,16 @@
#pragma warning( disable : 4290 )
#endif
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/BaseDataStructure.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
#include <string>
-#include <activemq/commands/BaseDataStructure.h>
#include <vector>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ExceptionResponse.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ExceptionResponse.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ExceptionResponse.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ExceptionResponse.cpp Wed Feb 25 21:05:02 2009
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/commands/ExceptionResponse.h>
+#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
#include <decaf/lang/exceptions/NullPointerException.h>
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ExceptionResponse.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ExceptionResponse.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ExceptionResponse.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ExceptionResponse.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_EXCEPTIONRESPONSE_H_
#define _ACTIVEMQ_COMMANDS_EXCEPTIONRESPONSE_H_
@@ -24,17 +23,17 @@
#pragma warning( disable : 4290 )
#endif
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/BrokerError.h>
#include <activemq/commands/Response.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
#include <string>
-#include <activemq/commands/BrokerError.h>
#include <vector>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.cpp Wed Feb 25 21:05:02 2009
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/commands/FlushCommand.h>
+#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
#include <decaf/lang/exceptions/NullPointerException.h>
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_FLUSHCOMMAND_H_
#define _ACTIVEMQ_COMMANDS_FLUSHCOMMAND_H_
@@ -24,16 +23,16 @@
#pragma warning( disable : 4290 )
#endif
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/BaseCommand.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
#include <string>
-#include <activemq/commands/BaseCommand.h>
#include <vector>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.cpp Wed Feb 25 21:05:02 2009
@@ -15,10 +15,10 @@
* limitations under the License.
*/
+#include <activemq/commands/IntegerResponse.h>
#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
#include <decaf/lang/exceptions/NullPointerException.h>
-#include <activemq/commands/IntegerResponse.h>
using namespace std;
using namespace activemq;
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_INTEGERRESPONSE_H_
#define _ACTIVEMQ_COMMANDS_INTEGERRESPONSE_H_
@@ -24,16 +23,16 @@
#pragma warning( disable : 4290 )
#endif
-#include <decaf/lang/Pointer.h>
#include <activemq/commands/Response.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
#include <string>
#include <vector>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.cpp Wed Feb 25 21:05:02 2009
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/commands/JournalQueueAck.h>
+#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
#include <decaf/lang/exceptions/NullPointerException.h>
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_JOURNALQUEUEACK_H_
#define _ACTIVEMQ_COMMANDS_JOURNALQUEUEACK_H_
@@ -24,18 +23,18 @@
#pragma warning( disable : 4290 )
#endif
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/ActiveMQDestination.h>
+#include <activemq/commands/BaseDataStructure.h>
#include <activemq/commands/MessageAck.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
#include <string>
-#include <activemq/commands/BaseDataStructure.h>
#include <vector>
-#include <activemq/commands/ActiveMQDestination.h>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.cpp Wed Feb 25 21:05:02 2009
@@ -15,10 +15,10 @@
* limitations under the License.
*/
+#include <activemq/commands/JournalTopicAck.h>
#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
#include <decaf/lang/exceptions/NullPointerException.h>
-#include <activemq/commands/JournalTopicAck.h>
using namespace std;
using namespace activemq;
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_JOURNALTOPICACK_H_
#define _ACTIVEMQ_COMMANDS_JOURNALTOPICACK_H_
@@ -24,19 +23,19 @@
#pragma warning( disable : 4290 )
#endif
+#include <activemq/commands/ActiveMQDestination.h>
+#include <activemq/commands/BaseDataStructure.h>
#include <activemq/commands/MessageId.h>
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/TransactionId.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
#include <string>
-#include <activemq/commands/BaseDataStructure.h>
#include <vector>
-#include <activemq/commands/ActiveMQDestination.h>
-#include <activemq/commands/TransactionId.h>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.cpp Wed Feb 25 21:05:02 2009
@@ -15,10 +15,10 @@
* limitations under the License.
*/
+#include <activemq/commands/JournalTrace.h>
#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
#include <decaf/lang/exceptions/NullPointerException.h>
-#include <activemq/commands/JournalTrace.h>
using namespace std;
using namespace activemq;
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_JOURNALTRACE_H_
#define _ACTIVEMQ_COMMANDS_JOURNALTRACE_H_
@@ -24,16 +23,16 @@
#pragma warning( disable : 4290 )
#endif
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/BaseDataStructure.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
#include <string>
-#include <activemq/commands/BaseDataStructure.h>
#include <vector>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.cpp Wed Feb 25 21:05:02 2009
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/commands/JournalTransaction.h>
+#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
#include <decaf/lang/exceptions/NullPointerException.h>
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_JOURNALTRANSACTION_H_
#define _ACTIVEMQ_COMMANDS_JOURNALTRANSACTION_H_
@@ -24,17 +23,17 @@
#pragma warning( disable : 4290 )
#endif
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/BaseDataStructure.h>
+#include <activemq/commands/TransactionId.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
#include <string>
-#include <activemq/commands/BaseDataStructure.h>
#include <vector>
-#include <activemq/commands/TransactionId.h>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.cpp Wed Feb 25 21:05:02 2009
@@ -15,9 +15,9 @@
* limitations under the License.
*/
+#include <activemq/commands/KeepAliveInfo.h>
#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
-#include <activemq/commands/KeepAliveInfo.h>
#include <decaf/lang/exceptions/NullPointerException.h>
using namespace std;
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_KEEPALIVEINFO_H_
#define _ACTIVEMQ_COMMANDS_KEEPALIVEINFO_H_
@@ -24,16 +23,16 @@
#pragma warning( disable : 4290 )
#endif
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/BaseCommand.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
#include <string>
-#include <activemq/commands/BaseCommand.h>
#include <vector>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.cpp Wed Feb 25 21:05:02 2009
@@ -15,10 +15,10 @@
* limitations under the License.
*/
+#include <activemq/commands/LastPartialCommand.h>
#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
#include <decaf/lang/exceptions/NullPointerException.h>
-#include <activemq/commands/LastPartialCommand.h>
using namespace std;
using namespace activemq;
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_LASTPARTIALCOMMAND_H_
#define _ACTIVEMQ_COMMANDS_LASTPARTIALCOMMAND_H_
@@ -24,16 +23,16 @@
#pragma warning( disable : 4290 )
#endif
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/PartialCommand.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
#include <string>
#include <vector>
-#include <activemq/commands/PartialCommand.h>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.cpp Wed Feb 25 21:05:02 2009
@@ -15,11 +15,11 @@
* limitations under the License.
*/
+#include <activemq/commands/LocalTransactionId.h>
#include <activemq/exceptions/ActiveMQException.h>
-#include <apr_strings.h>
#include <activemq/state/CommandVisitor.h>
+#include <apr_strings.h>
#include <decaf/lang/exceptions/NullPointerException.h>
-#include <activemq/commands/LocalTransactionId.h>
using namespace std;
using namespace activemq;
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_LOCALTRANSACTIONID_H_
#define _ACTIVEMQ_COMMANDS_LOCALTRANSACTIONID_H_
@@ -24,18 +23,18 @@
#pragma warning( disable : 4290 )
#endif
-#include <decaf/lang/Pointer.h>
-#include <decaf/lang/Comparable.h>
#include <activemq/commands/ConnectionId.h>
+#include <activemq/commands/TransactionId.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Comparable.h>
+#include <decaf/lang/Pointer.h>
#include <string>
#include <vector>
-#include <activemq/commands/TransactionId.h>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.cpp Wed Feb 25 21:05:02 2009
@@ -15,12 +15,12 @@
* limitations under the License.
*/
+#include <activemq/commands/Message.h>
#include <activemq/exceptions/ActiveMQException.h>
-#include <activemq/wireformat/openwire/marshal/PrimitiveMapMarshaller.h>
#include <activemq/state/CommandVisitor.h>
-#include <decaf/lang/exceptions/NullPointerException.h>
-#include <activemq/commands/Message.h>
#include <activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.h>
+#include <activemq/wireformat/openwire/marshal/PrimitiveMapMarshaller.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
using namespace std;
using namespace activemq;
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_MESSAGE_H_
#define _ACTIVEMQ_COMMANDS_MESSAGE_H_
@@ -24,20 +23,20 @@
#pragma warning( disable : 4290 )
#endif
-#include <activemq/commands/MessageId.h>
-#include <activemq/commands/DataStructure.h>
-#include <decaf/util/Date.h>
+#include <activemq/commands/ActiveMQDestination.h>
#include <activemq/commands/BaseCommand.h>
-#include <vector>
+#include <activemq/commands/BrokerId.h>
+#include <activemq/commands/ConsumerId.h>
+#include <activemq/commands/DataStructure.h>
+#include <activemq/commands/MessageId.h>
#include <activemq/commands/ProducerId.h>
+#include <activemq/commands/TransactionId.h>
+#include <activemq/util/Config.h>
#include <activemq/util/PrimitiveMap.h>
#include <decaf/lang/Pointer.h>
-#include <activemq/commands/BrokerId.h>
+#include <decaf/util/Date.h>
#include <string>
-#include <activemq/util/Config.h>
-#include <activemq/commands/ActiveMQDestination.h>
-#include <activemq/commands/TransactionId.h>
-#include <activemq/commands/ConsumerId.h>
+#include <vector>
namespace activemq{
namespace core{
@@ -45,7 +44,7 @@
}
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.cpp Wed Feb 25 21:05:02 2009
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/commands/MessageAck.h>
+#include <activemq/exceptions/ActiveMQException.h>
#include <activemq/state/CommandVisitor.h>
#include <decaf/lang/exceptions/NullPointerException.h>
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.h Wed Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
#ifndef _ACTIVEMQ_COMMANDS_MESSAGEACK_H_
#define _ACTIVEMQ_COMMANDS_MESSAGEACK_H_
@@ -24,20 +23,20 @@
#pragma warning( disable : 4290 )
#endif
+#include <activemq/commands/ActiveMQDestination.h>
+#include <activemq/commands/BaseCommand.h>
+#include <activemq/commands/ConsumerId.h>
#include <activemq/commands/MessageId.h>
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/TransactionId.h>
#include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
#include <string>
-#include <activemq/commands/BaseCommand.h>
#include <vector>
-#include <activemq/commands/ActiveMQDestination.h>
-#include <activemq/commands/TransactionId.h>
-#include <activemq/commands/ConsumerId.h>
namespace activemq{
namespace commands{
- using decaf::lang::Pointer;
+ using decaf::lang::Pointer;
/*
*