Author: solomax
Date: Sat May 21 04:57:42 2016
New Revision: 1744828
URL: http://svn.apache.org/viewvc?rev=1744828&view=rev
Log:
[OPENMEETINGS-1384] originate action seems to be fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java?rev=1744828&r1=1744827&r2=1744828&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
Sat May 21 04:57:42 2016
@@ -31,7 +31,6 @@ import org.asteriskjava.manager.action.D
import org.asteriskjava.manager.action.EventGeneratingAction;
import org.asteriskjava.manager.action.ManagerAction;
import org.asteriskjava.manager.action.OriginateAction;
-import org.asteriskjava.manager.internal.ManagerConnectionImpl;
import org.asteriskjava.manager.response.ManagerError;
import org.asteriskjava.manager.response.ManagerResponse;
import org.red5.logging.Red5LoggerFactory;
@@ -181,11 +180,11 @@ public class SipDao {
}
OriginateAction oa = new OriginateAction();
- oa.setChannel(String.format("Local/%s@rooms-out", number));
- //oa.setContext("rooms-out");
- oa.setExten(String.format("%s@rooms-originate", sipNumber));
+ oa.setChannel(String.format("Local/%s@rooms-originate",
sipNumber));
+ oa.setContext("rooms-out");
+ oa.setExten(number);
oa.setPriority(1);
- oa.setTimeout(30000L);
+ oa.setTimeout(timeout);
exec(oa); //TODO handle response
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java?rev=1744828&r1=1744827&r2=1744828&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
Sat May 21 04:57:42 2016
@@ -19,6 +19,7 @@
package org.apache.openmeetings.db.dao.room;
import org.apache.openmeetings.db.entity.room.Room;
+import org.asteriskjava.manager.DefaultManagerConnection;
import org.asteriskjava.manager.ManagerConnection;
import org.asteriskjava.manager.ManagerConnectionFactory;
import org.asteriskjava.manager.ResponseEvents;
@@ -30,7 +31,6 @@ import org.asteriskjava.manager.action.D
import org.asteriskjava.manager.action.EventGeneratingAction;
import org.asteriskjava.manager.action.ManagerAction;
import org.asteriskjava.manager.action.OriginateAction;
-import org.asteriskjava.manager.internal.ManagerConnectionImpl;
import org.asteriskjava.manager.response.ManagerError;
import org.asteriskjava.manager.response.ManagerResponse;
import org.red5.logging.Red5LoggerFactory;
@@ -180,11 +180,11 @@ public class SipDao {
}
OriginateAction oa = new OriginateAction();
- oa.setChannel(String.format("Local/%s@rooms-out", number));
- //oa.setContext("rooms-out");
- oa.setExten(String.format("%s@rooms-originate", sipNumber));
+ oa.setChannel(String.format("Local/%s@rooms-originate",
sipNumber));
+ oa.setContext("rooms-out");
+ oa.setExten(number);
oa.setPriority(1);
- oa.setTimeout(30000L);
+ oa.setTimeout(timeout);
exec(oa); //TODO handle response
}
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java?rev=1744828&r1=1744827&r2=1744828&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
Sat May 21 04:57:42 2016
@@ -19,6 +19,7 @@
package org.apache.openmeetings.db.dao.room;
import org.apache.openmeetings.db.entity.room.Room;
+import org.asteriskjava.manager.DefaultManagerConnection;
import org.asteriskjava.manager.ManagerConnection;
import org.asteriskjava.manager.ManagerConnectionFactory;
import org.asteriskjava.manager.ResponseEvents;
@@ -30,7 +31,6 @@ import org.asteriskjava.manager.action.D
import org.asteriskjava.manager.action.EventGeneratingAction;
import org.asteriskjava.manager.action.ManagerAction;
import org.asteriskjava.manager.action.OriginateAction;
-import org.asteriskjava.manager.internal.ManagerConnectionImpl;
import org.asteriskjava.manager.response.ManagerError;
import org.asteriskjava.manager.response.ManagerResponse;
import org.red5.logging.Red5LoggerFactory;
@@ -180,11 +180,11 @@ public class SipDao {
}
OriginateAction oa = new OriginateAction();
- oa.setChannel(String.format("Local/%s@rooms-out", number));
- //oa.setContext("rooms-out");
- oa.setExten(String.format("%s@rooms-originate", sipNumber));
+ oa.setChannel(String.format("Local/%s@rooms-originate",
sipNumber));
+ oa.setContext("rooms-out");
+ oa.setExten(number);
oa.setPriority(1);
- oa.setTimeout(30000L);
+ oa.setTimeout(timeout);
exec(oa); //TODO handle response
}
