- change AssetInventoryServer config from XML to INI

- convert AssetInventoryServer logging to OpenSim's log4net
- updated AssetInventoryServer.ini.example file

2 files changed, 62 insertions, 6 deletions

diff --git a/bin/AssetInventoryServer.ini.example b/bin/AssetInventoryServer.ini.example
index 503870e..91b8b44 100644
--- a/bin/AssetInventoryServer.ini.example
+++ b/bin/AssetInventoryServer.ini.example
@@ -1,9 +1,9 @@
-;[Config]
+[Config]
 
 ; The port number for the asset server to listen on.
 listen_port = 8003
 
-;[Extensions]
+[Plugins]
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Asset Storage Provider
@@ -31,7 +31,7 @@ asset_storage_provider = OpenSimAssetStorage
 ; illustrating an inventory backend example. The inventory is stored in
 ; SimpleInventory/ by creating a folder for each agent that contains all of the
 ; inventory items and folders serialized as XML files.
-;inventory_asset_provider = SimpleInventoryStorage
+;inventory_storage_provider = SimpleInventoryStorage
 
 ; OpenSimMySQL inventory connects to a MySQL server that has an inventory table
 ; created by OpenSim. If the OpenSimMySQLStorage backend is also being used, the
@@ -40,7 +40,7 @@ asset_storage_provider = OpenSimAssetStorage
 ; database. This backend combined with the OpenSimInventoryFrontend will allow
 ; the server to be used as a drop-in replacement for
 ; OpenSim.Grid.InventoryServer.exe, while also allowing other frontends to run.
-inventory_asset_provider = OpenSimInventoryStorage
+inventory_storage_provider = OpenSimInventoryStorage
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Authentication Provider
@@ -56,7 +56,7 @@ authentication_provider = NullAuthentication
 ; Authorize all is a dummy authorization module that allows all requests for
 ; metadata, data, and asset creation. Use this extension if your primary
 ; storage provider or front-end interface does not support authentication.
-authroization_provider = AuthorizeAll
+authorization_provider = AuthorizeAll
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Metrics Provider
@@ -95,7 +95,19 @@ metrics_provider = NullMetrics
 
 frontends = ReferenceFrontend,OpenSimAssetFrontend,OpenSimInventoryFrontend,BrowseFrontend
 
-;[MySQL]
+; The OpenSim section applies to the OpenSim plugin (OpenSimAssetStorage,
+; OpenSimInventoryStorage, OpenSimAssetFronend, OpenSimInventoryFrontend).
+[OpenSim]
+
+; The database provider determines which database to use. Any database backend
+; supported by OpenSim is supported.
+;asset_database_provider = "OpenSim.Data.SQLite.dll"
+asset_database_provider = "OpenSim.Data.MySQL.dll"
+;asset_database_provider = "OpenSim.Data.NHibernate.dll"
+
+;inventory_database_provider = "OpenSim.Data.SQLite.dll"
+inventory_database_provider = "OpenSim.Data.MySQL.dll"
+;inventory_database_provider = "OpenSim.Data.NHibernate.dll"
 
 ; Database connection string used by the OpenSim MySQL backend. If these lines
 ; are commented out or missing, the server will look for an
@@ -103,5 +115,15 @@ frontends = ReferenceFrontend,OpenSimAssetFrontend,OpenSimInventoryFrontend,Brow
 ; working directory. These files are generated by OpenSim.Grid.AssetServer.exe
 ; and OpenSim.Grid.InventoryServer.exe, respectively, and can be used without
 ; modification.
+
+; For SQLite
+;asset_database_connect = "URI:file:Asset.db,version=3"
+;inventory_database_connect = "URI:file:Inventory.db,version=3"
+
+; For MySQL
 asset_database_connect = "Server=localhost; Database=opensim; User=changeme; Password=changeme;"
 inventory_database_connect = "Server=localhost; Database=opensim; User=changeme; Password=changeme;"
+
+; For NHibernate
+;asset_database_connect = "SQLiteDialect;SQLite20Driver;Data Source=file:Asset.db;Version=3"
+;inventory_database_connect = "SQLiteDialect;SQLite20Driver;Data Source=file:Asset.db;Version=3"
diff --git a/bin/OpenSim.Grid.AssetInventoryServer.exe.config b/bin/OpenSim.Grid.AssetInventoryServer.exe.config
new file mode 100644
index 0000000..e542cf2
--- /dev/null
+++ b/bin/OpenSim.Grid.AssetInventoryServer.exe.config
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <configSections>
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
+  </configSections>
+  <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.Grid.AssetInventoryServer.log" />
+      <appendToFile value="true" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date %-5level - %logger %message%newline" />
+      </layout>
+    </appender>
+
+    <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" -->
+    <logger name="NHibernate" additivity="false">
+      <level value="INFO"/>
+      <appender-ref ref="NHibernateFileLog"/>
+    </logger>
+
+    <root>
+      <level value="DEBUG" />
+      <appender-ref ref="Console" />
+      <appender-ref ref="LogFileAppender" />
+    </root>
+  </log4net>
+</configuration>