activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r747896 [1/2] - in /activemq/activemq-cpp/trunk: activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ src/main/activemq/commands/
Date Wed, 25 Feb 2009 19:32:15 GMT
Author: tabish
Date: Wed Feb 25 19:32:13 2009
New Revision: 747896

URL: http://svn.apache.org/viewvc?rev=747896&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/ConnectionIdHeaderGenerator.java   (with props)
    activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConsumerIdHeaderGenerator.java   (with props)
    activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConsumerIdSourceGenerator.java   (with props)
    activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ProducerIdHeaderGenerator.java   (with props)
    activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ProducerIdSourceGenerator.java   (with props)
    activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/SessionIdHeaderGenerator.java   (with props)
    activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/SessionIdSourceGenerator.java   (with props)
Modified:
    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/src/main/activemq/commands/BrokerId.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionControl.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionError.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionId.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerControl.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerId.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ControlCommand.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/DataArrayResponse.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/DataResponse.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/DestinationInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/DiscoveryEvent.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ExceptionResponse.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/MessagePull.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/NetworkBridgeFilter.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/PartialCommand.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerAck.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerId.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveSubscriptionInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ReplayCommand.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/Response.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionId.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ShutdownInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/SubscriptionInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionId.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionInfo.h
    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/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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -61,6 +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 {
             generator = new CommandHeaderGenerator();
         }
@@ -90,6 +98,12 @@
         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 {
             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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -51,6 +51,8 @@
         out.println("");
         generateNamespaceWrapper( out );
 
+        out.println("     using decaf::lang::Pointer;");
+        out.println("");
         out.println("    /*");
         out.println("     *");
         out.println("     *  Command code for OpenWire format for "+getClassName() );
@@ -160,7 +162,7 @@
             out.println("         * " );
             out.println("         * @return a Response to the visitor being called or NULL if no response." );
             out.println("         */" );
-            out.println("        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )" );
+            out.println("        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor )" );
             out.println("            throw( exceptions::ActiveMQException );" );
             out.println("");
         }
@@ -230,7 +232,7 @@
                 !property.getType().getSimpleName().equals("String") &&
                 !type.startsWith("std::vector") ) {
 
-                type = "decaf::lang::Pointer<" + type + ">";
+                type = "Pointer<" + type + ">";
             }
 
             out.println("        "+type+" "+name+";");
@@ -267,7 +269,7 @@
                 !property.getType().getSimpleName().equals("String") &&
                 !type.startsWith("std::vector") ) {
 
-                    type = "decaf::lang::Pointer<" + type + ">&";
+                    type = "Pointer<" + type + ">&";
                     constness = "const ";
             } else if( property.getType().getSimpleName().equals("String") ||
                        type.startsWith("std::vector") ) {

Added: 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=747896&view=auto
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConnectionIdHeaderGenerator.java (added)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConnectionIdHeaderGenerator.java Wed Feb 25 19:32:13 2009
@@ -0,0 +1,48 @@
+/**
+ * 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 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 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("");
+
+        super.generateAdditionalConstructors(out);
+    }
+
+}

Propchange: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConnectionIdHeaderGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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=747896&view=auto
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConsumerIdHeaderGenerator.java (added)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConsumerIdHeaderGenerator.java Wed Feb 25 19:32:13 2009
@@ -0,0 +1,59 @@
+/**
+ * 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 ConsumerIdHeaderGenerator extends CommandHeaderGenerator {
+
+    protected void populateIncludeFilesSet() {
+        Set<String> includes = getIncludeFiles();
+        includes.add("<activemq/commands/SessionId.h>");
+
+        super.populateIncludeFilesSet();
+    }
+
+    protected void generateAdditionalConstructors( PrintWriter out ) {
+        out.println("        "+getClassName()+"( const SessionId& sessionId, long long consumerIdd ) {");
+        out.println("            this->connectionId = sessionId.getConnectionId();");
+        out.println("            this->sessionId = sessionId.getValue();");
+        out.println("            this->value = consumerIdd;");
+        out.println("        }");
+        out.println("");
+
+        super.generateAdditionalConstructors(out);
+    }
+
+    protected void generateProperties( PrintWriter out ) {
+
+        out.println("    private:");
+        out.println("");
+        out.println("        Pointer<SessionId> parentId;");
+        out.println("");
+
+        super.generateProperties(out);
+    }
+
+    protected void generateAdditonalMembers( PrintWriter out ) {
+        out.println("        const Pointer<SessionId>& getParentId() const;");
+        out.println("");
+
+        super.generateAdditonalMembers( out );
+    }
+
+}

Propchange: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConsumerIdHeaderGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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=747896&view=auto
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConsumerIdSourceGenerator.java (added)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConsumerIdSourceGenerator.java Wed Feb 25 19:32:13 2009
@@ -0,0 +1,36 @@
+/**
+ * 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;
+
+public class ConsumerIdSourceGenerator extends CommandSourceGenerator {
+
+    protected void generateAdditionalMethods( PrintWriter out ) {
+        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("    }");
+        out.println("    return this->parentId;");
+        out.println("}");
+        out.println("");
+
+        super.generateAdditionalMethods(out);
+    }
+
+}

Propchange: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ConsumerIdSourceGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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=747896&view=auto
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ProducerIdHeaderGenerator.java (added)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ProducerIdHeaderGenerator.java Wed Feb 25 19:32:13 2009
@@ -0,0 +1,59 @@
+/**
+ * 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 ProducerIdHeaderGenerator extends CommandHeaderGenerator {
+
+    protected void populateIncludeFilesSet() {
+        Set<String> includes = getIncludeFiles();
+        includes.add("<activemq/commands/SessionId.h>");
+
+        super.populateIncludeFilesSet();
+    }
+
+    protected void generateAdditionalConstructors( PrintWriter out ) {
+        out.println("        "+getClassName()+"( const SessionId& sessionId, long long consumerIdd ) {");
+        out.println("            this->connectionId = sessionId.getConnectionId();");
+        out.println("            this->sessionId = sessionId.getValue();");
+        out.println("            this->value = consumerIdd;");
+        out.println("        }");
+        out.println("");
+
+        super.generateAdditionalConstructors(out);
+    }
+
+    protected void generateProperties( PrintWriter out ) {
+
+        out.println("    private:");
+        out.println("");
+        out.println("        Pointer<SessionId> parentId;");
+        out.println("");
+
+        super.generateProperties(out);
+    }
+
+    protected void generateAdditonalMembers( PrintWriter out ) {
+        out.println("        const Pointer<SessionId>& getParentId() const;");
+        out.println("");
+
+        super.generateAdditonalMembers( out );
+    }
+
+}

Propchange: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ProducerIdHeaderGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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=747896&view=auto
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ProducerIdSourceGenerator.java (added)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ProducerIdSourceGenerator.java Wed Feb 25 19:32:13 2009
@@ -0,0 +1,36 @@
+/**
+ * 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;
+
+public class ProducerIdSourceGenerator extends CommandSourceGenerator {
+
+    protected void generateAdditionalMethods( PrintWriter out ) {
+        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("    }");
+        out.println("    return this->parentId;");
+        out.println("}");
+        out.println("");
+
+        super.generateAdditionalMethods(out);
+    }
+
+}

Propchange: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ProducerIdSourceGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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=747896&view=auto
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/SessionIdHeaderGenerator.java (added)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/SessionIdHeaderGenerator.java Wed Feb 25 19:32:13 2009
@@ -0,0 +1,70 @@
+/**
+ * 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 SessionIdHeaderGenerator 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>");
+        includes.add("<activemq/commands/ConnectionId.h>");
+
+        super.populateIncludeFilesSet();
+    }
+
+    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("");
+
+        super.generateAdditionalConstructors(out);
+    }
+
+    protected void generateProperties( PrintWriter out ) {
+
+        out.println("    private:");
+        out.println("");
+        out.println("        Pointer<ConnectionId> parentId;");
+        out.println("");
+
+        super.generateProperties(out);
+    }
+
+    protected void generateAdditonalMembers( PrintWriter out ) {
+        out.println("        const Pointer<ConnectionId>& getParentId() const;");
+        out.println("");
+
+        super.generateAdditonalMembers( out );
+    }
+
+}

Propchange: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/SessionIdHeaderGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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=747896&view=auto
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/SessionIdSourceGenerator.java (added)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/SessionIdSourceGenerator.java Wed Feb 25 19:32:13 2009
@@ -0,0 +1,36 @@
+/**
+ * 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;
+
+public class SessionIdSourceGenerator extends CommandSourceGenerator {
+
+    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("    }");
+        out.println("    return this->parentId;");
+        out.println("}");
+        out.println("");
+
+        super.generateAdditionalMethods(out);
+    }
+
+}

Propchange: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/SessionIdSourceGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -34,6 +34,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for BrokerId

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -35,6 +35,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for BrokerInfo
@@ -47,7 +49,7 @@
     class AMQCPP_API BrokerInfo : public BaseCommand {
     protected:
 
-        decaf::lang::Pointer<BrokerId> brokerId;
+        Pointer<BrokerId> brokerId;
         std::string brokerURL;
         std::vector< decaf::lang::Pointer<BrokerInfo> > peerBrokerInfos;
         std::string brokerName;
@@ -111,9 +113,9 @@
          */
         virtual bool equals( const DataStructure* value ) const;
 
-        virtual const decaf::lang::Pointer<BrokerId>& getBrokerId() const;
-        virtual decaf::lang::Pointer<BrokerId>& getBrokerId();
-        virtual void setBrokerId( const decaf::lang::Pointer<BrokerId>& brokerId );
+        virtual const Pointer<BrokerId>& getBrokerId() const;
+        virtual Pointer<BrokerId>& getBrokerId();
+        virtual void setBrokerId( const Pointer<BrokerId>& brokerId );
 
         virtual const std::string& getBrokerURL() const;
         virtual std::string& getBrokerURL();
@@ -167,7 +169,7 @@
          * 
          * @return a Response to the visitor being called or NULL if no response.
          */
-        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
+        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor )
             throw( exceptions::ActiveMQException );
 
     };

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -33,6 +33,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for ConnectionControl
@@ -124,7 +126,7 @@
          * 
          * @return a Response to the visitor being called or NULL if no response.
          */
-        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
+        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor )
             throw( exceptions::ActiveMQException );
 
     };

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -35,6 +35,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for ConnectionError
@@ -47,8 +49,8 @@
     class AMQCPP_API ConnectionError : public BaseCommand {
     protected:
 
-        decaf::lang::Pointer<BrokerError> exception;
-        decaf::lang::Pointer<ConnectionId> connectionId;
+        Pointer<BrokerError> exception;
+        Pointer<ConnectionId> connectionId;
 
     public:
 
@@ -101,13 +103,13 @@
          */
         virtual bool equals( const DataStructure* value ) const;
 
-        virtual const decaf::lang::Pointer<BrokerError>& getException() const;
-        virtual decaf::lang::Pointer<BrokerError>& getException();
-        virtual void setException( const decaf::lang::Pointer<BrokerError>& exception );
-
-        virtual const decaf::lang::Pointer<ConnectionId>& getConnectionId() const;
-        virtual decaf::lang::Pointer<ConnectionId>& getConnectionId();
-        virtual void setConnectionId( const decaf::lang::Pointer<ConnectionId>& connectionId );
+        virtual const Pointer<BrokerError>& getException() const;
+        virtual Pointer<BrokerError>& getException();
+        virtual void setException( const Pointer<BrokerError>& exception );
+
+        virtual const Pointer<ConnectionId>& getConnectionId() const;
+        virtual Pointer<ConnectionId>& getConnectionId();
+        virtual void setConnectionId( const Pointer<ConnectionId>& connectionId );
 
         /**
          * Allows a Visitor to visit this command and return a response to the
@@ -116,7 +118,7 @@
          * 
          * @return a Response to the visitor being called or NULL if no response.
          */
-        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
+        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor )
             throw( exceptions::ActiveMQException );
 
     };

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -34,6 +34,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for ConnectionId

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -35,6 +35,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for ConnectionInfo
@@ -47,7 +49,7 @@
     class AMQCPP_API ConnectionInfo : public BaseCommand {
     protected:
 
-        decaf::lang::Pointer<ConnectionId> connectionId;
+        Pointer<ConnectionId> connectionId;
         std::string clientId;
         std::string password;
         std::string userName;
@@ -107,9 +109,9 @@
          */
         virtual bool equals( const DataStructure* value ) const;
 
-        virtual const decaf::lang::Pointer<ConnectionId>& getConnectionId() const;
-        virtual decaf::lang::Pointer<ConnectionId>& getConnectionId();
-        virtual void setConnectionId( const decaf::lang::Pointer<ConnectionId>& connectionId );
+        virtual const Pointer<ConnectionId>& getConnectionId() const;
+        virtual Pointer<ConnectionId>& getConnectionId();
+        virtual void setConnectionId( const Pointer<ConnectionId>& connectionId );
 
         virtual const std::string& getClientId() const;
         virtual std::string& getClientId();
@@ -143,7 +145,7 @@
          * 
          * @return a Response to the visitor being called or NULL if no response.
          */
-        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
+        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor )
             throw( exceptions::ActiveMQException );
 
     };

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -34,6 +34,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for ConsumerControl
@@ -47,7 +49,7 @@
     protected:
 
         bool close;
-        decaf::lang::Pointer<ConsumerId> consumerId;
+        Pointer<ConsumerId> consumerId;
         int prefetch;
         bool flush;
         bool start;
@@ -107,9 +109,9 @@
         virtual bool isClose() const;
         virtual void setClose( bool close );
 
-        virtual const decaf::lang::Pointer<ConsumerId>& getConsumerId() const;
-        virtual decaf::lang::Pointer<ConsumerId>& getConsumerId();
-        virtual void setConsumerId( const decaf::lang::Pointer<ConsumerId>& consumerId );
+        virtual const Pointer<ConsumerId>& getConsumerId() const;
+        virtual Pointer<ConsumerId>& getConsumerId();
+        virtual void setConsumerId( const Pointer<ConsumerId>& consumerId );
 
         virtual int getPrefetch() const;
         virtual void setPrefetch( int prefetch );
@@ -130,7 +132,7 @@
          * 
          * @return a Response to the visitor being called or NULL if no response.
          */
-        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
+        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor )
             throw( exceptions::ActiveMQException );
 
     };

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -34,6 +34,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for ConsumerId

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -37,6 +37,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for ConsumerInfo
@@ -49,9 +51,9 @@
     class AMQCPP_API ConsumerInfo : public BaseCommand {
     protected:
 
-        decaf::lang::Pointer<ConsumerId> consumerId;
+        Pointer<ConsumerId> consumerId;
         bool browser;
-        decaf::lang::Pointer<ActiveMQDestination> destination;
+        Pointer<ActiveMQDestination> destination;
         int prefetchSize;
         int maximumPendingMessageLimit;
         bool dispatchAsync;
@@ -62,7 +64,7 @@
         bool retroactive;
         unsigned char priority;
         std::vector< decaf::lang::Pointer<BrokerId> > brokerPath;
-        decaf::lang::Pointer<BooleanExpression> additionalPredicate;
+        Pointer<BooleanExpression> additionalPredicate;
         bool networkSubscription;
         bool optimizedAcknowledge;
         bool noRangeAcks;
@@ -118,16 +120,16 @@
          */
         virtual bool equals( const DataStructure* value ) const;
 
-        virtual const decaf::lang::Pointer<ConsumerId>& getConsumerId() const;
-        virtual decaf::lang::Pointer<ConsumerId>& getConsumerId();
-        virtual void setConsumerId( const decaf::lang::Pointer<ConsumerId>& consumerId );
+        virtual const Pointer<ConsumerId>& getConsumerId() const;
+        virtual Pointer<ConsumerId>& getConsumerId();
+        virtual void setConsumerId( const Pointer<ConsumerId>& consumerId );
 
         virtual bool isBrowser() const;
         virtual void setBrowser( bool browser );
 
-        virtual const decaf::lang::Pointer<ActiveMQDestination>& getDestination() const;
-        virtual decaf::lang::Pointer<ActiveMQDestination>& getDestination();
-        virtual void setDestination( const decaf::lang::Pointer<ActiveMQDestination>& destination );
+        virtual const Pointer<ActiveMQDestination>& getDestination() const;
+        virtual Pointer<ActiveMQDestination>& getDestination();
+        virtual void setDestination( const Pointer<ActiveMQDestination>& destination );
 
         virtual int getPrefetchSize() const;
         virtual void setPrefetchSize( int prefetchSize );
@@ -162,9 +164,9 @@
         virtual std::vector< decaf::lang::Pointer<BrokerId> >& getBrokerPath();
         virtual void setBrokerPath( const std::vector< decaf::lang::Pointer<BrokerId> >& brokerPath );
 
-        virtual const decaf::lang::Pointer<BooleanExpression>& getAdditionalPredicate() const;
-        virtual decaf::lang::Pointer<BooleanExpression>& getAdditionalPredicate();
-        virtual void setAdditionalPredicate( const decaf::lang::Pointer<BooleanExpression>& additionalPredicate );
+        virtual const Pointer<BooleanExpression>& getAdditionalPredicate() const;
+        virtual Pointer<BooleanExpression>& getAdditionalPredicate();
+        virtual void setAdditionalPredicate( const Pointer<BooleanExpression>& additionalPredicate );
 
         virtual bool isNetworkSubscription() const;
         virtual void setNetworkSubscription( bool networkSubscription );
@@ -182,7 +184,7 @@
          * 
          * @return a Response to the visitor being called or NULL if no response.
          */
-        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
+        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor )
             throw( exceptions::ActiveMQException );
 
     };

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -33,6 +33,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for ControlCommand
@@ -109,7 +111,7 @@
          * 
          * @return a Response to the visitor being called or NULL if no response.
          */
-        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
+        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor )
             throw( exceptions::ActiveMQException );
 
     };

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -34,6 +34,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for DataArrayResponse

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -34,6 +34,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for DataResponse
@@ -46,7 +48,7 @@
     class AMQCPP_API DataResponse : public Response {
     protected:
 
-        decaf::lang::Pointer<DataStructure> data;
+        Pointer<DataStructure> data;
 
     public:
 
@@ -99,9 +101,9 @@
          */
         virtual bool equals( const DataStructure* value ) const;
 
-        virtual const decaf::lang::Pointer<DataStructure>& getData() const;
-        virtual decaf::lang::Pointer<DataStructure>& getData();
-        virtual void setData( const decaf::lang::Pointer<DataStructure>& data );
+        virtual const Pointer<DataStructure>& getData() const;
+        virtual Pointer<DataStructure>& getData();
+        virtual void setData( const Pointer<DataStructure>& data );
 
     };
 

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -36,6 +36,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for DestinationInfo
@@ -48,8 +50,8 @@
     class AMQCPP_API DestinationInfo : public BaseCommand {
     protected:
 
-        decaf::lang::Pointer<ConnectionId> connectionId;
-        decaf::lang::Pointer<ActiveMQDestination> destination;
+        Pointer<ConnectionId> connectionId;
+        Pointer<ActiveMQDestination> destination;
         unsigned char operationType;
         long long timeout;
         std::vector< decaf::lang::Pointer<BrokerId> > brokerPath;
@@ -105,13 +107,13 @@
          */
         virtual bool equals( const DataStructure* value ) const;
 
-        virtual const decaf::lang::Pointer<ConnectionId>& getConnectionId() const;
-        virtual decaf::lang::Pointer<ConnectionId>& getConnectionId();
-        virtual void setConnectionId( const decaf::lang::Pointer<ConnectionId>& connectionId );
-
-        virtual const decaf::lang::Pointer<ActiveMQDestination>& getDestination() const;
-        virtual decaf::lang::Pointer<ActiveMQDestination>& getDestination();
-        virtual void setDestination( const decaf::lang::Pointer<ActiveMQDestination>& destination );
+        virtual const Pointer<ConnectionId>& getConnectionId() const;
+        virtual Pointer<ConnectionId>& getConnectionId();
+        virtual void setConnectionId( const Pointer<ConnectionId>& connectionId );
+
+        virtual const Pointer<ActiveMQDestination>& getDestination() const;
+        virtual Pointer<ActiveMQDestination>& getDestination();
+        virtual void setDestination( const Pointer<ActiveMQDestination>& destination );
 
         virtual unsigned char getOperationType() const;
         virtual void setOperationType( unsigned char operationType );
@@ -130,7 +132,7 @@
          * 
          * @return a Response to the visitor being called or NULL if no response.
          */
-        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
+        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor )
             throw( exceptions::ActiveMQException );
 
     };

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -33,6 +33,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for DiscoveryEvent

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -34,6 +34,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for ExceptionResponse
@@ -46,7 +48,7 @@
     class AMQCPP_API ExceptionResponse : public Response {
     protected:
 
-        decaf::lang::Pointer<BrokerError> exception;
+        Pointer<BrokerError> exception;
 
     public:
 
@@ -99,9 +101,9 @@
          */
         virtual bool equals( const DataStructure* value ) const;
 
-        virtual const decaf::lang::Pointer<BrokerError>& getException() const;
-        virtual decaf::lang::Pointer<BrokerError>& getException();
-        virtual void setException( const decaf::lang::Pointer<BrokerError>& exception );
+        virtual const Pointer<BrokerError>& getException() const;
+        virtual Pointer<BrokerError>& getException();
+        virtual void setException( const Pointer<BrokerError>& exception );
 
     };
 

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -33,6 +33,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for FlushCommand
@@ -104,7 +106,7 @@
          * 
          * @return a Response to the visitor being called or NULL if no response.
          */
-        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
+        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor )
             throw( exceptions::ActiveMQException );
 
     };

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -33,6 +33,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for IntegerResponse

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -35,6 +35,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for JournalQueueAck
@@ -47,8 +49,8 @@
     class AMQCPP_API JournalQueueAck : public BaseDataStructure {
     protected:
 
-        decaf::lang::Pointer<ActiveMQDestination> destination;
-        decaf::lang::Pointer<MessageAck> messageAck;
+        Pointer<ActiveMQDestination> destination;
+        Pointer<MessageAck> messageAck;
 
     public:
 
@@ -101,13 +103,13 @@
          */
         virtual bool equals( const DataStructure* value ) const;
 
-        virtual const decaf::lang::Pointer<ActiveMQDestination>& getDestination() const;
-        virtual decaf::lang::Pointer<ActiveMQDestination>& getDestination();
-        virtual void setDestination( const decaf::lang::Pointer<ActiveMQDestination>& destination );
-
-        virtual const decaf::lang::Pointer<MessageAck>& getMessageAck() const;
-        virtual decaf::lang::Pointer<MessageAck>& getMessageAck();
-        virtual void setMessageAck( const decaf::lang::Pointer<MessageAck>& messageAck );
+        virtual const Pointer<ActiveMQDestination>& getDestination() const;
+        virtual Pointer<ActiveMQDestination>& getDestination();
+        virtual void setDestination( const Pointer<ActiveMQDestination>& destination );
+
+        virtual const Pointer<MessageAck>& getMessageAck() const;
+        virtual Pointer<MessageAck>& getMessageAck();
+        virtual void setMessageAck( const Pointer<MessageAck>& messageAck );
 
     };
 

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -36,6 +36,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for JournalTopicAck
@@ -48,12 +50,12 @@
     class AMQCPP_API JournalTopicAck : public BaseDataStructure {
     protected:
 
-        decaf::lang::Pointer<ActiveMQDestination> destination;
-        decaf::lang::Pointer<MessageId> messageId;
+        Pointer<ActiveMQDestination> destination;
+        Pointer<MessageId> messageId;
         long long messageSequenceId;
         std::string subscritionName;
         std::string clientId;
-        decaf::lang::Pointer<TransactionId> transactionId;
+        Pointer<TransactionId> transactionId;
 
     public:
 
@@ -106,13 +108,13 @@
          */
         virtual bool equals( const DataStructure* value ) const;
 
-        virtual const decaf::lang::Pointer<ActiveMQDestination>& getDestination() const;
-        virtual decaf::lang::Pointer<ActiveMQDestination>& getDestination();
-        virtual void setDestination( const decaf::lang::Pointer<ActiveMQDestination>& destination );
-
-        virtual const decaf::lang::Pointer<MessageId>& getMessageId() const;
-        virtual decaf::lang::Pointer<MessageId>& getMessageId();
-        virtual void setMessageId( const decaf::lang::Pointer<MessageId>& messageId );
+        virtual const Pointer<ActiveMQDestination>& getDestination() const;
+        virtual Pointer<ActiveMQDestination>& getDestination();
+        virtual void setDestination( const Pointer<ActiveMQDestination>& destination );
+
+        virtual const Pointer<MessageId>& getMessageId() const;
+        virtual Pointer<MessageId>& getMessageId();
+        virtual void setMessageId( const Pointer<MessageId>& messageId );
 
         virtual long long getMessageSequenceId() const;
         virtual void setMessageSequenceId( long long messageSequenceId );
@@ -125,9 +127,9 @@
         virtual std::string& getClientId();
         virtual void setClientId( const std::string& clientId );
 
-        virtual const decaf::lang::Pointer<TransactionId>& getTransactionId() const;
-        virtual decaf::lang::Pointer<TransactionId>& getTransactionId();
-        virtual void setTransactionId( const decaf::lang::Pointer<TransactionId>& transactionId );
+        virtual const Pointer<TransactionId>& getTransactionId() const;
+        virtual Pointer<TransactionId>& getTransactionId();
+        virtual void setTransactionId( const Pointer<TransactionId>& transactionId );
 
     };
 

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -33,6 +33,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for JournalTrace

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -34,6 +34,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for JournalTransaction
@@ -46,7 +48,7 @@
     class AMQCPP_API JournalTransaction : public BaseDataStructure {
     protected:
 
-        decaf::lang::Pointer<TransactionId> transactionId;
+        Pointer<TransactionId> transactionId;
         unsigned char type;
         bool wasPrepared;
 
@@ -101,9 +103,9 @@
          */
         virtual bool equals( const DataStructure* value ) const;
 
-        virtual const decaf::lang::Pointer<TransactionId>& getTransactionId() const;
-        virtual decaf::lang::Pointer<TransactionId>& getTransactionId();
-        virtual void setTransactionId( const decaf::lang::Pointer<TransactionId>& transactionId );
+        virtual const Pointer<TransactionId>& getTransactionId() const;
+        virtual Pointer<TransactionId>& getTransactionId();
+        virtual void setTransactionId( const Pointer<TransactionId>& transactionId );
 
         virtual unsigned char getType() const;
         virtual void setType( unsigned char type );

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -33,6 +33,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for KeepAliveInfo
@@ -111,7 +113,7 @@
          * 
          * @return a Response to the visitor being called or NULL if no response.
          */
-        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
+        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor )
             throw( exceptions::ActiveMQException );
 
     };

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -33,6 +33,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for LastPartialCommand

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -35,6 +35,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for LocalTransactionId
@@ -48,7 +50,7 @@
     protected:
 
         long long value;
-        decaf::lang::Pointer<ConnectionId> connectionId;
+        Pointer<ConnectionId> connectionId;
 
     public:
 
@@ -103,9 +105,9 @@
         virtual long long getValue() const;
         virtual void setValue( long long value );
 
-        virtual const decaf::lang::Pointer<ConnectionId>& getConnectionId() const;
-        virtual decaf::lang::Pointer<ConnectionId>& getConnectionId();
-        virtual void setConnectionId( const decaf::lang::Pointer<ConnectionId>& connectionId );
+        virtual const Pointer<ConnectionId>& getConnectionId() const;
+        virtual Pointer<ConnectionId>& getConnectionId();
+        virtual void setConnectionId( const Pointer<ConnectionId>& connectionId );
 
         virtual int compareTo( const LocalTransactionId& value ) const;
 

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -45,6 +45,8 @@
 }
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for Message
@@ -77,25 +79,25 @@
 
     protected:
 
-        decaf::lang::Pointer<ProducerId> producerId;
-        decaf::lang::Pointer<ActiveMQDestination> destination;
-        decaf::lang::Pointer<TransactionId> transactionId;
-        decaf::lang::Pointer<ActiveMQDestination> originalDestination;
-        decaf::lang::Pointer<MessageId> messageId;
-        decaf::lang::Pointer<TransactionId> originalTransactionId;
+        Pointer<ProducerId> producerId;
+        Pointer<ActiveMQDestination> destination;
+        Pointer<TransactionId> transactionId;
+        Pointer<ActiveMQDestination> originalDestination;
+        Pointer<MessageId> messageId;
+        Pointer<TransactionId> originalTransactionId;
         std::string groupID;
         int groupSequence;
         std::string correlationId;
         bool persistent;
         long long expiration;
         unsigned char priority;
-        decaf::lang::Pointer<ActiveMQDestination> replyTo;
+        Pointer<ActiveMQDestination> replyTo;
         long long timestamp;
         std::string type;
         std::vector<unsigned char> content;
         std::vector<unsigned char> marshalledProperties;
-        decaf::lang::Pointer<DataStructure> dataStructure;
-        decaf::lang::Pointer<ConsumerId> targetConsumerId;
+        Pointer<DataStructure> dataStructure;
+        Pointer<ConsumerId> targetConsumerId;
         bool compressed;
         int redeliveryCounter;
         std::vector< decaf::lang::Pointer<BrokerId> > brokerPath;
@@ -267,29 +269,29 @@
             this->readOnlyBody = value;
         }
 
-        virtual const decaf::lang::Pointer<ProducerId>& getProducerId() const;
-        virtual decaf::lang::Pointer<ProducerId>& getProducerId();
-        virtual void setProducerId( const decaf::lang::Pointer<ProducerId>& producerId );
-
-        virtual const decaf::lang::Pointer<ActiveMQDestination>& getDestination() const;
-        virtual decaf::lang::Pointer<ActiveMQDestination>& getDestination();
-        virtual void setDestination( const decaf::lang::Pointer<ActiveMQDestination>& destination );
-
-        virtual const decaf::lang::Pointer<TransactionId>& getTransactionId() const;
-        virtual decaf::lang::Pointer<TransactionId>& getTransactionId();
-        virtual void setTransactionId( const decaf::lang::Pointer<TransactionId>& transactionId );
-
-        virtual const decaf::lang::Pointer<ActiveMQDestination>& getOriginalDestination() const;
-        virtual decaf::lang::Pointer<ActiveMQDestination>& getOriginalDestination();
-        virtual void setOriginalDestination( const decaf::lang::Pointer<ActiveMQDestination>& originalDestination );
-
-        virtual const decaf::lang::Pointer<MessageId>& getMessageId() const;
-        virtual decaf::lang::Pointer<MessageId>& getMessageId();
-        virtual void setMessageId( const decaf::lang::Pointer<MessageId>& messageId );
-
-        virtual const decaf::lang::Pointer<TransactionId>& getOriginalTransactionId() const;
-        virtual decaf::lang::Pointer<TransactionId>& getOriginalTransactionId();
-        virtual void setOriginalTransactionId( const decaf::lang::Pointer<TransactionId>& originalTransactionId );
+        virtual const Pointer<ProducerId>& getProducerId() const;
+        virtual Pointer<ProducerId>& getProducerId();
+        virtual void setProducerId( const Pointer<ProducerId>& producerId );
+
+        virtual const Pointer<ActiveMQDestination>& getDestination() const;
+        virtual Pointer<ActiveMQDestination>& getDestination();
+        virtual void setDestination( const Pointer<ActiveMQDestination>& destination );
+
+        virtual const Pointer<TransactionId>& getTransactionId() const;
+        virtual Pointer<TransactionId>& getTransactionId();
+        virtual void setTransactionId( const Pointer<TransactionId>& transactionId );
+
+        virtual const Pointer<ActiveMQDestination>& getOriginalDestination() const;
+        virtual Pointer<ActiveMQDestination>& getOriginalDestination();
+        virtual void setOriginalDestination( const Pointer<ActiveMQDestination>& originalDestination );
+
+        virtual const Pointer<MessageId>& getMessageId() const;
+        virtual Pointer<MessageId>& getMessageId();
+        virtual void setMessageId( const Pointer<MessageId>& messageId );
+
+        virtual const Pointer<TransactionId>& getOriginalTransactionId() const;
+        virtual Pointer<TransactionId>& getOriginalTransactionId();
+        virtual void setOriginalTransactionId( const Pointer<TransactionId>& originalTransactionId );
 
         virtual const std::string& getGroupID() const;
         virtual std::string& getGroupID();
@@ -311,9 +313,9 @@
         virtual unsigned char getPriority() const;
         virtual void setPriority( unsigned char priority );
 
-        virtual const decaf::lang::Pointer<ActiveMQDestination>& getReplyTo() const;
-        virtual decaf::lang::Pointer<ActiveMQDestination>& getReplyTo();
-        virtual void setReplyTo( const decaf::lang::Pointer<ActiveMQDestination>& replyTo );
+        virtual const Pointer<ActiveMQDestination>& getReplyTo() const;
+        virtual Pointer<ActiveMQDestination>& getReplyTo();
+        virtual void setReplyTo( const Pointer<ActiveMQDestination>& replyTo );
 
         virtual long long getTimestamp() const;
         virtual void setTimestamp( long long timestamp );
@@ -330,13 +332,13 @@
         virtual std::vector<unsigned char>& getMarshalledProperties();
         virtual void setMarshalledProperties( const std::vector<unsigned char>& marshalledProperties );
 
-        virtual const decaf::lang::Pointer<DataStructure>& getDataStructure() const;
-        virtual decaf::lang::Pointer<DataStructure>& getDataStructure();
-        virtual void setDataStructure( const decaf::lang::Pointer<DataStructure>& dataStructure );
-
-        virtual const decaf::lang::Pointer<ConsumerId>& getTargetConsumerId() const;
-        virtual decaf::lang::Pointer<ConsumerId>& getTargetConsumerId();
-        virtual void setTargetConsumerId( const decaf::lang::Pointer<ConsumerId>& targetConsumerId );
+        virtual const Pointer<DataStructure>& getDataStructure() const;
+        virtual Pointer<DataStructure>& getDataStructure();
+        virtual void setDataStructure( const Pointer<DataStructure>& dataStructure );
+
+        virtual const Pointer<ConsumerId>& getTargetConsumerId() const;
+        virtual Pointer<ConsumerId>& getTargetConsumerId();
+        virtual void setTargetConsumerId( const Pointer<ConsumerId>& targetConsumerId );
 
         virtual bool isCompressed() const;
         virtual void setCompressed( bool compressed );
@@ -378,7 +380,7 @@
          * 
          * @return a Response to the visitor being called or NULL if no response.
          */
-        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
+        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor )
             throw( exceptions::ActiveMQException );
 
     };

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=747896&r1=747895&r2=747896&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 19:32:13 2009
@@ -37,6 +37,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for MessageAck
@@ -49,12 +51,12 @@
     class AMQCPP_API MessageAck : public BaseCommand {
     protected:
 
-        decaf::lang::Pointer<ActiveMQDestination> destination;
-        decaf::lang::Pointer<TransactionId> transactionId;
-        decaf::lang::Pointer<ConsumerId> consumerId;
+        Pointer<ActiveMQDestination> destination;
+        Pointer<TransactionId> transactionId;
+        Pointer<ConsumerId> consumerId;
         unsigned char ackType;
-        decaf::lang::Pointer<MessageId> firstMessageId;
-        decaf::lang::Pointer<MessageId> lastMessageId;
+        Pointer<MessageId> firstMessageId;
+        Pointer<MessageId> lastMessageId;
         int messageCount;
 
     public:
@@ -108,28 +110,28 @@
          */
         virtual bool equals( const DataStructure* value ) const;
 
-        virtual const decaf::lang::Pointer<ActiveMQDestination>& getDestination() const;
-        virtual decaf::lang::Pointer<ActiveMQDestination>& getDestination();
-        virtual void setDestination( const decaf::lang::Pointer<ActiveMQDestination>& destination );
-
-        virtual const decaf::lang::Pointer<TransactionId>& getTransactionId() const;
-        virtual decaf::lang::Pointer<TransactionId>& getTransactionId();
-        virtual void setTransactionId( const decaf::lang::Pointer<TransactionId>& transactionId );
-
-        virtual const decaf::lang::Pointer<ConsumerId>& getConsumerId() const;
-        virtual decaf::lang::Pointer<ConsumerId>& getConsumerId();
-        virtual void setConsumerId( const decaf::lang::Pointer<ConsumerId>& consumerId );
+        virtual const Pointer<ActiveMQDestination>& getDestination() const;
+        virtual Pointer<ActiveMQDestination>& getDestination();
+        virtual void setDestination( const Pointer<ActiveMQDestination>& destination );
+
+        virtual const Pointer<TransactionId>& getTransactionId() const;
+        virtual Pointer<TransactionId>& getTransactionId();
+        virtual void setTransactionId( const Pointer<TransactionId>& transactionId );
+
+        virtual const Pointer<ConsumerId>& getConsumerId() const;
+        virtual Pointer<ConsumerId>& getConsumerId();
+        virtual void setConsumerId( const Pointer<ConsumerId>& consumerId );
 
         virtual unsigned char getAckType() const;
         virtual void setAckType( unsigned char ackType );
 
-        virtual const decaf::lang::Pointer<MessageId>& getFirstMessageId() const;
-        virtual decaf::lang::Pointer<MessageId>& getFirstMessageId();
-        virtual void setFirstMessageId( const decaf::lang::Pointer<MessageId>& firstMessageId );
-
-        virtual const decaf::lang::Pointer<MessageId>& getLastMessageId() const;
-        virtual decaf::lang::Pointer<MessageId>& getLastMessageId();
-        virtual void setLastMessageId( const decaf::lang::Pointer<MessageId>& lastMessageId );
+        virtual const Pointer<MessageId>& getFirstMessageId() const;
+        virtual Pointer<MessageId>& getFirstMessageId();
+        virtual void setFirstMessageId( const Pointer<MessageId>& firstMessageId );
+
+        virtual const Pointer<MessageId>& getLastMessageId() const;
+        virtual Pointer<MessageId>& getLastMessageId();
+        virtual void setLastMessageId( const Pointer<MessageId>& lastMessageId );
 
         virtual int getMessageCount() const;
         virtual void setMessageCount( int messageCount );
@@ -148,7 +150,7 @@
          * 
          * @return a Response to the visitor being called or NULL if no response.
          */
-        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
+        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor )
             throw( exceptions::ActiveMQException );
 
     };

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.h?rev=747896&r1=747895&r2=747896&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.h Wed Feb 25 19:32:13 2009
@@ -36,6 +36,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for MessageDispatch
@@ -48,9 +50,9 @@
     class AMQCPP_API MessageDispatch : public BaseCommand {
     protected:
 
-        decaf::lang::Pointer<ConsumerId> consumerId;
-        decaf::lang::Pointer<ActiveMQDestination> destination;
-        decaf::lang::Pointer<Message> message;
+        Pointer<ConsumerId> consumerId;
+        Pointer<ActiveMQDestination> destination;
+        Pointer<Message> message;
         int redeliveryCounter;
 
     public:
@@ -104,17 +106,17 @@
          */
         virtual bool equals( const DataStructure* value ) const;
 
-        virtual const decaf::lang::Pointer<ConsumerId>& getConsumerId() const;
-        virtual decaf::lang::Pointer<ConsumerId>& getConsumerId();
-        virtual void setConsumerId( const decaf::lang::Pointer<ConsumerId>& consumerId );
-
-        virtual const decaf::lang::Pointer<ActiveMQDestination>& getDestination() const;
-        virtual decaf::lang::Pointer<ActiveMQDestination>& getDestination();
-        virtual void setDestination( const decaf::lang::Pointer<ActiveMQDestination>& destination );
-
-        virtual const decaf::lang::Pointer<Message>& getMessage() const;
-        virtual decaf::lang::Pointer<Message>& getMessage();
-        virtual void setMessage( const decaf::lang::Pointer<Message>& message );
+        virtual const Pointer<ConsumerId>& getConsumerId() const;
+        virtual Pointer<ConsumerId>& getConsumerId();
+        virtual void setConsumerId( const Pointer<ConsumerId>& consumerId );
+
+        virtual const Pointer<ActiveMQDestination>& getDestination() const;
+        virtual Pointer<ActiveMQDestination>& getDestination();
+        virtual void setDestination( const Pointer<ActiveMQDestination>& destination );
+
+        virtual const Pointer<Message>& getMessage() const;
+        virtual Pointer<Message>& getMessage();
+        virtual void setMessage( const Pointer<Message>& message );
 
         virtual int getRedeliveryCounter() const;
         virtual void setRedeliveryCounter( int redeliveryCounter );
@@ -133,7 +135,7 @@
          * 
          * @return a Response to the visitor being called or NULL if no response.
          */
-        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
+        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor )
             throw( exceptions::ActiveMQException );
 
     };

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.h?rev=747896&r1=747895&r2=747896&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.h Wed Feb 25 19:32:13 2009
@@ -36,6 +36,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for MessageDispatchNotification
@@ -48,10 +50,10 @@
     class AMQCPP_API MessageDispatchNotification : public BaseCommand {
     protected:
 
-        decaf::lang::Pointer<ConsumerId> consumerId;
-        decaf::lang::Pointer<ActiveMQDestination> destination;
+        Pointer<ConsumerId> consumerId;
+        Pointer<ActiveMQDestination> destination;
         long long deliverySequenceId;
-        decaf::lang::Pointer<MessageId> messageId;
+        Pointer<MessageId> messageId;
 
     public:
 
@@ -104,20 +106,20 @@
          */
         virtual bool equals( const DataStructure* value ) const;
 
-        virtual const decaf::lang::Pointer<ConsumerId>& getConsumerId() const;
-        virtual decaf::lang::Pointer<ConsumerId>& getConsumerId();
-        virtual void setConsumerId( const decaf::lang::Pointer<ConsumerId>& consumerId );
-
-        virtual const decaf::lang::Pointer<ActiveMQDestination>& getDestination() const;
-        virtual decaf::lang::Pointer<ActiveMQDestination>& getDestination();
-        virtual void setDestination( const decaf::lang::Pointer<ActiveMQDestination>& destination );
+        virtual const Pointer<ConsumerId>& getConsumerId() const;
+        virtual Pointer<ConsumerId>& getConsumerId();
+        virtual void setConsumerId( const Pointer<ConsumerId>& consumerId );
+
+        virtual const Pointer<ActiveMQDestination>& getDestination() const;
+        virtual Pointer<ActiveMQDestination>& getDestination();
+        virtual void setDestination( const Pointer<ActiveMQDestination>& destination );
 
         virtual long long getDeliverySequenceId() const;
         virtual void setDeliverySequenceId( long long deliverySequenceId );
 
-        virtual const decaf::lang::Pointer<MessageId>& getMessageId() const;
-        virtual decaf::lang::Pointer<MessageId>& getMessageId();
-        virtual void setMessageId( const decaf::lang::Pointer<MessageId>& messageId );
+        virtual const Pointer<MessageId>& getMessageId() const;
+        virtual Pointer<MessageId>& getMessageId();
+        virtual void setMessageId( const Pointer<MessageId>& messageId );
 
         /**
          * @return an answer of true to the isMessageDispatchNotification() query.
@@ -133,7 +135,7 @@
          * 
          * @return a Response to the visitor being called or NULL if no response.
          */
-        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
+        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor )
             throw( exceptions::ActiveMQException );
 
     };

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.h?rev=747896&r1=747895&r2=747896&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.h Wed Feb 25 19:32:13 2009
@@ -35,6 +35,8 @@
 namespace activemq{
 namespace commands{
 
+     using decaf::lang::Pointer;
+
     /*
      *
      *  Command code for OpenWire format for MessageId
@@ -47,7 +49,7 @@
     class AMQCPP_API MessageId : public BaseDataStructure, public decaf::lang::Comparable<MessageId> {
     protected:
 
-        decaf::lang::Pointer<ProducerId> producerId;
+        Pointer<ProducerId> producerId;
         long long producerSequenceId;
         long long brokerSequenceId;
 
@@ -101,9 +103,9 @@
          */
         virtual bool equals( const DataStructure* value ) const;
 
-        virtual const decaf::lang::Pointer<ProducerId>& getProducerId() const;
-        virtual decaf::lang::Pointer<ProducerId>& getProducerId();
-        virtual void setProducerId( const decaf::lang::Pointer<ProducerId>& producerId );
+        virtual const Pointer<ProducerId>& getProducerId() const;
+        virtual Pointer<ProducerId>& getProducerId();
+        virtual void setProducerId( const Pointer<ProducerId>& producerId );
 
         virtual long long getProducerSequenceId() const;
         virtual void setProducerSequenceId( long long producerSequenceId );



Mime
View raw message