Index: source/ariba/CommunicationListener.cpp
===================================================================
--- source/ariba/CommunicationListener.cpp	(revision 2460)
+++ source/ariba/CommunicationListener.cpp	(revision 2460)
@@ -0,0 +1,88 @@
+// [License]
+// The Ariba-Underlay Copyright
+//
+// Copyright (c) 2008-2009, Institute of Telematics, UniversitÀt Karlsruhe (TH)
+//
+// Institute of Telematics
+// UniversitÀt Karlsruhe (TH)
+// Zirkel 2, 76128 Karlsruhe
+// Germany
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE INSTITUTE OF TELEMATICS ``AS IS'' AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OF TELEMATICS OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// The views and conclusions contained in the software and documentation
+// are those of the authors and should not be interpreted as representing
+// official policies, either expressed or implied, of the Institute of
+// Telematics.
+// [License]
+
+#include "CommunicationListener.h"
+
+namespace ariba {
+
+// dummy
+CommunicationListener::CommunicationListener() {
+}
+
+// dummy
+CommunicationListener::~CommunicationListener() {
+}
+
+// dummy
+void CommunicationListener::onLinkUp(const LinkID& l, const NodeID& r) {
+}
+
+// dummy
+void CommunicationListener::onLinkDown(const LinkID& l, const NodeID& r) {
+}
+
+// dummy
+void CommunicationListener::onLinkChanged(const LinkID& l, const NodeID& r) {
+}
+
+// dummy
+void CommunicationListener::onLinkFail(const LinkID& l, const NodeID& r) {
+}
+
+// dummy
+void CommunicationListener::onLinkQoSChanged(const LinkID& l, const NodeID& r,
+		const LinkProperties& p) {
+}
+
+// dummy
+bool CommunicationListener::onLinkRequest(const NodeID& remote,
+		const DataMessage& msg) {
+	return false;
+}
+
+// dummy
+void CommunicationListener::onMessage(const DataMessage& msg,
+		const NodeID& remote, const LinkID& lnk) {
+}
+
+// dummy
+void CommunicationListener::onMessageSent(seqnum_t seq_num, bool failed,
+		const DataMessage& msg) {
+}
+
+} // namespace ariba
Index: source/ariba/CommunicationListener.h
===================================================================
--- source/ariba/CommunicationListener.h	(revision 2460)
+++ source/ariba/CommunicationListener.h	(revision 2460)
@@ -0,0 +1,97 @@
+// [License]
+// The Ariba-Underlay Copyright
+//
+// Copyright (c) 2008-2009, Institute of Telematics, UniversitÀt Karlsruhe (TH)
+//
+// Institute of Telematics
+// UniversitÀt Karlsruhe (TH)
+// Zirkel 2, 76128 Karlsruhe
+// Germany
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE INSTITUTE OF TELEMATICS ``AS IS'' AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OF TELEMATICS OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// The views and conclusions contained in the software and documentation
+// are those of the authors and should not be interpreted as representing
+// official policies, either expressed or implied, of the Institute of
+// Telematics.
+// [License]
+
+#ifndef COMMUNICATIONLISTENER_H_
+#define COMMUNICATIONLISTENER_H_
+
+namespace ariba {
+// forward declaration
+class CommunicationListener;
+class ServiceInterfaceWrapper;
+}
+
+#include "Message.h"
+#include "Identifiers.h"
+#include "LinkProperties.h"
+#include "DataMessage.h"
+
+namespace ariba {
+
+/**
+ *
+ */
+class CommunicationListener {
+	friend class Node;
+	friend class ServiceInterfaceWrapper;
+protected:
+	CommunicationListener();
+	virtual ~CommunicationListener();
+
+	// --- link events ---
+
+	virtual void onLinkUp(const LinkID& lnk, const NodeID& remote);
+
+	virtual void onLinkDown(const LinkID& lnk, const NodeID& remote);
+
+	virtual void onLinkChanged(const LinkID& lnk, const NodeID& remote);
+
+	virtual void onLinkFail(const LinkID& lnk, const NodeID& remote);
+
+	virtual void onLinkQoSChanged(const LinkID& lnk, const NodeID& remote,
+			const LinkProperties& prop);
+
+	// --- service specific events ---
+
+	virtual bool onLinkRequest(const NodeID& remote, const DataMessage& msg);
+
+	// --- general receive method ---
+
+	virtual void onMessage(const DataMessage& msg, const NodeID& remote,
+			const LinkID& lnk = LinkID::UNSPECIFIED);
+
+	virtual void onMessageSent(seqnum_t seq_num, bool failed,
+			const DataMessage& msg = DataMessage::UNSPECIFIED);
+
+	// --- dht functionality ---
+	//	virtual void onGetResponse( const Identifier<> id, const Message* msg );
+	//	virtual void onPutResponse( const Identifier<> id, const Message* msg );
+};
+
+} // namespace ariba
+
+#endif /* COMMUNICATIONLISTENER_H_ */
Index: source/ariba/Makefile.am
===================================================================
--- source/ariba/Makefile.am	(revision 2457)
+++ source/ariba/Makefile.am	(revision 2460)
@@ -47,12 +47,11 @@
   AribaModule.cpp \
   AribaModule.h \
-  TidyCommunicationListener.cpp \
-  TidyCommunicationListener.h \
+  CommunicationListener.cpp \
+  CommunicationListener.h \
   Identifiers.cpp \
   Identifiers.h \
   LinkProperties.cpp \
   LinkProperties.h \
-  TidyMessage.cpp \
-  TidyMessage.h \
+  Message.h \
   DataMessage.cpp \
   DataMessage.h \
Index: source/ariba/Message.h
===================================================================
--- source/ariba/Message.h	(revision 2460)
+++ source/ariba/Message.h	(revision 2460)
@@ -0,0 +1,52 @@
+// [License]
+// The Ariba-Underlay Copyright
+//
+// Copyright (c) 2008-2009, Institute of Telematics, UniversitÀt Karlsruhe (TH)
+//
+// Institute of Telematics
+// UniversitÀt Karlsruhe (TH)
+// Zirkel 2, 76128 Karlsruhe
+// Germany
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE INSTITUTE OF TELEMATICS ``AS IS'' AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OF TELEMATICS OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// The views and conclusions contained in the software and documentation
+// are those of the authors and should not be interpreted as representing
+// official policies, either expressed or implied, of the Institute of
+// Telematics.
+// [License]
+
+#ifndef TIDYMESSAGE_H_
+#define TIDYMESSAGE_H_
+
+/** THIS FILE IS ABOUT TO BE DEPRECATED !! */
+
+#include <inttypes.h>
+#include "ariba/utility/messages.h"
+
+namespace ariba {
+typedef uint16_t seqnum_t;
+typedef utility::Message Message;
+} // namespace ariba
+
+#endif /* MESSAGE_H_ */
Index: source/ariba/Node.h
===================================================================
--- source/ariba/Node.h	(revision 2457)
+++ source/ariba/Node.h	(revision 2460)
@@ -52,5 +52,5 @@
 #include "Name.h"
 #include "AribaModule.h"
-#include "TidyCommunicationListener.h"
+#include "CommunicationListener.h"
 #include "DataMessage.h"
 
Index: source/ariba/TidyCommunicationListener.cpp
===================================================================
--- source/ariba/TidyCommunicationListener.cpp	(revision 2457)
+++ 	(revision )
@@ -1,88 +1,0 @@
-// [License]
-// The Ariba-Underlay Copyright
-//
-// Copyright (c) 2008-2009, Institute of Telematics, UniversitÀt Karlsruhe (TH)
-//
-// Institute of Telematics
-// UniversitÀt Karlsruhe (TH)
-// Zirkel 2, 76128 Karlsruhe
-// Germany
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE INSTITUTE OF TELEMATICS ``AS IS'' AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OF TELEMATICS OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// The views and conclusions contained in the software and documentation
-// are those of the authors and should not be interpreted as representing
-// official policies, either expressed or implied, of the Institute of
-// Telematics.
-// [License]
-
-#include "TidyCommunicationListener.h"
-
-namespace ariba {
-
-// dummy
-CommunicationListener::CommunicationListener() {
-}
-
-// dummy
-CommunicationListener::~CommunicationListener() {
-}
-
-// dummy
-void CommunicationListener::onLinkUp(const LinkID& l, const NodeID& r) {
-}
-
-// dummy
-void CommunicationListener::onLinkDown(const LinkID& l, const NodeID& r) {
-}
-
-// dummy
-void CommunicationListener::onLinkChanged(const LinkID& l, const NodeID& r) {
-}
-
-// dummy
-void CommunicationListener::onLinkFail(const LinkID& l, const NodeID& r) {
-}
-
-// dummy
-void CommunicationListener::onLinkQoSChanged(const LinkID& l, const NodeID& r,
-		const LinkProperties& p) {
-}
-
-// dummy
-bool CommunicationListener::onLinkRequest(const NodeID& remote,
-		const DataMessage& msg) {
-	return false;
-}
-
-// dummy
-void CommunicationListener::onMessage(const DataMessage& msg,
-		const NodeID& remote, const LinkID& lnk) {
-}
-
-// dummy
-void CommunicationListener::onMessageSent(seqnum_t seq_num, bool failed,
-		const DataMessage& msg) {
-}
-
-} // namespace ariba
Index: source/ariba/TidyCommunicationListener.h
===================================================================
--- source/ariba/TidyCommunicationListener.h	(revision 2457)
+++ 	(revision )
@@ -1,97 +1,0 @@
-// [License]
-// The Ariba-Underlay Copyright
-//
-// Copyright (c) 2008-2009, Institute of Telematics, UniversitÀt Karlsruhe (TH)
-//
-// Institute of Telematics
-// UniversitÀt Karlsruhe (TH)
-// Zirkel 2, 76128 Karlsruhe
-// Germany
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE INSTITUTE OF TELEMATICS ``AS IS'' AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OF TELEMATICS OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// The views and conclusions contained in the software and documentation
-// are those of the authors and should not be interpreted as representing
-// official policies, either expressed or implied, of the Institute of
-// Telematics.
-// [License]
-
-#ifndef COMMUNICATIONLISTENER_H_
-#define COMMUNICATIONLISTENER_H_
-
-namespace ariba {
-// forward declaration
-class CommunicationListener;
-class ServiceInterfaceWrapper;
-}
-
-#include "TidyMessage.h"
-#include "Identifiers.h"
-#include "LinkProperties.h"
-#include "DataMessage.h"
-
-namespace ariba {
-
-/**
- *
- */
-class CommunicationListener {
-	friend class Node;
-	friend class ServiceInterfaceWrapper;
-protected:
-	CommunicationListener();
-	virtual ~CommunicationListener();
-
-	// --- link events ---
-
-	virtual void onLinkUp(const LinkID& lnk, const NodeID& remote);
-
-	virtual void onLinkDown(const LinkID& lnk, const NodeID& remote);
-
-	virtual void onLinkChanged(const LinkID& lnk, const NodeID& remote);
-
-	virtual void onLinkFail(const LinkID& lnk, const NodeID& remote);
-
-	virtual void onLinkQoSChanged(const LinkID& lnk, const NodeID& remote,
-			const LinkProperties& prop);
-
-	// --- service specific events ---
-
-	virtual bool onLinkRequest(const NodeID& remote, const DataMessage& msg);
-
-	// --- general receive method ---
-
-	virtual void onMessage(const DataMessage& msg, const NodeID& remote,
-			const LinkID& lnk = LinkID::UNSPECIFIED);
-
-	virtual void onMessageSent(seqnum_t seq_num, bool failed,
-			const DataMessage& msg = DataMessage::UNSPECIFIED);
-
-	// --- dht functionality ---
-	//	virtual void onGetResponse( const Identifier<> id, const Message* msg );
-	//	virtual void onPutResponse( const Identifier<> id, const Message* msg );
-};
-
-} // namespace ariba
-
-#endif /* COMMUNICATIONLISTENER_H_ */
Index: source/ariba/TidyMessage.cpp
===================================================================
--- source/ariba/TidyMessage.cpp	(revision 2457)
+++ 	(revision )
@@ -1,44 +1,0 @@
-// [License]
-// The Ariba-Underlay Copyright
-//
-// Copyright (c) 2008-2009, Institute of Telematics, UniversitÀt Karlsruhe (TH)
-//
-// Institute of Telematics
-// UniversitÀt Karlsruhe (TH)
-// Zirkel 2, 76128 Karlsruhe
-// Germany
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE INSTITUTE OF TELEMATICS ``AS IS'' AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OF TELEMATICS OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// The views and conclusions contained in the software and documentation
-// are those of the authors and should not be interpreted as representing
-// official policies, either expressed or implied, of the Institute of
-// Telematics.
-// [License]
-
-#include "TidyMessage.h"
-
-namespace ariba {
-
-
-} // namespace ariba
Index: source/ariba/TidyMessage.h
===================================================================
--- source/ariba/TidyMessage.h	(revision 2457)
+++ 	(revision )
@@ -1,50 +1,0 @@
-// [License]
-// The Ariba-Underlay Copyright
-//
-// Copyright (c) 2008-2009, Institute of Telematics, UniversitÀt Karlsruhe (TH)
-//
-// Institute of Telematics
-// UniversitÀt Karlsruhe (TH)
-// Zirkel 2, 76128 Karlsruhe
-// Germany
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE INSTITUTE OF TELEMATICS ``AS IS'' AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OF TELEMATICS OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// The views and conclusions contained in the software and documentation
-// are those of the authors and should not be interpreted as representing
-// official policies, either expressed or implied, of the Institute of
-// Telematics.
-// [License]
-
-#ifndef TIDYMESSAGE_H_
-#define TIDYMESSAGE_H_
-
-#include <inttypes.h>
-#include "ariba/utility/messages.h"
-
-namespace ariba {
-typedef uint16_t seqnum_t;
-typedef utility::Message Message;
-} // namespace ariba
-
-#endif /* MESSAGE_H_ */
Index: source/ariba/ariba.h
===================================================================
--- source/ariba/ariba.h	(revision 2457)
+++ source/ariba/ariba.h	(revision 2460)
@@ -53,6 +53,6 @@
 #include "NodeListener.h"
 #include "SpoVNetProperties.h"
-#include "TidyCommunicationListener.h"
-#include "TidyMessage.h"
+#include "CommunicationListener.h"
+#include "Message.h"
 
 #endif /* ARIBA_H_ */