Worked on Asset server, asset downloads (from server to sim) now work.

Asset uploads (from sim to server) may or may not work, needs more testing, if they don't work then it should be just a encoding problem and not hard to fix.

OpenGridServices.AssetServer/AssetHttpServer.cs

@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+//using OpenSim.CAPS;
+using Nwc.XmlRpc;
+using System.Collections;
+using OpenSim.Framework.Console;
+using OpenSim.Servers;
+
+namespace OpenGridServices.AssetServer
+{
+    public class AssetHttpServer :BaseHttpServer
+    {
+        public AssetHttpServer(int port)
+            : base(port)
+        {
+        }
+
+        public override void HandleRequest(Object stateinfo)
+        {
+            try
+            {
+                HttpListenerContext context = (HttpListenerContext)stateinfo;
+
+                HttpListenerRequest request = context.Request;
+                HttpListenerResponse response = context.Response;
+
+                response.KeepAlive = false;
+                response.SendChunked = false;
+
+                System.IO.Stream body = request.InputStream;
+                System.Text.Encoding encoding = System.Text.Encoding.UTF8;
+                System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding);
+
+                string requestBody = reader.ReadToEnd();
+                body.Close();
+                reader.Close();
+
+                //Console.WriteLine(request.HttpMethod + " " + request.RawUrl + " Http/" + request.ProtocolVersion.ToString() + " content type: " + request.ContentType);
+                //Console.WriteLine(requestBody);
+
+                string responseString = "";
+                switch (request.ContentType)
+                {
+                    case "text/xml":
+                        // must be XML-RPC, so pass to the XML-RPC parser
+
+                        responseString = ParseXMLRPC(requestBody);
+                        responseString = Regex.Replace(responseString, "utf-16", "utf-8");
+
+                        response.AddHeader("Content-type", "text/xml");
+                        break;
+
+                    case "application/xml":
+                        // probably LLSD we hope, otherwise it should be ignored by the parser
+                        responseString = ParseLLSDXML(requestBody);
+                        response.AddHeader("Content-type", "application/xml");
+                        break;
+
+                    case "application/x-www-form-urlencoded":
+                        // a form data POST so send to the REST parser
+                        responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
+                        response.AddHeader("Content-type", "text/plain");
+                        break;
+
+                    case null:
+                        // must be REST or invalid crap, so pass to the REST parser
+                        responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
+                        response.AddHeader("Content-type", "text/plain");
+                        break;
+
+                }
+
+                Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
+                byte[] buffer = Windows1252Encoding.GetBytes(responseString);
+                System.IO.Stream output = response.OutputStream;
+                response.SendChunked = false;
+                response.ContentLength64 = buffer.Length;
+                output.Write(buffer, 0, buffer.Length);
+                output.Close();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+            }
+        }
+
+    }
+}

OpenGridServices.AssetServer/Main.cs

@@ -40,6 +40,7 @@ using OpenSim.Framework.Sims;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Utilities;
 using OpenSim.GridInterfaces.Local;		// REFACTORING IS NEEDED!!!!!!!!!!!
 using OpenSim.Servers;
 using Db4objects.Db4o;
@@ -70,7 +71,7 @@ namespace OpenGridServices.AssetServer
 
         private void Work()
         {
-            m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"\nEnter help for a list of commands\n");
+            m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "\nEnter help for a list of commands\n");
 
             while (true)
             {
@@ -86,31 +87,59 @@ namespace OpenGridServices.AssetServer
 
         public void Startup()
         {
-	    m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Setting up asset DB");
+            m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Setting up asset DB");
             setupDB();
 
-            m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting HTTP process");
+            m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting HTTP process");
-            BaseHttpServer httpServer = new BaseHttpServer(8003);
+            AssetHttpServer httpServer = new AssetHttpServer(8003);
 
 
             httpServer.AddRestHandler("GET", "/assets/", this.assetGetMethod);
-
+            httpServer.AddRestHandler("POST", "/assets/", this.assetPostMethod);
 
             httpServer.Start();
 
         }
 
-	public string assetGetMethod(string request, string path, string param) {
+        public string assetPostMethod(string requestBody, string path, string param)
-		byte[] assetdata=getAssetData(new LLUUID(param),false);
+        {
-		if(assetdata!=null) {
+            AssetBase asset = new AssetBase();
-			return System.Text.Encoding.ASCII.GetString(assetdata);
+            asset.Name = "";
-		} else {
+            asset.FullID = new LLUUID(param);
+            Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
+            byte[] buffer = Windows1252Encoding.GetBytes(requestBody);
+            asset.Data = buffer;
+            AssetStorage store = new AssetStorage();
+            store.Data = asset.Data;
+            store.Name = asset.Name;
+            store.UUID = asset.FullID;
+            db.Set(store);
+            db.Commit();
+            return "";
+        }
+
+        public string assetGetMethod(string request, string path, string param)
+        {
+            Console.WriteLine("got a request " +param);
+            byte[] assetdata = getAssetData(new LLUUID(param), false);
+            if (assetdata != null)
+            {
+                 Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
+                 string ret = Windows1252Encoding.GetString(assetdata);
+                //string ret = System.Text.Encoding.Unicode.GetString(assetdata);
+
+                return ret;
+               
+            }
+            else
+            {
                 return "";
             }
 
         }
 
-	public byte[] getAssetData(LLUUID assetID, bool isTexture) {
+        public byte[] getAssetData(LLUUID assetID, bool isTexture)
+        {
             byte[] idata = null;
             bool found = false;
             AssetStorage foundAsset = null;
@@ -132,18 +161,19 @@ namespace OpenGridServices.AssetServer
             }
         }
 
-	public void setupDB() {
+        public void setupDB()
-		bool yapfile=System.IO.File.Exists("assets.yap");
+        {
+            bool yapfile = System.IO.File.Exists("assets.yap");
             try
             {
                 db = Db4oFactory.OpenFile("assets.yap");
-	                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:setupDB() - creation");
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:setupDB() - creation");
             }
             catch (Exception e)
             {
                 db.Close();
-	                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Main.cs:setupDB() - Exception occured");
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "Main.cs:setupDB() - Exception occured");
-                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, e.ToString());
             }
             if (!yapfile)
             {
@@ -151,7 +181,8 @@ namespace OpenGridServices.AssetServer
             }
         }
 
-	public void LoadDB() {
+        public void LoadDB()
+        {
             try
             {
 
@@ -291,7 +322,7 @@ namespace OpenGridServices.AssetServer
             switch (cmd)
             {
                 case "help":
-                    m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"shutdown - shutdown this asset server (USE CAUTION!)");
+                    m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "shutdown - shutdown this asset server (USE CAUTION!)");
                     break;
 
                 case "shutdown":

OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj

@@ -112,6 +112,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AssetHttpServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Main.cs">
       <SubType>Code</SubType>
     </Compile>

OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build

@@ -11,6 +11,7 @@
             <resources prefix="OpenGridServices.AssetServer" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
+                <include name="AssetHttpServer.cs" />
                 <include name="Main.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>

OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs

@@ -49,6 +49,11 @@ namespace OpenSim.GridInterfaces.Remote
 
         public void UploadNewAsset(AssetBase asset)
         {
+            Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
+            string ret = Windows1252Encoding.GetString(asset.Data);
+            byte[] buffer = Windows1252Encoding.GetBytes(ret);
+            WebClient client = new WebClient();
+            client.UploadData(this.AssetServerUrl + "assets/" + asset.FullID, buffer);
 
         }
 
@@ -66,7 +71,7 @@ namespace OpenSim.GridInterfaces.Remote
 		// 404... THE MAGIC FILE NOT FOUND ERROR, very useful for telling you things such as a file (or asset ;) ) not being found!!!!!!!!!!! it's 2:22AM
                 ARequest req = this._assetRequests.Dequeue();
                 LLUUID assetID = req.AssetID;
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW," RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID);
+              //  OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW," RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID);
                 WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "assets/" + assetID);
                 WebResponse AssetResponse = AssetLoad.GetResponse();
                 byte[] idata = new byte[(int)AssetResponse.ContentLength];

OpenSim.RegionServer/RegionInfo.cs

@@ -25,7 +25,7 @@ namespace OpenSim
 
         //following should be removed and the GenericConfig object passed around,
         //so each class (AssetServer, GridServer etc) can access what config data they want 
-        public string AssetURL = "";
+        public string AssetURL = "http://127.0.0.1:8003/";
         public string AssetSendKey = "";
 
         public string GridURL = "";
@@ -230,6 +230,17 @@ namespace OpenSim
                         this.GridRecvKey = attri;
                     }
 
+                    attri = "";
+                    attri = configData.GetAttribute("AssetServerURL");
+                    if (attri == "")
+                    {
+                        this.AssetURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/");
+                        configData.SetAttribute("AssetServerURL", this.GridURL);
+                    }
+                    else
+                    {
+                        this.AssetURL = attri;
+                    }
 
                 }
                 this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));

OpenSim.Servers/BaseHttpServer.cs

@@ -27,7 +27,7 @@ namespace OpenSim.Servers
                 get { return m_restMethod; }
             }
 
-            public RestMethodEntry( string path, RestMethod restMethod )
+            public RestMethodEntry(string path, RestMethod restMethod)
             {
                 m_path = path;
                 m_restMethod = restMethod;
@@ -51,7 +51,7 @@ namespace OpenSim.Servers
 
             if (!this.m_restHandlers.ContainsKey(methodKey))
             {
-                this.m_restHandlers.Add(methodKey, new RestMethodEntry( path, handler ));
+                this.m_restHandlers.Add(methodKey, new RestMethodEntry(path, handler));
                 return true;
             }
 
@@ -76,7 +76,7 @@ namespace OpenSim.Servers
             XmlRpcResponse response;
 
             XmlRpcMethod method;
-            if( this.m_rpcHandlers.TryGetValue( methodName, out method ) )
+            if (this.m_rpcHandlers.TryGetValue(methodName, out method))
             {
                 response = method(request);
             }
@@ -100,11 +100,11 @@ namespace OpenSim.Servers
             string requestKey = String.Format("{0}: {1}", method, path);
 
             string bestMatch = String.Empty;
-            foreach( string currentKey in m_restHandlers.Keys )
+            foreach (string currentKey in m_restHandlers.Keys)
             {
-                if( requestKey.StartsWith( currentKey ))
+                if (requestKey.StartsWith(currentKey))
                 {
-                    if(currentKey.Length > bestMatch.Length )
+                    if (currentKey.Length > bestMatch.Length)
                     {
                         bestMatch = currentKey;
                     }
@@ -116,7 +116,7 @@ namespace OpenSim.Servers
             {
                 RestMethod restMethod = restMethodEntry.RestMethod;
 
-                string param = path.Substring( restMethodEntry.Path.Length );
+                string param = path.Substring(restMethodEntry.Path.Length);
                 response = restMethod(request, path, param);
 
             }
@@ -144,7 +144,7 @@ namespace OpenSim.Servers
 
                 string methodName = request.MethodName;
 
-                responseString = ProcessXMLRPCMethod(methodName, request );
+                responseString = ProcessXMLRPCMethod(methodName, request);
             }
             catch (Exception e)
             {
@@ -155,7 +155,8 @@ namespace OpenSim.Servers
 
         public virtual void HandleRequest(Object stateinfo)
         {
-	try {
+            try
+            {
                 HttpListenerContext context = (HttpListenerContext)stateinfo;
 
                 HttpListenerRequest request = context.Request;
@@ -213,14 +214,16 @@ namespace OpenSim.Servers
                 response.ContentLength64 = buffer.Length;
                 output.Write(buffer, 0, buffer.Length);
                 output.Close();
-	} catch (Exception e) {
+            }
+            catch (Exception e)
+            {
                 Console.WriteLine(e.ToString());
             }
         }
 
         public void Start()
         {
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW,"BaseHttpServer.cs: Starting up HTTP Server");
+            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: Starting up HTTP Server");
 
             m_workerThread = new Thread(new ThreadStart(StartHTTP));
             m_workerThread.IsBackground = true;
@@ -231,7 +234,7 @@ namespace OpenSim.Servers
         {
             try
             {
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW,"BaseHttpServer.cs: StartHTTP() - Spawned main thread OK");
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK");
                 m_httpListener = new HttpListener();
 
                 m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
@@ -246,7 +249,7 @@ namespace OpenSim.Servers
             }
             catch (Exception e)
             {
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM,e.Message);
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM, e.Message);
             }
         }
     }

OpenSim.sln

@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C# Express 2005
+# Visual Studio 2005
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim.Storage\LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}"
@@ -65,6 +65,68 @@ Global
     Debug|Any CPU = Debug|Any CPU
     Release|Any CPU = Release|Any CPU
   EndGlobalSection
+  GlobalSection(ProjectDependencies) = postSolution
+    ({EE9E5D96-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({EE9E5D96-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).7 = ({8BE16150-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).8 = ({8BB20F0A-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).9 = ({632E1BFD-0000-0000-0000-000000000000})
+    ({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})
+    ({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({632E1BFD-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000})
+    ({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})
+    ({632E1BFD-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000})
+    ({632E1BFD-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000})
+    ({8ACA2445-0000-0000-0000-000000000000}).4 = ({8E81D43C-0000-0000-0000-000000000000})
+    ({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({97A82740-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({0F3C3AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000})
+    ({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({66591469-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({66591469-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({66591469-0000-0000-0000-000000000000}).5 = ({8BB20F0A-0000-0000-0000-000000000000})
+    ({66591469-0000-0000-0000-000000000000}).8 = ({8E81D43C-0000-0000-0000-000000000000})
+    ({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
+    ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({8BB20F0A-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})
+    ({B0027747-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({B0027747-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000})
+    ({0A563AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000})
+    ({7924FD35-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({7924FD35-0000-0000-0000-000000000000}).2 = ({8BB20F0A-0000-0000-0000-000000000000})
+    ({7924FD35-0000-0000-0000-000000000000}).3 = ({8E81D43C-0000-0000-0000-000000000000})
+    ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({B55C0B5D-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})
+    ({21BFC8E2-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({21BFC8E2-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({21BFC8E2-0000-0000-0000-000000000000}).5 = ({8BB20F0A-0000-0000-0000-000000000000})
+    ({21BFC8E2-0000-0000-0000-000000000000}).6 = ({62CDF671-0000-0000-0000-000000000000})
+    ({21BFC8E2-0000-0000-0000-000000000000}).7 = ({7924FD35-0000-0000-0000-000000000000})
+    ({21BFC8E2-0000-0000-0000-000000000000}).10 = ({8E81D43C-0000-0000-0000-000000000000})
+    ({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({6B20B603-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({6B20B603-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({39BD9497-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000})
+    ({7E494328-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({7E494328-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({1E3F341A-0000-0000-0000-000000000000}).4 = ({62CDF671-0000-0000-0000-000000000000})
+    ({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({0021261B-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({0021261B-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({0021261B-0000-0000-0000-000000000000}).5 = ({546099CD-0000-0000-0000-000000000000})
+    ({0021261B-0000-0000-0000-000000000000}).6 = ({8BB20F0A-0000-0000-0000-000000000000})
+    ({0021261B-0000-0000-0000-000000000000}).9 = ({8E81D43C-0000-0000-0000-000000000000})
+  EndGlobalSection
   GlobalSection(ProjectConfigurationPlatforms) = postSolution
     {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

ServiceManager/ServiceManager.csproj

@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
@@ -6,8 +6,7 @@
     <ProjectGuid>{E141F4EE-0000-0000-0000-000000000000}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
+    <ApplicationIcon></ApplicationIcon>
-    </ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>ServiceManager</AssemblyName>
@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>
+    <AppDesignerFolder></AppDesignerFolder>
-    </AppDesignerFolder>
     <RootNamespace>ServiceManager</RootNamespace>
-    <StartupObject>
+    <StartupObject></StartupObject>
-    </StartupObject>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
   </PropertyGroup>
@@ -31,8 +28,7 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
+    <DocumentationFile></DocumentationFile>
-    </DocumentationFile>
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
+    <NoWarn></NoWarn>
-    </NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
+    <DocumentationFile></DocumentationFile>
-    </DocumentationFile>
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
@@ -61,19 +55,18 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
+    <NoWarn></NoWarn>
-    </NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System">
+    <Reference Include="System" >
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.ServiceProcess">
+    <Reference Include="System.ServiceProcess" >
       <HintPath>System.ServiceProcess.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Xml">
+    <Reference Include="System.Xml" >
       <HintPath>System.Xml.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -82,7 +75,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ServiceManager.cs">
-      <SubType>Component</SubType>
+      <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />