[openmeetings] branch master updated: [OPENMEETINGS-2732] wicket-bootstrap, font-awesome, spring, ical4j, h2, swagger
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new b9b09e24c [OPENMEETINGS-2732] wicket-bootstrap, font-awesome, spring,
ical4j, h2, swagger
b9b09e24c is described below
commit b9b09e24c647c908052490418b42334368e79ab5
Author: Maxim Solodovnik
AuthorDate: Fri Jun 17 12:55:21 2022 +0700
[OPENMEETINGS-2732] wicket-bootstrap, font-awesome, spring, ical4j, h2,
swagger
---
.../openmeetings/db/entity/basic/MailMessage.java | 2 +-
.../service/calendar/caldav/IcalUtils.java | 10 +-
.../apache/openmeetings/util/mail/IcalHandler.java | 23 +++---
pom.xml| 14 ++---
4 files changed, 25 insertions(+), 24 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java
index 94780611c..90a296243 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java
@@ -191,6 +191,6 @@ public class MailMessage extends HistoricalEntity {
}
public String getIcsMethod() {
- return icsMethod == null ? Method.REQUEST.getValue() :
icsMethod;
+ return icsMethod == null ? Method.VALUE_REQUEST : icsMethod;
}
}
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java
index 6df71dea2..2372d78a8 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java
@@ -67,16 +67,16 @@ import net.fortuna.ical4j.model.component.VEvent;
import net.fortuna.ical4j.model.parameter.Cn;
import net.fortuna.ical4j.model.parameter.Role;
import net.fortuna.ical4j.model.property.Attendee;
-import net.fortuna.ical4j.model.property.CalScale;
import net.fortuna.ical4j.model.property.DateProperty;
import net.fortuna.ical4j.model.property.Description;
import net.fortuna.ical4j.model.property.Location;
import net.fortuna.ical4j.model.property.Organizer;
import net.fortuna.ical4j.model.property.ProdId;
import net.fortuna.ical4j.model.property.Sequence;
-import net.fortuna.ical4j.model.property.Transp;
import net.fortuna.ical4j.model.property.Uid;
-import net.fortuna.ical4j.model.property.Version;
+import net.fortuna.ical4j.model.property.immutable.ImmutableCalScale;
+import net.fortuna.ical4j.model.property.immutable.ImmutableTransp;
+import net.fortuna.ical4j.model.property.immutable.ImmutableVersion;
import net.fortuna.ical4j.transform.recurrence.Frequency;
/**
@@ -367,7 +367,7 @@ public class IcalUtils {
List comps = new ArrayList<>(events);
comps.add(0, timeZone.getVTimeZone());
return new Calendar(
- new PropertyList(List.of(new ProdId(PROD_ID),
Version.VERSION_2_0, CalScale.GREGORIAN))
+ new PropertyList(List.of(new ProdId(PROD_ID),
ImmutableVersion.VERSION_2_0, ImmutableCalScale.GREGORIAN))
, new ComponentList<>(comps));
}
@@ -383,7 +383,7 @@ public class IcalUtils {
mProperties.add(new Description(appointment.getDescription()));
mProperties.add(new Sequence(0));
- mProperties.add(Transp.OPAQUE);
+ mProperties.add(ImmutableTransp.OPAQUE);
String uid = appointment.getIcalId();
Uid ui;
diff --git
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
index 6c7821e5e..35642ec34 100644
---
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
+++
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
@@ -51,7 +51,6 @@ import net.fortuna.ical4j.model.parameter.Role;
import net.fortuna.ical4j.model.parameter.Rsvp;
import net.fortuna.ical4j.model.parameter.XParameter;
import net.fortuna.ical4j.model.property.Attendee;
-import net.fortuna.ical4j.model.property.CalScale;
import net.fortuna.ical4j.model.property.Created;
import net.fortuna.ical4j.model.property.Description;
import net.fortuna.ical4j.model.property.LastModified;
@@ -60,10 +59,12 @@ import net.fortuna.ical4j.model.property.Method;
import net.fortuna.ical4j.model.property.Organizer;
import net.fortuna.ical4j.model.property.ProdId;
[jira] [Commented] (OPENMEETINGS-2737) Incomplete Address when dialing OM Conference room
[
https://issues.apache.org/jira/browse/OPENMEETINGS-2737?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17555375#comment-17555375
]
Maxim Solodovnik commented on OPENMEETINGS-2737:
{quote}I am not sure how your incoming call is working without having a
extention for your phone in the same context as rooms{quote}
I'm not the author of this idea, only maintainer :)
As far as I understand
* OM internal server periodically checks if there are incoming SIP call
* if we found one
* we will enter as {{omsip_user}} to {{[rooms-omsip]}} and will get to the same
{{ConfBridge}}
* And internally we are adding audio/video connections to our multimedia-map
:)
something like this :)
{quote}And yes you can added me as a contributor.{quote} how you would like to
be listed? would you like to have and URL near your name? :)
> Incomplete Address when dialing OM Conference room
> --
>
> Key: OPENMEETINGS-2737
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2737
> Project: Openmeetings
> Issue Type: Bug
> Components: VoIP/SIP
>Affects Versions: 6.2.0
>Reporter: Horace Miles
>Assignee: Maxim Solodovnik
>Priority: Major
> Fix For: 7.0.0
>
> Attachments: agent-confid.gsm, r-agent-confid.gsm
>
>
> When trying to call OM conference room I receive the following error:
> SIP/2.0 484 Address Incomplete
> *CLI> pjsip show history
> No. Timestamp (Dir) Address SIP Message
>
> = == ==
> ===
> 0 1652464465 * <== 98.174.244.227:41916 INVITE
> sip:40011@98.174.244.232 SIP/2.0
> 1 1652464465 * ==> 98.174.244.227:41916 SIP/2.0 401 Unauthorized
> 2 1652464465 * <== 98.174.244.227:41916 ACK sip:40011@98.174.244.232
> SIP/2.0
> 3 1652464465 * <== 98.174.244.227:41916 INVITE
> sip:40011@98.174.244.232 SIP/2.0
> 4 1652464465 * ==> 98.174.244.227:41916 SIP/2.0 484 Address Incomplete
> 5 1652464465 * <== 98.174.244.227:41916 ACK sip:40011@98.174.244.232
> SIP/2.0
> *CLI>
> sip.conf settings
> [omsip_user]
> host=dynamic
> secret=
> context=rooms-omsip
> transport=ws,wss
> type=friend
> encryption=no
> avpf=yes
> icesupport=yes
> directmedia=no
> allow=!all,ulaw,opus,vp8
> extensions.conf configuration
> [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-omsip]
> exten =>
> _400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavail)
> exten => _400X!,n(ok),Confbridge(${EXTEN},default_bridge,omsip_user)
> exten => _400X!,n(notavail),Hangup
> Asterisk Database
> CLI> database show
> /dundi/secret :
> fL3QQ8egcjnj1bEufyh+AQ==;W6fVbQ9sJWPq0oZp50y7Ig==
> /dundi/secretexpiry : 1652465880
> /openmeetings/rooms : 4004
> /openmeetings/rooms/40011 :
> /pbx/UUID :
> 7dd6882b-8da9-4099-a6a7-3012970c94ca
> /registrar/contact/horace-cellphone;@de16880426ac7644569b396c5df408ff:
> {"via_addr":"10.10.0.8","qualify_timeout":"3.00","call_id":"GM3y5EhhVO","reg_server":"","prune_on_boot":"no","path":"","endpoint":"horace-cellphone","via_port":"41916","authenticate_qualify":"no","uri":"sip:horace-cellphone@98.174.244.227:41916;transport=udp","qualify_frequency":"0","user_agent":"LinphoneAndroid/4.6.7
> (Galaxy Note9) LinphoneSDK/5.1.28
> (tags/5.1.28^0)","expiration_time":"1652465692","outbound_proxy":""}
> /registrar/contact/horace-desktop;@2487af86a629ea26178ed30c7963b8f8:
> {"via_addr":"10.10.0.2","qualify_timeout":"3.00","call_id":"2LzZJqpTs1","reg_server":"","prune_on_boot":"no","path":"","endpoint":"horace-desktop","via_port":"5060","authenticate_qualify":"no","uri":"sip:horace-desktop@98.174.244.227;transport=udp","qualify_frequency":"0","user_agent":"Linphone
> Desktop/4.4.1 (MILES-PC) Windows 10 Version 2009, Qt 5.15.2
>
[jira] [Comment Edited] (OPENMEETINGS-2737) Incomplete Address when dialing OM Conference room
[
https://issues.apache.org/jira/browse/OPENMEETINGS-2737?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17555113#comment-17555113
]
Horace Miles edited comment on OPENMEETINGS-2737 at 6/16/22 2:53 PM:
-
Thanks Maxim,
Shall I change the instructions?
https://nightlies.apache.org/openmeetings/AsteriskIntegration.html
I am not sure how your incoming call is working without having a extention for
your phone in the same context as rooms, but I think that needs to be added for
those individuals that no nothing about asterisk.
And yes you can added me as a contributor. I plan to continue contributing and
I am just so happy with OM!
was (Author: hormiles):
Thanks Maxim,
I am not sure how your incoming call is working without having a extention for
your phone in the same context as rooms, but I think that needs to be added for
those individuals that no nothing about asterisk.
> Incomplete Address when dialing OM Conference room
> --
>
> Key: OPENMEETINGS-2737
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2737
> Project: Openmeetings
> Issue Type: Bug
> Components: VoIP/SIP
>Affects Versions: 6.2.0
>Reporter: Horace Miles
>Assignee: Maxim Solodovnik
>Priority: Major
> Fix For: 7.0.0
>
> Attachments: agent-confid.gsm, r-agent-confid.gsm
>
>
> When trying to call OM conference room I receive the following error:
> SIP/2.0 484 Address Incomplete
> *CLI> pjsip show history
> No. Timestamp (Dir) Address SIP Message
>
> = == ==
> ===
> 0 1652464465 * <== 98.174.244.227:41916 INVITE
> sip:40011@98.174.244.232 SIP/2.0
> 1 1652464465 * ==> 98.174.244.227:41916 SIP/2.0 401 Unauthorized
> 2 1652464465 * <== 98.174.244.227:41916 ACK sip:40011@98.174.244.232
> SIP/2.0
> 3 1652464465 * <== 98.174.244.227:41916 INVITE
> sip:40011@98.174.244.232 SIP/2.0
> 4 1652464465 * ==> 98.174.244.227:41916 SIP/2.0 484 Address Incomplete
> 5 1652464465 * <== 98.174.244.227:41916 ACK sip:40011@98.174.244.232
> SIP/2.0
> *CLI>
> sip.conf settings
> [omsip_user]
> host=dynamic
> secret=
> context=rooms-omsip
> transport=ws,wss
> type=friend
> encryption=no
> avpf=yes
> icesupport=yes
> directmedia=no
> allow=!all,ulaw,opus,vp8
> extensions.conf configuration
> [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-omsip]
> exten =>
> _400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavail)
> exten => _400X!,n(ok),Confbridge(${EXTEN},default_bridge,omsip_user)
> exten => _400X!,n(notavail),Hangup
> Asterisk Database
> CLI> database show
> /dundi/secret :
> fL3QQ8egcjnj1bEufyh+AQ==;W6fVbQ9sJWPq0oZp50y7Ig==
> /dundi/secretexpiry : 1652465880
> /openmeetings/rooms : 4004
> /openmeetings/rooms/40011 :
> /pbx/UUID :
> 7dd6882b-8da9-4099-a6a7-3012970c94ca
> /registrar/contact/horace-cellphone;@de16880426ac7644569b396c5df408ff:
> {"via_addr":"10.10.0.8","qualify_timeout":"3.00","call_id":"GM3y5EhhVO","reg_server":"","prune_on_boot":"no","path":"","endpoint":"horace-cellphone","via_port":"41916","authenticate_qualify":"no","uri":"sip:horace-cellphone@98.174.244.227:41916;transport=udp","qualify_frequency":"0","user_agent":"LinphoneAndroid/4.6.7
> (Galaxy Note9) LinphoneSDK/5.1.28
> (tags/5.1.28^0)","expiration_time":"1652465692","outbound_proxy":""}
> /registrar/contact/horace-desktop;@2487af86a629ea26178ed30c7963b8f8:
> {"via_addr":"10.10.0.2","qualify_timeout":"3.00","call_id":"2LzZJqpTs1","reg_server":"","prune_on_boot":"no","path":"","endpoint":"horace-desktop","via_port":"5060","authenticate_qualify":"no","uri":"sip:horace-desktop@98.174.244.227;transport=udp","qualify_frequency":"0","user_agent":"Linphone
> Desktop/4.4.1
[jira] [Commented] (OPENMEETINGS-2737) Incomplete Address when dialing OM Conference room
[
https://issues.apache.org/jira/browse/OPENMEETINGS-2737?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17555113#comment-17555113
]
Horace Miles commented on OPENMEETINGS-2737:
Thanks Maxim,
I am not sure how your incoming call is working without having a extention for
your phone in the same context as rooms, but I think that needs to be added for
those individuals that no nothing about asterisk.
> Incomplete Address when dialing OM Conference room
> --
>
> Key: OPENMEETINGS-2737
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2737
> Project: Openmeetings
> Issue Type: Bug
> Components: VoIP/SIP
>Affects Versions: 6.2.0
>Reporter: Horace Miles
>Assignee: Maxim Solodovnik
>Priority: Major
> Fix For: 7.0.0
>
> Attachments: agent-confid.gsm, r-agent-confid.gsm
>
>
> When trying to call OM conference room I receive the following error:
> SIP/2.0 484 Address Incomplete
> *CLI> pjsip show history
> No. Timestamp (Dir) Address SIP Message
>
> = == ==
> ===
> 0 1652464465 * <== 98.174.244.227:41916 INVITE
> sip:40011@98.174.244.232 SIP/2.0
> 1 1652464465 * ==> 98.174.244.227:41916 SIP/2.0 401 Unauthorized
> 2 1652464465 * <== 98.174.244.227:41916 ACK sip:40011@98.174.244.232
> SIP/2.0
> 3 1652464465 * <== 98.174.244.227:41916 INVITE
> sip:40011@98.174.244.232 SIP/2.0
> 4 1652464465 * ==> 98.174.244.227:41916 SIP/2.0 484 Address Incomplete
> 5 1652464465 * <== 98.174.244.227:41916 ACK sip:40011@98.174.244.232
> SIP/2.0
> *CLI>
> sip.conf settings
> [omsip_user]
> host=dynamic
> secret=
> context=rooms-omsip
> transport=ws,wss
> type=friend
> encryption=no
> avpf=yes
> icesupport=yes
> directmedia=no
> allow=!all,ulaw,opus,vp8
> extensions.conf configuration
> [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-omsip]
> exten =>
> _400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavail)
> exten => _400X!,n(ok),Confbridge(${EXTEN},default_bridge,omsip_user)
> exten => _400X!,n(notavail),Hangup
> Asterisk Database
> CLI> database show
> /dundi/secret :
> fL3QQ8egcjnj1bEufyh+AQ==;W6fVbQ9sJWPq0oZp50y7Ig==
> /dundi/secretexpiry : 1652465880
> /openmeetings/rooms : 4004
> /openmeetings/rooms/40011 :
> /pbx/UUID :
> 7dd6882b-8da9-4099-a6a7-3012970c94ca
> /registrar/contact/horace-cellphone;@de16880426ac7644569b396c5df408ff:
> {"via_addr":"10.10.0.8","qualify_timeout":"3.00","call_id":"GM3y5EhhVO","reg_server":"","prune_on_boot":"no","path":"","endpoint":"horace-cellphone","via_port":"41916","authenticate_qualify":"no","uri":"sip:horace-cellphone@98.174.244.227:41916;transport=udp","qualify_frequency":"0","user_agent":"LinphoneAndroid/4.6.7
> (Galaxy Note9) LinphoneSDK/5.1.28
> (tags/5.1.28^0)","expiration_time":"1652465692","outbound_proxy":""}
> /registrar/contact/horace-desktop;@2487af86a629ea26178ed30c7963b8f8:
> {"via_addr":"10.10.0.2","qualify_timeout":"3.00","call_id":"2LzZJqpTs1","reg_server":"","prune_on_boot":"no","path":"","endpoint":"horace-desktop","via_port":"5060","authenticate_qualify":"no","uri":"sip:horace-desktop@98.174.244.227;transport=udp","qualify_frequency":"0","user_agent":"Linphone
> Desktop/4.4.1 (MILES-PC) Windows 10 Version 2009, Qt 5.15.2
> LinphoneCore/5.1.19-1-g6cdd0918e","expiration_time":"1652466228","outbound_proxy":""}
> 7 results found.
> *CLI>
> I am using linphone 4.4.1 - Qt5.15.2
> Asterisk 16
> I can successfully make calls from Asterisk extension inbound and output to
> both internal extentions and external PTSN numbers.
> I can not dial out of a OM Conference room - I get nothing at all
> I can not dial into a open meetings
> I can not dial between conference rooms
> I have also tried
