Author: solomax
Date: Tue Feb 5 04:47:47 2013
New Revision: 1442469
URL: http://svn.apache.org/viewvc?rev=1442469&view=rev
Log:
SIP: clean up old sip
Removed:
openmeetings/trunk/singlewebapp/WebContent/src/base/sipfunctions.lzx
Modified:
openmeetings/trunk/singlewebapp/WebContent/project.xsd
openmeetings/trunk/singlewebapp/WebContent/src/base/library.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
openmeetings/trunk/singlewebapp/xdocs/red5sip-integration_2.1.xml
Modified: openmeetings/trunk/singlewebapp/WebContent/project.xsd
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/project.xsd?rev=1442469&r1=1442468&r2=1442469&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/project.xsd (original)
+++ openmeetings/trunk/singlewebapp/WebContent/project.xsd Tue Feb 5 04:47:47
2013
@@ -567,12 +567,8 @@
<xs:complexType name="baseConferenceRoom" mixed="true">
<xs:complexContent>
<xs:extension base="project:baseContentView">
- <xs:attribute name="sipNumberIndex" type="lzx:number" default="0" >
-</xs:attribute>
- <xs:attribute name="sipNumberAsArray" type="xs:string" default="null" >
-</xs:attribute>
<xs:attribute name="roomobj" type="xs:string" default="null" >
-</xs:attribute>
+ </xs:attribute>
<xs:attribute name="meetingTimer" type="xs:string" default="null" >
</xs:attribute>
</xs:extension>
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/library.lzx?rev=1442469&r1=1442468&r2=1442469&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/library.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/library.lzx Tue Feb 5
04:47:47 2013
@@ -31,7 +31,6 @@
<!-- for main.lzx -->
<include href="externalJavaScript.lzx" />
<include href="functions.lzx" />
- <include href="sipfunctions.lzx" />
<include href="mainAttributes.lzx" />
<include href="mainDatasets.lzx" />
<include href="mainMethods.lzx" />
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1442469&r1=1442468&r2=1442469&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
Tue Feb 5 04:47:47 2013
@@ -61,9 +61,6 @@
<attribute name="meetingTimer" value="null" />
- <attribute name="sipNumberAsArray" value="null" />
- <attribute name="sipNumberIndex" value="0" type="number" />
-
<handler name="oninit">
<![CDATA[
_mainScrollBar.setAttribute("visibility","hidden");
@@ -90,16 +87,6 @@
canvas._mainbgcontentNavi.setAttribute('height',0);
canvas.setAttribute('naviHeightDelta',28);
- if (canvas.thishib.sip_enabled) {
- if (sipIsEnabled()) {
- if ($debug) Debug.write("Dial SIP Number:
",canvas.currentRoomObject.sipNumber);
-
-
preCustomStartCallByCallTo(canvas.currentRoomObject.sipNumber);
- } else {
- new lz.labelerrorPopup(canvas,{error:'SIP Applet is not
ready!'});
- }
- }
-
if(this._chatPanelStrict){
var hideChat = this.roomobj.hideChat != null &&
this.roomobj.hideChat;
this._chatPanelStrict.setAttribute('visible',
!hideChat);
@@ -110,35 +97,6 @@
]]>
</handler>
- <method name="startDialing">
- this.sipNumberIndex = 0;
- this.doNextSipNumber();
- </method>
-
- <method name="doNextSipNumber">
- <![CDATA[
- if (this.sipNumberIndex < this.sipNumberAsArray.length) {
-
- var nextNumber = this.sipNumberAsArray[this.sipNumberIndex];
-
- this.sipNumberIndex++;
-
- callDTMFButton(this,nextNumber);
-
- } else {
-
- if ($debug) Debug.write("Number Completed - Start Dial
Process");
-
- preCustomStartCall();
-
- }
- ]]>
- </method>
-
- <method name="ringring">
- if ($debug) Debug.write("ringring - ringring - ringring");
- </method>
-
<handler name="onkeydown" reference="lz.Keys" args="keyCode">
<![CDATA[
if ($debug) Debug.write("onkeydown:: keyCode = ", keyCode);
Modified: openmeetings/trunk/singlewebapp/xdocs/red5sip-integration_2.1.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/xdocs/red5sip-integration_2.1.xml?rev=1442469&r1=1442468&r2=1442469&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/xdocs/red5sip-integration_2.1.xml (original)
+++ openmeetings/trunk/singlewebapp/xdocs/red5sip-integration_2.1.xml Tue Feb
5 04:47:47 2013
@@ -36,6 +36,7 @@
</blockquote><br /><br />
Modify file /etc/odbcinst.ini as follows:
(replace the path to the *.so files below with the real paths on your system)
<blockquote>
+ (The path below is for x32 server, x64
version is most probably located at /usr/lib/x86_64-linux-gnu/odbc)<br/>
<i>
[MySQL]<br />
Description = ODBC for MySQL<br
/>
