You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/07/28 10:22:55 UTC

svn commit: r426431 [9/14] - in /incubator/activemq/branches/activemq-4.0: activemq-core/src/gram/script/ activemq-core/src/main/java/org/apache/activemq/kaha/impl/ activemq-core/src/main/java/org/apache/activemq/openwire/v1/ activemq-core/src/test/jav...

Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/FutureResponse.hpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/ICommandListener.hpp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/ICommandListener.hpp?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/ICommandListener.hpp (original)
+++ incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/ICommandListener.hpp Fri Jul 28 01:22:48 2006
@@ -1,51 +1,51 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef ActiveMQ_ICommandListener_hpp_
-#define ActiveMQ_ICommandListener_hpp_
-
-#include <exception>
-#include "activemq/ICommand.hpp"
-#include "ppr/util/ifr/p"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace transport
-    {
-      using namespace ifr;
-      using namespace std;
-      using namespace apache::activemq;
-      using namespace apache::activemq::command;
-      using namespace apache::cms;
-      struct ITransport;
-
-/*
- * 
- */
-struct ICommandListener : Interface
-{
-    virtual void onCommand(p<ITransport> transport, p<ICommand> command) = 0 ;
-    virtual void onError(p<ITransport> transport, exception& error) = 0 ;
-} ;
-
-/* namespace */
-    }
-  }
-}
-
-#endif /*ActiveMQ_ICommandListener_hpp_*/
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef ActiveMQ_ICommandListener_hpp_
+#define ActiveMQ_ICommandListener_hpp_
+
+#include <exception>
+#include "activemq/ICommand.hpp"
+#include "ppr/util/ifr/p"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace transport
+    {
+      using namespace ifr;
+      using namespace std;
+      using namespace apache::activemq;
+      using namespace apache::activemq::command;
+      using namespace apache::cms;
+      struct ITransport;
+
+/*
+ * 
+ */
+struct ICommandListener : Interface
+{
+    virtual void onCommand(p<ITransport> transport, p<ICommand> command) = 0 ;
+    virtual void onError(p<ITransport> transport, exception& error) = 0 ;
+} ;
+
+/* namespace */
+    }
+  }
+}
+
+#endif /*ActiveMQ_ICommandListener_hpp_*/

Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/ICommandListener.hpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/ITransport.hpp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/ITransport.hpp?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/ITransport.hpp (original)
+++ incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/ITransport.hpp Fri Jul 28 01:22:48 2006
@@ -1,56 +1,56 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef ActiveMQ_ITransport_hpp_
-#define ActiveMQ_ITransport_hpp_
-
-#include "cms/IStartable.hpp"
-#include "activemq/ICommand.hpp"
-#include "activemq/command/Response.hpp"
-#include "activemq/transport/FutureResponse.hpp"
-#include "activemq/transport/ICommandListener.hpp"
-#include "ppr/util/ifr/p"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace transport
-    {
-      using namespace ifr ;
-      using namespace apache::cms;
-      using namespace apache::activemq;
-      using namespace apache::activemq::command;
-
-/*
- * Represents the logical networking transport layer.
- */
-struct ITransport : IStartable
-{
-    virtual void setCommandListener(p<ICommandListener> listener) = 0 ;
-    virtual p<ICommandListener> getCommandListener() = 0 ;
-
-    virtual void oneway(p<ICommand> command) = 0 ;
-	virtual p<FutureResponse> asyncRequest(p<ICommand> command) = 0 ;
-	virtual p<Response> request(p<ICommand> command) = 0 ;
-} ;
-
-/* namespace */
-    }
-  }
-}
-
-#endif /*ActiveMQ_ITransport_hpp_*/
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef ActiveMQ_ITransport_hpp_
+#define ActiveMQ_ITransport_hpp_
+
+#include "cms/IStartable.hpp"
+#include "activemq/ICommand.hpp"
+#include "activemq/command/Response.hpp"
+#include "activemq/transport/FutureResponse.hpp"
+#include "activemq/transport/ICommandListener.hpp"
+#include "ppr/util/ifr/p"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace transport
+    {
+      using namespace ifr ;
+      using namespace apache::cms;
+      using namespace apache::activemq;
+      using namespace apache::activemq::command;
+
+/*
+ * Represents the logical networking transport layer.
+ */
+struct ITransport : IStartable
+{
+    virtual void setCommandListener(p<ICommandListener> listener) = 0 ;
+    virtual p<ICommandListener> getCommandListener() = 0 ;
+
+    virtual void oneway(p<ICommand> command) = 0 ;
+	virtual p<FutureResponse> asyncRequest(p<ICommand> command) = 0 ;
+	virtual p<Response> request(p<ICommand> command) = 0 ;
+} ;
+
+/* namespace */
+    }
+  }
+}
+
+#endif /*ActiveMQ_ITransport_hpp_*/

Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/ITransport.hpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/ITransportFactory.hpp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/ITransportFactory.hpp?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/ITransportFactory.hpp (original)
+++ incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/ITransportFactory.hpp Fri Jul 28 01:22:48 2006
@@ -1,49 +1,49 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef ActiveMQ_ITransportFactory_hpp_
-#define ActiveMQ_ITransportFactory_hpp_
-
-#include "activemq/transport/ITransport.hpp"
-#include "ppr/IllegalArgumentException.hpp"
-#include "ppr/net/SocketException.hpp"
-#include "ppr/net/Uri.hpp"
-#include "ppr/util/ifr/p"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace transport
-    {
-      using namespace ifr ;
-      using namespace apache::ppr;
-      using namespace apache::ppr::net;
-
-/*
- * 
- */
-struct ITransportFactory : Interface
-{
-	virtual p<ITransport> createTransport(p<Uri> location) throw (SocketException, IllegalArgumentException) = 0 ;
-} ;
-
-/* namespace */
-    }
-  }
-}
-
-#endif /*ActiveMQ_ITransportFactory_hpp_*/
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef ActiveMQ_ITransportFactory_hpp_
+#define ActiveMQ_ITransportFactory_hpp_
+
+#include "activemq/transport/ITransport.hpp"
+#include "ppr/IllegalArgumentException.hpp"
+#include "ppr/net/SocketException.hpp"
+#include "ppr/net/Uri.hpp"
+#include "ppr/util/ifr/p"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace transport
+    {
+      using namespace ifr ;
+      using namespace apache::ppr;
+      using namespace apache::ppr::net;
+
+/*
+ * 
+ */
+struct ITransportFactory : Interface
+{
+	virtual p<ITransport> createTransport(p<Uri> location) throw (SocketException, IllegalArgumentException) = 0 ;
+} ;
+
+/* namespace */
+    }
+  }
+}
+
+#endif /*ActiveMQ_ITransportFactory_hpp_*/

Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/ITransportFactory.hpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/LoggingFilter.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/LoggingFilter.cpp?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/LoggingFilter.cpp (original)
+++ incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/LoggingFilter.cpp Fri Jul 28 01:22:48 2006
@@ -1,106 +1,106 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "activemq/transport/LoggingFilter.hpp"
-
-using namespace apache::activemq::transport;
-
-
-// --- Constructors -------------------------------------------------
-
-/*
- * 
- */
-LoggingFilter::LoggingFilter(p<ITransport> next) :
-    TransportFilter(next)
-{
-    this->next = next ;
-}
-
-
-// --- Operation methods --------------------------------------------
-
-/*
- * 
- */
-void LoggingFilter::oneway(p<ICommand> command)
-{
-    int cmdid  = command->getCommandId(),
-        corrid = -1 ;
-
-    // Get correlation id if a response
-    if( command->getDataStructureType() == Response::TYPE )
-        corrid = p_cast<Response>(command)->getCorrelationId() ;
-
-    // Dump log entry
-    printf("Sending command: cmd.id = %d, corr.id = %d, type = %s\n",
-           cmdid, corrid, 
-           AbstractCommand::getDataStructureTypeAsString(command->getDataStructureType())->c_str() ) ;
-
-/*    cout << "Sending command: id = " <<
-            command->getCommandId() <<
-            ", type = " <<
-            AbstractCommand::getDataStructureTypeAsString(command->getDataStructureType())->c_str() <<
-            endl ;*/
-
-    this->next->oneway(command) ;
-}
-
-
-// --- Event methods ------------------------------------------------
-
-/*
- * 
- */
-void LoggingFilter::onCommand(p<ITransport> transport, p<ICommand> command)
-{
-    if( command == NULL )
-        cout << "Received NULL command" << endl ;
-    else
-    {
-        int cmdid  = command->getCommandId(),
-            corrid = -1 ;
-
-        // Get correlation id if a response
-        if( command->getDataStructureType() == Response::TYPE )
-            corrid = p_cast<Response>(command)->getCorrelationId() ;
-
-        // Dump log entry
-        printf("Received command: cmd.id = %d, corr.id = %d, type = %s\n",
-               cmdid, corrid, 
-               AbstractCommand::getDataStructureTypeAsString(command->getDataStructureType())->c_str() ) ;
-
-/*        cout << "Recived command: id = " <<
-                command->getCommandId() <<
-                ", type = " <<
-                AbstractCommand::getDataStructureTypeAsString(command->getDataStructureType())->c_str() <<
-                endl ;*/
-    }
-
-    // Forward incoming command to "real" listener
-    this->listener->onCommand(transport, command) ;
-}
-
-/*
- * 
- */
-void LoggingFilter::onError(p<ITransport> transport, exception& error)
-{
-    cout << "Received exception = '" << error.what() << "'" << endl ;
-
-    // Forward incoming exception to "real" listener
-    this->listener->onError(transport, error) ;
-}
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "activemq/transport/LoggingFilter.hpp"
+
+using namespace apache::activemq::transport;
+
+
+// --- Constructors -------------------------------------------------
+
+/*
+ * 
+ */
+LoggingFilter::LoggingFilter(p<ITransport> next) :
+    TransportFilter(next)
+{
+    this->next = next ;
+}
+
+
+// --- Operation methods --------------------------------------------
+
+/*
+ * 
+ */
+void LoggingFilter::oneway(p<ICommand> command)
+{
+    int cmdid  = command->getCommandId(),
+        corrid = -1 ;
+
+    // Get correlation id if a response
+    if( command->getDataStructureType() == Response::TYPE )
+        corrid = p_cast<Response>(command)->getCorrelationId() ;
+
+    // Dump log entry
+    printf("Sending command: cmd.id = %d, corr.id = %d, type = %s\n",
+           cmdid, corrid, 
+           AbstractCommand::getDataStructureTypeAsString(command->getDataStructureType())->c_str() ) ;
+
+/*    cout << "Sending command: id = " <<
+            command->getCommandId() <<
+            ", type = " <<
+            AbstractCommand::getDataStructureTypeAsString(command->getDataStructureType())->c_str() <<
+            endl ;*/
+
+    this->next->oneway(command) ;
+}
+
+
+// --- Event methods ------------------------------------------------
+
+/*
+ * 
+ */
+void LoggingFilter::onCommand(p<ITransport> transport, p<ICommand> command)
+{
+    if( command == NULL )
+        cout << "Received NULL command" << endl ;
+    else
+    {
+        int cmdid  = command->getCommandId(),
+            corrid = -1 ;
+
+        // Get correlation id if a response
+        if( command->getDataStructureType() == Response::TYPE )
+            corrid = p_cast<Response>(command)->getCorrelationId() ;
+
+        // Dump log entry
+        printf("Received command: cmd.id = %d, corr.id = %d, type = %s\n",
+               cmdid, corrid, 
+               AbstractCommand::getDataStructureTypeAsString(command->getDataStructureType())->c_str() ) ;
+
+/*        cout << "Recived command: id = " <<
+                command->getCommandId() <<
+                ", type = " <<
+                AbstractCommand::getDataStructureTypeAsString(command->getDataStructureType())->c_str() <<
+                endl ;*/
+    }
+
+    // Forward incoming command to "real" listener
+    this->listener->onCommand(transport, command) ;
+}
+
+/*
+ * 
+ */
+void LoggingFilter::onError(p<ITransport> transport, exception& error)
+{
+    cout << "Received exception = '" << error.what() << "'" << endl ;
+
+    // Forward incoming exception to "real" listener
+    this->listener->onError(transport, error) ;
+}

Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/LoggingFilter.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/LoggingFilter.hpp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/LoggingFilter.hpp?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/LoggingFilter.hpp (original)
+++ incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/LoggingFilter.hpp Fri Jul 28 01:22:48 2006
@@ -1,57 +1,57 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef ActiveMQ_LoggingFilter_hpp_
-#define ActiveMQ_LoggingFilter_hpp_
-
-#include <iostream>
-#include <exception>
-#include "activemq/transport/TransportFilter.hpp"
-#include "ppr/util/ifr/p"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace transport
-    {
-      using namespace ifr;
-      using namespace std;
-
-/*
- * 
- */
-class LoggingFilter : public TransportFilter
-{
-protected:
-    p<ITransport> next ;
-
-public:
-    LoggingFilter(p<ITransport> next) ;
-    virtual ~LoggingFilter() {}
-
-	virtual void oneway(p<ICommand> command) ;
-
-    virtual void onCommand(p<ITransport> transport, p<ICommand> command) ;
-    virtual void onError(p<ITransport> transport, exception& error) ;
-} ;
-
-/* namespace */
-    }
-  }
-}
-
-#endif /*ActiveMQ_LoggingFilter_hpp_*/
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef ActiveMQ_LoggingFilter_hpp_
+#define ActiveMQ_LoggingFilter_hpp_
+
+#include <iostream>
+#include <exception>
+#include "activemq/transport/TransportFilter.hpp"
+#include "ppr/util/ifr/p"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace transport
+    {
+      using namespace ifr;
+      using namespace std;
+
+/*
+ * 
+ */
+class LoggingFilter : public TransportFilter
+{
+protected:
+    p<ITransport> next ;
+
+public:
+    LoggingFilter(p<ITransport> next) ;
+    virtual ~LoggingFilter() {}
+
+	virtual void oneway(p<ICommand> command) ;
+
+    virtual void onCommand(p<ITransport> transport, p<ICommand> command) ;
+    virtual void onError(p<ITransport> transport, exception& error) ;
+} ;
+
+/* namespace */
+    }
+  }
+}
+
+#endif /*ActiveMQ_LoggingFilter_hpp_*/

Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/LoggingFilter.hpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/MutexFilter.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/MutexFilter.cpp?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/MutexFilter.cpp (original)
+++ incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/MutexFilter.cpp Fri Jul 28 01:22:48 2006
@@ -1,72 +1,72 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "activemq/transport/MutexFilter.hpp"
-
-using namespace apache::activemq::transport;
-
-// --- Constructors -------------------------------------------------
-
-/*
- * 
- */
-MutexFilter::MutexFilter(p<ITransport> next) :
-   TransportFilter(next)
-{
-    this->next = next ;
-}
-
-/*
- * 
- */
-MutexFilter::~MutexFilter()
-{
-    // Wait for transmission lock before disposal
-    LOCKED_SCOPE (mutex) ;
-}
-
-
-// --- Operation methods --------------------------------------------
-
-/*
- * 
- */
-void MutexFilter::oneway(p<ICommand> command)
-{
-    // Wait for transmission lock and then transmit command
-    LOCKED_SCOPE (mutex) ;
-    this->next->oneway(command) ;
-}
-
-/*
- * 
- */
-p<FutureResponse> MutexFilter::asyncRequest(p<ICommand> command)
-{
-    // Wait for transmission lock and then transmit command
-    LOCKED_SCOPE (mutex) ;
-    return this->next->asyncRequest(command) ;
-}
-
-/*
- * 
- */
-p<Response> MutexFilter::request(p<ICommand> command)
-{
-    // Wait for transmission lock and then transmit command
-    LOCKED_SCOPE (mutex) ;
-    return this->next->request(command) ;
-}
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "activemq/transport/MutexFilter.hpp"
+
+using namespace apache::activemq::transport;
+
+// --- Constructors -------------------------------------------------
+
+/*
+ * 
+ */
+MutexFilter::MutexFilter(p<ITransport> next) :
+   TransportFilter(next)
+{
+    this->next = next ;
+}
+
+/*
+ * 
+ */
+MutexFilter::~MutexFilter()
+{
+    // Wait for transmission lock before disposal
+    LOCKED_SCOPE (mutex) ;
+}
+
+
+// --- Operation methods --------------------------------------------
+
+/*
+ * 
+ */
+void MutexFilter::oneway(p<ICommand> command)
+{
+    // Wait for transmission lock and then transmit command
+    LOCKED_SCOPE (mutex) ;
+    this->next->oneway(command) ;
+}
+
+/*
+ * 
+ */
+p<FutureResponse> MutexFilter::asyncRequest(p<ICommand> command)
+{
+    // Wait for transmission lock and then transmit command
+    LOCKED_SCOPE (mutex) ;
+    return this->next->asyncRequest(command) ;
+}
+
+/*
+ * 
+ */
+p<Response> MutexFilter::request(p<ICommand> command)
+{
+    // Wait for transmission lock and then transmit command
+    LOCKED_SCOPE (mutex) ;
+    return this->next->request(command) ;
+}

Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/MutexFilter.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/MutexFilter.hpp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/MutexFilter.hpp?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/MutexFilter.hpp (original)
+++ incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/MutexFilter.hpp Fri Jul 28 01:22:48 2006
@@ -1,56 +1,56 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef ActiveMQ_MutexFilter_hpp_
-#define ActiveMQ_MutexFilter_hpp_
-
-#include "activemq/transport/TransportFilter.hpp"
-#include "ppr/thread/SimpleMutex.hpp"
-#include "ppr/util/ifr/p"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace transport
-    {
-      using namespace ifr;
-      using namespace apache::ppr::thread;
-
-/*
- * A filter transport which gaurds access to the next transport
- * using a mutex.
- */
-class MutexFilter : public TransportFilter
-{
-protected:
-    SimpleMutex mutex ;
-
-public:
-    MutexFilter(p<ITransport> next) ;
-    virtual ~MutexFilter() ;
-
-	virtual void oneway(p<ICommand> command) ;
-	virtual p<FutureResponse> asyncRequest(p<ICommand> command) ;
-	virtual p<Response> request(p<ICommand> command) ;
-} ;
-
-/* namespace */
-    }
-  }
-}
-
-#endif /*ActiveMQ_MutexFilter_hpp_*/
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef ActiveMQ_MutexFilter_hpp_
+#define ActiveMQ_MutexFilter_hpp_
+
+#include "activemq/transport/TransportFilter.hpp"
+#include "ppr/thread/SimpleMutex.hpp"
+#include "ppr/util/ifr/p"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace transport
+    {
+      using namespace ifr;
+      using namespace apache::ppr::thread;
+
+/*
+ * A filter transport which gaurds access to the next transport
+ * using a mutex.
+ */
+class MutexFilter : public TransportFilter
+{
+protected:
+    SimpleMutex mutex ;
+
+public:
+    MutexFilter(p<ITransport> next) ;
+    virtual ~MutexFilter() ;
+
+	virtual void oneway(p<ICommand> command) ;
+	virtual p<FutureResponse> asyncRequest(p<ICommand> command) ;
+	virtual p<Response> request(p<ICommand> command) ;
+} ;
+
+/* namespace */
+    }
+  }
+}
+
+#endif /*ActiveMQ_MutexFilter_hpp_*/

Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/MutexFilter.hpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/TransportFactory.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/TransportFactory.cpp?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/TransportFactory.cpp (original)
+++ incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/TransportFactory.cpp Fri Jul 28 01:22:48 2006
@@ -1,91 +1,91 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "activemq/transport/TransportFactory.hpp"
-#include <cctype>
-#include <algorithm>
-
-using namespace apache::activemq::transport;
-
-
-// --- Constructors -------------------------------------------------
-
-/*
- *
- */
-TransportFactory::TransportFactory()
-{
-    socketFactory = new SocketFactory() ;
-}
-
-
-// --- Operation methods --------------------------------------------
-
-/*
- *
- */
-p<ITransport> TransportFactory::createTransport(p<Uri> location) throw (SocketException, IllegalArgumentException)
-{
-    p<ISocket>    socket ;
-    p<ITransport> transport ;
-    p<IProtocol>  protocol ;
-    string        uriString ;
-
-    // Make an URI all lower case string
-    uriString = location->toString() ;
-    std::transform(uriString.begin(), uriString.end(), uriString.begin(), (int(*)(int))tolower) ;  // The explicit cast is needed to compile on Linux
-
-    // Create and open socket
-    cout << "Opening socket to: " << location->host() << " on port " << location->port() << endl ;
-    socket = connect(location->host().c_str(), location->port()) ;
-
-    // Create wire protocol depending on specified query parameter
-    if( uriString.find("protocol=openwire") != string::npos )
-        protocol = new OpenWireProtocol() ;
-    else
-        throw IllegalArgumentException("Unknown or unspecified wire protocol") ;
-
-    // Create transport depending on specified URI scheme
-    if( uriString.find("tcp://") != string::npos )
-	    transport = new TcpTransport(socket, protocol) ;
-    else
-        throw IllegalArgumentException("Cannot create transport for unknown URI scheme") ;
-
-    // Chain logging filter is requested in URI query
-    if( uriString.find("trace=true") != string::npos )
-        transport = new LoggingFilter(transport) ;
-
-    // Chain correlator and mutext filters
-	transport = new CorrelatorFilter(transport) ;
-	transport = new MutexFilter(transport) ;
-
-	return transport ;
-}
-
-
-// --- Implementation methods ---------------------------------------
-
-/*
- *
- */
-p<ISocket> TransportFactory::connect(const char* host, int port) throw (SocketException)
-{
-    p<ISocket> socket = socketFactory->createSocket() ;
-
- 	// Try to connect socket to given address and port
-    socket->connect(host, port) ;
-    return socket ;
-}
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "activemq/transport/TransportFactory.hpp"
+#include <cctype>
+#include <algorithm>
+
+using namespace apache::activemq::transport;
+
+
+// --- Constructors -------------------------------------------------
+
+/*
+ *
+ */
+TransportFactory::TransportFactory()
+{
+    socketFactory = new SocketFactory() ;
+}
+
+
+// --- Operation methods --------------------------------------------
+
+/*
+ *
+ */
+p<ITransport> TransportFactory::createTransport(p<Uri> location) throw (SocketException, IllegalArgumentException)
+{
+    p<ISocket>    socket ;
+    p<ITransport> transport ;
+    p<IProtocol>  protocol ;
+    string        uriString ;
+
+    // Make an URI all lower case string
+    uriString = location->toString() ;
+    std::transform(uriString.begin(), uriString.end(), uriString.begin(), (int(*)(int))tolower) ;  // The explicit cast is needed to compile on Linux
+
+    // Create and open socket
+    cout << "Opening socket to: " << location->host() << " on port " << location->port() << endl ;
+    socket = connect(location->host().c_str(), location->port()) ;
+
+    // Create wire protocol depending on specified query parameter
+    if( uriString.find("protocol=openwire") != string::npos )
+        protocol = new OpenWireProtocol() ;
+    else
+        throw IllegalArgumentException("Unknown or unspecified wire protocol") ;
+
+    // Create transport depending on specified URI scheme
+    if( uriString.find("tcp://") != string::npos )
+	    transport = new TcpTransport(socket, protocol) ;
+    else
+        throw IllegalArgumentException("Cannot create transport for unknown URI scheme") ;
+
+    // Chain logging filter is requested in URI query
+    if( uriString.find("trace=true") != string::npos )
+        transport = new LoggingFilter(transport) ;
+
+    // Chain correlator and mutext filters
+	transport = new CorrelatorFilter(transport) ;
+	transport = new MutexFilter(transport) ;
+
+	return transport ;
+}
+
+
+// --- Implementation methods ---------------------------------------
+
+/*
+ *
+ */
+p<ISocket> TransportFactory::connect(const char* host, int port) throw (SocketException)
+{
+    p<ISocket> socket = socketFactory->createSocket() ;
+
+ 	// Try to connect socket to given address and port
+    socket->connect(host, port) ;
+    return socket ;
+}

Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/TransportFactory.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/TransportFactory.hpp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/TransportFactory.hpp?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/TransportFactory.hpp (original)
+++ incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/TransportFactory.hpp Fri Jul 28 01:22:48 2006
@@ -1,79 +1,79 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef ActiveMQ_TransportFactory_hpp_
-#define ActiveMQ_TransportFactory_hpp_
-
-// Turn off warning message for ignored exception specification
-#ifdef _MSC_VER
-#pragma warning( disable : 4290 )
-#endif
-
-#include <string>
-#include "activemq/protocol/IProtocol.hpp"
-#include "activemq/protocol/openwire/OpenWireProtocol.hpp"
-#include "activemq/transport/ITransport.hpp"
-#include "activemq/transport/ITransportFactory.hpp"
-#include "activemq/transport/LoggingFilter.hpp"
-#include "activemq/transport/MutexFilter.hpp"
-#include "activemq/transport/CorrelatorFilter.hpp"
-#include "activemq/transport/tcp/TcpTransport.hpp"
-#include "ppr/IllegalArgumentException.hpp"
-#include "ppr/net/ISocket.hpp"
-#include "ppr/net/Socket.hpp"
-#include "ppr/net/SocketException.hpp"
-#include "ppr/net/ISocketFactory.hpp"
-#include "ppr/net/SocketFactory.hpp"
-#include "ppr/util/ifr/p"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace transport
-    {
-      using namespace ifr ;
-      using namespace std;
-      using namespace apache::activemq::protocol;
-      using namespace apache::activemq::protocol::openwire;
-      using namespace apache::activemq::transport::tcp;
-      using namespace apache::ppr::net;
-
-/*
- * An implementation of ITransport that uses sockets to communicate with
- * the broker.
- */
-class TransportFactory : public ITransportFactory
-{
-private:
-    p<ISocketFactory> socketFactory ;
-
-public:
-    TransportFactory() ;
-    virtual ~TransportFactory() {}
-
-	virtual p<ITransport> createTransport(p<Uri> location) throw (SocketException, IllegalArgumentException) ;
-
-protected:
-    virtual p<ISocket> connect(const char* host, int port) throw (SocketException) ;
-} ;
-
-/* namespace */
-    }
-  }
-}
-
-#endif /*ActiveMQ_TransportFactory_hpp_*/
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef ActiveMQ_TransportFactory_hpp_
+#define ActiveMQ_TransportFactory_hpp_
+
+// Turn off warning message for ignored exception specification
+#ifdef _MSC_VER
+#pragma warning( disable : 4290 )
+#endif
+
+#include <string>
+#include "activemq/protocol/IProtocol.hpp"
+#include "activemq/protocol/openwire/OpenWireProtocol.hpp"
+#include "activemq/transport/ITransport.hpp"
+#include "activemq/transport/ITransportFactory.hpp"
+#include "activemq/transport/LoggingFilter.hpp"
+#include "activemq/transport/MutexFilter.hpp"
+#include "activemq/transport/CorrelatorFilter.hpp"
+#include "activemq/transport/tcp/TcpTransport.hpp"
+#include "ppr/IllegalArgumentException.hpp"
+#include "ppr/net/ISocket.hpp"
+#include "ppr/net/Socket.hpp"
+#include "ppr/net/SocketException.hpp"
+#include "ppr/net/ISocketFactory.hpp"
+#include "ppr/net/SocketFactory.hpp"
+#include "ppr/util/ifr/p"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace transport
+    {
+      using namespace ifr ;
+      using namespace std;
+      using namespace apache::activemq::protocol;
+      using namespace apache::activemq::protocol::openwire;
+      using namespace apache::activemq::transport::tcp;
+      using namespace apache::ppr::net;
+
+/*
+ * An implementation of ITransport that uses sockets to communicate with
+ * the broker.
+ */
+class TransportFactory : public ITransportFactory
+{
+private:
+    p<ISocketFactory> socketFactory ;
+
+public:
+    TransportFactory() ;
+    virtual ~TransportFactory() {}
+
+	virtual p<ITransport> createTransport(p<Uri> location) throw (SocketException, IllegalArgumentException) ;
+
+protected:
+    virtual p<ISocket> connect(const char* host, int port) throw (SocketException) ;
+} ;
+
+/* namespace */
+    }
+  }
+}
+
+#endif /*ActiveMQ_TransportFactory_hpp_*/

Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/TransportFactory.hpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/TransportFilter.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/TransportFilter.cpp?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/TransportFilter.cpp (original)
+++ incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/TransportFilter.cpp Fri Jul 28 01:22:48 2006
@@ -1,112 +1,112 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "activemq/transport/TransportFilter.hpp"
-
-using namespace apache::activemq::transport;
-
-
-// --- Constructors -------------------------------------------------
-
-/*
- * 
- */
-TransportFilter::TransportFilter(p<ITransport> next)
-{
-    this->next     = next ;
-    this->listener = NULL ;
-
-    // Set us up as the command listener for next link in chain
-    next->setCommandListener( smartify(this) ) ;
-}
-
-
-// --- Attribute methods --------------------------------------------
-
-/*
- *
- */
-void TransportFilter::setCommandListener(p<ICommandListener> listener)
-{
-    this->listener = listener ;
-}
-
-/*
- *
- */
-p<ICommandListener> TransportFilter::getCommandListener()
-{
-    return this->listener ;
-}
-
-
-// --- Operation methods --------------------------------------------
-
-/*
- * 
- */
-void TransportFilter::start()
-{
-    if( listener == NULL )
-	    throw InvalidOperationException ("Command listener cannot be null when Start is called.") ;
-
-    // Start next link in chain
-    this->next->start() ;
-}
-
-/*
- * 
- */
-void TransportFilter::oneway(p<ICommand> command)
-{
-    this->next->oneway(command) ;
-}
-
-/*
- * 
- */
-p<FutureResponse> TransportFilter::asyncRequest(p<ICommand> command)
-{
-    return this->next->asyncRequest(command) ;
-}
-
-/*
- * 
- */
-p<Response> TransportFilter::request(p<ICommand> command)
-{
-    return this->next->request(command) ;
-}
-
-// --- Event methods ------------------------------------------------
-
-/*
- * 
- */
-void TransportFilter::onCommand(p<ITransport> transport, p<ICommand> command)
-{
-    // Forward incoming command to "real" listener
-    this->listener->onCommand(transport, command) ;
-}
-
-/*
- * 
- */
-void TransportFilter::onError(p<ITransport> transport, exception& error)
-{
-    // Forward incoming exception to "real" listener
-    this->listener->onError(transport, error) ;
-}
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "activemq/transport/TransportFilter.hpp"
+
+using namespace apache::activemq::transport;
+
+
+// --- Constructors -------------------------------------------------
+
+/*
+ * 
+ */
+TransportFilter::TransportFilter(p<ITransport> next)
+{
+    this->next     = next ;
+    this->listener = NULL ;
+
+    // Set us up as the command listener for next link in chain
+    next->setCommandListener( smartify(this) ) ;
+}
+
+
+// --- Attribute methods --------------------------------------------
+
+/*
+ *
+ */
+void TransportFilter::setCommandListener(p<ICommandListener> listener)
+{
+    this->listener = listener ;
+}
+
+/*
+ *
+ */
+p<ICommandListener> TransportFilter::getCommandListener()
+{
+    return this->listener ;
+}
+
+
+// --- Operation methods --------------------------------------------
+
+/*
+ * 
+ */
+void TransportFilter::start()
+{
+    if( listener == NULL )
+	    throw InvalidOperationException ("Command listener cannot be null when Start is called.") ;
+
+    // Start next link in chain
+    this->next->start() ;
+}
+
+/*
+ * 
+ */
+void TransportFilter::oneway(p<ICommand> command)
+{
+    this->next->oneway(command) ;
+}
+
+/*
+ * 
+ */
+p<FutureResponse> TransportFilter::asyncRequest(p<ICommand> command)
+{
+    return this->next->asyncRequest(command) ;
+}
+
+/*
+ * 
+ */
+p<Response> TransportFilter::request(p<ICommand> command)
+{
+    return this->next->request(command) ;
+}
+
+// --- Event methods ------------------------------------------------
+
+/*
+ * 
+ */
+void TransportFilter::onCommand(p<ITransport> transport, p<ICommand> command)
+{
+    // Forward incoming command to "real" listener
+    this->listener->onCommand(transport, command) ;
+}
+
+/*
+ * 
+ */
+void TransportFilter::onError(p<ITransport> transport, exception& error)
+{
+    // Forward incoming exception to "real" listener
+    this->listener->onError(transport, error) ;
+}

Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/TransportFilter.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/TransportFilter.hpp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/TransportFilter.hpp?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/TransportFilter.hpp (original)
+++ incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/TransportFilter.hpp Fri Jul 28 01:22:48 2006
@@ -1,66 +1,66 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef ActiveMQ_TransportFilter_hpp_
-#define ActiveMQ_TransportFilter_hpp_
-
-#include <string>
-#include "activemq/command/Response.hpp"
-#include "activemq/transport/ITransport.hpp"
-#include "ppr/InvalidOperationException.hpp"
-#include "ppr/util/ifr/p"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace transport
-    {
-      using namespace ifr;
-      using namespace apache::activemq::command;
-      using namespace apache::ppr;
-
-/*
- * 
- */
-class TransportFilter : public ITransport, public ICommandListener
-{
-protected:
-    p<ITransport>       next ;
-    p<ICommandListener> listener ;
-
-public:
-    TransportFilter(p<ITransport> next) ;
-    virtual ~TransportFilter() {}
-
-    virtual void setCommandListener(p<ICommandListener> listener) ;
-    virtual p<ICommandListener> getCommandListener() ;
-
-	virtual void start() ;
-	virtual void oneway(p<ICommand> command) ;
-	virtual p<FutureResponse> asyncRequest(p<ICommand> command) ;
-	virtual p<Response> request(p<ICommand> command) ;
-
-    virtual void onCommand(p<ITransport> transport, p<ICommand> command) ;
-    virtual void onError(p<ITransport> transport, exception& error) ;
-} ;
-
-/* namespace */
-    }
-  }
-}
-
-#endif /*ActiveMQ_TransportFilter_hpp_*/
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef ActiveMQ_TransportFilter_hpp_
+#define ActiveMQ_TransportFilter_hpp_
+
+#include <string>
+#include "activemq/command/Response.hpp"
+#include "activemq/transport/ITransport.hpp"
+#include "ppr/InvalidOperationException.hpp"
+#include "ppr/util/ifr/p"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace transport
+    {
+      using namespace ifr;
+      using namespace apache::activemq::command;
+      using namespace apache::ppr;
+
+/*
+ * 
+ */
+class TransportFilter : public ITransport, public ICommandListener
+{
+protected:
+    p<ITransport>       next ;
+    p<ICommandListener> listener ;
+
+public:
+    TransportFilter(p<ITransport> next) ;
+    virtual ~TransportFilter() {}
+
+    virtual void setCommandListener(p<ICommandListener> listener) ;
+    virtual p<ICommandListener> getCommandListener() ;
+
+	virtual void start() ;
+	virtual void oneway(p<ICommand> command) ;
+	virtual p<FutureResponse> asyncRequest(p<ICommand> command) ;
+	virtual p<Response> request(p<ICommand> command) ;
+
+    virtual void onCommand(p<ITransport> transport, p<ICommand> command) ;
+    virtual void onError(p<ITransport> transport, exception& error) ;
+} ;
+
+/* namespace */
+    }
+  }
+}
+
+#endif /*ActiveMQ_TransportFilter_hpp_*/

Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/TransportFilter.hpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/tcp/TcpTransport.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/tcp/TcpTransport.cpp?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/tcp/TcpTransport.cpp (original)
+++ incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/tcp/TcpTransport.cpp Fri Jul 28 01:22:48 2006
@@ -1,157 +1,157 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "activemq/transport/tcp/TcpTransport.hpp"
-
-using namespace std;
-using namespace apache::activemq::transport::tcp;
-
-
-// --- Constructors -------------------------------------------------
-
-/*
- *
- */
-TcpTransport::TcpTransport(p<ISocket> socket, p<IProtocol> wireProtocol)
-{
-    // Initialize members
-    this->socket     = socket ;
-    this->protocol   = wireProtocol ;
-    this->reader     = NULL ;
-    this->writer     = NULL ;
-    this->listener   = NULL ;
-    this->readThread = NULL ;
-    this->started    = false ;
-    this->closed     = false ;
-}
-
-/*
- *
- */
-TcpTransport::~TcpTransport()
-{
-    closed = true ;
-    readThread->join() ;
-    reader->close() ;
-    socket->close() ;
-}
-
-
-// --- Attribute methods --------------------------------------------
-
-/*
- *
- */
-void TcpTransport::setCommandListener(p<ICommandListener> listener)
-{
-    this->listener = listener ;
-}
-
-/*
- *
- */
-p<ICommandListener> TcpTransport::getCommandListener()
-{
-    return this->listener ;
-}
-
-
-// --- Operation methods --------------------------------------------
-
-/*
- *
- */
-void TcpTransport::start()
-{
-    if( !started )
-    {
-        // Must have a command listener
-        if( listener == NULL )
-			throw InvalidOperationException("Command listener cannot be null when TCP transport start is called.") ;
-
-        started = true ;
-
-        // Create the I/O streams
-        writer = new SocketOutputStream(socket) ;
-        reader = new SocketInputStream(socket) ;
-        
-        // Create and start the background read thread
-        readThread = new ReadThread(this) ;
-        readThread->start() ;
-
-        // Ask protocol handler to handshake
-        protocol->handshake( smartify(this) ) ;
-    }
-}
-
-/*
- *
- */
-void TcpTransport::oneway(p<ICommand> command)
-{
-    protocol->marshal(command, writer) ;
-    writer->flush() ;
-}
-
-/*
- *
- */
-p<FutureResponse> TcpTransport::asyncRequest(p<ICommand> command)
-{
-    throw InvalidOperationException("Use a CorrelatorFilter if you want to issue asynchrounous request calls.") ;
-}
-
-/*
- *
- */
-p<Response> TcpTransport::request(p<ICommand> command)
-{
-    throw InvalidOperationException("Use a CorrelatorFilter if you want to issue request calls.") ;
-}
-
-
-// --- Implementation methods ---------------------------------------
-
-/*
- *
- */
-void TcpTransport::readLoop()
-{
-    // Continue loop until closed or aborted
-    while( !closed )
-    {
-        p<ICommand> command = NULL ;
-
-        try
-        {
-            // Read next command
-            command = p_cast<ICommand> (protocol->unmarshal(reader)) ;
-
-            // Forward to command listener
-
-            listener->onCommand(smartify(this), command) ;
-        }
-        catch( exception& e )
-        {
-            // Socket closed or error
-            if( !closed )
-                listener->onError(smartify(this), e) ;
-
-            cout << "Exiting read loop due to exception: " << e.what() << endl ;
-            break ;
-        }
-    }
-}
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "activemq/transport/tcp/TcpTransport.hpp"
+
+using namespace std;
+using namespace apache::activemq::transport::tcp;
+
+
+// --- Constructors -------------------------------------------------
+
+/*
+ *
+ */
+TcpTransport::TcpTransport(p<ISocket> socket, p<IProtocol> wireProtocol)
+{
+    // Initialize members
+    this->socket     = socket ;
+    this->protocol   = wireProtocol ;
+    this->reader     = NULL ;
+    this->writer     = NULL ;
+    this->listener   = NULL ;
+    this->readThread = NULL ;
+    this->started    = false ;
+    this->closed     = false ;
+}
+
+/*
+ *
+ */
+TcpTransport::~TcpTransport()
+{
+    closed = true ;
+    readThread->join() ;
+    reader->close() ;
+    socket->close() ;
+}
+
+
+// --- Attribute methods --------------------------------------------
+
+/*
+ *
+ */
+void TcpTransport::setCommandListener(p<ICommandListener> listener)
+{
+    this->listener = listener ;
+}
+
+/*
+ *
+ */
+p<ICommandListener> TcpTransport::getCommandListener()
+{
+    return this->listener ;
+}
+
+
+// --- Operation methods --------------------------------------------
+
+/*
+ *
+ */
+void TcpTransport::start()
+{
+    if( !started )
+    {
+        // Must have a command listener
+        if( listener == NULL )
+			throw InvalidOperationException("Command listener cannot be null when TCP transport start is called.") ;
+
+        started = true ;
+
+        // Create the I/O streams
+        writer = new SocketOutputStream(socket) ;
+        reader = new SocketInputStream(socket) ;
+        
+        // Create and start the background read thread
+        readThread = new ReadThread(this) ;
+        readThread->start() ;
+
+        // Ask protocol handler to handshake
+        protocol->handshake( smartify(this) ) ;
+    }
+}
+
+/*
+ *
+ */
+void TcpTransport::oneway(p<ICommand> command)
+{
+    protocol->marshal(command, writer) ;
+    writer->flush() ;
+}
+
+/*
+ *
+ */
+p<FutureResponse> TcpTransport::asyncRequest(p<ICommand> command)
+{
+    throw InvalidOperationException("Use a CorrelatorFilter if you want to issue asynchrounous request calls.") ;
+}
+
+/*
+ *
+ */
+p<Response> TcpTransport::request(p<ICommand> command)
+{
+    throw InvalidOperationException("Use a CorrelatorFilter if you want to issue request calls.") ;
+}
+
+
+// --- Implementation methods ---------------------------------------
+
+/*
+ *
+ */
+void TcpTransport::readLoop()
+{
+    // Continue loop until closed or aborted
+    while( !closed )
+    {
+        p<ICommand> command = NULL ;
+
+        try
+        {
+            // Read next command
+            command = p_cast<ICommand> (protocol->unmarshal(reader)) ;
+
+            // Forward to command listener
+
+            listener->onCommand(smartify(this), command) ;
+        }
+        catch( exception& e )
+        {
+            // Socket closed or error
+            if( !closed )
+                listener->onError(smartify(this), e) ;
+
+            cout << "Exiting read loop due to exception: " << e.what() << endl ;
+            break ;
+        }
+    }
+}

Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/tcp/TcpTransport.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/tcp/TcpTransport.hpp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/tcp/TcpTransport.hpp?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/tcp/TcpTransport.hpp (original)
+++ incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/tcp/TcpTransport.hpp Fri Jul 28 01:22:48 2006
@@ -1,128 +1,128 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef ActiveMQ_TcpTransport_hpp_
-#define ActiveMQ_TcpTransport_hpp_
-
-// Turn off warning message for ignored exception specification
-#ifdef _MSC_VER
-#pragma warning( disable : 4290 )
-#endif
-
-#include <iostream>
-#include <map>
-#include "cms/CmsException.hpp"
-#include "activemq/BrokerException.hpp"
-#include "activemq/ICommand.hpp"
-#include "activemq/command/BaseCommand.hpp"
-#include "activemq/command/Response.hpp"
-#include "activemq/command/ExceptionResponse.hpp"
-#include "activemq/protocol/IProtocol.hpp"
-#include "activemq/transport/FutureResponse.hpp"
-#include "activemq/transport/ITransport.hpp"
-#include "activemq/transport/ICommandListener.hpp"
-#include "ppr/InvalidOperationException.hpp"
-#include "ppr/io/SocketInputStream.hpp"
-#include "ppr/io/SocketOutputStream.hpp"
-#include "ppr/net/ISocket.hpp"
-#include "ppr/net/Socket.hpp"
-#include "ppr/net/SocketException.hpp"
-#include "ppr/net/ISocketFactory.hpp"
-#include "ppr/net/SocketFactory.hpp"
-#include "ppr/thread/SimpleMutex.hpp"
-#include "ppr/thread/Thread.hpp"
-#include "ppr/util/ifr/p"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace transport
-    {
-      namespace tcp
-      {
-        using namespace ifr ;
-        using namespace std;
-        using namespace apache::activemq;
-        using namespace apache::activemq::command;
-        using namespace apache::activemq::protocol;
-        using namespace apache::ppr;
-        using namespace apache::ppr::io;
-        using namespace apache::ppr::net;
-        using namespace apache::ppr::thread;
-        using namespace apache::ppr::util;
-        class ReadThread ;
-
-/*
- * An implementation of ITransport that uses TCP to communicate with
- * the broker.
- */
-class TcpTransport : public ITransport
-{
-private:
-    p<IProtocol>                 protocol ;
-    p<SocketInputStream>         reader ;
-    p<SocketOutputStream>        writer ;
-    p<ICommandListener>          listener ;
-    p<ReadThread>                readThread ;
-    p<ISocket>                   socket ;
-    bool                         closed,
-                                 started ;
-
-public:
-    TcpTransport(p<ISocket> socket, p<IProtocol> wireProtocol) ;
-    virtual ~TcpTransport() ;
-
-    virtual void setCommandListener(p<ICommandListener> listener) ;
-    virtual p<ICommandListener> getCommandListener() ;
-
-    virtual void start() ;
-    virtual void oneway(p<ICommand> command) ;
-    virtual p<FutureResponse> asyncRequest(p<ICommand> command) ;
-    virtual p<Response> request(p<ICommand> command) ;
-
-public:
-    void readLoop() ;
-} ;
-
-/*
- * 
- */
-class ReadThread : public Thread
-{
-private:
-    TcpTransport* transport ;
-
-public:
-    ReadThread(TcpTransport* transport)
-    {
-        this->transport = transport ;
-    }
-
-protected:
-    virtual void run() throw(p<exception>)
-    {
-        transport->readLoop() ;
-    }
-} ;
-
-/* namespace */
-      }
-    }
-  }
-}
-
-#endif /*ActiveMQ_TcpTransport_hpp_*/
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef ActiveMQ_TcpTransport_hpp_
+#define ActiveMQ_TcpTransport_hpp_
+
+// Turn off warning message for ignored exception specification
+#ifdef _MSC_VER
+#pragma warning( disable : 4290 )
+#endif
+
+#include <iostream>
+#include <map>
+#include "cms/CmsException.hpp"
+#include "activemq/BrokerException.hpp"
+#include "activemq/ICommand.hpp"
+#include "activemq/command/BaseCommand.hpp"
+#include "activemq/command/Response.hpp"
+#include "activemq/command/ExceptionResponse.hpp"
+#include "activemq/protocol/IProtocol.hpp"
+#include "activemq/transport/FutureResponse.hpp"
+#include "activemq/transport/ITransport.hpp"
+#include "activemq/transport/ICommandListener.hpp"
+#include "ppr/InvalidOperationException.hpp"
+#include "ppr/io/SocketInputStream.hpp"
+#include "ppr/io/SocketOutputStream.hpp"
+#include "ppr/net/ISocket.hpp"
+#include "ppr/net/Socket.hpp"
+#include "ppr/net/SocketException.hpp"
+#include "ppr/net/ISocketFactory.hpp"
+#include "ppr/net/SocketFactory.hpp"
+#include "ppr/thread/SimpleMutex.hpp"
+#include "ppr/thread/Thread.hpp"
+#include "ppr/util/ifr/p"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace transport
+    {
+      namespace tcp
+      {
+        using namespace ifr ;
+        using namespace std;
+        using namespace apache::activemq;
+        using namespace apache::activemq::command;
+        using namespace apache::activemq::protocol;
+        using namespace apache::ppr;
+        using namespace apache::ppr::io;
+        using namespace apache::ppr::net;
+        using namespace apache::ppr::thread;
+        using namespace apache::ppr::util;
+        class ReadThread ;
+
+/*
+ * An implementation of ITransport that uses TCP to communicate with
+ * the broker.
+ */
+class TcpTransport : public ITransport
+{
+private:
+    p<IProtocol>                 protocol ;
+    p<SocketInputStream>         reader ;
+    p<SocketOutputStream>        writer ;
+    p<ICommandListener>          listener ;
+    p<ReadThread>                readThread ;
+    p<ISocket>                   socket ;
+    bool                         closed,
+                                 started ;
+
+public:
+    TcpTransport(p<ISocket> socket, p<IProtocol> wireProtocol) ;
+    virtual ~TcpTransport() ;
+
+    virtual void setCommandListener(p<ICommandListener> listener) ;
+    virtual p<ICommandListener> getCommandListener() ;
+
+    virtual void start() ;
+    virtual void oneway(p<ICommand> command) ;
+    virtual p<FutureResponse> asyncRequest(p<ICommand> command) ;
+    virtual p<Response> request(p<ICommand> command) ;
+
+public:
+    void readLoop() ;
+} ;
+
+/*
+ * 
+ */
+class ReadThread : public Thread
+{
+private:
+    TcpTransport* transport ;
+
+public:
+    ReadThread(TcpTransport* transport)
+    {
+        this->transport = transport ;
+    }
+
+protected:
+    virtual void run() throw(p<exception>)
+    {
+        transport->readLoop() ;
+    }
+} ;
+
+/* namespace */
+      }
+    }
+  }
+}
+
+#endif /*ActiveMQ_TcpTransport_hpp_*/

Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/transport/tcp/TcpTransport.hpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/cms/CmsException.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/cms/CmsException.cpp?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/cms/CmsException.cpp (original)
+++ incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/cms/CmsException.cpp Fri Jul 28 01:22:48 2006
@@ -1,46 +1,46 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "cms/CmsException.hpp"
-
-using namespace apache::cms;
-
-
-/*
- *
- */
-CmsException::CmsException()
-     : msg("")
-{
-    // no-op
-}
-
-/*
- *
- */
-CmsException::CmsException(const char* message)
-     : msg(message)
-{
-    // no-op
-}
-
-/*
- *
- */
-CmsException::~CmsException () throw ()
-{
-    // no-op
-}
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "cms/CmsException.hpp"
+
+using namespace apache::cms;
+
+
+/*
+ *
+ */
+CmsException::CmsException()
+     : msg("")
+{
+    // no-op
+}
+
+/*
+ *
+ */
+CmsException::CmsException(const char* message)
+     : msg(message)
+{
+    // no-op
+}
+
+/*
+ *
+ */
+CmsException::~CmsException () throw ()
+{
+    // no-op
+}

Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/cms/CmsException.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/cms/CmsException.hpp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/cms/CmsException.hpp?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/cms/CmsException.hpp (original)
+++ incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/cms/CmsException.hpp Fri Jul 28 01:22:48 2006
@@ -1,51 +1,51 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef Cms_CmsException_hpp_
-#define Cms_CmsException_hpp_
-
-#include <exception>
-#include <string>
-
-namespace apache
-{
-  namespace cms
-  {
-    using namespace std;
-
-/*
- * 
- */
-class CmsException : public exception
-{
-protected:
-    string msg;
-
-public:
-    CmsException() ;
-    CmsException(const char* message) ;
-    virtual ~CmsException() throw();
-
-    virtual const char* what() const throw () {
-      return msg.c_str();
-    }
-} ;
-
-/* namespace */
-  }
-}
-
-#endif /*Cms_CmsException_hpp_*/
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef Cms_CmsException_hpp_
+#define Cms_CmsException_hpp_
+
+#include <exception>
+#include <string>
+
+namespace apache
+{
+  namespace cms
+  {
+    using namespace std;
+
+/*
+ * 
+ */
+class CmsException : public exception
+{
+protected:
+    string msg;
+
+public:
+    CmsException() ;
+    CmsException(const char* message) ;
+    virtual ~CmsException() throw();
+
+    virtual const char* what() const throw () {
+      return msg.c_str();
+    }
+} ;
+
+/* namespace */
+  }
+}
+
+#endif /*Cms_CmsException_hpp_*/

Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/cms/CmsException.hpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/cms/IBytesMessage.hpp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/cms/IBytesMessage.hpp?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/cms/IBytesMessage.hpp (original)
+++ incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/cms/IBytesMessage.hpp Fri Jul 28 01:22:48 2006
@@ -1,70 +1,70 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef Cms_IBytesMessage_hpp_
-#define Cms_IBytesMessage_hpp_
-
-// Turn off warning message for ignored exception specification
-#ifdef _MSC_VER
-#pragma warning( disable : 4290 )
-#endif
-
-#include <string>
-#include "cms/IMessage.hpp"
-#include "cms/MessageEOFException.hpp"
-#include "cms/MessageNotReadableException.hpp"
-#include "cms/MessageNotWritableException.hpp"
-#include "ppr/util/ifr/p"
-
-namespace apache
-{
-  namespace cms
-  {
-    using namespace std;
-    using namespace ifr;
-
-/*
- * 
- */
-struct IBytesMessage : IMessage
-{
-    //virtual int getBodyLength() = 0;
-    virtual void reset() = 0 ;
-    virtual char readByte() throw (MessageNotReadableException, MessageEOFException) = 0 ;
-    virtual int readBytes(char* buffer, int index, int length) throw (MessageNotReadableException, MessageEOFException) = 0 ;
-    virtual bool readBoolean() throw (MessageNotReadableException, MessageEOFException) = 0 ;
-    virtual double readDouble() throw (MessageNotReadableException, MessageEOFException) = 0 ;
-    virtual float readFloat() throw (MessageNotReadableException, MessageEOFException) = 0 ;
-    virtual int readInt() throw (MessageNotReadableException, MessageEOFException) = 0 ;
-    virtual long long readLong() throw (MessageNotReadableException, MessageEOFException) = 0 ;
-    virtual short readShort() throw (MessageNotReadableException, MessageEOFException) = 0 ;
-    virtual p<string> readUTF() throw (MessageNotReadableException, MessageEOFException) = 0 ;
-    virtual void writeBoolean(bool value) throw (MessageNotWritableException) = 0 ;
-    virtual void writeByte(char value) throw (MessageNotWritableException) = 0 ;
-    virtual void writeBytes(char* value, int index, int length) throw (MessageNotWritableException) = 0 ;
-    virtual void writeDouble(double value) throw (MessageNotWritableException) = 0 ;
-    virtual void writeFloat(float value) throw (MessageNotWritableException) = 0 ;
-    virtual void writeInt(int value) throw (MessageNotWritableException) = 0 ;
-    virtual void writeLong(long long value) throw (MessageNotWritableException) = 0 ;
-    virtual void writeShort(short value) throw (MessageNotWritableException) = 0 ;
-    virtual void writeUTF(const char* value) throw (MessageNotWritableException) = 0 ;
-} ;
-
-/* namespace */
-  }
-}
-
-#endif /*Cms_IBytesMessage_hpp_*/
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef Cms_IBytesMessage_hpp_
+#define Cms_IBytesMessage_hpp_
+
+// Turn off warning message for ignored exception specification
+#ifdef _MSC_VER
+#pragma warning( disable : 4290 )
+#endif
+
+#include <string>
+#include "cms/IMessage.hpp"
+#include "cms/MessageEOFException.hpp"
+#include "cms/MessageNotReadableException.hpp"
+#include "cms/MessageNotWritableException.hpp"
+#include "ppr/util/ifr/p"
+
+namespace apache
+{
+  namespace cms
+  {
+    using namespace std;
+    using namespace ifr;
+
+/*
+ * 
+ */
+struct IBytesMessage : IMessage
+{
+    //virtual int getBodyLength() = 0;
+    virtual void reset() = 0 ;
+    virtual char readByte() throw (MessageNotReadableException, MessageEOFException) = 0 ;
+    virtual int readBytes(char* buffer, int index, int length) throw (MessageNotReadableException, MessageEOFException) = 0 ;
+    virtual bool readBoolean() throw (MessageNotReadableException, MessageEOFException) = 0 ;
+    virtual double readDouble() throw (MessageNotReadableException, MessageEOFException) = 0 ;
+    virtual float readFloat() throw (MessageNotReadableException, MessageEOFException) = 0 ;
+    virtual int readInt() throw (MessageNotReadableException, MessageEOFException) = 0 ;
+    virtual long long readLong() throw (MessageNotReadableException, MessageEOFException) = 0 ;
+    virtual short readShort() throw (MessageNotReadableException, MessageEOFException) = 0 ;
+    virtual p<string> readUTF() throw (MessageNotReadableException, MessageEOFException) = 0 ;
+    virtual void writeBoolean(bool value) throw (MessageNotWritableException) = 0 ;
+    virtual void writeByte(char value) throw (MessageNotWritableException) = 0 ;
+    virtual void writeBytes(char* value, int index, int length) throw (MessageNotWritableException) = 0 ;
+    virtual void writeDouble(double value) throw (MessageNotWritableException) = 0 ;
+    virtual void writeFloat(float value) throw (MessageNotWritableException) = 0 ;
+    virtual void writeInt(int value) throw (MessageNotWritableException) = 0 ;
+    virtual void writeLong(long long value) throw (MessageNotWritableException) = 0 ;
+    virtual void writeShort(short value) throw (MessageNotWritableException) = 0 ;
+    virtual void writeUTF(const char* value) throw (MessageNotWritableException) = 0 ;
+} ;
+
+/* namespace */
+  }
+}
+
+#endif /*Cms_IBytesMessage_hpp_*/

Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/cms/IBytesMessage.hpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/cms/IConnection.hpp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/cms/IConnection.hpp?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/cms/IConnection.hpp (original)
+++ incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/cms/IConnection.hpp Fri Jul 28 01:22:48 2006
@@ -1,55 +1,55 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef Cms_IConnection_hpp_
-#define Cms_IConnection_hpp_
-
-#include "cms/ISession.hpp"
-#include "cms/CmsException.hpp"
-#include "activemq/AcknowledgementMode.hpp"
-#include "ppr/util/ifr/p"
-
-// Turn off warning message for ignored exception specification
-#ifdef _MSC_VER
-#pragma warning( disable : 4290 )
-#endif
-
-namespace apache
-{
-  namespace cms
-  {
-    using namespace ifr;
-    using namespace apache::activemq;
-
-/*
- * 
- */
-struct IConnection : Interface
-{
-    virtual p<ISession> createSession() throw(CmsException) = 0 ;
-    virtual p<ISession> createSession(AcknowledgementMode ackMode) throw(CmsException) = 0 ;
-    virtual p<string> getClientId() = 0 ;
-    virtual void setClientId(const char* value) throw (CmsException) = 0 ;
-    virtual AcknowledgementMode getAcknowledgementMode() = 0 ;
-    virtual void setAcknowledgementMode(AcknowledgementMode mode) = 0 ;
-    virtual void close() = 0 ;
-} ;
-
-/* namespace */
-  }
-}
-
-#endif /*Cms_IConnection_hpp_*/
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef Cms_IConnection_hpp_
+#define Cms_IConnection_hpp_
+
+#include "cms/ISession.hpp"
+#include "cms/CmsException.hpp"
+#include "activemq/AcknowledgementMode.hpp"
+#include "ppr/util/ifr/p"
+
+// Turn off warning message for ignored exception specification
+#ifdef _MSC_VER
+#pragma warning( disable : 4290 )
+#endif
+
+namespace apache
+{
+  namespace cms
+  {
+    using namespace ifr;
+    using namespace apache::activemq;
+
+/*
+ * 
+ */
+struct IConnection : Interface
+{
+    virtual p<ISession> createSession() throw(CmsException) = 0 ;
+    virtual p<ISession> createSession(AcknowledgementMode ackMode) throw(CmsException) = 0 ;
+    virtual p<string> getClientId() = 0 ;
+    virtual void setClientId(const char* value) throw (CmsException) = 0 ;
+    virtual AcknowledgementMode getAcknowledgementMode() = 0 ;
+    virtual void setAcknowledgementMode(AcknowledgementMode mode) = 0 ;
+    virtual void close() = 0 ;
+} ;
+
+/* namespace */
+  }
+}
+
+#endif /*Cms_IConnection_hpp_*/

Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/cms/IConnection.hpp
------------------------------------------------------------------------------
    svn:eol-style = native