Author: timur
Date: Tue Apr 3 04:54:37 2012
New Revision: 1308685
URL: http://svn.apache.org/viewvc?rev=1308685&view=rev
Log:
OPENMEETINGS-127 importing room's sip numbers
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java?rev=1308685&r1=1308684&r2=1308685&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
Tue Apr 3 04:54:37 2012
@@ -841,7 +841,7 @@ public class Roommanagement {
Configuration conf = cfgManagement.getConfKey(3L,
"red5sip.enable");
if(conf != null && conf.getConf_value().equals("yes")) {
SipCreateConferenceRequestResult requestResult =
asteriskDbSipClient
- .createSIPConference(new
SIPCreateConferenceRequest());
+ .createSIPConference(new
SIPCreateConferenceRequest(sipNumber));
if(!requestResult.hasError()) {
r.setSipNumber(requestResult.getConferenceNumber());
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java?rev=1308685&r1=1308684&r2=1308685&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/AsteriskDbSipClient.java
Tue Apr 3 04:54:37 2012
@@ -58,7 +58,12 @@ public class AsteriskDbSipClient impleme
}
public SipCreateConferenceRequestResult
createSIPConference(SIPCreateConferenceRequest request) {
- String confno = asteriskDAO.addMeetMeConference();
+ String confno;
+ if(request.getSipNumber() != null &&
!request.getSipNumber().isEmpty()) {
+ confno = asteriskDAO.addMeetMeConference(request.getSipNumber());
+ } else {
+ confno = asteriskDAO.addMeetMeConference();
+ }
return new SipCreateConferenceRequestResult(confno, "") {
public boolean hasError() {
return false;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java?rev=1308685&r1=1308684&r2=1308685&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
Tue Apr 3 04:54:37 2012
@@ -66,24 +66,28 @@ public class AsteriskDAOImpl {
public String addMeetMeConference() {
int count = ((Number)em.createQuery("SELECT COUNT(m.confno) FROM
MeetMe AS m").getSingleResult()).intValue();
-
Configuration conf =
cfgManagement.getConfKey(3L,"red5sip.room_prefix");
String prefix = DEFAULT_SIP_CONTEXT;
if(conf != null) {
prefix = conf.getConf_value();
}
String confno = prefix+(count+1);
+ addMeetMeConference(confno);
+ return confno;
+ }
+
+ public String addMeetMeConference(String sipNumber) {
MeetMe mm = new MeetMe();
- mm.setConfno(confno);
+ mm.setConfno(sipNumber);
Extensions e = new Extensions();
e.setApp("MeetMe");
- e.setAppdata(confno + ",dM");
- e.setExten(confno);
+ e.setAppdata(sipNumber + ",dM");
+ e.setExten(sipNumber);
e.setContext("rooms");
e.setPriority(1);
em.persist(mm);
em.persist(e);
- return confno;
+ return sipNumber;
}
public Integer getConferensMembersNumber(String confNo) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java?rev=1308685&r1=1308684&r2=1308685&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/api/request/SIPCreateConferenceRequest.java
Tue Apr 3 04:54:37 2012
@@ -32,4 +32,8 @@ public class SIPCreateConferenceRequest
super();
this.sipNumber = sipNumber;
}
+
+ public String getSipNumber() {
+ return sipNumber;
+ }
}
\ No newline at end of file
