Revision: 3216
Author: seba.wagner
Date: Thu Apr 15 01:07:33 2010
Log: Fix URIUserIDAdd for SIP Gateway
http://code.google.com/p/openmeetings/source/detail?r=3216
Modified:
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java
/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/custom/OpenXGCustomXMLMarshall.java
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
Mon Mar 8 12:19:31 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
Thu Apr 15 01:07:33 2010
@@ -525,7 +525,7 @@
if (generateSipUserData) {
- UserSipData userSipData =
OpenXGHttpClient.getInstance().openSIPgUserCreateUser(firstname, "",
lastname, us.getAdresses().getEmail(), password);
+ UserSipData userSipData =
OpenXGHttpClient.getInstance().openSIPgUserCreateUser(firstname, "",
lastname, us.getAdresses().getEmail(), password, login);
if (us.getUserSipData() ==
null) {
Long userSipDataId =
UserSipDataDaoImpl.getInstance().addUserSipData(userSipData);
@@ -1042,7 +1042,7 @@
if (generateSipUserData) {
- UserSipData userSipData =
OpenXGHttpClient.getInstance().openSIPgUserCreateUser(firstname, "",
lastname, users.getAdresses().getEmail(), userpass);
+ UserSipData userSipData =
OpenXGHttpClient.getInstance().openSIPgUserCreateUser(firstname, "",
lastname, users.getAdresses().getEmail(), userpass, login);
Long userSipDataId =
UserSipDataDaoImpl.getInstance().addUserSipData(userSipData);
@@ -1153,7 +1153,7 @@
if (generateSipUserData) {
- UserSipData userSipData =
OpenXGHttpClient.getInstance().openSIPgUserCreateUser(firstname, "",
lastname, users.getAdresses().getEmail(), userpass);
+ UserSipData userSipData =
OpenXGHttpClient.getInstance().openSIPgUserCreateUser(firstname, "",
lastname, users.getAdresses().getEmail(), userpass, login);
Long userSipDataId =
UserSipDataDaoImpl.getInstance().addUserSipData(userSipData);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java
Thu Apr 8 11:31:29 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java
Thu Apr 15 01:07:33 2010
@@ -60,7 +60,7 @@
String email = "[email protected]";
String password = "password";
- UserSipData sipData = this.openSIPgUserCreateUser(first_name,
middle_i, last_name, email, password);
+ UserSipData sipData = this.openSIPgUserCreateUser(first_name,
middle_i, last_name, email, password, "test");
} catch (Exception err) {
@@ -81,7 +81,7 @@
* @return
*/
public UserSipData openSIPgUserCreateUser(String first_name, String
middle_i,
- String last_name, String email, String password) {
+ String last_name, String email, String login, String
password) {
try {
//Check if the OpenXG Gateway is enabled in general
@@ -154,18 +154,20 @@
// throw new Exception("You have no more numbers, you need to
allocate more numbers and alter the Configuration value sip.phonerange");
// }
- Long useridAsNumber = sipPhoneRangeStart +
sipPhoneRangeCurrentIndex;
-
-
log.debug("(sip_phonerange_start.getConf_value().length()) "+(sip_phonerange_start.getConf_value().length()+1));
-
- //The userid == the Number allocated in National Format!
- //The userid is calculated on the number of available numbers in the
range
- String userid =
String.format("%0"+(sip_phonerange_start.getConf_value().length())+"d",
useridAsNumber);
-
- sipPhoneRangeCurrentIndex++;
-
sip_phonerange_currentindex.setConf_value(""+sipPhoneRangeCurrentIndex);
-
-
Configurationmanagement.getInstance().updateConfig(sip_phonerange_currentindex);
+// Long useridAsNumber = sipPhoneRangeStart +
sipPhoneRangeCurrentIndex;
+//
+//
log.debug("(sip_phonerange_start.getConf_value().length()) "+(sip_phonerange_start.getConf_value().length()+1));
+//
+// //The userid == the Number allocated in National Format!
+// //The userid is calculated on the number of available numbers in the
range
+// String userid =
String.format("%0"+(sip_phonerange_start.getConf_value().length())+"d",
useridAsNumber);
+
+ String userid = login;
+
+// sipPhoneRangeCurrentIndex++;
+//
sip_phonerange_currentindex.setConf_value(""+sipPhoneRangeCurrentIndex);
+
+//
Configurationmanagement.getInstance().updateConfig(sip_phonerange_currentindex);
String digest = this.digest_calculate(new Object[]{client_id,
userid, domain,
first_name, middle_i,
last_name, password, community_code,
@@ -201,7 +203,8 @@
UserSipData userSipData = new UserSipData();
- userSipData.setUsername(sip_language_phonecode.getConf_value() +
useridAsNumber);
+ //userSipData.setUsername(sip_language_phonecode.getConf_value()
+ useridAsNumber);
+ userSipData.setUsername(userid);
userSipData.setUserpass(password);
userSipData.setAuthId(userid);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/custom/OpenXGCustomXMLMarshall.java
Thu Apr 8 11:31:29 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/custom/OpenXGCustomXMLMarshall.java
Thu Apr 15 01:07:33 2010
@@ -124,7 +124,7 @@
String stringToPost = "<?xml version=\"1.0\" ?>"+
"<methodCall>"+
- "
<methodName>OpenSIPg.UserConferenceAdd</methodName>"+
+ "
<methodName>OpenSIPg.URIUserIDAdd</methodName>"+
" <params>"+
"
<param>"+
"
<value>"+
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
