Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/red5sip-integration_2.0.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/red5sip-integration_2.0.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/red5sip-integration_2.0.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/red5sip-integration_2.0.xml Fri Nov 13 01:24:41 2015 @@ -12,8 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> - +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>SIP-Transport Integration</title> <author email="[email protected]"> @@ -35,158 +36,144 @@ <section name="Setup Asterisk"> <div> Run the commands - <blockquote> - <i> - sudo apt-get update<br/> - sudo apt-get install asterisk asterisk-mysql - </i> - </blockquote> + <source> +<![CDATA[ +sudo apt-get update +sudo apt-get install asterisk asterisk-mysql +]]> + </source> </div> <div> Ubuntu 10.04 has broken asterisk-mysql version. For other distribution next commands not needed: - <blockquote> - <i> - aptitude purge asterisk-mysql - <br/> - cd /tmp - <br/> - apt-get build-dep asterisk-mysql - <br/> - apt-get -b source asterisk-mysql - <br/> - dpkg -i asterisk-mysql_1.6.2.0-1_i386.deb - </i> - - </blockquote> + <source> +<![CDATA[ +aptitude purge asterisk-mysql +cd /tmp +apt-get build-dep asterisk-mysql +apt-get -b source asterisk-mysql +dpkg -i asterisk-mysql_1.6.2.0-1_i386.deb +]]> + </source> </div> <div> Enable asterisk mysql realtime module:<br/><br/> Add string - <blockquote> - <i>load => res_config_mysql.so</i> - </blockquote> + <source> +<![CDATA[ +load => res_config_mysql.so +]]> + </source> to the /etc/asterisk/modules.conf into the "modules" section. </div> <div> Configure mysql realtime module:<br/><br/> Create file /etc/asterisk/res_mysql.conf and add lines: - <blockquote> - <i>[general] - <br/> - dbhost=127.0.0.1 - <br/> - dbname=openmeetings - <br/> - dbuser=root - <br/> - dbpass= - <br/> - dbport=3306 - </i> - - </blockquote> + <source> +<![CDATA[ +[general] +dbhost=127.0.0.1 +dbname=openmeetings +dbuser=root +dbpass= +dbport=3306 +]]> + </source> </div> <div> Add next lines into the /etc/asterisk/extconfig.conf: - <blockquote> - <i>[settings] - <br/> - sipusers => mysql,general,sipusers - <br/> - sippeers => mysql,general,sipusers - <br/> - extensions => mysql,general,extensions - <br/> - meetme => mysql,general,meetme - </i> - - </blockquote> + <source> +<![CDATA[ +[settings] +sipusers => mysql,general,sipusers +sippeers => mysql,general,sipusers +extensions => mysql,general,extensions +meetme => mysql,general,meetme +]]> + </source> </div> <div> Add next lines into the /etc/asterisk/extensions.conf: - <blockquote> - <i>[rooms] - <br/> - switch => Realtime/@ - </i> - - </blockquote> + <source> +<![CDATA[ +[rooms] +switch => Realtime/@ +]]> + </source> </div> <div> Restart asterisk: - <blockquote> - <i>service asterisk restart</i> - </blockquote> + <source> +<![CDATA[ +service asterisk restart +]]> + </source> Insert, for example, SIP user with name 'test': - <blockquote> - <i> - INSERT INTO sipusers (allow, context, disallow, host, name, secret) VALUES ('ulaw' , 'rooms', NULL, 'dynamic' , 'test', '12345'); - </i> - </blockquote> + <source> +<![CDATA[ +INSERT INTO sipusers (allow, context, disallow, host, name, secret) VALUES ('ulaw' , 'rooms', NULL, 'dynamic' , 'test', '12345'); +]]> + </source> </div> </section> <section name="Setup red5sip transport"> <div> - Download red5sip from<blockquote>http://red5phone.googlecode.com/svn/branches/red5sip</blockquote> + Download red5sip from<tt>http://red5phone.googlecode.com/svn/branches/red5sip</tt> </div> <p> Build with Apache Ant </p> <div> Install jsvc: - <blockquote> - <i>apt-get install jsvc</i> - </blockquote> + <source> +<![CDATA[ +apt-get install jsvc +]]> + </source> </div> <div> Insert proper values to the /opt/red5sip/settings.properties - <blockquote> - <i>red5.host - red5 server address (127.0.0.1) - <br/> - sip.obproxy - asterisk adderss (127.0.0.1) - <br/> - sip.phone - sip phone number (test) - <br/> - sip.authid - sip auth id (test) - <br/> - sip.secret - sip password (12345) - <br/> - sip.realm - sip realm, "asterisk" by default - <br/> - sip.proxy - - <br/> - rooms - ids of openmeetings rooms, can be, for example, 2,3,5,6 - </i> - - </blockquote> + <source> +<![CDATA[ +red5.host - red5 server address (127.0.0.1) +sip.obproxy - asterisk adderss (127.0.0.1) +sip.phone - sip phone number (test) +sip.authid - sip auth id (test) +sip.secret - sip password (12345) +sip.realm - sip realm, "asterisk" by default +sip.proxy - +rooms - ids of openmeetings rooms, can be, for example, 2,3,5,6 +]]> + </source> </div> <div> Add red5sip to autostart: - <blockquote> - <i>ln -s /opt/red5sip/red5sip.sh /etc/init.d/red5sip - <br/> - chmod a+x /etc/init.d/red5sip - <br/> - update-rc.d /etc/init.d/red5sip defaults - </i> - - </blockquote> + <source> +<![CDATA[ +ln -s /opt/red5sip/red5sip.sh /etc/init.d/red5sip +chmod a+x /etc/init.d/red5sip +update-rc.d /etc/init.d/red5sip defaults +]]> + </source> </div> <div> Start openmeetings - <blockquote> - <i>service red5 start</i> - </blockquote> + <source> +<![CDATA[ +service red5 start +]]> + </source> </div> <div> Start red5sip - <blockquote> - <i>service red5sip start</i> - </blockquote> + <source> +<![CDATA[ +service red5sip start +]]> + </source> </div> </section> </body>
Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/red5sip-integration_2.1.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/red5sip-integration_2.1.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/red5sip-integration_2.1.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/red5sip-integration_2.1.xml Fri Nov 13 01:24:41 2015 @@ -12,10 +12,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>SIP-Transport Integration</title> - <author email="[email protected]">OpenMeetings Team</author> + <author email="[email protected]">OpenMeetings Team</author> </properties> <body> <section name="SIP-Transport Integration"> @@ -26,75 +28,77 @@ <section name="Prerequisites"> <div> Run the commands - <blockquote> - <i> - sudo apt-get update && sudo apt-get upgrade<br /> - sudo apt-get install build-essential linux-headers-`uname -r` libxml2-dev libncurses5-dev libsqlite3-dev sqlite3 openssl libssl-dev<br /> - </i> - </blockquote> + <source> +<![CDATA[ +sudo apt-get update && sudo apt-get upgrade +sudo apt-get install build-essential linux-headers-`uname -r` libxml2-dev libncurses5-dev libsqlite3-dev sqlite3 openssl libssl-dev +]]> + </source> </div> </section> <section name="ODBC Setup"> <div> Run the commands - <blockquote> - <i> - sudo apt-get update<br /> - sudo apt-get install unixODBC unixODBC-dev libmyodbc - </i> - </blockquote> + <source> +<![CDATA[ +sudo apt-get update +sudo apt-get install unixODBC unixODBC-dev libmyodbc +]]> + </source> </div> <div> Set up Asterisk connector:<br /><br /> Modify file <tt>/etc/odbc.ini</tt> as follows: (replace USER, PASSWORD and Socket with values relative to your system) - <blockquote> - <i> - [asterisk-connector]<br /> - Description = MySQL connection to 'openmeetings' database<br /> - Driver = MySQL<br /> - Database = openmeetings<br /> - Server = localhost<br /> - USER = root<br /> - PASSWORD =<br /> - Port = 3306<br /> - Socket = /var/run/mysqld/mysqld.sock<br /> - </i> - </blockquote><br /><br /> - Modify file <tt>/etc/odbcinst.ini</tt> 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 <tt>/usr/lib/x86_64-linux-gnu/odbc</tt>)<br/> - <i> - [MySQL]<br /> - Description = ODBC for MySQL<br /> - Driver = /usr/lib/i386-linux-gnu/odbc/libmyodbc.so<br /> - Setup = /usr/lib/i386-linux-gnu/odbc/libodbcmyS.so<br /> - FileUsage = 1<br /> - </i> - </blockquote><br /><br /> + <source> +<![CDATA[ +[asterisk-connector] +Description = MySQL connection to 'openmeetings' database +Driver = MySQL +Database = openmeetings +Server = localhost +USER = root +PASSWORD = +Port = 3306 +Socket = /var/run/mysqld/mysqld.sock +]]> + </source> + Modify file <tt>/etc/odbcinst.ini</tt> as follows: (replace the path to the *.so files below with the real paths on your system)<br/> + (The path below is for x32 server, x64 version is most probably located at <tt>/usr/lib/x86_64-linux-gnu/odbc</tt>)<br/> + <source> +<![CDATA[ +[MySQL] +Description = ODBC for MySQL +Driver = /usr/lib/i386-linux-gnu/odbc/libmyodbc.so +Setup = /usr/lib/i386-linux-gnu/odbc/libodbcmyS.so +FileUsage = 1 +]]> + </source> Run the following command to ensure everything works as expected: - <blockquote> - <i>echo "select 1" | isql -v asterisk-connector</i> - </blockquote> + <source> +<![CDATA[ +echo "select 1" | isql -v asterisk-connector +]]> + </source> </div> </section> <section name="Building and setting up Asterisk"> <div> Run the commands - <blockquote> - <i> - sudo mkdir /usr/src/asterisk && cd /usr/src/asterisk<br /> - sudo wget http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-11.2.1.tar.gz<br /> - sudo tar -xvzf asterisk-11.2.1.tar.gz<br /> - cd ./asterisk-11.2.1<br /> - sudo make clean<br /> - sudo ./configure<br /> - sudo make<br /> - sudo make install<br /> - sudo make samples<br /> - sudo make config<br /> - sudo service asterisk start<br /> - </i> - </blockquote> + <source> +<![CDATA[ +sudo mkdir /usr/src/asterisk && cd /usr/src/asterisk +sudo wget http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-11.2.1.tar.gz +sudo tar -xvzf asterisk-11.2.1.tar.gz +cd ./asterisk-11.2.1 +sudo make clean +sudo ./configure +sudo make +sudo make install +sudo make samples +sudo make config +sudo service asterisk start +]]> + </source> </div> </section> <section name="Configure Asterisk"> @@ -102,141 +106,141 @@ Enable asterisk ODBC module:<br /><br /> Modify "[modules]" section of <tt>/etc/asterisk/modules.conf</tt> as follows:<br /> <strong>Add/uncomment the following lines</strong> - <blockquote> - <i> - preload => res_odbc.so<br /> - preload => res_config_odbc.so<br /> - </i> - </blockquote> + <source> +<![CDATA[ +preload => res_odbc.so +preload => res_config_odbc.so +]]> + </source> </div><br /> <div> Create/update "[asterisk]" section in <tt>/etc/asterisk/res_odbc.conf</tt>: - <blockquote> - <i> - [asterisk]<br /> - enabled => yes<br /> - dsn => asterisk-connector<br /> - pre-connect => yes - </i> - </blockquote> + <source> +<![CDATA[ +[asterisk] +enabled => yes +dsn => asterisk-connector +pre-connect => yes +]]> + </source> </div><br /> <div> Modify <tt>/etc/asterisk/sip.conf</tt><br /> <strong>Add/uncomment the following line</strong>:<br /> - <blockquote> - <i> - videosupport=yes<br /> - rtcachefriends=yes<br /> - </i> - </blockquote> + <source> +<![CDATA[ +videosupport=yes +rtcachefriends=yes +]]> + </source> <strong>Increase maxexpiry value to 43200</strong>:<br /> - <blockquote> - <i> - maxexpiry=43200<br /> - </i> - </blockquote> + <source> +<![CDATA[ +maxexpiry=43200 +]]> + </source> <strong>Add user for the "SIP Transport"</strong>:<br /> - <blockquote> - <i> - [red5sip_user]<br /> - type=friend<br /> - secret=12345<br /> - disallow=all<br /> - allow=ulaw<br /> - allow=h264<br /> - host=dynamic<br /> - nat=force_rport,comedia<br /> - context=rooms-red5sip<br /> - </i> - </blockquote> + <source> +<![CDATA[ +[red5sip_user] +type=friend +secret=12345 +disallow=all +allow=ulaw +allow=h264 +host=dynamic +nat=force_rport,comedia +context=rooms-red5sip +]]> + </source> </div><br /> <div> Add next lines into the <tt>/etc/asterisk/extconfig.conf</tt>: - <blockquote> - <i> - [settings]<br /> - sippeers => odbc,asterisk,sipusers<br /> - </i> - </blockquote> + <source> +<![CDATA[ +[settings] +sippeers => odbc,asterisk,sipusers +]]> + </source> </div><br /> <div> Modify <tt>/etc/asterisk/extensions.conf</tt><br /> <strong>Add the following section</strong>:<br /> - <blockquote> - <i> - [rooms]<br /> - exten => _400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavail)<br /> - exten => _400X!,n(ok),SET(PIN=${DB(openmeetings/rooms/${EXTEN})})<br /> - exten => _400X!,n,Set(CONFBRIDGE(user,template)=sip_user)<br /> - exten => _400X!,n,Set(CONFBRIDGE(user,pin)=${PIN})<br /> - exten => _400X!,n(ok),Confbridge(${EXTEN},default_bridge,)<br /> - exten => _400X!,n,Hangup<br /> - exten => _400X!,n(notavail),Answer()<br /> - exten => _400X!,n,Playback(invalid)<br /> - exten => _400X!,n,Hangup<br /> - <br /> - [rooms-originate]<br /> - exten => _400X!,1,Confbridge(${EXTEN},default_bridge,sip_user)<br /> - exten => _400X!,n,Hangup<br /> - <br /> - [rooms-out]<br /> - ; *****************************************************<br /> - ; Extensions for outgoing calls from Openmeetings room.<br /> - ; *****************************************************<br /> - <br /> - [rooms-red5sip]<br /> - exten => _400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavil)<br /> - exten => _400X!,n(ok),Confbridge(${EXTEN},default_bridge,red5sip_user)<br /> - exten => _400X!,n(notavail),Hangup <br /> - </i> - </blockquote> + <source> +<![CDATA[ +[rooms] +exten => _400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavail) +exten => _400X!,n(ok),SET(PIN=${DB(openmeetings/rooms/${EXTEN})}) +exten => _400X!,n,Set(CONFBRIDGE(user,template)=sip_user) +exten => _400X!,n,Set(CONFBRIDGE(user,pin)=${PIN}) +exten => _400X!,n(ok),Confbridge(${EXTEN},default_bridge,) +exten => _400X!,n,Hangup +exten => _400X!,n(notavail),Answer() +exten => _400X!,n,Playback(invalid) +exten => _400X!,n,Hangup + +[rooms-originate] +exten => _400X!,1,Confbridge(${EXTEN},default_bridge,sip_user) +exten => _400X!,n,Hangup + +[rooms-out] +; ***************************************************** +; Extensions for outgoing calls from Openmeetings room. +; ***************************************************** + +[rooms-red5sip] +exten => _400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavail) +exten => _400X!,n(ok),Confbridge(${EXTEN},default_bridge,red5sip_user) +exten => _400X!,n(notavail),Hangup +]]> + </source> </div><br /> <div> Modify <tt>/etc/asterisk/confbridge.conf</tt><br /> <strong>Add/Modify the following secions</strong>:<br /> - <blockquote> - <i> - [general]<br /> - <br /> - [red5sip_user]<br /> - type=user<br /> - marked=yes<br /> - dsp_drop_silence=yes<br /> - denoise=true<br /> - <br /> - [sip_user]<br /> - type=user<br /> - end_marked=yes<br /> - wait_marked=yes<br /> - music_on_hold_when_empty=yes<br /> - dsp_drop_silence=yes<br /> - denoise=true<br /> - <br /> - [default_bridge]<br /> - type=bridge<br /> - video_mode=follow_talker<br /> - </i> - </blockquote> + <source> +<![CDATA[ +[general] + +[red5sip_user] +type=user +marked=yes +dsp_drop_silence=yes +denoise=true + +[sip_user] +type=user +end_marked=yes +wait_marked=yes +music_on_hold_when_empty=yes +dsp_drop_silence=yes +denoise=true + +[default_bridge] +type=bridge +video_mode=follow_talker +]]> + </source> </div><br /> <div> To enable Asterisk Manager API modify <tt>/etc/asterisk/manager.conf</tt><br /> <strong>Add/Modify the following sections</strong>:<br /> - <blockquote> - <i> - [general]<br /> - enabled = yes<br /> - webenabled = no<br /> - port = 5038<br /> - bindaddr = 127.0.0.1<br /> - <br /> - [openmeetings]<br /> - secret = 12345<br /> - deny=0.0.0.0/0.0.0.0<br /> - permit=127.0.0.1/255.255.255.0<br /> - read = all<br /> - write = all<br /> - </i> - </blockquote> + <source> +<![CDATA[ +[general] +enabled = yes +webenabled = no +port = 5038 +bindaddr = 127.0.0.1 + +[openmeetings] +secret = 12345 +deny=0.0.0.0/0.0.0.0 +permit=127.0.0.1/255.255.255.0 +read = all +write = all +]]> + </source> </div><br /> <div> Update Openmeetings with creadentials for Asterisk manager. @@ -250,64 +254,71 @@ </div><br /> <div> Restart asterisk: - <blockquote> - <i>service asterisk restart</i> - </blockquote> + <source> +<![CDATA[ +service asterisk restart +]]> + </source> </div><br /> </section> <section name="Setup red5sip transport"> <div> - Download red5sip from - <blockquote>http://red5phone.googlecode.com/svn/branches/red5sip_2.1</blockquote> + Download red5sip from <tt>http://red5phone.googlecode.com/svn/branches/red5sip_2.1</tt> </div> <div> Build with Apache Ant - <blockquote> - <i>ant</i> - </blockquote> + <source> +<![CDATA[ +ant +]]> + </source> </div> <div> Insert proper values to the <tt>/opt/red5sip/settings.properties</tt> - <blockquote> - <i> - red5.host=127.0.0.1 # red5 server address<br /> - om.context=openmeetings # Openmeetings context<br /> - red5.codec=asao<br /> - red5.codec.rate=22 # should correlate with mic settings in public/config.xml<br /> - sip.obproxy=127.0.0.1 # asterisk adderss<br /> - sip.phone=red5sip_user # sip phone number<br /> - sip.authid=red5sip_user # sip auth id<br /> - sip.secret=12345 # sip password<br /> - sip.realm=asterisk # sip realm<br /> - sip.proxy=127.0.0.1 # address of sip proxy <br /> - rooms.forceStart=no # TBD <br /> - rooms=1 # TBD (not in use) <br /> - </i> - </blockquote> + <source> +<![CDATA[ +red5.host=127.0.0.1 # red5 server address +om.context=openmeetings # Openmeetings context +red5.codec=asao +red5.codec.rate=22 # should correlate with mic settings in public/config.xml +sip.obproxy=127.0.0.1 # asterisk adderss +sip.phone=red5sip_user # sip phone number +sip.authid=red5sip_user # sip auth id +sip.secret=12345 # sip password +sip.realm=asterisk # sip realm +sip.proxy=127.0.0.1 # address of sip proxy +rooms.forceStart=no # TBD +rooms=1 # TBD (not in use) +]]> + </source> </div> <div> Add red5sip to autostart: - <blockquote> - <i> - sudo cp /opt/red5sip/red5sip /etc/init.d/<br /> - sudo chmod a+x /etc/init.d/red5sip<br /> - sudo update-rc.d red5sip defaults - </i> - </blockquote> + <source> +<![CDATA[ +sudo cp /opt/red5sip/red5sip /etc/init.d/ +sudo chmod a+x /etc/init.d/red5sip +sudo update-rc.d red5sip defaults +]]> + </source> </div> <div> Start openmeetings - <blockquote> - <i>service red5 start</i> - </blockquote> + <source> +<![CDATA[ +service red5 start +]]> + </source> </div> <div> Start red5sip - <blockquote> - <i>service red5sip start</i> - </blockquote> + <source> +<![CDATA[ +service red5sip start +]]> + </source> </div> </section> </body> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/red5sip-integration_3.0.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/red5sip-integration_3.0.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/red5sip-integration_3.0.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/red5sip-integration_3.0.xml Fri Nov 13 01:24:41 2015 @@ -12,10 +12,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>SIP-Transport Integration</title> - <author email="[email protected]">OpenMeetings Team</author> + <author email="[email protected]">OpenMeetings Team</author> </properties> <body> <section name="SIP-Transport Integration"> @@ -26,75 +28,77 @@ <section name="Prerequisites"> <div> Run the commands - <blockquote> - <i> - sudo apt-get update && sudo apt-get upgrade<br /> - sudo apt-get install build-essential linux-headers-`uname -r` libxml2-dev libncurses5-dev libsqlite3-dev sqlite3 openssl libssl-dev<br /> - </i> - </blockquote> + <source> +<![CDATA[ +sudo apt-get update && sudo apt-get upgrade +sudo apt-get install build-essential linux-headers-`uname -r` libxml2-dev libncurses5-dev libsqlite3-dev sqlite3 openssl libssl-dev +]]> + </source> </div> </section> <section name="ODBC Setup"> <div> Run the commands - <blockquote> - <i> - sudo apt-get update<br /> - sudo apt-get install unixODBC unixODBC-dev libmyodbc - </i> - </blockquote> + <source> +<![CDATA[ +sudo apt-get update +sudo apt-get install unixODBC unixODBC-dev libmyodbc +]]> + </source> </div> <div> Set up Asterisk connector:<br /><br /> Modify file <tt>/etc/odbc.ini</tt> as follows: (replace USER, PASSWORD and Socket with values relative to your system) - <blockquote> - <i> - [asterisk-connector]<br /> - Description = MySQL connection to 'openmeetings' database<br /> - Driver = MySQL<br /> - Database = openmeetings<br /> - Server = localhost<br /> - USER = root<br /> - PASSWORD =<br /> - Port = 3306<br /> - Socket = /var/run/mysqld/mysqld.sock<br /> - </i> - </blockquote><br /><br /> - Modify file <tt>/etc/odbcinst.ini</tt> 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 <tt>/usr/lib/x86_64-linux-gnu/odbc</tt>)<br/> - <i> - [MySQL]<br /> - Description = ODBC for MySQL<br /> - Driver = /usr/lib/i386-linux-gnu/odbc/libmyodbc.so<br /> - Setup = /usr/lib/i386-linux-gnu/odbc/libodbcmyS.so<br /> - FileUsage = 1<br /> - </i> - </blockquote><br /><br /> + <source> +<![CDATA[ +[asterisk-connector] +Description = MySQL connection to 'openmeetings' database +Driver = MySQL +Database = openmeetings +Server = localhost +USER = root +PASSWORD = +Port = 3306 +Socket = /var/run/mysqld/mysqld.sock +]]> + </source> + Modify file <tt>/etc/odbcinst.ini</tt> as follows: (replace the path to the *.so files below with the real paths on your system)<br/> + (The path below is for x32 server, x64 version is most probably located at <tt>/usr/lib/x86_64-linux-gnu/odbc</tt>)<br/> + <source> +<![CDATA[ +[MySQL] +Description = ODBC for MySQL +Driver = /usr/lib/i386-linux-gnu/odbc/libmyodbc.so +Setup = /usr/lib/i386-linux-gnu/odbc/libodbcmyS.so +FileUsage = 1 +]]> + </source> Run the following command to ensure everything works as expected: - <blockquote> - <i>echo "select 1" | isql -v asterisk-connector</i> - </blockquote> + <source> +<![CDATA[ +echo "select 1" | isql -v asterisk-connector +]]> + </source> </div> </section> <section name="Building and setting up Asterisk"> <div> Run the commands - <blockquote> - <i> - sudo mkdir /usr/src/asterisk && cd /usr/src/asterisk<br /> - sudo wget http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-11.2.1.tar.gz<br /> - sudo tar -xvzf asterisk-11.2.1.tar.gz<br /> - cd ./asterisk-11.2.1<br /> - sudo make clean<br /> - sudo ./configure<br /> - sudo make<br /> - sudo make install<br /> - sudo make samples<br /> - sudo make config<br /> - sudo service asterisk start<br /> - </i> - </blockquote> + <source> +<![CDATA[ +sudo mkdir /usr/src/asterisk && cd /usr/src/asterisk +sudo wget http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-11.2.1.tar.gz +sudo tar -xvzf asterisk-11.2.1.tar.gz +cd ./asterisk-11.2.1 +sudo make clean +sudo ./configure +sudo make +sudo make install +sudo make samples +sudo make config +sudo service asterisk start +]]> + </source> </div> </section> <section name="Configure Asterisk"> @@ -102,141 +106,151 @@ Enable asterisk ODBC module:<br /><br /> Modify "[modules]" section of <tt>/etc/asterisk/modules.conf</tt> as follows:<br /> <strong>Add/uncomment the following lines</strong> - <blockquote> - <i> - preload => res_odbc.so<br /> - preload => res_config_odbc.so<br /> - </i> - </blockquote> + <source> +<![CDATA[ +preload => res_odbc.so +preload => res_config_odbc.so +]]> + </source> </div><br /> <div> Create/update "[asterisk]" section in <tt>/etc/asterisk/res_odbc.conf</tt>: - <blockquote> - <i> - [asterisk]<br /> - enabled => yes<br /> - dsn => asterisk-connector<br /> - pre-connect => yes - </i> - </blockquote> + <source> +<![CDATA[ +[asterisk] +enabled => yes +dsn => asterisk-connector +pre-connect => yes +]]> + </source> </div><br /> <div> Modify <tt>/etc/asterisk/sip.conf</tt><br /> <strong>Add/uncomment the following line</strong>:<br /> - <blockquote> - <i> - videosupport=yes<br /> - rtcachefriends=yes<br /> - </i> - </blockquote> + <source> +<![CDATA[ +videosupport=yes +rtcachefriends=yes +]]> + </source> <strong>Increase maxexpiry value to 43200</strong>:<br /> - <blockquote> - <i> - maxexpiry=43200<br /> - </i> - </blockquote> + <source> +<![CDATA[ +maxexpiry=43200 +]]> + </source> <strong>Add user for the "SIP Transport"</strong>:<br /> - <blockquote> - <i> - [red5sip_user]<br /> - type=friend<br /> - secret=12345<br /> - disallow=all<br /> - allow=ulaw<br /> - allow=h264<br /> - host=dynamic<br /> - nat=force_rport,comedia<br /> - context=rooms-red5sip<br /> - </i> - </blockquote> + <source> +<![CDATA[ +[red5sip_user] +type=friend +secret=12345 +disallow=all +allow=ulaw +allow=h264 +host=dynamic +nat=force_rport,comedia +context=rooms-red5sip +]]> + </source> </div><br /> <div> Add next lines into the <tt>/etc/asterisk/extconfig.conf</tt>: - <blockquote> - <i> - [settings]<br /> - sippeers => odbc,asterisk,sipusers<br /> - </i> - </blockquote> + <source> +<![CDATA[ +[settings] +sippeers => odbc,asterisk,sipusers +]]> + </source> </div><br /> <div> Modify <tt>/etc/asterisk/extensions.conf</tt><br /> <strong>Add the following section</strong>:<br /> - <blockquote> - <i> - [rooms]<br /> - exten => _400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavail)<br /> - exten => _400X!,n(ok),SET(PIN=${DB(openmeetings/rooms/${EXTEN})})<br /> - exten => _400X!,n,Set(CONFBRIDGE(user,template)=sip_user)<br /> - exten => _400X!,n,Set(CONFBRIDGE(user,pin)=${PIN})<br /> - exten => _400X!,n(ok),Confbridge(${EXTEN},default_bridge,)<br /> - exten => _400X!,n,Hangup<br /> - exten => _400X!,n(notavail),Answer()<br /> - exten => _400X!,n,Playback(invalid)<br /> - exten => _400X!,n,Hangup<br /> - <br /> - [rooms-originate]<br /> - exten => _400X!,1,Confbridge(${EXTEN},default_bridge,sip_user)<br /> - exten => _400X!,n,Hangup<br /> - <br /> - [rooms-out]<br /> - ; *****************************************************<br /> - ; Extensions for outgoing calls from Openmeetings room.<br /> - ; *****************************************************<br /> - <br /> - [rooms-red5sip]<br /> - exten => _400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavil)<br /> - exten => _400X!,n(ok),Confbridge(${EXTEN},default_bridge,red5sip_user)<br /> - exten => _400X!,n(notavail),Hangup <br /> - </i> - </blockquote> + <source> +<![CDATA[ +; ***************************************************** +; The below dial plan is used to dial into a Openmeetings Conference room +; The first line DB_EXISTS(openmeetings/room/ does not belong to the openmeetings application but is the name of astDB containing the astDB family/key pair and values +; To Check if your astDB has been created do the following in a terminal window type the following: +; asterisk ârx âdatabase showâ +; If you do not receive an output with that resembles openmeetings/rooms/400## where â##â will equal the extension assigned when you created your room +; If you do not receive the above output check your parameters in /opt/red5/webapps/openmeetings/WEB-INF/classes/openmeetings-applicationContext.xml +; Go back into the Administrator Panel and remove the PIN number in each room save the record with no PIN number and then re-enter the pin again resave the record. +; ***************************************************** + +[rooms] +exten => _400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavail) +exten => _400X!,n(ok),SET(PIN=${DB(openmeetings/rooms/${EXTEN})}) +exten => _400X!,n,Set(CONFBRIDGE(user,template)=sip_user) +exten => _400X!,n,Set(CONFBRIDGE(user,pin)=${PIN}) +exten => _400X!,n(ok),Confbridge(${EXTEN},default_bridge,) +exten => _400X!,n,Hangup +exten => _400X!,n(notavail),Answer() +exten => _400X!,n,Playback(invalid) +exten => _400X!,n,Hangup + +[rooms-originate] +exten => _400X!,1,Confbridge(${EXTEN},default_bridge,sip_user) +exten => _400X!,n,Hangup + +[rooms-out] +; ***************************************************** +; Extensions for outgoing calls from Openmeetings room. +; ***************************************************** + +[rooms-red5sip] +exten => _400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavail) +exten => _400X!,n(ok),Confbridge(${EXTEN},default_bridge,red5sip_user) +exten => _400X!,n(notavail),Hangup +]]> + </source> </div><br /> <div> Modify <tt>/etc/asterisk/confbridge.conf</tt><br /> <strong>Add/Modify the following secions</strong>:<br /> - <blockquote> - <i> - [general]<br /> - <br /> - [red5sip_user]<br /> - type=user<br /> - marked=yes<br /> - dsp_drop_silence=yes<br /> - denoise=true<br /> - <br /> - [sip_user]<br /> - type=user<br /> - end_marked=yes<br /> - wait_marked=yes<br /> - music_on_hold_when_empty=yes<br /> - dsp_drop_silence=yes<br /> - denoise=true<br /> - <br /> - [default_bridge]<br /> - type=bridge<br /> - video_mode=follow_talker<br /> - </i> - </blockquote> + <source> +<![CDATA[ +[general] + +[red5sip_user] +type=user +marked=yes +dsp_drop_silence=yes +denoise=true + +[sip_user] +type=user +end_marked=yes +wait_marked=yes +music_on_hold_when_empty=yes +dsp_drop_silence=yes +denoise=true + +[default_bridge] +type=bridge +video_mode=follow_talker +]]> + </source> </div><br /> <div> To enable Asterisk Manager API modify <tt>/etc/asterisk/manager.conf</tt><br /> <strong>Add/Modify the following sections</strong>:<br /> - <blockquote> - <i> - [general]<br /> - enabled = yes<br /> - webenabled = no<br /> - port = 5038<br /> - bindaddr = 127.0.0.1<br /> - <br /> - [openmeetings]<br /> - secret = 12345<br /> - deny=0.0.0.0/0.0.0.0<br /> - permit=127.0.0.1/255.255.255.0<br /> - read = all<br /> - write = all<br /> - </i> - </blockquote> + <source> +<![CDATA[ +[general] +enabled = yes +webenabled = no +port = 5038 +bindaddr = 127.0.0.1 + +[openmeetings] +secret = 12345 +deny=0.0.0.0/0.0.0.0 +permit=127.0.0.1/255.255.255.0 +read = all +write = all +]]> + </source> </div><br /> <div> Update Openmeetings with creadentials for Asterisk manager. @@ -250,67 +264,80 @@ </div><br /> <div> Restart asterisk: - <blockquote> - <i>service asterisk restart</i> - </blockquote> + <source> +<![CDATA[ +service asterisk restart +]]> + </source> </div><br /> </section> <section name="Setup red5sip transport"> <div> - Download red5sip from - <blockquote>git clone https://github.com/solomax/red5phone.git</blockquote> + Download red5sip from <tt>https://github.com/solomax/red5phone/tree/red5sip_3.0</tt>, switch to the branch red5sip_3.0 </div> <div> - Switch to the correct branch: <blockquote>git checkout red5sip_3.0</blockquote> + switch to the branch red5sip_3.0 + <source> +<![CDATA[ +git clone https://github.com/solomax/red5phone.git +git checkout red5sip_3.0 +]]> + </source> </div> <div> Build with Apache Ant - <blockquote> - <i>ant</i> - </blockquote> + <source> +<![CDATA[ +ant +]]> + </source> </div> <div> Insert proper values to the <tt>/opt/red5sip/settings.properties</tt> - <blockquote> - <i> - red5.host=127.0.0.1 # red5 server address<br /> - om.context=openmeetings # Openmeetings context<br /> - red5.codec=asao<br /> - red5.codec.rate=22 # should correlate with mic settings in public/config.xml<br /> - sip.obproxy=127.0.0.1 # asterisk adderss<br /> - sip.phone=red5sip_user # sip phone number<br /> - sip.authid=red5sip_user # sip auth id<br /> - sip.secret=12345 # sip password<br /> - sip.realm=asterisk # sip realm<br /> - sip.proxy=127.0.0.1 # address of sip proxy <br /> - rooms.forceStart=no # TBD <br /> - rooms=1 # TBD (not in use) <br /> - </i> - </blockquote> + <source> +<![CDATA[ +red5.host=127.0.0.1 # red5 server address +om.context=openmeetings # Openmeetings context +red5.codec=asao +red5.codec.rate=22 # should correlate with mic settings in public/config.xml +sip.obproxy=127.0.0.1 # asterisk adderss +sip.phone=red5sip_user # sip phone number +sip.authid=red5sip_user # sip auth id +sip.secret=12345 # sip password +sip.realm=asterisk # sip realm +sip.proxy=127.0.0.1 # address of sip proxy +rooms.forceStart=no # TBD +rooms=1 # TBD (not in use) +]]> + </source> </div> <div> Add red5sip to autostart: - <blockquote> - <i> - sudo cp /opt/red5sip/red5sip /etc/init.d/<br /> - sudo chmod a+x /etc/init.d/red5sip<br /> - sudo update-rc.d red5sip defaults - </i> - </blockquote> + <source> +<![CDATA[ +sudo cp /opt/red5sip/red5sip /etc/init.d/ +sudo chmod a+x /etc/init.d/red5sip +sudo update-rc.d red5sip defaults +]]> + </source> </div> <div> Start openmeetings - <blockquote> - <i>service red5 start</i> - </blockquote> + <source> +<![CDATA[ +service red5 start +]]> + </source> </div> <div> Start red5sip - <blockquote> - <i>service red5sip start</i> - </blockquote> + <source> +<![CDATA[ +service red5sip start +]]> + </source> </div> </section> </body> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/themes-and-branding.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/themes-and-branding.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/themes-and-branding.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/themes-and-branding.xml Fri Nov 13 01:24:41 2015 @@ -12,8 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> - +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Theme and color</title> <author email="[email protected]"> @@ -36,17 +37,18 @@ <section name="Editing the theme"> - <p>You can find the default theme in the SVN: </p> + <p>To modify default theme used by OM please open following file in the SVN: </p> <p> <a - href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/src/main/webapp/openmeetings/public/theme.xml"; - target="_BLANK" rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/src/main/webapp/openmeetings/public/theme.xml + href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui-1.10.4.custom.css"; + target="_blank" rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme_om/jquery-ui-1.10.4.custom.css </a> </p> + <p>and follow to link following "To view and modify this theme, visit" text in css comments</p> <p> Or if you already installed OpenMeetings on your machine at: <br /> - <tt>/webapps/openmeetings/public/theme.xml</tt> + <tt>/webapps/openmeetings/css/theme_om/jquery-ui-1.10.4.custom.css</tt> <br /> The file contains border, background and font color definitions as well as paths to icons that are loaded at runtime. @@ -55,7 +57,7 @@ (eventually clear the browser cache) to see updates based on modification in your theme. </p> - + <p>All other elements might be styled by modifying CSS files in <tt>/webapps/openmeetings/css</tt> folder</p> </section> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/voip-sip-integration.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/voip-sip-integration.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/voip-sip-integration.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/voip-sip-integration.xml Fri Nov 13 01:24:41 2015 @@ -12,8 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> - +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>VoIP and SIP Integration</title> <author email="[email protected]"> Modified: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java Fri Nov 13 01:24:41 2015 @@ -44,7 +44,6 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.db.entity.room.Invitation; import org.apache.openmeetings.db.entity.room.Invitation.MessageType; import org.apache.openmeetings.db.entity.room.Room; -import org.apache.openmeetings.db.entity.room.Room.Type; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.util.TimezoneUtil; import org.apache.openmeetings.service.mail.template.AppointmentReminderTemplate; @@ -193,7 +192,7 @@ public class AppointmentLogic { Boolean isDaily, Boolean isWeekly, Boolean isMonthly, Boolean isYearly, Long categoryId, String remind, String[] mmClient, Long roomType, Long languageId, - Boolean isPasswordProtected, String password, long roomId, Long users_id) { + Boolean isPasswordProtected, String password, long roomId, Long userId) { Appointment a = new Appointment(); a.setTitle(appointmentName); a.setLocation(appointmentLocation); @@ -211,9 +210,9 @@ public class AppointmentLogic { a.setRoom(new Room()); a.getRoom().setComment(appointmentDescription); a.getRoom().setName(appointmentName); - a.getRoom().setType(Type.get(roomType)); + a.getRoom().setType(Room.Type.get(roomType)); } - a.setOwner(userDao.get(users_id)); + a.setOwner(userDao.get(userId)); a.setPasswordProtected(isPasswordProtected); a.setPassword(password); a.setMeetingMembers(new ArrayList<MeetingMember>()); @@ -221,7 +220,7 @@ public class AppointmentLogic { if (Strings.isEmpty(singleClient)) { continue; } - MeetingMember mm = getMeetingMember(users_id, languageId, singleClient); + MeetingMember mm = getMeetingMember(userId, languageId, singleClient); mm.setAppointment(a); a.getMeetingMembers().add(mm); } Modified: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java Fri Nov 13 01:24:41 2015 @@ -28,6 +28,7 @@ import org.apache.openmeetings.db.dao.ba import org.apache.openmeetings.service.mail.template.FeedbackTemplate; import org.apache.openmeetings.service.mail.template.RegisterUserTemplate; import org.apache.wicket.Application; +import org.apache.wicket.request.mapper.parameter.PageParameters; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -49,22 +50,25 @@ public class EmailManager { } /** - * sends a mail adress to the user with his account data + * sends a mail address to the user with his account data * * @param username * @param userpass * @param email + * @param hash * @return * @throws Exception */ - public String sendMail(String username, String userpass, String email, String link, Boolean sendEmailWithVerficationCode, Long langId) { + public String sendMail(String username, String userpass, String email, String hash, Boolean sendEmailWithVerficationCode, Long langId) { log.debug("sendMail:: username = {}, email = {}", username, email); Integer sendEmailAtRegister = configurationDao.getConfValue("sendEmailAtRegister", Integer.class, "0"); + String link = ((IApplication)Application.get(wicketApplicationName)).urlForActivatePage(new PageParameters().add("u", hash)); + if (sendEmailAtRegister == 1) { RegisterUserTemplate.ensureApplication(langId != null ? langId : configurationDao.getConfValue(CONFIG_DEFAULT_LANG_KEY, Long.class, "1")); - mailHandler.send(email, getString(512) + mailHandler.send(email, getString(512) , RegisterUserTemplate.getEmail(username, userpass, email, sendEmailWithVerficationCode ? link : null)); } return "success"; @@ -74,9 +78,4 @@ public class EmailManager { public void sendFeedback(String username, String email, String message) { mailHandler.send("[email protected]", getString(499), FeedbackTemplate.getEmail(username, email, message)); } - - public String addEmailCon(String EMail, int CONTACT_ID) { - String succ = "invalid email"; - return succ; - } } Modified: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html Fri Nov 13 01:24:41 2015 @@ -33,6 +33,6 @@ <a wicket:id="verification_url1"><wicket:message key="668" /></a> <br /> <span wicket:id="verification_url2"></span> <br /> </div> - <span wicket:id="organisationLbl"></span> + <span wicket:id="groupLbl"></span> </wicket:extend> </html> \ No newline at end of file Modified: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java Fri Nov 13 01:24:41 2015 @@ -35,7 +35,7 @@ public class RegisterUserTemplate extend add(verification.add(new Label("verification_url2", verification_url)) .add(new ExternalLink("verification_url1", verification_url)) .setVisible(verification_url != null)); - add(new Label("organisationLbl", getString(511, langId))); + add(new Label("groupLbl", getString(511, langId))); } public static String getEmail(String username, String userpass, String email, String verification_url) { Modified: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java Fri Nov 13 01:24:41 2015 @@ -113,7 +113,7 @@ public class InvitationManager implement } public void sendInvitionLink(Invitation i, MessageType type, String subject, String message, boolean ical) throws Exception { - String invitation_link = type == MessageType.Cancel ? null : ((IApplication)Application.get(wicketApplicationName)).getOmInvitationLink(configDao.getBaseUrl(), i); + String invitation_link = type == MessageType.Cancel ? null : ((IApplication)Application.get(wicketApplicationName)).getOmInvitationLink(configDao.getBaseUrl(), i); //TODO check for exceptions User owner = i.getInvitedBy(); String invitorName = owner.getFirstname() + " " + owner.getLastname(); @@ -162,11 +162,11 @@ public class InvitationManager implement * @param subject * @return */ - public boolean sendInvitationReminderSMS(String phone, String subject, long language_id) { + public boolean sendInvitationReminderSMS(String phone, String subject, long languageId) { if (!Strings.isEmpty(phone)) { log.debug("sendInvitationReminderSMS to " + phone + ": " + subject); try { - return smsHandler.sendSMS(phone, subject, language_id); + return smsHandler.sendSMS(phone, subject, languageId); } catch (Exception e) { log.error("sendInvitationReminderSMS", e); } @@ -310,7 +310,7 @@ public class InvitationManager implement public Invitation getInvitation(Invitation _invitation, User inveetee, Room room , boolean isPasswordProtected, String invitationpass, Valid valid, - User createdBy, Long language_id, Date gmtTimeStart, Date gmtTimeEnd + User createdBy, Long languageId, Date gmtTimeStart, Date gmtTimeEnd , Appointment appointment) { Invitation invitation = _invitation; @@ -349,8 +349,8 @@ public class InvitationManager implement invitation.setInvitedBy(createdBy); invitation.setInvitee(inveetee); - if (language_id != null && Type.contact == invitation.getInvitee().getType()) { - invitation.getInvitee().setLanguageId(language_id); + if (languageId != null && Type.contact == invitation.getInvitee().getType()) { + invitation.getInvitee().setLanguageId(languageId); } invitation.setRoom(room); invitation.setInserted(new Date()); @@ -359,31 +359,11 @@ public class InvitationManager implement return invitation; } - /** - * Sending invitation within plain mail - * - * @param user_level - * @param username - * @param message - * @param email - * @param subject - * @param rooms_id - * @param conferencedomain - * @param isPasswordProtected - * @param invitationpass - * @param valid - * @param validFrom - * @param validTo - * @param createdBy - * @return - */ - public Invitation getInvitation(User inveetee, Room room - , boolean isPasswordProtected, String invitationpass, Valid valid, - User createdBy, Long language_id, Date gmtTimeStart, Date gmtTimeEnd - , Appointment appointment) + public Invitation getInvitation(User inveetee, Room room, boolean isPasswordProtected, String invitationpass, Valid valid, + User createdBy, Long languageId, Date gmtTimeStart, Date gmtTimeEnd, Appointment appointment) { - Invitation i = getInvitation(null, inveetee, room, isPasswordProtected, invitationpass, valid, createdBy - , language_id, gmtTimeStart, gmtTimeEnd, appointment); + Invitation i = getInvitation((Invitation)null, inveetee, room, isPasswordProtected, invitationpass, valid, createdBy + , languageId, gmtTimeStart, gmtTimeEnd, appointment); i = invitationDao.update(i); return i; } Modified: openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java (original) +++ openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java Fri Nov 13 01:24:41 2015 @@ -42,28 +42,28 @@ import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.TypedQuery; +import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; import org.apache.openmeetings.db.dao.label.LabelDao; import org.apache.openmeetings.db.dao.server.ISessionManager; import org.apache.openmeetings.db.dao.server.SessiondataDao; import org.apache.openmeetings.db.dao.user.IUserManager; -import org.apache.openmeetings.db.dao.user.OrganisationDao; +import org.apache.openmeetings.db.dao.user.GroupDao; import org.apache.openmeetings.db.dao.user.StateDao; import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.dto.basic.SearchResult; import org.apache.openmeetings.db.entity.room.Client; import org.apache.openmeetings.db.entity.server.Sessiondata; import org.apache.openmeetings.db.entity.user.Address; -import org.apache.openmeetings.db.entity.user.Organisation_Users; +import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.State; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.User.Right; import org.apache.openmeetings.db.entity.user.User.Type; import org.apache.openmeetings.db.entity.user.Userdata; +import org.apache.openmeetings.db.util.AuthLevelUtil; import org.apache.openmeetings.db.util.TimezoneUtil; import org.apache.openmeetings.service.mail.EmailManager; -import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter; -import org.apache.openmeetings.db.util.AuthLevelUtil; import org.apache.openmeetings.util.CalendarPatterns; import org.apache.openmeetings.util.DaoHelper; import org.apache.openmeetings.util.crypt.ManageCryptStyle; @@ -93,7 +93,7 @@ public class UserManager implements IUse @Autowired private StateDao stateDao; @Autowired - private OrganisationDao orgDao; + private GroupDao groupDao; @Autowired private UserDao userDao; @Autowired @@ -166,16 +166,16 @@ public class UserManager implements IUse return null; } - public Long logout(String SID, long USER_ID) { + public Long logout(String SID, long userId) { sessiondataDao.updateUser(SID, 0, false, null); return -12L; } - public List<Userdata> getUserdataDashBoard(Long user_id) { - if (user_id != null && user_id.longValue() > 0) { + public List<Userdata> getUserdataDashBoard(Long userId) { + if (userId != null && userId.longValue() > 0) { try { - TypedQuery<Userdata> query = em.createQuery("select c from Userdata as c where c.user_id = :user_id AND c.deleted = false", Userdata.class); - query.setParameter("user_id", user_id); + TypedQuery<Userdata> query = em.createQuery("select c from Userdata as c where c.userId = :userId AND c.deleted = false", Userdata.class); + query.setParameter("userId", userId); List<Userdata> ll = query.getResultList(); return ll; } catch (Exception ex2) { @@ -185,13 +185,13 @@ public class UserManager implements IUse return null; } - public Userdata getUserdataByKey(Long user_id, String DATA_KEY) { + public Userdata getUserdataByKey(Long userId, String key) { Userdata userdata = new Userdata(); - if (user_id != null && user_id.longValue() > 0) { + if (userId != null && userId.longValue() > 0) { try { - TypedQuery<Userdata> query = em.createQuery("select c from Userdata as c where c.user_id = :user_id AND c.data_key = :data_key AND c.deleted = false", Userdata.class); - query.setParameter("user_id", user_id); - query.setParameter("data_key", DATA_KEY); + TypedQuery<Userdata> query = em.createQuery("select c from Userdata as c where c.userId = :userId AND c.key = :key AND c.deleted = false", Userdata.class); + query.setParameter("userId", userId); + query.setParameter("key", key); for (Iterator<Userdata> it2 = query.getResultList().iterator(); it2.hasNext();) { userdata = it2.next(); } @@ -199,23 +199,23 @@ public class UserManager implements IUse log.error("getUserdataByKey", ex2); } } else { - userdata.setComment("Error: No USER_ID given"); + userdata.setComment("Error: No user id given"); } return userdata; } - public String updateUserdata(int DATA_ID, long USER_ID, String DATA_KEY, - String DATA, String Comment) { + public String updateUserdata(int dataId, long userId, String key, + String data, String comment) { String res = "Fehler beim Update"; try { - String hqlUpdate = "update userdata set DATA_KEY= :DATA_KEY, USER_ID = :USER_ID, DATA = :DATA, updatetime = :updatetime, comment = :Comment where DATA_ID= :DATA_ID"; + String hqlUpdate = "update userdata set key= :key, userId = :userId, data = :data, updated = :updated, comment = :comment where id= :id"; int updatedEntities = em.createQuery(hqlUpdate) - .setParameter("DATA_KEY", DATA_KEY) - .setParameter("USER_ID", USER_ID) - .setParameter("DATA", DATA) - .setParameter("updatetime", -1L) - .setParameter("Comment", Comment) - .setParameter("DATA_ID", DATA_ID).executeUpdate(); + .setParameter("key", key) + .setParameter("userId", userId) + .setParameter("data", data) + .setParameter("updated", -1L) + .setParameter("comment", comment) + .setParameter("id", dataId).executeUpdate(); res = "Success" + updatedEntities; } catch (Exception ex2) { log.error("updateUserdata", ex2); @@ -223,18 +223,17 @@ public class UserManager implements IUse return res; } - public String updateUserdataByKey(Long USER_ID, String DATA_KEY, - String DATA, String Comment) { + public String updateUserdataByKey(Long userId, String key, String data, String comment) { String res = "Fehler beim Update"; try { - String hqlUpdate = "UPDATE Userdata set data = :data, updatetime = :updatetime, " - + "comment = :comment where user_id= :user_id AND data_key = :data_key"; + String hqlUpdate = "UPDATE Userdata set data = :data, updated = :updated, " + + "comment = :comment where userId= :userId AND key = :key"; int updatedEntities = em.createQuery(hqlUpdate) - .setParameter("data", DATA) - .setParameter("updatetime", -1L) - .setParameter("comment", Comment) - .setParameter("user_id", USER_ID) - .setParameter("data_key", DATA_KEY).executeUpdate(); + .setParameter("data", data) + .setParameter("updated", -1L) + .setParameter("comment", comment) + .setParameter("userId", userId) + .setParameter("key", key).executeUpdate(); res = "Success" + updatedEntities; } catch (Exception ex2) { log.error("updateUserdataByKey", ex2); @@ -242,16 +241,15 @@ public class UserManager implements IUse return res; } - public String addUserdata(long USER_ID, String DATA_KEY, String DATA, - String Comment) { + public String addUserdata(long userId, String key, String data, String comment) { String ret = "Fehler beim speichern der Userdata"; Userdata userdata = new Userdata(); - userdata.setKey(DATA_KEY); - userdata.setData(DATA); + userdata.setKey(key); + userdata.setData(data); userdata.setInserted(new Date()); userdata.setUpdated(null); - userdata.setComment(Comment); - userdata.setUserId(USER_ID); + userdata.setComment(comment); + userdata.setUserId(userId); userdata.setDeleted(false); try { em.merge(userdata); @@ -265,12 +263,9 @@ public class UserManager implements IUse /** * Method to register a new User, User will automatically be added to the * default user_level(1) new users will be automatically added to the - * Organisation with the id specified in the configuration value + * Group with the id specified in the configuration value * default_group_id * - * @param user_level - * @param availible - * @param status * @param login * @param Userpass * @param lastname @@ -283,57 +278,41 @@ public class UserManager implements IUse * @param zip * @param stateId * @param town - * @param language_id + * @param languageId + * @param phone + * @param sendSMS + * @param generateSipUserData + * @param jNameTimeZone + * @param sendConfirmation * @return */ public Long registerUser(String login, String Userpass, String lastname, String firstname, String email, Date age, String street, String additionalname, String fax, String zip, long stateId, - String town, long language_id, String phone, boolean sendSMS, boolean generateSipUserData, String jNameTimeZone) { - - String baseURL = cfgDao.getBaseUrl(); - boolean sendConfirmation = baseURL != null - && !baseURL.isEmpty() - && 1 == cfgDao.getConfValue("sendEmailWithVerficationCode", Integer.class, "0"); - - return registerUser(login, Userpass, lastname, firstname, email, age, - street, additionalname, fax, zip, stateId, town, language_id, - phone, sendSMS, generateSipUserData, jNameTimeZone, sendConfirmation); - } - - public Long registerUserNoEmail(String login, String Userpass, - String lastname, String firstname, String email, Date age, - String street, String additionalname, String fax, String zip, - long stateId, String town, long language_id, String phone, boolean sendSMS, - boolean generateSipUserData, String jNameTimeZone) { - - return registerUser(login, Userpass, lastname, firstname, email, age, - street, additionalname, fax, zip, stateId, town, language_id, - phone, sendSMS, generateSipUserData, jNameTimeZone, false); - } - - public Long registerUser(String login, String Userpass, String lastname, - String firstname, String email, Date age, String street, - String additionalname, String fax, String zip, long stateId, - String town, long language_id, String phone, boolean sendSMS, + String town, long languageId, String phone, boolean sendSMS, boolean generateSipUserData, String jNameTimeZone, Boolean sendConfirmation) { try { // Checks if FrontEndUsers can register if ("1".equals(cfgDao.getConfValue(CONFIG_SOAP_REGISTER_KEY, String.class, "0"))) { - + if (sendConfirmation == null) { + String baseURL = cfgDao.getBaseUrl(); + sendConfirmation = baseURL != null + && !baseURL.isEmpty() + && 1 == cfgDao.getConfValue("sendEmailWithVerficationCode", Integer.class, "0"); + } // TODO: Read and generate SIP-Data via RPC-Interface Issue 1098 - Long user_id = registerUserInit(UserDao.getDefaultRights(), login, + Long userId = registerUserInit(UserDao.getDefaultRights(), login, Userpass, lastname, firstname, email, age, street, - additionalname, fax, zip, stateId, town, language_id, + additionalname, fax, zip, stateId, town, languageId, true, Arrays.asList(cfgDao.getConfValue(CONFIG_DEFAULT_GROUP_ID, Long.class, null)), phone, sendSMS, sendConfirmation, timezoneUtil.getTimeZone(jNameTimeZone), false, "", "", false, true, null); - if (user_id > 0 && sendConfirmation) { + if (userId > 0 && sendConfirmation) { return -40L; } - return user_id; + return userId; } } catch (Exception e) { log.error("[registerUser]", e); @@ -357,9 +336,9 @@ public class UserManager implements IUse * @param zip * @param stateId * @param town - * @param language_id + * @param languageId * @param sendWelcomeMessage - * @param organisations + * @param groups * @param phone * @param sendSMS * @param sendConfirmation @@ -377,8 +356,8 @@ public class UserManager implements IUse public Long registerUserInit(Set<Right> rights, String login, String password, String lastname, String firstname, String email, Date age, String street, String additionalname, String fax, String zip, long stateId, - String town, long language_id, boolean sendWelcomeMessage, - List<Long> organisations, String phone, boolean sendSMS, Boolean sendConfirmation, + String town, long languageId, boolean sendWelcomeMessage, + List<Long> groups, String phone, boolean sendSMS, Boolean sendConfirmation, TimeZone timezone, Boolean forceTimeZoneCheck, String userOffers, String userSearchs, Boolean showContactData, Boolean showContactDataToContacts, String activatedHash) throws Exception { @@ -399,7 +378,7 @@ public class UserManager implements IUse link += "activate?u=" + hash; if (sendWelcomeMessage && email.length() != 0) { - String sendMail = emailManagement.sendMail(login, password, email, link, sendConfirmation, language_id); + String sendMail = emailManagement.sendMail(login, password, email, link, sendConfirmation, languageId); if (!sendMail.equals("success")) { return -19L; } @@ -412,25 +391,19 @@ public class UserManager implements IUse rights.remove(Right.Login); } - List<Organisation_Users> orgList = new ArrayList<Organisation_Users>(); - for (Long id : organisations) { - orgList.add(new Organisation_Users(orgDao.get(id))); + List<GroupUser> groupList = new ArrayList<GroupUser>(); + for (Long id : groups) { + groupList.add(new GroupUser(groupDao.get(id))); } - User u = userDao.addUser(rights, firstname, login, lastname, language_id, + User u = userDao.addUser(rights, firstname, login, lastname, languageId, password, adr, sendSMS, age, hash, timezone, forceTimeZoneCheck, userOffers, userSearchs, showContactData, - showContactDataToContacts, null, null, orgList, null); + showContactDataToContacts, null, null, groupList, null); if (u == null) { return -111L; } log.debug("Added user-Id " + u.getId()); - /* - * Long adress_emails_id = - * emailManagement.registerEmail(email, address_id,""); if - * (adress_emails_id==null) { return new Long(-112); } - */ - if (adr.getId() > 0 && u.getId() > 0) { return u.getId(); } else { @@ -469,15 +442,12 @@ public class UserManager implements IUse if (rcl.getRoomId() != null) { scopeName = rcl.getRoomId().toString(); } - IScope currentScope = scopeApplicationAdapter - .getRoomScope(scopeName); + IScope currentScope = scopeApplicationAdapter.getRoomScope(scopeName); scopeApplicationAdapter.roomLeaveByScope(rcl, currentScope, true); HashMap<Integer, String> messageObj = new HashMap<Integer, String>(); messageObj.put(0, "kick"); - scopeApplicationAdapter.sendMessageById(messageObj, - rcl.getStreamid(), currentScope); - + scopeApplicationAdapter.sendMessageById(messageObj, rcl.getStreamid(), currentScope); } return true; } @@ -489,13 +459,11 @@ public class UserManager implements IUse public Boolean kickUserByPublicSID(String SID, String publicSID) { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); // admins only - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { - - Client rcl = sessionManager - .getClientByPublicSID(publicSID, false, null); + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { + Client rcl = sessionManager.getClientByPublicSID(publicSID, false, null); if (rcl == null) { return true; @@ -505,13 +473,11 @@ public class UserManager implements IUse if (rcl.getRoomId() != null) { scopeName = rcl.getRoomId().toString(); } - IScope currentScope = scopeApplicationAdapter - .getRoomScope(scopeName); + IScope currentScope = scopeApplicationAdapter.getRoomScope(scopeName); HashMap<Integer, String> messageObj = new HashMap<Integer, String>(); messageObj.put(0, "kick"); - scopeApplicationAdapter.sendMessageById(messageObj, - rcl.getStreamid(), currentScope); + scopeApplicationAdapter.sendMessageById(messageObj, rcl.getStreamid(), currentScope); scopeApplicationAdapter.roomLeaveByScope(rcl, currentScope, true); @@ -580,7 +546,7 @@ public class UserManager implements IUse u.setType(Type.oauth); u.getRights().remove(Right.Login);; u.setDomainId(serverId); - u.getOrganisation_users().add(new Organisation_Users(orgDao.get(cfgDao.getConfValue(CONFIG_DEFAULT_GROUP_ID, Long.class, "-1")))); + u.getGroupUsers().add(new GroupUser(groupDao.get(cfgDao.getConfValue(CONFIG_DEFAULT_GROUP_ID, Long.class, "-1")))); u.setLogin(login); u.setShowContactDataToContacts(true); u.setLastname(lastname); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java Fri Nov 13 01:24:41 2015 @@ -60,7 +60,7 @@ public class ConfigForm extends AdminBas super(id, new CompoundPropertyModel<Configuration>(configuration)); setOutputMarkupId(true); this.listContainer = listContainer; - add(new RequiredTextField<String>("conf_key").setLabel(Model.of(Application.getString(267))).add(new IValidator<String>(){ + add(new RequiredTextField<String>("key").setLabel(Model.of(Application.getString(267))).add(new IValidator<String>(){ private static final long serialVersionUID = 1L; public void validate(IValidatable<String> validatable) { @@ -70,8 +70,8 @@ public class ConfigForm extends AdminBas } } })); - add(new TextField<String>("conf_value").setLabel(Model.of(Application.getString(271)))); - add(forDatePattern("updatetime", WEB_DATE_PATTERN)); + add(new TextField<String>("value").setLabel(Model.of(Application.getString(271)))); + add(forDatePattern("updated", WEB_DATE_PATTERN)); add(new Label("user.login")); add(new TextArea<String>("comment")); @@ -83,7 +83,7 @@ public class ConfigForm extends AdminBas @Override protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) { ConfigurationDao cfgDao = getBean(ConfigurationDao.class); - Configuration c = cfgDao.forceGet(getModelObject().getConf_key()); + Configuration c = cfgDao.forceGet(getModelObject().getKey()); if (c != null && c.isDeleted() && !c.getId().equals(getModelObject().getId())) { getModelObject().setId(c.getId()); } Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html Fri Nov 13 01:24:41 2015 @@ -45,9 +45,9 @@ <table class="adminListTable"> <tbody wicket:id="listContainer" > <tr wicket:id="configList"> - <td class="three_column_layout_column1"><div class="three_column_layout_divcolumn1"><span wicket:id="configuration_id"></span></div></td> - <td class="three_column_layout_column2"><div class="three_column_layout_divcolumn2"><span wicket:id="conf_key"></span></div></td> - <td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="conf_value"></span></div></td> + <td class="three_column_layout_column1"><div class="three_column_layout_divcolumn1"><span wicket:id="id"></span></div></td> + <td class="three_column_layout_column2"><div class="three_column_layout_divcolumn2"><span wicket:id="key"></span></div></td> + <td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="value"></span></div></td> </tr> </tbody> </table> @@ -60,13 +60,13 @@ <fieldset class="ui-widget-content"> <legend class="ui-widget-header"><wicket:message key="266" /></legend> <div class="formelement"> - <label><wicket:message key="267" /></label><input type="text" wicket:id="conf_key"/> + <label><wicket:message key="267" /></label><input type="text" wicket:id="key"/> </div> <div class="formelement"> - <label><wicket:message key="271" /></label><input type="text" wicket:id="conf_value"/> + <label><wicket:message key="271" /></label><input type="text" wicket:id="value"/> </div> <div class="formelement"> - <label><wicket:message key="268" /></label><span wicket:id="updatetime"/> + <label><wicket:message key="268" /></label><span wicket:id="updated"/> </div> <div class="formelement"> <label><wicket:message key="269" /></label><span wicket:id="user.login"/> Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java Fri Nov 13 01:24:41 2015 @@ -46,9 +46,9 @@ public class ConfigsPanel extends AdminP private final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer"); @Override - public void onMenuPanelLoad(IPartialPageRequestHandler target) { - super.onMenuPanelLoad(target); - target.appendJavaScript("omConfigPanelInit();"); + public void onMenuPanelLoad(IPartialPageRequestHandler handler) { + super.onMenuPanelLoad(handler); + handler.appendJavaScript("omConfigPanelInit();"); } public ConfigsPanel(String id) { @@ -61,9 +61,9 @@ public class ConfigsPanel extends AdminP @Override protected void populateItem(final Item<Configuration> item) { final Configuration c = item.getModelObject(); - item.add(new Label("configuration_id", c.getId())); - item.add(new Label("conf_key", c.getConf_key())); - item.add(new Label("conf_value", c.getConf_value())); + item.add(new Label("id", c.getId())); + item.add(new Label("key", c.getKey())); + item.add(new Label("value", c.getValue())); item.add(new AjaxEventBehavior("click") { private static final long serialVersionUID = 1L; @@ -88,9 +88,9 @@ public class ConfigsPanel extends AdminP } }; DataViewContainer<Configuration> container = new DataViewContainer<Configuration>(listContainer, dataView, navigator); - container.addLink(new OmOrderByBorder<Configuration>("orderById", "configuration_id", container)) - .addLink(new OmOrderByBorder<Configuration>("orderByKey", "conf_key", container)) - .addLink(new OmOrderByBorder<Configuration>("orderByValue", "conf_value", container)); + container.addLink(new OmOrderByBorder<Configuration>("orderById", "id", container)) + .addLink(new OmOrderByBorder<Configuration>("orderByKey", "key", container)) + .addLink(new OmOrderByBorder<Configuration>("orderByValue", "value", container)); add(container.getLinks()); add(navigator); Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java (original) +++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java Fri Nov 13 01:24:41 2015 @@ -21,10 +21,10 @@ package org.apache.openmeetings.web.admi import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.app.WebSession.getUserId; -import org.apache.openmeetings.db.dao.user.OrganisationDao; -import org.apache.openmeetings.db.dao.user.OrganisationUserDao; -import org.apache.openmeetings.db.entity.user.Organisation; -import org.apache.openmeetings.db.entity.user.Organisation_Users; +import org.apache.openmeetings.db.dao.user.GroupDao; +import org.apache.openmeetings.db.dao.user.GroupUserDao; +import org.apache.openmeetings.db.entity.user.Group; +import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.web.admin.AdminBaseForm; import org.apache.openmeetings.web.admin.AdminUserChoiceProvider; @@ -40,7 +40,7 @@ import org.apache.wicket.model.Model; import org.apache.wicket.util.time.Duration; import org.wicketstuff.select2.Select2Choice; -public class GroupForm extends AdminBaseForm<Organisation> { +public class GroupForm extends AdminBaseForm<Group> { private static final long serialVersionUID = 1L; private GroupUsersPanel usersPanel; private WebMarkupContainer groupList; @@ -50,13 +50,13 @@ public class GroupForm extends AdminBase return String.format("%s [%s %s]", choice.getLogin(), choice.getFirstname(), choice.getLastname()); } - public GroupForm(String id, WebMarkupContainer groupList, Organisation organisation) { - super(id, new CompoundPropertyModel<Organisation>(organisation)); + public GroupForm(String id, WebMarkupContainer groupList, Group group) { + super(id, new CompoundPropertyModel<Group>(group)); this.groupList = groupList; setOutputMarkupId(true); add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString(165)))); - usersPanel = new GroupUsersPanel("users", getOrgId()); + usersPanel = new GroupUsersPanel("users", getGroupId()); add(usersPanel); add(userToadd = new Select2Choice<User>("user2add", Model.of((User)null), new AdminUserChoiceProvider() { @@ -72,21 +72,21 @@ public class GroupForm extends AdminBase @Override protected void onUpdate(AjaxRequestTarget target) { - Organisation o = GroupForm.this.getModelObject(); + Group o = GroupForm.this.getModelObject(); User u = userToadd.getModelObject(); boolean found = false; if (o.getId() != null) { - found = null != getBean(OrganisationUserDao.class).getByOrganizationAndUser(o.getId(), u.getId()); + found = null != getBean(GroupUserDao.class).getByGroupAndUser(o.getId(), u.getId()); } if (!found && u != null) { - for (Organisation_Users ou : usersPanel.getUsers2add()) { + for (GroupUser ou : usersPanel.getUsers2add()) { if (ou.getUser().getId().equals(u.getId())) { found = true; break; } } if (!found) { - Organisation_Users ou = new Organisation_Users(o); + GroupUser ou = new GroupUser(o); ou.setUser(u); usersPanel.getUsers2add().add(ou); @@ -103,28 +103,28 @@ public class GroupForm extends AdminBase public void updateView(AjaxRequestTarget target) { userToadd.setModelObject(null); - usersPanel.update(getOrgId()); + usersPanel.update(getGroupId()); target.add(this, groupList); target.appendJavaScript("groupsInit();"); } - private long getOrgId() { + private long getGroupId() { return getModelObject().getId() != null ? getModelObject().getId() : 0; } @Override protected void onNewSubmit(AjaxRequestTarget target, Form<?> f) { - setModelObject(new Organisation()); + setModelObject(new Group()); updateView(target); } @Override protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) { - Organisation org = getModelObject(); + Group org = getModelObject(); if (org.getId() != null) { - org = getBean(OrganisationDao.class).get(org.getId()); + org = getBean(GroupDao.class).get(org.getId()); } else { - org = new Organisation(); + org = new Group(); } setModelObject(org); updateView(target); @@ -132,17 +132,17 @@ public class GroupForm extends AdminBase @Override protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) { - getBean(OrganisationDao.class).delete(getModelObject(), getUserId()); - setModelObject(new Organisation()); + getBean(GroupDao.class).delete(getModelObject(), getUserId()); + setModelObject(new Group()); updateView(target); } @Override protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) { - Organisation o = getModelObject(); - o = getBean(OrganisationDao.class).update(o, getUserId()); + Group o = getModelObject(); + o = getBean(GroupDao.class).update(o, getUserId()); setModelObject(o); - getBean(OrganisationUserDao.class).update(usersPanel.getUsers2add(), getUserId()); + getBean(GroupUserDao.class).update(usersPanel.getUsers2add(), getUserId()); hideNewRecord(); updateView(target); }
