From 4789500d32bf97b49deff0b78a8e144b7119befb Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 18 May 2009 21:14:08 +0000
Subject: Rename OpenSim.Server.exe to OpenSim.Services.exe and the
 corresponding ini to OpenSim.Services.ini.example, which makes soooo much
 more sense. Thanks, Adam!

---
 bin/OpenSim.Server.exe.config    | 33 ---------------------------------
 bin/OpenSim.Server.ini.example   | 19 -------------------
 bin/OpenSim.Services.exe.config  | 33 +++++++++++++++++++++++++++++++++
 bin/OpenSim.Services.ini.example | 19 +++++++++++++++++++
 prebuild.xml                     |  2 +-
 5 files changed, 53 insertions(+), 53 deletions(-)
 delete mode 100644 bin/OpenSim.Server.exe.config
 delete mode 100644 bin/OpenSim.Server.ini.example
 create mode 100644 bin/OpenSim.Services.exe.config
 create mode 100644 bin/OpenSim.Services.ini.example

diff --git a/bin/OpenSim.Server.exe.config b/bin/OpenSim.Server.exe.config
deleted file mode 100644
index c2d93c0..0000000
--- a/bin/OpenSim.Server.exe.config
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
-  </configSections>
-  <runtime>
-    <gcConcurrent enabled="true" />
-	<gcServer enabled="true" />
-  </runtime>
-  <appSettings>
-  </appSettings>
-  <log4net>
-    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
-      </layout>
-    </appender>
-
-    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSim.log" />
-      <appendToFile value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date %-5level - %logger %message%newline" />
-      </layout>
-    </appender>
-
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="Console" />
-      <appender-ref ref="LogFileAppender" />
-    </root>
-  </log4net>
-</configuration>
diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
deleted file mode 100644
index b2e0f96..0000000
--- a/bin/OpenSim.Server.ini.example
+++ /dev/null
@@ -1,19 +0,0 @@
-[Startup]
-; These are also available as command line options
-
-; console = "local" ; Use "basic" to use this on a pipe
-; inifile = "OpenSim.Servers.AssetServer.ini"
-; logfile = "AssetServer.log" ; Also read from application config file
-
-; Connectors, comma separated
-ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector"
-
-[Network]
-port = 8003
-
-[AssetService]
-LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
-StorageProvider = "OpenSim.Data.MySQL.dll"
-ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim;"
-DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
-AssetLoaderArgs = "assets/AssetSets.xml"
diff --git a/bin/OpenSim.Services.exe.config b/bin/OpenSim.Services.exe.config
new file mode 100644
index 0000000..c2d93c0
--- /dev/null
+++ b/bin/OpenSim.Services.exe.config
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <configSections>
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
+  </configSections>
+  <runtime>
+    <gcConcurrent enabled="true" />
+	<gcServer enabled="true" />
+  </runtime>
+  <appSettings>
+  </appSettings>
+  <log4net>
+    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
+      </layout>
+    </appender>
+
+    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
+      <file value="OpenSim.log" />
+      <appendToFile value="true" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date %-5level - %logger %message%newline" />
+      </layout>
+    </appender>
+
+    <root>
+      <level value="DEBUG" />
+      <appender-ref ref="Console" />
+      <appender-ref ref="LogFileAppender" />
+    </root>
+  </log4net>
+</configuration>
diff --git a/bin/OpenSim.Services.ini.example b/bin/OpenSim.Services.ini.example
new file mode 100644
index 0000000..b2e0f96
--- /dev/null
+++ b/bin/OpenSim.Services.ini.example
@@ -0,0 +1,19 @@
+[Startup]
+; These are also available as command line options
+
+; console = "local" ; Use "basic" to use this on a pipe
+; inifile = "OpenSim.Servers.AssetServer.ini"
+; logfile = "AssetServer.log" ; Also read from application config file
+
+; Connectors, comma separated
+ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector"
+
+[Network]
+port = 8003
+
+[AssetService]
+LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
+StorageProvider = "OpenSim.Data.MySQL.dll"
+ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim;"
+DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
+AssetLoaderArgs = "assets/AssetSets.xml"
diff --git a/prebuild.xml b/prebuild.xml
index 697c266..0450108 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1418,7 +1418,7 @@
       </Files>
     </Project>
 
-    <Project name="OpenSim.Server" path="OpenSim/Server" type="Exe">
+    <Project name="OpenSim.Services" path="OpenSim/Server" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../bin/</OutputPath>
-- 
cgit v1.1