Merge branch 'grid-service-redux'

author: Melanie 2009-09-28 23:03:47 +0100
committer: Melanie 2009-09-28 23:03:47 +0100
commit: 07091493134341a316624d9a1f6a2ef1cfa2f2d8 (patch)
tree: 1d394e128be9766656a441058b2bdf141ba90269 /bin/config-include
parent: Allow the notation config_name@port/dll_name:class_name as a handler spec (diff)
parent: Forgot a return statement. (diff)
download: opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.zip
opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.gz
opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.bz2
opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.xz
6 files changed, 37 insertions, 6 deletions
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 10f7dbd..261c1b8 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -12,5 +12,12 @@
    InventoryServices = "RemoteInventoryServicesConnector"
    AuthorizationServices = "RemoteAuthorizationServicesConnector"
    NeighbourServices = "RemoteNeighbourServicesConnector"
+    GridServices = "RemoteGridServicesConnector"
    NeighbourServiceInConnector = true
    LandServiceInConnector = true
+[GridService]
+        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+        ; for the LocalGridServicesConnector which is used by the Remote one
+    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+    
+\ No newline at end of file
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 3a8ec35..e9d3728 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -15,6 +15,11 @@
    ;
    InventoryServerURI = "http://myinventoryserver.com:8004"
+[GridService]
+    ;
+    ; change this to your grid-wide inventory server
+    ;
+    GridServerURI = "http://mygridserver.com:8001"
 [Modules]
    ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 8b65ab8..1bfcf89 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -11,9 +11,10 @@
    AssetServices = "HGAssetBroker"
    InventoryServices = "HGInventoryBroker"
    NeighbourServices = "RemoteNeighbourServicesConnector"
+    GridServices = "HGGridServicesConnector"
    NeighbourServiceInConnector = true
    LandServiceInConnector = true
+    HypergridServiceInConnector = true
 [AssetService]
    LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
@@ -22,3 +23,11 @@
 [InventoryService]
    LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteInventoryServicesConnector"
    HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
+[GridService]
+    ; for the HGGridServicesConnector to instantiate
+        GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
+        ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
+        ; which in turn uses this
+        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 5a5cbff..a6c089c 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -25,5 +25,4 @@
 [GridService]
        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
-        StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+    Realm = "regions"
-        
-\ No newline at end of file
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index bac7983..b0e2de3 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -32,3 +32,10 @@
 [FreeswitchService]
    ;; Configuration for the freeswitch service goes here
    LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
+[GridService]
+    ;; For in-memory region storage (default)
+        StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+    ;;--- For MySql region storage (alternative)
+        ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
+        ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index b14517d..75cdad9 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -10,13 +10,15 @@
 [Modules]
    AssetServices = "HGAssetBroker"
    InventoryServices = "HGInventoryBroker"
-    NeighbourServices = "LocalNeighbourServicesConnector"
+    NeighbourServices = "RemoteNeighbourServicesConnector"
    AuthorizationServices = "LocalAuthorizationServicesConnector"
    GridServices = "HGGridServicesConnector"
    InventoryServiceInConnector = true
    AssetServiceInConnector = true
    HGAuthServiceInConnector = true
    HypergridServiceInConnector = true
+    NeighbourServiceInConnector = true
 [AssetService]
    ; For the AssetServiceInConnector
@@ -42,6 +44,8 @@
    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"
    
 [GridService]
-        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    ; for the HGGridServicesConnector to instantiate
        GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
-        StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-\ No newline at end of file
+        ; LocalGridServicesConnector needs this
+        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+        Realm = "regions"
author	Melanie	2009-09-28 23:03:47 +0100
committer	Melanie	2009-09-28 23:03:47 +0100
commit	07091493134341a316624d9a1f6a2ef1cfa2f2d8 (patch)
tree	1d394e128be9766656a441058b2bdf141ba90269 /bin/config-include
parent	Allow the notation config_name@port/dll_name:class_name as a handler spec (diff)
parent	Forgot a return statement. (diff)
download	opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.zip opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.gz opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.bz2 opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.xz

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 10f7dbd..261c1b8 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini
@@ -12,5 +12,12 @@
12	InventoryServices = "RemoteInventoryServicesConnector"	12	InventoryServices = "RemoteInventoryServicesConnector"
13	AuthorizationServices = "RemoteAuthorizationServicesConnector"	13	AuthorizationServices = "RemoteAuthorizationServicesConnector"
14	NeighbourServices = "RemoteNeighbourServicesConnector"	14	NeighbourServices = "RemoteNeighbourServicesConnector"
		15	GridServices = "RemoteGridServicesConnector"
15	NeighbourServiceInConnector = true	16	NeighbourServiceInConnector = true
16	LandServiceInConnector = true	17	LandServiceInConnector = true
		18
		19	[GridService]
		20	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
		21	; for the LocalGridServicesConnector which is used by the Remote one
		22	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
		23	\ No newline at end of file


diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 3a8ec35..e9d3728 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example
@@ -15,6 +15,11 @@
15	;	15	;
16	InventoryServerURI = "http://myinventoryserver.com:8004"	16	InventoryServerURI = "http://myinventoryserver.com:8004"
17		17
		18	[GridService]
		19	;
		20	; change this to your grid-wide inventory server
		21	;
		22	GridServerURI = "http://mygridserver.com:8001"
18		23
19	[Modules]	24	[Modules]
20	;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.	25	;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.


diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 8b65ab8..1bfcf89 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini
@@ -11,9 +11,10 @@
11	AssetServices = "HGAssetBroker"	11	AssetServices = "HGAssetBroker"
12	InventoryServices = "HGInventoryBroker"	12	InventoryServices = "HGInventoryBroker"
13	NeighbourServices = "RemoteNeighbourServicesConnector"	13	NeighbourServices = "RemoteNeighbourServicesConnector"
		14	GridServices = "HGGridServicesConnector"
14	NeighbourServiceInConnector = true	15	NeighbourServiceInConnector = true
15	LandServiceInConnector = true	16	LandServiceInConnector = true
16		17	HypergridServiceInConnector = true
17		18
18	[AssetService]	19	[AssetService]
19	LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"	20	LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
@@ -22,3 +23,11 @@
22	[InventoryService]	23	[InventoryService]
23	LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteInventoryServicesConnector"	24	LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteInventoryServicesConnector"
24	HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"	25	HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
		26
		27	[GridService]
		28	; for the HGGridServicesConnector to instantiate
		29	GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
		30	; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
		31	; which in turn uses this
		32	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
		33	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"


diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 5a5cbff..a6c089c 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini
@@ -25,5 +25,4 @@
25		25
26	[GridService]	26	[GridService]
27	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"	27	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
28	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"	28	Realm = "regions"
29	\ No newline at end of file


diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index bac7983..b0e2de3 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example
@@ -32,3 +32,10 @@
32	[FreeswitchService]	32	[FreeswitchService]
33	;; Configuration for the freeswitch service goes here	33	;; Configuration for the freeswitch service goes here
34	LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"	34	LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
		35
		36	[GridService]
		37	;; For in-memory region storage (default)
		38	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
		39	;;--- For MySql region storage (alternative)
		40	;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
		41	;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"


diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index b14517d..75cdad9 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini
@@ -10,13 +10,15 @@
10	[Modules]	10	[Modules]
11	AssetServices = "HGAssetBroker"	11	AssetServices = "HGAssetBroker"
12	InventoryServices = "HGInventoryBroker"	12	InventoryServices = "HGInventoryBroker"
13	NeighbourServices = "LocalNeighbourServicesConnector"	13	NeighbourServices = "RemoteNeighbourServicesConnector"
14	AuthorizationServices = "LocalAuthorizationServicesConnector"	14	AuthorizationServices = "LocalAuthorizationServicesConnector"
15	GridServices = "HGGridServicesConnector"	15	GridServices = "HGGridServicesConnector"
16	InventoryServiceInConnector = true	16	InventoryServiceInConnector = true
17	AssetServiceInConnector = true	17	AssetServiceInConnector = true
18	HGAuthServiceInConnector = true	18	HGAuthServiceInConnector = true
19	HypergridServiceInConnector = true	19	HypergridServiceInConnector = true
		20	NeighbourServiceInConnector = true
		21
20		22
21	[AssetService]	23	[AssetService]
22	; For the AssetServiceInConnector	24	; For the AssetServiceInConnector
@@ -42,6 +44,8 @@
42	LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"	44	LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"
43		45
44	[GridService]	46	[GridService]
45	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"	47	; for the HGGridServicesConnector to instantiate
46	GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"	48	GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
47	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" \ No newline at end of file	49	; LocalGridServicesConnector needs this
		50	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
		51	Realm = "regions"