Move the connectors under services for reasons of application logic. Remove

the user server skeleton in preparation for introducing a generic server

1 files changed, 3 insertions, 33 deletions

diff --git a/prebuild.xml b/prebuild.xml
index 4c7510e..62286aa 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1297,7 +1297,7 @@
       </Files>
     </Project>
 
-    <Project name="OpenSim.Servers.Connectors" path="OpenSim/Servers/Connectors" type="Library">
+    <Project name="OpenSim.Services.Connectors" path="OpenSim/Services/Connectors" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1349,7 +1349,7 @@
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="OpenSim.Services.Interfaces"/>
       <Reference name="OpenSim.Services.Base"/>
-      <Reference name="OpenSim.Servers.Connectors"/>
+      <Reference name="OpenSim.Services.Connectors"/>
       <Reference name="OpenSim.Data"/>
       <Reference name="Nini.dll" />
       <Reference name="log4net.dll"/>
@@ -1387,36 +1387,6 @@
       </Files>
     </Project>
 
-    <Project name="OpenSim.Servers.UserServer" path="OpenSim/Servers/UserServer" type="Exe">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-
-      <ReferencePath>../../../bin/</ReferencePath>
-      <Reference name="System"/>
-      <Reference name="OpenMetaverseTypes.dll"/>
-      <Reference name="OpenMetaverse.dll"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Servers.Base"/>
-      <Reference name="OpenSim.Services.Base" />
-      <Reference name="OpenSim.Services.Interfaces"/>
-      <Reference name="Nini.dll" />
-      <Reference name="log4net.dll"/>
-
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-
     <Project name="OpenSim.Servers.AssetServer.Handlers" path="OpenSim/Servers/AssetServer/Handlers" type="Library">
       <Configuration name="Debug">
         <Options>
@@ -1506,7 +1476,7 @@
       <Reference name="OpenSim.Data" />
       <Reference name="OpenSim.Region.Framework" />
       <Reference name="OpenSim.Servers.Base" />
-      <Reference name="OpenSim.Servers.Connectors" />
+      <Reference name="OpenSim.Services.Connectors" />
       <Reference name="OpenSim.Services.Base" />
       <Reference name="OpenSim.Services.Interfaces" />
       <Reference name="OpenSim.Framework.Serialization"/>