aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMike Mazur2009-02-16 02:27:43 +0000
committerMike Mazur2009-02-16 02:27:43 +0000
commit5277fc64c07da92014e749be40aa837193a26495 (patch)
tree5351a96ac5d612560dc63d8c8585237d9dc80d27 /bin
parent- remove dependency on ExtensionLoader.dll (DBConnString.cs can go) (diff)
downloadopensim-SC_OLD-5277fc64c07da92014e749be40aa837193a26495.zip
opensim-SC_OLD-5277fc64c07da92014e749be40aa837193a26495.tar.gz
opensim-SC_OLD-5277fc64c07da92014e749be40aa837193a26495.tar.bz2
opensim-SC_OLD-5277fc64c07da92014e749be40aa837193a26495.tar.xz
- change AssetInventoryServer config from XML to INI
- convert AssetInventoryServer logging to OpenSim's log4net - updated AssetInventoryServer.ini.example file
Diffstat (limited to '')
-rw-r--r--bin/AssetInventoryServer.ini.example34
-rw-r--r--bin/OpenSim.Grid.AssetInventoryServer.exe.config34
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 @@
1;[Config] 1[Config]
2 2
3; The port number for the asset server to listen on. 3; The port number for the asset server to listen on.
4listen_port = 8003 4listen_port = 8003
5 5
6;[Extensions] 6[Plugins]
7 7
8;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
9; Asset Storage Provider 9; Asset Storage Provider
@@ -31,7 +31,7 @@ asset_storage_provider = OpenSimAssetStorage
31; illustrating an inventory backend example. The inventory is stored in 31; illustrating an inventory backend example. The inventory is stored in
32; SimpleInventory/ by creating a folder for each agent that contains all of the 32; SimpleInventory/ by creating a folder for each agent that contains all of the
33; inventory items and folders serialized as XML files. 33; inventory items and folders serialized as XML files.
34;inventory_asset_provider = SimpleInventoryStorage 34;inventory_storage_provider = SimpleInventoryStorage
35 35
36; OpenSimMySQL inventory connects to a MySQL server that has an inventory table 36; OpenSimMySQL inventory connects to a MySQL server that has an inventory table
37; created by OpenSim. If the OpenSimMySQLStorage backend is also being used, the 37; created by OpenSim. If the OpenSimMySQLStorage backend is also being used, the
@@ -40,7 +40,7 @@ asset_storage_provider = OpenSimAssetStorage
40; database. This backend combined with the OpenSimInventoryFrontend will allow 40; database. This backend combined with the OpenSimInventoryFrontend will allow
41; the server to be used as a drop-in replacement for 41; the server to be used as a drop-in replacement for
42; OpenSim.Grid.InventoryServer.exe, while also allowing other frontends to run. 42; OpenSim.Grid.InventoryServer.exe, while also allowing other frontends to run.
43inventory_asset_provider = OpenSimInventoryStorage 43inventory_storage_provider = OpenSimInventoryStorage
44 44
45;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 45;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
46; Authentication Provider 46; Authentication Provider
@@ -56,7 +56,7 @@ authentication_provider = NullAuthentication
56; Authorize all is a dummy authorization module that allows all requests for 56; Authorize all is a dummy authorization module that allows all requests for
57; metadata, data, and asset creation. Use this extension if your primary 57; metadata, data, and asset creation. Use this extension if your primary
58; storage provider or front-end interface does not support authentication. 58; storage provider or front-end interface does not support authentication.
59authroization_provider = AuthorizeAll 59authorization_provider = AuthorizeAll
60 60
61;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 61;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
62; Metrics Provider 62; Metrics Provider
@@ -95,7 +95,19 @@ metrics_provider = NullMetrics
95 95
96frontends = ReferenceFrontend,OpenSimAssetFrontend,OpenSimInventoryFrontend,BrowseFrontend 96frontends = ReferenceFrontend,OpenSimAssetFrontend,OpenSimInventoryFrontend,BrowseFrontend
97 97
98;[MySQL] 98; The OpenSim section applies to the OpenSim plugin (OpenSimAssetStorage,
99; OpenSimInventoryStorage, OpenSimAssetFronend, OpenSimInventoryFrontend).
100[OpenSim]
101
102; The database provider determines which database to use. Any database backend
103; supported by OpenSim is supported.
104;asset_database_provider = "OpenSim.Data.SQLite.dll"
105asset_database_provider = "OpenSim.Data.MySQL.dll"
106;asset_database_provider = "OpenSim.Data.NHibernate.dll"
107
108;inventory_database_provider = "OpenSim.Data.SQLite.dll"
109inventory_database_provider = "OpenSim.Data.MySQL.dll"
110;inventory_database_provider = "OpenSim.Data.NHibernate.dll"
99 111
100; Database connection string used by the OpenSim MySQL backend. If these lines 112; Database connection string used by the OpenSim MySQL backend. If these lines
101; are commented out or missing, the server will look for an 113; are commented out or missing, the server will look for an
@@ -103,5 +115,15 @@ frontends = ReferenceFrontend,OpenSimAssetFrontend,OpenSimInventoryFrontend,Brow
103; working directory. These files are generated by OpenSim.Grid.AssetServer.exe 115; working directory. These files are generated by OpenSim.Grid.AssetServer.exe
104; and OpenSim.Grid.InventoryServer.exe, respectively, and can be used without 116; and OpenSim.Grid.InventoryServer.exe, respectively, and can be used without
105; modification. 117; modification.
118
119; For SQLite
120;asset_database_connect = "URI:file:Asset.db,version=3"
121;inventory_database_connect = "URI:file:Inventory.db,version=3"
122
123; For MySQL
106asset_database_connect = "Server=localhost; Database=opensim; User=changeme; Password=changeme;" 124asset_database_connect = "Server=localhost; Database=opensim; User=changeme; Password=changeme;"
107inventory_database_connect = "Server=localhost; Database=opensim; User=changeme; Password=changeme;" 125inventory_database_connect = "Server=localhost; Database=opensim; User=changeme; Password=changeme;"
126
127; For NHibernate
128;asset_database_connect = "SQLiteDialect;SQLite20Driver;Data Source=file:Asset.db;Version=3"
129;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 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<configuration>
3 <configSections>
4 <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5 </configSections>
6 <appSettings>
7 </appSettings>
8 <log4net>
9 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
10 <layout type="log4net.Layout.PatternLayout">
11 <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
12 </layout>
13 </appender>
14 <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
15 <file value="OpenSim.Grid.AssetInventoryServer.log" />
16 <appendToFile value="true" />
17 <layout type="log4net.Layout.PatternLayout">
18 <conversionPattern value="%date %-5level - %logger %message%newline" />
19 </layout>
20 </appender>
21
22 <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" -->
23 <logger name="NHibernate" additivity="false">
24 <level value="INFO"/>
25 <appender-ref ref="NHibernateFileLog"/>
26 </logger>
27
28 <root>
29 <level value="DEBUG" />
30 <appender-ref ref="Console" />
31 <appender-ref ref="LogFileAppender" />
32 </root>
33 </log4net>
34</configuration>