From f7dbfe63e55ca875c1079084c4ca153f9a815327 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 18 May 2009 21:04:25 +0000
Subject: This commit changes the way the new server works. There is no longer
 a server exe for each function, rather each function is a connector and the
 server ini loads them. If you like your multiple processes, use -inifile with
 the server. Otherwise, you get one server process that serves all configured
 funcions, see example .ini. The new exe is OpenSim.Server.exe. Clean your
 bin, loads of names have changed!

---
 bin/OpenSim.Server.exe.config               | 33 +++++++++++++++++++++++++++++
 bin/OpenSim.Server.ini.example              | 19 +++++++++++++++++
 bin/OpenSim.Servers.AssetServer.exe.config  | 33 -----------------------------
 bin/OpenSim.Servers.AssetServer.ini.example | 16 --------------
 4 files changed, 52 insertions(+), 49 deletions(-)
 create mode 100644 bin/OpenSim.Server.exe.config
 create mode 100644 bin/OpenSim.Server.ini.example
 delete mode 100644 bin/OpenSim.Servers.AssetServer.exe.config
 delete mode 100644 bin/OpenSim.Servers.AssetServer.ini.example

(limited to 'bin')

diff --git a/bin/OpenSim.Server.exe.config b/bin/OpenSim.Server.exe.config
new file mode 100644
index 0000000..c2d93c0
--- /dev/null
+++ b/bin/OpenSim.Server.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.Server.ini.example b/bin/OpenSim.Server.ini.example
new file mode 100644
index 0000000..b2e0f96
--- /dev/null
+++ b/bin/OpenSim.Server.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/bin/OpenSim.Servers.AssetServer.exe.config b/bin/OpenSim.Servers.AssetServer.exe.config
deleted file mode 100644
index c2d93c0..0000000
--- a/bin/OpenSim.Servers.AssetServer.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.Servers.AssetServer.ini.example b/bin/OpenSim.Servers.AssetServer.ini.example
deleted file mode 100644
index 656ded0..0000000
--- a/bin/OpenSim.Servers.AssetServer.ini.example
+++ /dev/null
@@ -1,16 +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
-
-[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"
-- 
cgit v1.1