aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Hurliman2010-09-07 13:43:52 -0700
committerJohn Hurliman2010-09-07 13:43:52 -0700
commit587bab79b400b0a66d1a21328145b3d46f0b5599 (patch)
treec6f87f47c24941e02ecbfc4a00a9c1fd06ac864b
parent* Added sanity checks to the SimianAssetServiceConnector so it will throw a s... (diff)
parentFix Simian regression (diff)
downloadopensim-SC-587bab79b400b0a66d1a21328145b3d46f0b5599.zip
opensim-SC-587bab79b400b0a66d1a21328145b3d46f0b5599.tar.gz
opensim-SC-587bab79b400b0a66d1a21328145b3d46f0b5599.tar.bz2
opensim-SC-587bab79b400b0a66d1a21328145b3d46f0b5599.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs37
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs35
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs35
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs35
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs47
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs35
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs35
7 files changed, 140 insertions, 119 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index caeabb7..8f601e8 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
81 81
82 public SimianAssetServiceConnector(IConfigSource source) 82 public SimianAssetServiceConnector(IConfigSource source)
83 { 83 {
84 Initialise(source); 84 CommonInit(source);
85 } 85 }
86 86
87 public void Initialise(IConfigSource source) 87 public void Initialise(IConfigSource source)
@@ -91,25 +91,28 @@ namespace OpenSim.Services.Connectors.SimianGrid
91 { 91 {
92 string name = moduleConfig.GetString("AssetServices", ""); 92 string name = moduleConfig.GetString("AssetServices", "");
93 if (name == Name) 93 if (name == Name)
94 { 94 CommonInit(source);
95 IConfig gridConfig = source.Configs["AssetService"]; 95 }
96 if (gridConfig != null) 96 }
97 {
98 string serviceUrl = gridConfig.GetString("AssetServerURI");
99 if (!String.IsNullOrEmpty(serviceUrl))
100 {
101 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
102 serviceUrl = serviceUrl + '/';
103 m_serverUrl = serviceUrl;
104 }
105 }
106 97
107 if (String.IsNullOrEmpty(m_serverUrl)) 98 private void CommonInit(IConfigSource source)
108 m_log.Info("[SIMIAN ASSET CONNECTOR]: No AssetServerURI specified, disabling connector"); 99 {
109 else 100 IConfig gridConfig = source.Configs["AssetService"];
110 m_Enabled = true; 101 if (gridConfig != null)
102 {
103 string serviceUrl = gridConfig.GetString("AssetServerURI");
104 if (!String.IsNullOrEmpty(serviceUrl))
105 {
106 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
107 serviceUrl = serviceUrl + '/';
108 m_serverUrl = serviceUrl;
111 } 109 }
112 } 110 }
111
112 if (String.IsNullOrEmpty(m_serverUrl))
113 m_log.Info("[SIMIAN ASSET CONNECTOR]: No AssetServerURI specified, disabling connector");
114 else
115 m_Enabled = true;
113 } 116 }
114 117
115 #region IAssetService 118 #region IAssetService
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
index 68f73ee..51a09f8 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
69 69
70 public SimianAuthenticationServiceConnector(IConfigSource source) 70 public SimianAuthenticationServiceConnector(IConfigSource source)
71 { 71 {
72 Initialise(source); 72 CommonInit(source);
73 } 73 }
74 74
75 public void Initialise(IConfigSource source) 75 public void Initialise(IConfigSource source)
@@ -79,24 +79,27 @@ namespace OpenSim.Services.Connectors.SimianGrid
79 { 79 {
80 string name = moduleConfig.GetString("AuthenticationServices", ""); 80 string name = moduleConfig.GetString("AuthenticationServices", "");
81 if (name == Name) 81 if (name == Name)
82 { 82 CommonInit(source);
83 IConfig gridConfig = source.Configs["AuthenticationService"]; 83 }
84 if (gridConfig != null) 84 }
85 {
86 string serviceUrl = gridConfig.GetString("AuthenticationServerURI");
87 if (!String.IsNullOrEmpty(serviceUrl))
88 {
89 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
90 serviceUrl = serviceUrl + '/';
91 m_serverUrl = serviceUrl;
92 m_Enabled = true;
93 }
94 }
95 85
96 if (String.IsNullOrEmpty(m_serverUrl)) 86 private void CommonInit(IConfigSource source)
97 m_log.Info("[SIMIAN AUTH CONNECTOR]: No AuthenticationServerURI specified, disabling connector"); 87 {
88 IConfig gridConfig = source.Configs["AuthenticationService"];
89 if (gridConfig != null)
90 {
91 string serviceUrl = gridConfig.GetString("AuthenticationServerURI");
92 if (!String.IsNullOrEmpty(serviceUrl))
93 {
94 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
95 serviceUrl = serviceUrl + '/';
96 m_serverUrl = serviceUrl;
97 m_Enabled = true;
98 } 98 }
99 } 99 }
100
101 if (String.IsNullOrEmpty(m_serverUrl))
102 m_log.Info("[SIMIAN AUTH CONNECTOR]: No AuthenticationServerURI specified, disabling connector");
100 } 103 }
101 104
102 public string Authenticate(UUID principalID, string password, int lifetime) 105 public string Authenticate(UUID principalID, string password, int lifetime)
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
index 7e56bd1..3505c64 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
74 74
75 public SimianAvatarServiceConnector(IConfigSource source) 75 public SimianAvatarServiceConnector(IConfigSource source)
76 { 76 {
77 Initialise(source); 77 CommonInit(source);
78 } 78 }
79 79
80 public void Initialise(IConfigSource source) 80 public void Initialise(IConfigSource source)
@@ -84,24 +84,27 @@ namespace OpenSim.Services.Connectors.SimianGrid
84 { 84 {
85 string name = moduleConfig.GetString("AvatarServices", ""); 85 string name = moduleConfig.GetString("AvatarServices", "");
86 if (name == Name) 86 if (name == Name)
87 { 87 CommonInit(source);
88 IConfig gridConfig = source.Configs["AvatarService"]; 88 }
89 if (gridConfig != null) 89 }
90 {
91 string serviceUrl = gridConfig.GetString("AvatarServerURI");
92 if (!String.IsNullOrEmpty(serviceUrl))
93 {
94 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
95 serviceUrl = serviceUrl + '/';
96 m_serverUrl = serviceUrl;
97 m_Enabled = true;
98 }
99 }
100 90
101 if (String.IsNullOrEmpty(m_serverUrl)) 91 private void CommonInit(IConfigSource source)
102 m_log.Info("[SIMIAN AVATAR CONNECTOR]: No AvatarServerURI specified, disabling connector"); 92 {
93 IConfig gridConfig = source.Configs["AvatarService"];
94 if (gridConfig != null)
95 {
96 string serviceUrl = gridConfig.GetString("AvatarServerURI");
97 if (!String.IsNullOrEmpty(serviceUrl))
98 {
99 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
100 serviceUrl = serviceUrl + '/';
101 m_serverUrl = serviceUrl;
102 m_Enabled = true;
103 } 103 }
104 } 104 }
105
106 if (String.IsNullOrEmpty(m_serverUrl))
107 m_log.Info("[SIMIAN AVATAR CONNECTOR]: No AvatarServerURI specified, disabling connector");
105 } 108 }
106 109
107 #region IAvatarService 110 #region IAvatarService
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index a94620b..4409d5c 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
98 98
99 public SimianGridServiceConnector(IConfigSource source) 99 public SimianGridServiceConnector(IConfigSource source)
100 { 100 {
101 Initialise(source); 101 CommonInit(source);
102 } 102 }
103 103
104 public void Initialise(IConfigSource source) 104 public void Initialise(IConfigSource source)
@@ -108,24 +108,27 @@ namespace OpenSim.Services.Connectors.SimianGrid
108 { 108 {
109 string name = moduleConfig.GetString("GridServices", ""); 109 string name = moduleConfig.GetString("GridServices", "");
110 if (name == Name) 110 if (name == Name)
111 { 111 CommonInit(source);
112 IConfig gridConfig = source.Configs["GridService"]; 112 }
113 if (gridConfig != null) 113 }
114 {
115 string serviceUrl = gridConfig.GetString("GridServerURI");
116 if (!String.IsNullOrEmpty(serviceUrl))
117 {
118 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
119 serviceUrl = serviceUrl + '/';
120 m_serverUrl = serviceUrl;
121 m_Enabled = true;
122 }
123 }
124 114
125 if (String.IsNullOrEmpty(m_serverUrl)) 115 private void CommonInit(IConfigSource source)
126 m_log.Info("[SIMIAN GRID CONNECTOR]: No GridServerURI specified, disabling connector"); 116 {
117 IConfig gridConfig = source.Configs["GridService"];
118 if (gridConfig != null)
119 {
120 string serviceUrl = gridConfig.GetString("GridServerURI");
121 if (!String.IsNullOrEmpty(serviceUrl))
122 {
123 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
124 serviceUrl = serviceUrl + '/';
125 m_serverUrl = serviceUrl;
126 m_Enabled = true;
127 } 127 }
128 } 128 }
129
130 if (String.IsNullOrEmpty(m_serverUrl))
131 m_log.Info("[SIMIAN GRID CONNECTOR]: No GridServerURI specified, disabling connector");
129 } 132 }
130 133
131 #region IGridService 134 #region IGridService
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
index eb118ae..470eccd 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
88 88
89 public SimianInventoryServiceConnector(IConfigSource source) 89 public SimianInventoryServiceConnector(IConfigSource source)
90 { 90 {
91 Initialise(source); 91 CommonInit(source);
92 } 92 }
93 93
94 public void Initialise(IConfigSource source) 94 public void Initialise(IConfigSource source)
@@ -98,36 +98,39 @@ namespace OpenSim.Services.Connectors.SimianGrid
98 { 98 {
99 string name = moduleConfig.GetString("InventoryServices", ""); 99 string name = moduleConfig.GetString("InventoryServices", "");
100 if (name == Name) 100 if (name == Name)
101 CommonInit(source);
102 }
103 }
104
105 private void CommonInit(IConfigSource source)
106 {
107 IConfig gridConfig = source.Configs["InventoryService"];
108 if (gridConfig != null)
109 {
110 string serviceUrl = gridConfig.GetString("InventoryServerURI");
111 if (!String.IsNullOrEmpty(serviceUrl))
101 { 112 {
102 IConfig gridConfig = source.Configs["InventoryService"]; 113 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
114 serviceUrl = serviceUrl + '/';
115 m_serverUrl = serviceUrl;
116
117 gridConfig = source.Configs["UserAccountService"];
103 if (gridConfig != null) 118 if (gridConfig != null)
104 { 119 {
105 string serviceUrl = gridConfig.GetString("InventoryServerURI"); 120 serviceUrl = gridConfig.GetString("UserAccountServerURI");
106 if (!String.IsNullOrEmpty(serviceUrl)) 121 if (!String.IsNullOrEmpty(serviceUrl))
107 { 122 {
108 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("=")) 123 m_userServerUrl = serviceUrl;
109 serviceUrl = serviceUrl + '/'; 124 m_Enabled = true;
110 m_serverUrl = serviceUrl;
111
112 gridConfig = source.Configs["UserAccountService"];
113 if (gridConfig != null)
114 {
115 serviceUrl = gridConfig.GetString("UserAccountServerURI");
116 if (!String.IsNullOrEmpty(serviceUrl))
117 {
118 m_userServerUrl = serviceUrl;
119 m_Enabled = true;
120 }
121 }
122 } 125 }
123 } 126 }
124
125 if (String.IsNullOrEmpty(m_serverUrl))
126 m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No InventoryServerURI specified, disabling connector");
127 else if (String.IsNullOrEmpty(m_userServerUrl))
128 m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No UserAccountServerURI specified, disabling connector");
129 } 127 }
130 } 128 }
129
130 if (String.IsNullOrEmpty(m_serverUrl))
131 m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No InventoryServerURI specified, disabling connector");
132 else if (String.IsNullOrEmpty(m_userServerUrl))
133 m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No UserAccountServerURI specified, disabling connector");
131 } 134 }
132 135
133 /// <summary> 136 /// <summary>
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index 074c80f..077be3c 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
99 99
100 public SimianPresenceServiceConnector(IConfigSource source) 100 public SimianPresenceServiceConnector(IConfigSource source)
101 { 101 {
102 Initialise(source); 102 CommonInit(source);
103 } 103 }
104 104
105 public void Initialise(IConfigSource source) 105 public void Initialise(IConfigSource source)
@@ -109,24 +109,27 @@ namespace OpenSim.Services.Connectors.SimianGrid
109 { 109 {
110 string name = moduleConfig.GetString("PresenceServices", ""); 110 string name = moduleConfig.GetString("PresenceServices", "");
111 if (name == Name) 111 if (name == Name)
112 CommonInit(source);
113 }
114 }
115
116 private void CommonInit(IConfigSource source)
117 {
118 IConfig gridConfig = source.Configs["PresenceService"];
119 if (gridConfig != null)
120 {
121 string serviceUrl = gridConfig.GetString("PresenceServerURI");
122 if (!String.IsNullOrEmpty(serviceUrl))
112 { 123 {
113 IConfig gridConfig = source.Configs["PresenceService"]; 124 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
114 if (gridConfig != null) 125 serviceUrl = serviceUrl + '/';
115 { 126 m_serverUrl = serviceUrl;
116 string serviceUrl = gridConfig.GetString("PresenceServerURI"); 127 m_Enabled = true;
117 if (!String.IsNullOrEmpty(serviceUrl))
118 {
119 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
120 serviceUrl = serviceUrl + '/';
121 m_serverUrl = serviceUrl;
122 m_Enabled = true;
123 }
124 }
125
126 if (String.IsNullOrEmpty(m_serverUrl))
127 m_log.Info("[SIMIAN PRESENCE CONNECTOR]: No PresenceServerURI specified, disabling connector");
128 } 128 }
129 } 129 }
130
131 if (String.IsNullOrEmpty(m_serverUrl))
132 m_log.Info("[SIMIAN PRESENCE CONNECTOR]: No PresenceServerURI specified, disabling connector");
130 } 133 }
131 134
132 #region IPresenceService 135 #region IPresenceService
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
index 991c0f3..446ac71 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
73 73
74 public SimianUserAccountServiceConnector(IConfigSource source) 74 public SimianUserAccountServiceConnector(IConfigSource source)
75 { 75 {
76 Initialise(source); 76 CommonInit(source);
77 } 77 }
78 78
79 public void Initialise(IConfigSource source) 79 public void Initialise(IConfigSource source)
@@ -83,24 +83,27 @@ namespace OpenSim.Services.Connectors.SimianGrid
83 { 83 {
84 string name = moduleConfig.GetString("UserAccountServices", ""); 84 string name = moduleConfig.GetString("UserAccountServices", "");
85 if (name == Name) 85 if (name == Name)
86 { 86 CommonInit(source);
87 IConfig gridConfig = source.Configs["UserAccountService"]; 87 }
88 if (gridConfig != null) 88 }
89 {
90 string serviceUrl = gridConfig.GetString("UserAccountServerURI");
91 if (!String.IsNullOrEmpty(serviceUrl))
92 {
93 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
94 serviceUrl = serviceUrl + '/';
95 m_serverUrl = serviceUrl;
96 m_Enabled = true;
97 }
98 }
99 89
100 if (String.IsNullOrEmpty(m_serverUrl)) 90 private void CommonInit(IConfigSource source)
101 m_log.Info("[SIMIAN ACCOUNT CONNECTOR]: No UserAccountServerURI specified, disabling connector"); 91 {
92 IConfig gridConfig = source.Configs["UserAccountService"];
93 if (gridConfig != null)
94 {
95 string serviceUrl = gridConfig.GetString("UserAccountServerURI");
96 if (!String.IsNullOrEmpty(serviceUrl))
97 {
98 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
99 serviceUrl = serviceUrl + '/';
100 m_serverUrl = serviceUrl;
101 m_Enabled = true;
102 } 102 }
103 } 103 }
104
105 if (String.IsNullOrEmpty(m_serverUrl))
106 m_log.Info("[SIMIAN ACCOUNT CONNECTOR]: No UserAccountServerURI specified, disabling connector");
104 } 107 }
105 108
106 public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName) 109 public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
generated by cgit v1.1 at 2024-12-25 23:45:25 +0000