From 869eb7a6a62bd3ca9791159e7d7c9b229374704b Mon Sep 17 00:00:00 2001 From: Avery Pennarun Date: Thu, 25 Sep 2008 14:24:04 -0400 Subject: [PATCH] Rename NDesk.DBus namespace to just Wv. --- dbus-sharp/Address.cs | 2 +- dbus-sharp/Authentication.cs | 2 +- dbus-sharp/Bus.cs | 2 +- dbus-sharp/BusObject.cs | 2 +- dbus-sharp/Connection.cs | 2 +- dbus-sharp/DBus.cs | 2 +- dbus-sharp/DProxy.cs | 2 +- dbus-sharp/ExportObject.cs | 2 +- dbus-sharp/Introspection.cs | 2 +- dbus-sharp/Makefile | 9 ++++++--- dbus-sharp/Mapper.cs | 2 +- dbus-sharp/MatchRule.cs | 2 +- dbus-sharp/Message.cs | 2 +- dbus-sharp/MessageFilter.cs | 2 +- dbus-sharp/MessageReader.cs | 2 +- dbus-sharp/MessageWriter.cs | 2 +- dbus-sharp/PendingCall.cs | 2 +- dbus-sharp/Protocol.cs | 2 +- dbus-sharp/Server.cs | 2 +- dbus-sharp/Signature.cs | 2 +- dbus-sharp/SocketTransport.cs | 2 +- dbus-sharp/Transport.cs | 2 +- dbus-sharp/TypeImplementer.cs | 4 ++-- dbus-sharp/UnixMonoTransport.cs | 2 +- dbus-sharp/UnixNativeTransport.cs | 2 +- dbus-sharp/UnixTransport.cs | 2 +- dbus-sharp/Wrapper.cs | 2 +- dbus-sharp/t/Makefile | 1 + dbus-sharp/t/all.t.cs | 8 +++++++- 29 files changed, 41 insertions(+), 31 deletions(-) diff --git a/dbus-sharp/Address.cs b/dbus-sharp/Address.cs index 4e2a612..f4e1147 100644 --- a/dbus-sharp/Address.cs +++ b/dbus-sharp/Address.cs @@ -6,7 +6,7 @@ using System; using System.Text; using System.Collections.Generic; -namespace NDesk.DBus +namespace Wv { public class BadAddressException : Exception { diff --git a/dbus-sharp/Authentication.cs b/dbus-sharp/Authentication.cs index 3dd18ac..406441a 100644 --- a/dbus-sharp/Authentication.cs +++ b/dbus-sharp/Authentication.cs @@ -9,7 +9,7 @@ using System.IO; using System.Text; using System.Globalization; -namespace NDesk.DBus.Authentication +namespace Wv.Authentication { enum ClientState { diff --git a/dbus-sharp/Bus.cs b/dbus-sharp/Bus.cs index 025fa01..f081ead 100644 --- a/dbus-sharp/Bus.cs +++ b/dbus-sharp/Bus.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using org.freedesktop.DBus; -namespace NDesk.DBus +namespace Wv { using Transports; diff --git a/dbus-sharp/BusObject.cs b/dbus-sharp/BusObject.cs index c9a1426..9d821ef 100644 --- a/dbus-sharp/BusObject.cs +++ b/dbus-sharp/BusObject.cs @@ -7,7 +7,7 @@ using System.Reflection; using System.Reflection.Emit; using System.Collections.Generic; -namespace NDesk.DBus +namespace Wv { public class BusObject { diff --git a/dbus-sharp/Connection.cs b/dbus-sharp/Connection.cs index 5e68a30..3c8c6ee 100644 --- a/dbus-sharp/Connection.cs +++ b/dbus-sharp/Connection.cs @@ -9,7 +9,7 @@ using System.IO; using System.Threading; using System.Reflection; -namespace NDesk.DBus +namespace Wv { using Authentication; using Transports; diff --git a/dbus-sharp/DBus.cs b/dbus-sharp/DBus.cs index 8ce2a35..90a38ab 100644 --- a/dbus-sharp/DBus.cs +++ b/dbus-sharp/DBus.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -using NDesk.DBus; +using Wv; namespace org.freedesktop.DBus { diff --git a/dbus-sharp/DProxy.cs b/dbus-sharp/DProxy.cs index 80a372b..656111a 100644 --- a/dbus-sharp/DProxy.cs +++ b/dbus-sharp/DProxy.cs @@ -7,7 +7,7 @@ using System.Reflection; using System.Runtime.Remoting.Proxies; using System.Runtime.Remoting.Messaging; -namespace NDesk.DBus +namespace Wv { //marked internal because this is really an implementation detail and needs to be replaced internal class DProxy : RealProxy diff --git a/dbus-sharp/ExportObject.cs b/dbus-sharp/ExportObject.cs index 2d420e3..71babe8 100644 --- a/dbus-sharp/ExportObject.cs +++ b/dbus-sharp/ExportObject.cs @@ -8,7 +8,7 @@ using System.Reflection.Emit; using org.freedesktop.DBus; -namespace NDesk.DBus +namespace Wv { //TODO: perhaps ExportObject should not derive from BusObject internal class ExportObject : BusObject //, Peer diff --git a/dbus-sharp/Introspection.cs b/dbus-sharp/Introspection.cs index 6f10577..64f0e9e 100644 --- a/dbus-sharp/Introspection.cs +++ b/dbus-sharp/Introspection.cs @@ -9,7 +9,7 @@ using System.Xml; using System.Text; using System.Reflection; -namespace NDesk.DBus +namespace Wv { //TODO: complete this class class Introspector diff --git a/dbus-sharp/Makefile b/dbus-sharp/Makefile index ebb6358..8ecac45 100644 --- a/dbus-sharp/Makefile +++ b/dbus-sharp/Makefile @@ -6,6 +6,8 @@ all: wvdbus-sharp.dll CSFLAGS=/unsafe +wv.dll: + wvdbus-sharp.dll: \ assemblyinfo.cs \ Address.cs \ @@ -33,10 +35,11 @@ wvdbus-sharp.dll: \ UnixMonoTransport.cs \ UnixNativeTransport.cs \ UnixTransport.cs \ - Wrapper.cs + Wrapper.cs \ + $(WVDOTNET)/wv.dll -tests: t/tests +tests: all t/tests -test: t/test +test: tests t/test clean:: t/clean diff --git a/dbus-sharp/Mapper.cs b/dbus-sharp/Mapper.cs index 9eef8aa..d47f1f5 100644 --- a/dbus-sharp/Mapper.cs +++ b/dbus-sharp/Mapper.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.Reflection; -namespace NDesk.DBus +namespace Wv { static class Mapper { diff --git a/dbus-sharp/MatchRule.cs b/dbus-sharp/MatchRule.cs index cf54828..6cde036 100644 --- a/dbus-sharp/MatchRule.cs +++ b/dbus-sharp/MatchRule.cs @@ -6,7 +6,7 @@ using System; using System.Text; using System.Collections.Generic; -namespace NDesk.DBus +namespace Wv { //delegate void MessageHandler (Message msg); diff --git a/dbus-sharp/Message.cs b/dbus-sharp/Message.cs index bdf1596..90b1068 100644 --- a/dbus-sharp/Message.cs +++ b/dbus-sharp/Message.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.IO; -namespace NDesk.DBus +namespace Wv { public class Message { diff --git a/dbus-sharp/MessageFilter.cs b/dbus-sharp/MessageFilter.cs index b0849c2..ae9dbac 100644 --- a/dbus-sharp/MessageFilter.cs +++ b/dbus-sharp/MessageFilter.cs @@ -4,7 +4,7 @@ using System; -namespace NDesk.DBus +namespace Wv { class MessageFilter { diff --git a/dbus-sharp/MessageReader.cs b/dbus-sharp/MessageReader.cs index 0e31abe..90a5ac6 100644 --- a/dbus-sharp/MessageReader.cs +++ b/dbus-sharp/MessageReader.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.IO; using System.Reflection; -namespace NDesk.DBus +namespace Wv { public class MessageReader { diff --git a/dbus-sharp/MessageWriter.cs b/dbus-sharp/MessageWriter.cs index 1ebc566..275e8df 100644 --- a/dbus-sharp/MessageWriter.cs +++ b/dbus-sharp/MessageWriter.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.IO; using System.Reflection; -namespace NDesk.DBus +namespace Wv { public class MessageWriter { diff --git a/dbus-sharp/PendingCall.cs b/dbus-sharp/PendingCall.cs index a9950df..64548b6 100644 --- a/dbus-sharp/PendingCall.cs +++ b/dbus-sharp/PendingCall.cs @@ -5,7 +5,7 @@ using System; using System.Threading; -namespace NDesk.DBus +namespace Wv { class PendingCall { diff --git a/dbus-sharp/Protocol.cs b/dbus-sharp/Protocol.cs index 0951855..66b2bb9 100644 --- a/dbus-sharp/Protocol.cs +++ b/dbus-sharp/Protocol.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace NDesk.DBus +namespace Wv { //yyyyuua{yv} public struct Header diff --git a/dbus-sharp/Server.cs b/dbus-sharp/Server.cs index 5f27c53..deb474c 100644 --- a/dbus-sharp/Server.cs +++ b/dbus-sharp/Server.cs @@ -7,7 +7,7 @@ using System.IO; using System.Net; using System.Net.Sockets; -namespace NDesk.DBus +namespace Wv { //TODO: complete this class class Server diff --git a/dbus-sharp/Signature.cs b/dbus-sharp/Signature.cs index 7bd58c6..ff5f72e 100644 --- a/dbus-sharp/Signature.cs +++ b/dbus-sharp/Signature.cs @@ -9,7 +9,7 @@ using System.Collections.Generic; //TODO: Reflection should be done at a higher level than this class using System.Reflection; -namespace NDesk.DBus +namespace Wv { //maybe this should be nullable? public struct Signature diff --git a/dbus-sharp/SocketTransport.cs b/dbus-sharp/SocketTransport.cs index 5389d2f..53e86e1 100644 --- a/dbus-sharp/SocketTransport.cs +++ b/dbus-sharp/SocketTransport.cs @@ -7,7 +7,7 @@ using System.IO; using System.Net; using System.Net.Sockets; -namespace NDesk.DBus.Transports +namespace Wv.Transports { class SocketTransport : Transport { diff --git a/dbus-sharp/Transport.cs b/dbus-sharp/Transport.cs index 91baf1b..dccac40 100644 --- a/dbus-sharp/Transport.cs +++ b/dbus-sharp/Transport.cs @@ -5,7 +5,7 @@ using System; using System.IO; -namespace NDesk.DBus.Transports +namespace Wv.Transports { public abstract class Transport { diff --git a/dbus-sharp/TypeImplementer.cs b/dbus-sharp/TypeImplementer.cs index 51423c1..2f42f28 100644 --- a/dbus-sharp/TypeImplementer.cs +++ b/dbus-sharp/TypeImplementer.cs @@ -7,7 +7,7 @@ using System.Reflection; using System.Reflection.Emit; using System.Collections.Generic; -namespace NDesk.DBus +namespace Wv { static class TypeImplementer { @@ -19,7 +19,7 @@ namespace NDesk.DBus if (asmB != null) return; - asmB = AppDomain.CurrentDomain.DefineDynamicAssembly (new AssemblyName ("NDesk.DBus.Proxies"), AssemblyBuilderAccess.Run); + asmB = AppDomain.CurrentDomain.DefineDynamicAssembly (new AssemblyName ("Wv.Proxies"), AssemblyBuilderAccess.Run); modB = asmB.DefineDynamicModule ("ProxyModule"); } diff --git a/dbus-sharp/UnixMonoTransport.cs b/dbus-sharp/UnixMonoTransport.cs index 06481fe..7fd5758 100644 --- a/dbus-sharp/UnixMonoTransport.cs +++ b/dbus-sharp/UnixMonoTransport.cs @@ -10,7 +10,7 @@ using System.Net.Sockets; using Mono.Unix; using Mono.Unix.Native; -namespace NDesk.DBus.Transports +namespace Wv.Transports { class UnixMonoTransport : UnixTransport { diff --git a/dbus-sharp/UnixNativeTransport.cs b/dbus-sharp/UnixNativeTransport.cs index e57fab2..0823b42 100644 --- a/dbus-sharp/UnixNativeTransport.cs +++ b/dbus-sharp/UnixNativeTransport.cs @@ -16,7 +16,7 @@ using System.Runtime.InteropServices; using Mono.Unix; using Mono.Unix.Native; -namespace NDesk.DBus.Transports +namespace Wv.Transports { class UnixSocket { diff --git a/dbus-sharp/UnixTransport.cs b/dbus-sharp/UnixTransport.cs index 4ad4073..58035ee 100644 --- a/dbus-sharp/UnixTransport.cs +++ b/dbus-sharp/UnixTransport.cs @@ -6,7 +6,7 @@ using System; using System.IO; using Mono.Unix; -namespace NDesk.DBus.Transports +namespace Wv.Transports { abstract class UnixTransport : Transport { diff --git a/dbus-sharp/Wrapper.cs b/dbus-sharp/Wrapper.cs index 6ba9393..21f3f26 100644 --- a/dbus-sharp/Wrapper.cs +++ b/dbus-sharp/Wrapper.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.IO; -namespace NDesk.DBus +namespace Wv { //TODO: complete and use these wrapper classes //not sure exactly what I'm thinking but there seems to be sense here diff --git a/dbus-sharp/t/Makefile b/dbus-sharp/t/Makefile index 3bace2d..dbb9531 100644 --- a/dbus-sharp/t/Makefile +++ b/dbus-sharp/t/Makefile @@ -11,4 +11,5 @@ test: all.t.pass all.t.exe: \ all.t.cs.E \ + ../wvdbus-sharp.dll \ $(WVDOTNET)/wv.dll diff --git a/dbus-sharp/t/all.t.cs b/dbus-sharp/t/all.t.cs index c874713..568c5c3 100644 --- a/dbus-sharp/t/all.t.cs +++ b/dbus-sharp/t/all.t.cs @@ -9,10 +9,16 @@ using Wv.Test; class DbusTest { [Test] - public void basics() + public void create_bus() { + Bus bus = new Bus(Address.Session); WVPASS(true); } + + [Test] void message_read_write() + { + + } public static void Main() { -- 2.11.4.GIT