Revision: 3218
Author: seba.wagner
Date: Thu Apr 15 05:11:30 2010
Log: SIP Fields, Log XML-RPC Requests in separated Table + Conference SIP
Number in Room-Configuration
http://code.google.com/p/openmeetings/source/detail?r=3218
Added:
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/sip
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/sip/OpenXGReturnObject.hbm.xml
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/sip/OpenXGReturnObject.java
/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/custom/dao
/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/custom/dao/OpenXGReturnObjectDaoImpl.java
Deleted:
/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/custom/OpenXGReturnObject.java
Modified:
/trunk/singlewebapp/WebContent/conf/any_hibernate.cfg.xml
/trunk/singlewebapp/WebContent/conf/hibernate.cfg.xml
/trunk/singlewebapp/WebContent/conf/mysql_hibernate.cfg.xml
/trunk/singlewebapp/WebContent/conf/postgres_hibernate.cfg.xml
/trunk/singlewebapp/WebContent/languages/arabic.xml
/trunk/singlewebapp/WebContent/languages/bulgarian.xml
/trunk/singlewebapp/WebContent/languages/catalan.xml
/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
/trunk/singlewebapp/WebContent/languages/czech.xml
/trunk/singlewebapp/WebContent/languages/deutsch.xml
/trunk/singlewebapp/WebContent/languages/dutch.xml
/trunk/singlewebapp/WebContent/languages/english.xml
/trunk/singlewebapp/WebContent/languages/finnish.xml
/trunk/singlewebapp/WebContent/languages/french.xml
/trunk/singlewebapp/WebContent/languages/galician.xml
/trunk/singlewebapp/WebContent/languages/greek.xml
/trunk/singlewebapp/WebContent/languages/hebrew.xml
/trunk/singlewebapp/WebContent/languages/hungarian.xml
/trunk/singlewebapp/WebContent/languages/indonesian.xml
/trunk/singlewebapp/WebContent/languages/italian.xml
/trunk/singlewebapp/WebContent/languages/japanese.xml
/trunk/singlewebapp/WebContent/languages/korean.xml
/trunk/singlewebapp/WebContent/languages/persian.xml
/trunk/singlewebapp/WebContent/languages/polish.xml
/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
/trunk/singlewebapp/WebContent/languages/portugues.xml
/trunk/singlewebapp/WebContent/languages/russian.xml
/trunk/singlewebapp/WebContent/languages/spanish.xml
/trunk/singlewebapp/WebContent/languages/swedish.xml
/trunk/singlewebapp/WebContent/languages/thai.xml
/trunk/singlewebapp/WebContent/languages/turkish.xml
/trunk/singlewebapp/WebContent/languages/ukrainian.xml
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/admin/roomadmin/roomValueForm.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/invitation/autoloaderBarOnly.lzx
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/rooms/Rooms.hbm.xml
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/rooms/Rooms.java
/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java
=======================================
--- /dev/null
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/sip/OpenXGReturnObject.hbm.xml
Thu Apr 15 05:11:30 2010
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD
3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
+
+<hibernate-mapping>
+ <class table="open_xg_return_object" lazy="false"
name="org.openmeetings.app.hibernate.beans.sip.OpenXGReturnObject">
+ <id column="open_xg_return_object_id" name="openXGReturnObjectId">
+ <generator class="increment"/>
+ </id>
+ <property name="methodName" type="string" column="method_name"/>
+ <property name="inserted" type="java.util.Date" column="inserted"/>
+ <property name="status_code" type="string" column="status_code"/>
+ <property name="status_string" type="string" column="status_string"/>
+ <property name="conferenceNumber" type="string"
column="conference_number"/>
+ <property name="conferencePin" type="string" column="conference_pin"/>
+ </class>
+</hibernate-mapping>
=======================================
--- /dev/null
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/sip/OpenXGReturnObject.java
Thu Apr 15 05:11:30 2010
@@ -0,0 +1,106 @@
+package org.openmeetings.app.hibernate.beans.sip;
+
+import java.util.Date;
+
+/**
+ *
+ * @hibernate.class table="open_xg_return_object"
+ * lazy="false"
+ *
+ */
+public class OpenXGReturnObject {
+
+ private Long openXGReturnObjectId;
+ private String methodName;
+ private Date inserted;
+ private String status_code;
+ private String status_string;
+ private String conferenceNumber;
+ private String conferencePin;
+
+ /**
+ *
+ * @hibernate.id
+ * column="open_xg_return_object_id"
+ * generator-class="increment"
+ */
+ public Long getOpenXGReturnObjectId() {
+ return openXGReturnObjectId;
+ }
+ public void setOpenXGReturnObjectId(Long openXGReturnObjectId) {
+ this.openXGReturnObjectId = openXGReturnObjectId;
+ }
+
+ /**
+ * @hibernate.property
+ * column="method_name"
+ * type="string"
+ */
+ public String getMethodName() {
+ return methodName;
+ }
+ public void setMethodName(String methodName) {
+ this.methodName = methodName;
+ }
+
+ /**
+ * @hibernate.property
+ * column="inserted"
+ * type="java.util.Date"
+ */
+ public Date getInserted() {
+ return inserted;
+ }
+ public void setInserted(Date inserted) {
+ this.inserted = inserted;
+ }
+
+ /**
+ * @hibernate.property
+ * column="status_code"
+ * type="string"
+ */
+ public String getStatus_code() {
+ return status_code;
+ }
+ public void setStatus_code(String statusCode) {
+ status_code = statusCode;
+ }
+
+ /**
+ * @hibernate.property
+ * column="status_string"
+ * type="string"
+ */
+ public String getStatus_string() {
+ return status_string;
+ }
+ public void setStatus_string(String statusString) {
+ status_string = statusString;
+ }
+
+ /**
+ * @hibernate.property
+ * column="conference_number"
+ * type="string"
+ */
+ public String getConferenceNumber() {
+ return conferenceNumber;
+ }
+ public void setConferenceNumber(String conferenceNumber) {
+ this.conferenceNumber = conferenceNumber;
+ }
+
+ /**
+ * @hibernate.property
+ * column="conference_pin"
+ * type="string"
+ */
+ public String getConferencePin() {
+ return conferencePin;
+ }
+ public void setConferencePin(String conferencePin) {
+ this.conferencePin = conferencePin;
+ }
+
+}
=======================================
--- /dev/null
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/custom/dao/OpenXGReturnObjectDaoImpl.java
Thu Apr 15 05:11:30 2010
@@ -0,0 +1,50 @@
+package org.openmeetings.app.sip.xmlrpc.custom.dao;
+
+import java.util.Date;
+
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.openmeetings.app.hibernate.beans.sip.OpenXGReturnObject;
+import org.openmeetings.app.hibernate.utils.HibernateUtil;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+
+public class OpenXGReturnObjectDaoImpl {
+
+ private static final Logger log =
Red5LoggerFactory.getLogger(OpenXGReturnObjectDaoImpl.class, "openmeetings");
+
+ private OpenXGReturnObjectDaoImpl() {
+ }
+
+ private static OpenXGReturnObjectDaoImpl instance = null;
+
+ public static synchronized OpenXGReturnObjectDaoImpl getInstance() {
+ if (instance == null) {
+ instance = new OpenXGReturnObjectDaoImpl();
+ }
+ return instance;
+ }
+
+ public String addOpenXGReturnObject(OpenXGReturnObject
openXGReturnObject) {
+ try {
+
+ openXGReturnObject.setInserted(new Date());
+
+ Object idf = HibernateUtil.createSession();
+ Session session = HibernateUtil.getSession();
+ Transaction tx = session.beginTransaction();
+
+ session.save(openXGReturnObject);
+
+ tx.commit();
+ HibernateUtil.closeSession(idf);
+
+ } catch (HibernateException ex) {
+ log.error("[addOpenXGReturnObject]: ",ex);
+ } catch (Exception ex2) {
+ log.error("[addOpenXGReturnObject]: ",ex2);
+ }
+ return null;
+}
+}
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/custom/OpenXGReturnObject.java
Mon Mar 8 12:19:31 2010
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.openmeetings.app.sip.xmlrpc.custom;
-
-public class OpenXGReturnObject {
-
- private String status_code;
- private String status_string;
-
- public String getStatus_code() {
- return status_code;
- }
- public void setStatus_code(String statusCode) {
- status_code = statusCode;
- }
- public String getStatus_string() {
- return status_string;
- }
- public void setStatus_string(String statusString) {
- status_string = statusString;
- }
-
-}
=======================================
--- /trunk/singlewebapp/WebContent/conf/any_hibernate.cfg.xml Thu Jan 21
05:58:03 2010
+++ /trunk/singlewebapp/WebContent/conf/any_hibernate.cfg.xml Thu Apr 15
05:11:30 2010
@@ -81,6 +81,7 @@
<mapping
resource="org/openmeetings/app/hibernate/beans/rooms/RoomTypes.hbm.xml"/>
<mapping
resource="org/openmeetings/app/hibernate/beans/rooms/Rooms.hbm.xml"/>
<mapping
resource="org/openmeetings/app/hibernate/beans/rooms/Rooms_Organisation.hbm.xml"/>
+ <mapping
resource="org/openmeetings/app/hibernate/beans/sip/OpenXGReturnObject.hbm.xml"/>
<mapping
resource="org/openmeetings/app/hibernate/beans/user/Salutations.hbm.xml"/>
<mapping
resource="org/openmeetings/app/hibernate/beans/user/UserSipData.hbm.xml"/>
<mapping
resource="org/openmeetings/app/hibernate/beans/user/Userdata.hbm.xml"/>
=======================================
--- /trunk/singlewebapp/WebContent/conf/hibernate.cfg.xml Mon Feb 22
00:50:57 2010
+++ /trunk/singlewebapp/WebContent/conf/hibernate.cfg.xml Thu Apr 15
05:11:30 2010
@@ -87,6 +87,7 @@
<mapping
resource="org/openmeetings/app/hibernate/beans/rooms/RoomTypes.hbm.xml"/>
<mapping
resource="org/openmeetings/app/hibernate/beans/rooms/Rooms.hbm.xml"/>
<mapping
resource="org/openmeetings/app/hibernate/beans/rooms/Rooms_Organisation.hbm.xml"/>
+ <mapping
resource="org/openmeetings/app/hibernate/beans/sip/OpenXGReturnObject.hbm.xml"/>
<mapping
resource="org/openmeetings/app/hibernate/beans/user/Salutations.hbm.xml"/>
<mapping
resource="org/openmeetings/app/hibernate/beans/user/UserSipData.hbm.xml"/>
<mapping
resource="org/openmeetings/app/hibernate/beans/user/Userdata.hbm.xml"/>
=======================================
--- /trunk/singlewebapp/WebContent/conf/mysql_hibernate.cfg.xml Thu Jan 21
05:58:03 2010
+++ /trunk/singlewebapp/WebContent/conf/mysql_hibernate.cfg.xml Thu Apr 15
05:11:30 2010
@@ -87,6 +87,7 @@
<mapping
resource="org/openmeetings/app/hibernate/beans/rooms/RoomTypes.hbm.xml"/>
<mapping
resource="org/openmeetings/app/hibernate/beans/rooms/Rooms.hbm.xml"/>
<mapping
resource="org/openmeetings/app/hibernate/beans/rooms/Rooms_Organisation.hbm.xml"/>
+ <mapping
resource="org/openmeetings/app/hibernate/beans/sip/OpenXGReturnObject.hbm.xml"/>
<mapping
resource="org/openmeetings/app/hibernate/beans/user/Salutations.hbm.xml"/>
<mapping
resource="org/openmeetings/app/hibernate/beans/user/UserSipData.hbm.xml"/>
<mapping
resource="org/openmeetings/app/hibernate/beans/user/Userdata.hbm.xml"/>
=======================================
--- /trunk/singlewebapp/WebContent/conf/postgres_hibernate.cfg.xml Thu Jan
21 05:58:03 2010
+++ /trunk/singlewebapp/WebContent/conf/postgres_hibernate.cfg.xml Thu Apr
15 05:11:30 2010
@@ -70,6 +70,7 @@
<mapping
resource="org/openmeetings/app/hibernate/beans/rooms/RoomTypes.hbm.xml"/>
<mapping
resource="org/openmeetings/app/hibernate/beans/rooms/Rooms.hbm.xml"/>
<mapping
resource="org/openmeetings/app/hibernate/beans/rooms/Rooms_Organisation.hbm.xml"/>
+ <mapping
resource="org/openmeetings/app/hibernate/beans/sip/OpenXGReturnObject.hbm.xml"/>
<mapping
resource="org/openmeetings/app/hibernate/beans/user/Salutations.hbm.xml"/>
<mapping
resource="org/openmeetings/app/hibernate/beans/user/UserSipData.hbm.xml"/>
<mapping
resource="org/openmeetings/app/hibernate/beans/user/Userdata.hbm.xml"/>
=======================================
--- /trunk/singlewebapp/WebContent/languages/arabic.xml Fri Apr 9 00:48:34
2010
+++ /trunk/singlewebapp/WebContent/languages/arabic.xml Thu Apr 15 05:11:30
2010
@@ -3007,4 +3007,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/bulgarian.xml Thu Apr 15
01:52:13 2010
+++ /trunk/singlewebapp/WebContent/languages/bulgarian.xml Thu Apr 15
05:11:30 2010
@@ -3005,4 +3005,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/catalan.xml Thu Apr 15
01:52:13 2010
+++ /trunk/singlewebapp/WebContent/languages/catalan.xml Thu Apr 15
05:11:30 2010
@@ -3006,4 +3006,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Thu Apr
15 01:52:13 2010
+++ /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Thu Apr
15 05:11:30 2010
@@ -3006,4 +3006,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese traditional.xml Thu
Apr 15 01:52:13 2010
+++ /trunk/singlewebapp/WebContent/languages/chinese traditional.xml Thu
Apr 15 05:11:30 2010
@@ -3012,4 +3012,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/czech.xml Thu Apr 15 01:52:13
2010
+++ /trunk/singlewebapp/WebContent/languages/czech.xml Thu Apr 15 05:11:30
2010
@@ -3006,4 +3006,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/deutsch.xml Thu Apr 15
01:52:13 2010
+++ /trunk/singlewebapp/WebContent/languages/deutsch.xml Thu Apr 15
05:11:30 2010
@@ -3006,4 +3006,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/dutch.xml Thu Apr 15 01:52:13
2010
+++ /trunk/singlewebapp/WebContent/languages/dutch.xml Thu Apr 15 05:11:30
2010
@@ -3005,4 +3005,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/english.xml Thu Apr 15
01:52:13 2010
+++ /trunk/singlewebapp/WebContent/languages/english.xml Thu Apr 15
05:11:30 2010
@@ -700,7 +700,7 @@
<value>Wrong password</value>
</string>
<string id="232" name="user_registerFalsePWDHeader">
- <value>Please enter two identical passwords with minimum 6
chars</value>
+ <value>Please enter two identical passwords</value>
</string>
<string id="233" name="user_registerMailError">
<value>Wrong email</value>
@@ -3006,4 +3006,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/finnish.xml Thu Apr 15
01:52:13 2010
+++ /trunk/singlewebapp/WebContent/languages/finnish.xml Thu Apr 15
05:11:30 2010
@@ -3005,4 +3005,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/french.xml Thu Apr 15 01:52:13
2010
+++ /trunk/singlewebapp/WebContent/languages/french.xml Thu Apr 15 05:11:30
2010
@@ -3006,4 +3006,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/galician.xml Thu Apr 15
01:52:13 2010
+++ /trunk/singlewebapp/WebContent/languages/galician.xml Thu Apr 15
05:11:30 2010
@@ -3006,4 +3006,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/greek.xml Thu Apr 15 01:52:13
2010
+++ /trunk/singlewebapp/WebContent/languages/greek.xml Thu Apr 15 05:11:30
2010
@@ -3006,4 +3006,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/hebrew.xml Thu Apr 15 01:52:13
2010
+++ /trunk/singlewebapp/WebContent/languages/hebrew.xml Thu Apr 15 05:11:30
2010
@@ -3006,4 +3006,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/hungarian.xml Thu Apr 15
01:52:13 2010
+++ /trunk/singlewebapp/WebContent/languages/hungarian.xml Thu Apr 15
05:11:30 2010
@@ -3006,4 +3006,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/indonesian.xml Thu Apr 15
01:52:13 2010
+++ /trunk/singlewebapp/WebContent/languages/indonesian.xml Thu Apr 15
05:11:30 2010
@@ -3006,4 +3006,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/italian.xml Thu Apr 15
01:52:13 2010
+++ /trunk/singlewebapp/WebContent/languages/italian.xml Thu Apr 15
05:11:30 2010
@@ -3006,4 +3006,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/japanese.xml Fri Apr 9
00:48:34 2010
+++ /trunk/singlewebapp/WebContent/languages/japanese.xml Thu Apr 15
05:11:30 2010
@@ -3006,4 +3006,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/korean.xml Fri Apr 9 00:48:34
2010
+++ /trunk/singlewebapp/WebContent/languages/korean.xml Thu Apr 15 05:11:30
2010
@@ -3006,4 +3006,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/persian.xml Fri Apr 9
00:48:34 2010
+++ /trunk/singlewebapp/WebContent/languages/persian.xml Thu Apr 15
05:11:30 2010
@@ -3006,4 +3006,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/polish.xml Thu Apr 15 01:52:13
2010
+++ /trunk/singlewebapp/WebContent/languages/polish.xml Thu Apr 15 05:11:30
2010
@@ -3080,4 +3080,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/portugues brazil.xml Thu Apr
15 01:52:13 2010
+++ /trunk/singlewebapp/WebContent/languages/portugues brazil.xml Thu Apr
15 05:11:30 2010
@@ -3012,5 +3012,17 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/portugues.xml Thu Apr 15
01:52:13 2010
+++ /trunk/singlewebapp/WebContent/languages/portugues.xml Thu Apr 15
05:11:30 2010
@@ -3006,4 +3006,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/russian.xml Thu Apr 15
01:52:13 2010
+++ /trunk/singlewebapp/WebContent/languages/russian.xml Thu Apr 15
05:11:30 2010
@@ -3012,4 +3012,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/spanish.xml Thu Apr 15
01:52:13 2010
+++ /trunk/singlewebapp/WebContent/languages/spanish.xml Thu Apr 15
05:11:30 2010
@@ -3014,4 +3014,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/swedish.xml Thu Apr 15
01:52:13 2010
+++ /trunk/singlewebapp/WebContent/languages/swedish.xml Thu Apr 15
05:11:30 2010
@@ -3006,4 +3006,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/thai.xml Thu Apr 15 01:52:13
2010
+++ /trunk/singlewebapp/WebContent/languages/thai.xml Thu Apr 15 05:11:30
2010
@@ -3006,4 +3006,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/turkish.xml Thu Apr 15
01:52:13 2010
+++ /trunk/singlewebapp/WebContent/languages/turkish.xml Thu Apr 15
05:11:30 2010
@@ -3005,4 +3005,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/ukrainian.xml Thu Apr 15
01:52:13 2010
+++ /trunk/singlewebapp/WebContent/languages/ukrainian.xml Thu Apr 15
05:11:30 2010
@@ -3006,4 +3006,16 @@
<string id="1000" name="error user">
<value>This Email is already used by another User.</value>
</string>
+ <string id="1001" name="room-admin">
+ <value>SIP-Settings</value>
+ </string>
+ <string id="1002" name="room-admin">
+ <value>The Conference Number and PIN is automatically created via the
OpenXG RPC-Gateway</value>
+ </string>
+ <string id="1003" name="room-admin">
+ <value>SIP Number</value>
+ </string>
+ <string id="1004" name="room-admin">
+ <value>PIN</value>
+ </string>
</language>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Wed Apr 14 14:37:41 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Thu Apr 15 05:11:30 2010
@@ -379,7 +379,7 @@
<netRemoteCallHib name="getLanguageByIdAndMax"
funcname="languageservice.getLanguageByIdAndMax" >
<attribute name="start" value="0" type="number" />
<attribute name="step" value="100" type="number" />
- <attribute name="max" value="800" type="number" />
+ <attribute name="max" value="900" type="number" />
<netparam><method name="getValue">return
parent.parent.userlang;</method></netparam>
<netparam><method name="getValue">return
parent.start;</method></netparam>
<netparam><method name="getValue">return
parent.step;</method></netparam>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/admin/roomadmin/roomValueForm.lzx
Sat Jan 9 11:15:10 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/admin/roomadmin/roomValueForm.lzx
Thu Apr 15 05:11:30 2010
@@ -31,6 +31,8 @@
this._organisationslist.clearList();
this._turnoverlist.clearList();
this.allowUserQuestions.setValue(true);
+ this.sipNumber.setAttribute("text","");
+ this.conferencePin.setAttribute("text","");
this._listRoomModerators.clearList();
</handler>
@@ -93,6 +95,19 @@
this.numberOfParticipants.selectItem(String(obj.numberOfPartizipants));
this.roomtype.selectItem(String(obj.roomtype.roomtypes_id));
+
+ if (obj.sipNumber != null) {
+ this.sipNumber.setAttribute("text",obj.sipNumber);
+ } else {
+ this.sipNumber.setAttribute("text","");
+ }
+
+ if (obj.conferencePin != null) {
+ this.conferencePin.setAttribute("text",obj.conferencePin);
+ } else {
+
this.conferencePin.setAttribute("text",obj.conferencePin);
+ }
+
this._turnoverlist.clearList();
this._turnoverlist.getRoomClientsMapByRoomId.doCall();
@@ -348,7 +363,7 @@
multiline="true" width="370" />
<!-- RoomClient List Right Side -->
- <labelText labelid="587" width="200" y="40" resize="false"
+ <labelText labelid="587" width="300" y="40" resize="false"
x="398" fontstyle="bold" />
<simpleTurnOverList name="_turnoverlist" width="300"
mainBgColor="0xFFFFFF"
@@ -402,7 +417,7 @@
multiline="true" width="270" />
- <labelText labelid="816" width="200" y="380" resize="false" x="400"/>
+ <labelText labelid="816" width="300" y="380" resize="false" x="400"/>
<!-- 172:add default moderator -->
<baseChooseIcon resourceN="edit_add_rsc" labelid="821" y="380" x="680"
@@ -494,7 +509,28 @@
</method>
</simpleTurnOverList>
-
+
+ <!--SIP Settings -->
+ <labelText labelid="1001" width="200" y="600" resize="false"
+ x="400" fontstyle="bold" />
+
+ <view resource="messagebox_info_rsc" x="400" y="620" />
+
+ <labelText labelid="1002" x="424" y="620" fontstyle="italic"
+ multiline="true" width="270" />
+
+ <labelText labelid="1003" x="400" y="670" width="270" />
+
+ <labelText name="sipNumber" x="520" y="670" fgcolor="0x999999"
bgcolor="0xFFFFFF"
+ height="20" width="180" resize="false"/>
+
+ <labelText labelid="1004" x="400" y="692" width="270" />
+
+ <labelText name="conferencePin" x="520" y="692" fgcolor="0x999999"
bgcolor="0xFFFFFF"
+ height="20" width="180" resize="false"/>
+
+ <view x="400" y="900" />
+
</class>
<!--- list of conference/audience rooms -->
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/invitation/autoloaderBarOnly.lzx
Thu Mar 18 09:16:21 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/invitation/autoloaderBarOnly.lzx
Thu Apr 15 05:11:30 2010
@@ -29,7 +29,7 @@
remotecontext="$once{ canvas.thishib }" >
<attribute name="start" value="0" type="number" />
<attribute name="step" value="100" type="number" />
- <attribute name="max" value="800" type="number" />
+ <attribute name="max" value="900" type="number" />
<netparam><method name="getValue">return
canvas.thishib.userlang;</method></netparam>
<netparam><method name="getValue">return
parent.start;</method></netparam>
<netparam><method name="getValue">return
parent.step;</method></netparam>
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
Fri Mar 19 09:22:58 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
Thu Apr 15 05:11:30 2010
@@ -20,6 +20,7 @@
import org.openmeetings.app.hibernate.beans.recording.RoomClient;
import org.openmeetings.app.hibernate.beans.rooms.*;
+import org.openmeetings.app.hibernate.beans.sip.OpenXGReturnObject;
import org.openmeetings.app.hibernate.beans.user.*;
import org.openmeetings.app.hibernate.utils.HibernateUtil;
import org.openmeetings.app.data.basic.AuthLevelmanagement;
@@ -638,6 +639,15 @@
r.setIsModeratedRoom(isModeratedRoom);
r.setDeleted("false");
+
+ //handle SIP Issues
+ OpenXGReturnObject openXGReturnObject =
OpenXGHttpClient.getInstance().openSIPgCreateConference();
+
+ if (openXGReturnObject != null) {
+
r.setSipNumber(openXGReturnObject.getConferenceNumber());
+
r.setConferencePin(openXGReturnObject.getConferencePin());
+ }
+
Object idf = HibernateUtil.createSession();
Session session = HibernateUtil.getSession();
Transaction tx = session.beginTransaction();
@@ -655,8 +665,6 @@
if (roomModerators!=null) {
RoomModeratorsDaoImpl.getInstance().addRoomModeratorByUserList(roomModerators,
r.getRooms_id());
}
-
-
OpenXGHttpClient.getInstance().openSIPgCreateConference();
return returnId;
}
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/rooms/Rooms.hbm.xml
Sat Jan 9 11:15:10 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/rooms/Rooms.hbm.xml
Thu Apr 15 05:11:30 2010
@@ -21,5 +21,7 @@
<property name="externalRoomId" type="long" column="externalRoomId"/>
<property name="externalRoomType" type="string"
column="externalRoomType"/>
<property name="allowUserQuestions" type="boolean"
column="allow_user_questions"/>
+ <property name="sipNumber" type="string" column="sip_number"/>
+ <property name="conferencePin" type="string" column="conference_pin"/>
</class>
</hibernate-mapping>
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/rooms/Rooms.java
Sat Jan 9 11:15:10 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/rooms/Rooms.java
Thu Apr 15 05:11:30 2010
@@ -60,6 +60,9 @@
private Boolean isModeratedRoom;
private Boolean allowUserQuestions;
+
+ private String sipNumber;
+ private String conferencePin;
/**
* @hibernate.property
@@ -445,5 +448,29 @@
public void setAllowUserQuestions(Boolean allowUserQuestions) {
this.allowUserQuestions = allowUserQuestions;
}
+
+ /**
+ * @hibernate.property
+ * column="sip_number"
+ * type="string"
+ */
+ public String getSipNumber() {
+ return sipNumber;
+ }
+ public void setSipNumber(String sipNumber) {
+ this.sipNumber = sipNumber;
+ }
+
+ /**
+ * @hibernate.property
+ * column="conference_pin"
+ * type="string"
+ */
+ public String getConferencePin() {
+ return conferencePin;
+ }
+ public void setConferencePin(String conferencePin) {
+ this.conferencePin = conferencePin;
+ }
}
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java
Thu Apr 15 01:07:33 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java
Thu Apr 15 05:11:30 2010
@@ -16,9 +16,10 @@
import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.hibernate.beans.basic.Configuration;
+import org.openmeetings.app.hibernate.beans.sip.OpenXGReturnObject;
import org.openmeetings.app.hibernate.beans.user.UserSipData;
import org.openmeetings.app.sip.xmlrpc.custom.OpenXGCustomXMLMarshall;
-import org.openmeetings.app.sip.xmlrpc.custom.OpenXGReturnObject;
+import
org.openmeetings.app.sip.xmlrpc.custom.dao.OpenXGReturnObjectDaoImpl;
import org.openmeetings.utils.crypt.MD5;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -145,9 +146,9 @@
throw new Exception("sip.phonerange.start, sip.phonerange or
sip.phonerange.currentindex missing in Configuration table");
}
- Long sipPhoneRangeStart =
Long.parseLong(sip_phonerange_start.getConf_value());
+// Long sipPhoneRangeStart =
Long.parseLong(sip_phonerange_start.getConf_value());
// Long sipPhoneRange =
Long.parseLong(sip_phonerange.getConf_value());
- Long sipPhoneRangeCurrentIndex =
Long.parseLong(sip_phonerange_currentindex.getConf_value());
+// Long sipPhoneRangeCurrentIndex =
Long.parseLong(sip_phonerange_currentindex.getConf_value());
//Not sure anymore if this is really needed, we don't need a number
in national format
// if (sipPhoneRangeCurrentIndex >= sipPhoneRange) {
@@ -181,6 +182,10 @@
OpenXGReturnObject openXGReturnObject =
this.openSIPgPost(stringToPost);
+
+ openXGReturnObject.setMethodName("OpenSIPg.UserCreate");
+
+
OpenXGReturnObjectDaoImpl.getInstance().addOpenXGReturnObject(openXGReturnObject);
log.debug(" Status_code
"+openXGReturnObject.getStatus_code());
log.debug("
Status_string "+openXGReturnObject.getStatus_string());
@@ -198,6 +203,10 @@
OpenXGReturnObject openXGReturnObjectURI =
this.openSIPgPost(stringToPostURI);
+ openXGReturnObjectURI.setMethodName("OpenSIPg.URIUserIDAdd");
+
+
OpenXGReturnObjectDaoImpl.getInstance().addOpenXGReturnObject(openXGReturnObjectURI);
+
log.debug(" openXGReturnObjectURI Status
Code "+openXGReturnObjectURI.getStatus_code());
log.debug(" openXGReturnObjectURI Status
String "+openXGReturnObjectURI.getStatus_string());
@@ -227,29 +236,6 @@
return null;
}
-
-
- public OpenXGReturnObject openSIPgURIUserIDAdd(String client_id, String
digest, String userid, String domain,
- String first_name, String middle_i, String last_name, String password,
String community_code,
- String language_code, String email, String adminid) {
- try {
-
- //Get the XML-String representative
- String stringToPost = OpenXGCustomXMLMarshall.getInstance().
-
openSIPgURIUserIDAdd(client_id, digest, userid,
-
domain, adminid);
-
- return this.openSIPgPost(stringToPost);
-
- } catch (Exception err) {
-
- log.error("[openSIPgUserCreate]",err);
-
- }
-
- return null;
- }
-
public OpenXGReturnObject openSIPgCreateConference() {
@@ -298,6 +284,8 @@
long endTime = (d.getTime()/1000) + (60 * 60);
+ //"0", "2147483647",
+
String digest = this.digest_calculate(new
Object[]{client_id, "067201101", domain, ""+starttime,
""+endTime, language_code, adminid,
client_secret});
@@ -319,8 +307,14 @@
openSIPgCreateConference(client_id, digest, "067201101",
domain,
""+starttime, ""+endTime,
language_code, adminid);
-
- return this.openSIPgPost(stringToPost);
+
+ OpenXGReturnObject openXGReturnObject =
this.openSIPgPost(stringToPost);
+
+ openXGReturnObject.setMethodName("OpenSIPg.UserConferenceAdd");
+
+
OpenXGReturnObjectDaoImpl.getInstance().addOpenXGReturnObject(openXGReturnObject);
+
+ return openXGReturnObject;
} catch (Exception err) {
@@ -378,8 +372,13 @@
log.debug("parseReturnBody "+post.getResponseBodyAsString());
- return
this.parseOpenXGReturnBody(post.getResponseBodyAsStream());
-
+ OpenXGReturnObject oIG =
this.parseOpenXGReturnBody(post.getResponseBodyAsStream());
+
+ log.debug("oIG 1 "+oIG.getStatus_code());
+ log.debug("oIG 2 "+oIG.getStatus_string());
+
+ return oIG;
+
} else {
throw new Exception("Could not connect to OpenXG, check the
URL for the Configuration");
@@ -430,7 +429,7 @@
Node nameTextNode = name.item(0).getFirstChild();
- //log.debug("getNodeValue "+nameTextNode.getNodeValue());
+ log.debug("getNodeValue "+nameTextNode.getNodeValue());
if (nameTextNode.getNodeValue().equals("status_code")) {
@@ -456,6 +455,30 @@
openXGReturnObject.setStatus_string(valueTextNode.getNodeValue());
+ } else if
(nameTextNode.getNodeValue().equals("conference_number")) {
+
+ NodeList string = member.getElementsByTagName("string");
+
+ //log.debug("Value "+string.item(0).getNodeName());
+
+ Node valueTextNode = string.item(0).getFirstChild();
+
+ //log.debug("Value "+valueTextNode.getNodeValue());
+
+
openXGReturnObject.setConferenceNumber(valueTextNode.getNodeValue());
+
+ } else if
(nameTextNode.getNodeValue().equals("conference_pin")) {
+
+ NodeList string = member.getElementsByTagName("string");
+
+ //log.debug("Value "+string.item(0).getNodeName());
+
+ Node valueTextNode = string.item(0).getFirstChild();
+
+ //log.debug("Value "+valueTextNode.getNodeValue());
+
+
openXGReturnObject.setConferencePin(valueTextNode.getNodeValue());
+
}
}
--
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.
