From 35deff7ec4df6156abccdbeed83b14a6083e28f9 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 23 Sep 2009 09:27:01 -0700 Subject: Modules active. Tested HGGridConnector in standalone only for now. Modules commands work. --- bin/config-include/Standalone.ini | 5 +++++ bin/config-include/StandaloneHypergrid.ini | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'bin/config-include') diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 24020b6..69c60ee 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -12,6 +12,7 @@ InventoryServices = "LocalInventoryServicesConnector" NeighbourServices = "LocalNeighbourServicesConnector" AuthorizationServices = "LocalAuthorizationServicesConnector" + GridServices = "LocalGridServicesConnector" [AssetService] LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" @@ -21,3 +22,7 @@ [AuthorizationService] LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService" + +[GridService] + LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" + \ No newline at end of file diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index aa122be..24b0f26 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -12,9 +12,11 @@ InventoryServices = "HGInventoryBroker" NeighbourServices = "LocalNeighbourServicesConnector" AuthorizationServices = "LocalAuthorizationServicesConnector" + GridServices = "HGGridServicesConnector" InventoryServiceInConnector = true AssetServiceInConnector = true HGAuthServiceInConnector = true + HypergridServiceInConnector = true [AssetService] ; For the AssetServiceInConnector @@ -39,4 +41,7 @@ ; For the HGAuthServiceInConnector LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService" - \ No newline at end of file +[GridService] + LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" + GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServiceConnector" + StorageProvider = "OpenSim.Data.Null.dll" \ No newline at end of file -- cgit v1.1 From 67276589c883fe1a74d8d52057db1431d637dade Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 23 Sep 2009 17:20:07 -0700 Subject: Changed IGridService to use the new GridRegion data structure instead of old SimpleRegionInfo. Added grid configs to standalones. --- bin/config-include/Standalone.ini | 1 + bin/config-include/StandaloneHypergrid.ini | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'bin/config-include') diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 69c60ee..5a5cbff 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -25,4 +25,5 @@ [GridService] LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" + StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" \ No newline at end of file diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 24b0f26..b14517d 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -43,5 +43,5 @@ [GridService] LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" - GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServiceConnector" - StorageProvider = "OpenSim.Data.Null.dll" \ No newline at end of file + GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector" + StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" \ No newline at end of file -- cgit v1.1 From ae222140ca6984750f53716088b6df165d8a35e5 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 26 Sep 2009 10:08:59 -0700 Subject: Finished spec-ing the .inis for the new grid service modules. --- bin/config-include/Grid.ini | 7 +++++++ bin/config-include/GridCommon.ini.example | 5 +++++ bin/config-include/GridHypergrid.ini | 11 ++++++++++- bin/config-include/Standalone.ini | 3 +-- bin/config-include/StandaloneCommon.ini.example | 7 +++++++ bin/config-include/StandaloneHypergrid.ini | 6 ++++-- 6 files changed, 34 insertions(+), 5 deletions(-) (limited to 'bin/config-include') 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..2724c42 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:8002" [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" - \ No newline at end of file + Realm = "regions" 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..793f4d5 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -42,6 +42,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" -- cgit v1.1 From 368ae02dc9f7786545342d7bffae5de28678e85f Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 26 Sep 2009 10:18:22 -0700 Subject: Corrected the port number to 8001 in the test client and grid ini. --- bin/config-include/GridCommon.ini.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/config-include') diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 2724c42..e9d3728 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example @@ -19,7 +19,7 @@ ; ; change this to your grid-wide inventory server ; - GridServerURI = "http://mygridserver.com:8002" + GridServerURI = "http://mygridserver.com:8001" [Modules] ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. -- cgit v1.1 From 8b2b8801e63fbcf5252e5ddbb40438e224025348 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 27 Sep 2009 14:32:03 -0700 Subject: Fixed port in GridServer.ini. Added new configs for StandaloneHypergrid.ini --- bin/config-include/StandaloneHypergrid.ini | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'bin/config-include') diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 793f4d5..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 -- cgit v1.1 From b1d204802fa1c07e3b00d0b363346673b763d67b Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Tue, 29 Sep 2009 16:13:07 -0700 Subject: Minor bug fixes. --- bin/config-include/GridHypergrid.ini | 3 +++ bin/config-include/StandaloneHypergrid.ini | 3 +++ 2 files changed, 6 insertions(+) (limited to 'bin/config-include') diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 1bfcf89..f5aa603 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -7,6 +7,9 @@ [Includes] Include-Common = "config-include/GridCommon.ini" +[Startup] + hypergrid = true + [Modules] AssetServices = "HGAssetBroker" InventoryServices = "HGInventoryBroker" diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 75cdad9..baff811 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -7,6 +7,9 @@ [Includes] Include-Common = "config-include/StandaloneCommon.ini" +[Startup] + hypergrid = true + [Modules] AssetServices = "HGAssetBroker" InventoryServices = "HGInventoryBroker" -- cgit v1.1