You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/07/31 07:34:07 UTC
svn commit: r1367412 [2/4] - in /incubator/openmeetings/trunk/singlewebapp:
./ src/org/openmeetings/app/backup/ src/org/openmeetings/app/data/basic/dao/
src/org/openmeetings/app/data/calendar/daos/
src/org/openmeetings/app/data/conference/ src/org/open...
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/asterisk/AsteriskSipUsers.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/asterisk/AsteriskSipUsers.java?rev=1367412&r1=1367411&r2=1367412&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/asterisk/AsteriskSipUsers.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/asterisk/AsteriskSipUsers.java Tue Jul 31 05:34:05 2012
@@ -27,719 +27,784 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.simpleframework.xml.Element;
+import org.simpleframework.xml.Root;
+
@Entity
@Table(name = "sipusers")
+@Root(name="asterisksipuser")
public class AsteriskSipUsers implements Serializable {
private static final long serialVersionUID = -565831761546365623L;
@Id
- @Column(name = "id")
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- private int id;
-
- @Column(name = "accountcode")
- private String accountcode;
-
- @Column(name = "disallow")
- private String disallow = null;
-
- @Column(name = "allow")
- private String allow = "ulaw";
-
- @Column(name = "allowoverlap")
- private String allowoverlap = "yes";
-
- @Column(name = "allowsubscribe")
- private String allowsubscribe = "yes";
-
- @Column(name = "allowtransfer")
- private String allowtransfer;
-
- @Column(name = "amaflags")
- private String amaflags;
-
- @Column(name = "autoframing")
- private String autoframing;
-
- @Column(name = "auth")
- private String auth;
-
- @Column(name = "buggymwi")
- private String buggymwi = "no";
-
- @Column(name = "callgroup")
- private String callgroup;
-
- @Column(name = "callerid")
- private String callerid;
-
- @Column(name = "cid_number")
- private String cid_number;
-
- @Column(name = "fullname")
- private String fullname;
-
-// TODO: error
-// @Column(name = "call-limit")
-// private int callLimit;
-
- @Column(name = "callingpres")
- private String callingpres;
-
- @Column(name = "canreinvite")
- private String canreinvite = "yes";
-
- @Column(name = "context")
- private String context;
-
- @Column(name = "defaultip")
- private String defaultip;
-
- @Column(name = "dtmfmode")
- private String dtmfmode;
-
- @Column(name = "fromuser")
- private String fromuser;
-
- @Column(name = "fromdomain")
- private String fromdomain;
-
- @Column(name = "fullcontact")
- private String fullcontact;
-
-// @Column(name = "g726nonstandard")
- @Column(name = "g726nonstandard")
- //@Enumerated(EnumType.STRING)
- private String g726nonstandard = "no";
-
- @Column(name = "host", nullable = false)
- private String host = "dynamic";
-
- @Column(name = "insecure")
- private String insecure;
-
- @Column(name = "ipaddr", nullable = false)
- private String ipaddr = "";
-
- @Column(name = "language")
- private String language;
-
- @Column(name = "lastms")
- private String lastms;
-
- @Column(name = "mailbox")
- private String mailbox;
-
- @Column(name = "maxcallbitrate")
- private int maxcallbitrate = 384;
-
- @Column(name = "mohsuggest")
- private String mohsuggest;
-
- @Column(name = "md5secret")
- private String md5secret;
-
- @Column(name = "musiconhold")
- private String musiconhold;
-
- @Column(name = "name", nullable = false)
- private String name = "";
-
- @Column(name = "nat", nullable = false)
- private String nat = "no";
-
- @Column(name = "outboundproxy")
- private String outboundproxy;
-
- @Column(name = "deny")
- private String deny;
-
- @Column(name = "permit")
- private String permit;
-
- @Column(name = "pickupgroup")
- private String pickupgroup;
-
- @Column(name = "port", nullable = false)
- private String port = "";
-
-// @Column(name = "progressinband")
- @Column(name = "progressinband")
- //@Enumerated(EnumType.STRING)
- private String progressinband = "no";
-// private YesNoNever progressinband;
-
-// @Column(name = "promiscredir")
- @Column(name = "promiscredir")
- //@Enumerated(EnumType.STRING)
- private String promiscredir = "no";
-
- @Column(name = "qualify")
- private String qualify;
-
- @Column(name = "regexten", nullable = false)
- private String regexten = "";
-
- @Column(name = "regseconds", nullable = false)
- private int regseconds = 0;
-
-// @Column(name = "rfc2833compensate")
- @Column(name = "rfc2833compensate")
- //@Enumerated(EnumType.STRING)
- private String rfc2833compensate = "no";
-
- @Column(name = "rtptimeout")
- private String rtptimeout;
-
- @Column(name = "rtpholdtimeout")
- private String rtpholdtimeout;
-
- @Column(name = "secret")
- private String secret;
-
-// @Column(name = "sendrpid")
- @Column(name = "sendrpid")
- //@Enumerated(EnumType.STRING)
- private String sendrpid = "yes";
-
- @Column(name = "setvar", nullable = false)
- private String setvar = "";
-
- @Column(name = "subscribecontext")
- private String subscribecontext;
-
- @Column(name = "subscribemwi")
- private String subscribemwi;
-
-// @Column(name = "t38pt_udptl")
- @Column(name = "t38pt_udptl")
- //@Enumerated(EnumType.STRING)
- private String t38pt_udptl = "no";
-
-// @Column(name = "trustrpid")
- @Column(name = "trustrpid")
- //@Enumerated(EnumType.STRING)
- private String trustrpid = "no";
-
- @Column(name = "type", nullable = false)
- private String type = "friend";
-
-// @Column(name = "useclientcode")
- @Column(name = "useclientcode")
- //@Enumerated(EnumType.STRING)
- private String useclientcode = "no";
-
- @Column(name = "username", nullable = false)
- private String username = "";
-
- @Column(name = "usereqphone", nullable = false)
- private String usereqphone = "no";
-
-// @Column(name = "videosupport")
- @Column(name = "videosupport")
- //@Enumerated(EnumType.STRING)
- private String videosupport = "yes";
-
- @Column(name = "vmexten")
- private String vmexten;
-
-// create unique index name on asterisk.sipusers (name);
-// create index name_2 on asterisk.sipusers (name);
-
-
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getAccountcode() {
- return accountcode;
- }
-
- public void setAccountcode(String accountcode) {
- this.accountcode = accountcode;
- }
-
- public String getDisallow() {
- return disallow;
- }
-
- public void setDisallow(String disallow) {
- this.disallow = disallow;
- }
-
- public String getAllow() {
- return allow;
- }
-
- public void setAllow(String allow) {
- this.allow = allow;
- }
-
- public String getAllowoverlap() {
- return allowoverlap;
- }
-
- public void setAllowoverlap(String allowoverlap) {
- this.allowoverlap = allowoverlap;
- }
-
- public String getAllowsubscribe() {
- return allowsubscribe;
- }
-
- public void setAllowsubscribe(String allowsubscribe) {
- this.allowsubscribe = allowsubscribe;
- }
-
- public String getAllowtransfer() {
- return allowtransfer;
- }
-
- public void setAllowtransfer(String allowtransfer) {
- this.allowtransfer = allowtransfer;
- }
-
- public String getAmaflags() {
- return amaflags;
- }
-
- public void setAmaflags(String amaflags) {
- this.amaflags = amaflags;
- }
-
- public String getAutoframing() {
- return autoframing;
- }
-
- public void setAutoframing(String autoframing) {
- this.autoframing = autoframing;
- }
-
- public String getAuth() {
- return auth;
- }
-
- public void setAuth(String auth) {
- this.auth = auth;
- }
-
- public String getBuggymwi() {
- return buggymwi;
- }
-
- public void setBuggymwi(String buggymwi) {
- this.buggymwi = buggymwi;
- }
-
- public String getCallgroup() {
- return callgroup;
- }
-
- public void setCallgroup(String callgroup) {
- this.callgroup = callgroup;
- }
-
- public String getCallerid() {
- return callerid;
- }
-
- public void setCallerid(String callerid) {
- this.callerid = callerid;
- }
-
- public String getCid_number() {
- return cid_number;
- }
-
- public void setCid_number(String cid_number) {
- this.cid_number = cid_number;
- }
-
- public String getFullname() {
- return fullname;
- }
-
- public void setFullname(String fullname) {
- this.fullname = fullname;
- }
-
- public String getCallingpres() {
- return callingpres;
- }
-
- public void setCallingpres(String callingpres) {
- this.callingpres = callingpres;
- }
-
- public String getCanreinvite() {
- return canreinvite;
- }
-
- public void setCanreinvite(String canreinvite) {
- this.canreinvite = canreinvite;
- }
-
- public String getContext() {
- return context;
- }
-
- public void setContext(String context) {
- this.context = context;
- }
-
- public String getDefaultip() {
- return defaultip;
- }
-
- public void setDefaultip(String defaultip) {
- this.defaultip = defaultip;
- }
-
- public String getDtmfmode() {
- return dtmfmode;
- }
-
- public void setDtmfmode(String dtmfmode) {
- this.dtmfmode = dtmfmode;
- }
-
- public String getFromuser() {
- return fromuser;
- }
-
- public void setFromuser(String fromuser) {
- this.fromuser = fromuser;
- }
-
- public String getFromdomain() {
- return fromdomain;
- }
-
- public void setFromdomain(String fromdomain) {
- this.fromdomain = fromdomain;
- }
-
- public String getFullcontact() {
- return fullcontact;
- }
-
- public void setFullcontact(String fullcontact) {
- this.fullcontact = fullcontact;
- }
-
- public String getG726nonstandard() {
- return g726nonstandard;
- }
-
- public void setG726nonstandard(String g726nonstandard) {
- this.g726nonstandard = g726nonstandard;
- }
-
- public String getHost() {
- return host;
- }
-
- public void setHost(String host) {
- this.host = host;
- }
-
- public String getInsecure() {
- return insecure;
- }
-
- public void setInsecure(String insecure) {
- this.insecure = insecure;
- }
-
- public String getIpaddr() {
- return ipaddr;
- }
-
- public void setIpaddr(String ipaddr) {
- this.ipaddr = ipaddr;
- }
-
- public String getLanguage() {
- return language;
- }
-
- public void setLanguage(String language) {
- this.language = language;
- }
-
- public String getLastms() {
- return lastms;
- }
-
- public void setLastms(String lastms) {
- this.lastms = lastms;
- }
-
- public String getMailbox() {
- return mailbox;
- }
-
- public void setMailbox(String mailbox) {
- this.mailbox = mailbox;
- }
-
- public int getMaxcallbitrate() {
- return maxcallbitrate;
- }
-
- public void setMaxcallbitrate(int maxcallbitrate) {
- this.maxcallbitrate = maxcallbitrate;
- }
-
- public String getMohsuggest() {
- return mohsuggest;
- }
-
- public void setMohsuggest(String mohsuggest) {
- this.mohsuggest = mohsuggest;
- }
-
- public String getMd5secret() {
- return md5secret;
- }
-
- public void setMd5secret(String md5secret) {
- this.md5secret = md5secret;
- }
-
- public String getMusiconhold() {
- return musiconhold;
- }
-
- public void setMusiconhold(String musiconhold) {
- this.musiconhold = musiconhold;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getNat() {
- return nat;
- }
-
- public void setNat(String nat) {
- this.nat = nat;
- }
-
- public String getOutboundproxy() {
- return outboundproxy;
- }
-
- public void setOutboundproxy(String outboundproxy) {
- this.outboundproxy = outboundproxy;
- }
-
- public String getDeny() {
- return deny;
- }
-
- public void setDeny(String deny) {
- this.deny = deny;
- }
-
- public String getPermit() {
- return permit;
- }
-
- public void setPermit(String permit) {
- this.permit = permit;
- }
-
- public String getPickupgroup() {
- return pickupgroup;
- }
-
- public void setPickupgroup(String pickupgroup) {
- this.pickupgroup = pickupgroup;
- }
-
- public String getPort() {
- return port;
- }
-
- public void setPort(String port) {
- this.port = port;
- }
-
- public String getProgressinband() {
- return progressinband;
- }
-
- public void setProgressinband(String progressinband) {
- this.progressinband = progressinband;
- }
-
- public String getPromiscredir() {
- return promiscredir;
- }
-
- public void setPromiscredir(String promiscredir) {
- this.promiscredir = promiscredir;
- }
-
- public String getQualify() {
- return qualify;
- }
-
- public void setQualify(String qualify) {
- this.qualify = qualify;
- }
-
- public String getRegexten() {
- return regexten;
- }
-
- public void setRegexten(String regexten) {
- this.regexten = regexten;
- }
-
- public int getRegseconds() {
- return regseconds;
- }
-
- public void setRegseconds(int regseconds) {
- this.regseconds = regseconds;
- }
-
- public String getRfc2833compensate() {
- return rfc2833compensate;
- }
-
- public void setRfc2833compensate(String rfc2833compensate) {
- this.rfc2833compensate = rfc2833compensate;
- }
-
- public String getRtptimeout() {
- return rtptimeout;
- }
-
- public void setRtptimeout(String rtptimeout) {
- this.rtptimeout = rtptimeout;
- }
-
- public String getRtpholdtimeout() {
- return rtpholdtimeout;
- }
-
- public void setRtpholdtimeout(String rtpholdtimeout) {
- this.rtpholdtimeout = rtpholdtimeout;
- }
-
- public String getSecret() {
- return secret;
- }
-
- public void setSecret(String secret) {
- this.secret = secret;
- }
-
- public String getSendrpid() {
- return sendrpid;
- }
-
- public void setSendrpid(String sendrpid) {
- this.sendrpid = sendrpid;
- }
-
- public String getSetvar() {
- return setvar;
- }
-
- public void setSetvar(String setvar) {
- this.setvar = setvar;
- }
-
- public String getSubscribecontext() {
- return subscribecontext;
- }
-
- public void setSubscribecontext(String subscribecontext) {
- this.subscribecontext = subscribecontext;
- }
-
- public String getSubscribemwi() {
- return subscribemwi;
- }
-
- public void setSubscribemwi(String subscribemwi) {
- this.subscribemwi = subscribemwi;
- }
-
- public String getT38pt_udptl() {
- return t38pt_udptl;
- }
-
- public void setT38pt_udptl(String t38pt_udptl) {
- this.t38pt_udptl = t38pt_udptl;
- }
-
- public String getTrustrpid() {
- return trustrpid;
- }
-
- public void setTrustrpid(String trustrpid) {
- this.trustrpid = trustrpid;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getUseclientcode() {
- return useclientcode;
- }
-
- public void setUseclientcode(String useclientcode) {
- this.useclientcode = useclientcode;
- }
-
- public String getUsername() {
- return username;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public String getUsereqphone() {
- return usereqphone;
- }
-
- public void setUsereqphone(String usereqphone) {
- this.usereqphone = usereqphone;
- }
-
- public String getVideosupport() {
- return videosupport;
- }
-
- public void setVideosupport(String videosupport) {
- this.videosupport = videosupport;
- }
-
- public String getVmexten() {
- return vmexten;
- }
-
- public void setVmexten(String vmexten) {
- this.vmexten = vmexten;
- }
+ @Column(name = "id")
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Element(data = true)
+ private int id;
+
+ @Column(name = "accountcode")
+ @Element(data = true)
+ private String accountcode;
+
+ @Column(name = "disallow")
+ @Element(data = true)
+ private String disallow = null;
+
+ @Column(name = "allow")
+ @Element(data = true)
+ private String allow = "ulaw";
+
+ @Column(name = "allowoverlap")
+ @Element(data = true)
+ private String allowoverlap = "yes";
+
+ @Column(name = "allowsubscribe")
+ @Element(data = true)
+ private String allowsubscribe = "yes";
+
+ @Column(name = "allowtransfer")
+ @Element(data = true)
+ private String allowtransfer;
+
+ @Column(name = "amaflags")
+ @Element(data = true)
+ private String amaflags;
+
+ @Column(name = "autoframing")
+ @Element(data = true)
+ private String autoframing;
+
+ @Column(name = "auth")
+ @Element(data = true)
+ private String auth;
+
+ @Column(name = "buggymwi")
+ @Element(data=true)
+ private String buggymwi = "no";
+
+ @Column(name = "callgroup")
+ @Element(data=true)
+ private String callgroup;
+
+ @Column(name = "callerid")
+ @Element(data=true)
+ private String callerid;
+
+ @Column(name = "cid_number")
+ @Element(data=true)
+ private String cid_number;
+
+ @Column(name = "fullname")
+ @Element(data=true)
+ private String fullname;
+
+ // TODO: error
+ // @Column(name = "call-limit")
+ // private int callLimit;
+
+ @Column(name = "callingpres")
+ @Element(data=true)
+ private String callingpres;
+
+ @Column(name = "canreinvite")
+ @Element(data=true)
+ private String canreinvite = "yes";
+
+ @Column(name = "context")
+ @Element(data=true)
+ private String context;
+
+ @Column(name = "defaultip")
+ @Element(data=true)
+ private String defaultip;
+
+ @Column(name = "dtmfmode")
+ @Element(data=true)
+ private String dtmfmode;
+
+ @Column(name = "fromuser")
+ @Element(data=true)
+ private String fromuser;
+
+ @Column(name = "fromdomain")
+ @Element(data=true)
+ private String fromdomain;
+
+ @Column(name = "fullcontact")
+ @Element(data=true)
+ private String fullcontact;
+
+ // @Column(name = "g726nonstandard")
+ @Column(name = "g726nonstandard")
+ // @Enumerated(EnumType.STRING)
+ @Element(data=true)
+ private String g726nonstandard = "no";
+
+ @Column(name = "host", nullable = false)
+ @Element(data=true)
+ private String host = "dynamic";
+
+ @Column(name = "insecure")
+ @Element(data=true)
+ private String insecure;
+
+ @Column(name = "ipaddr", nullable = false)
+ @Element(data=true)
+ private String ipaddr = "";
+
+ @Column(name = "language")
+ @Element(data=true)
+ private String language;
+
+ @Column(name = "lastms")
+ @Element(data=true)
+ private String lastms;
+
+ @Column(name = "mailbox")
+ @Element(data=true)
+ private String mailbox;
+
+ @Column(name = "maxcallbitrate")
+ @Element(data=true)
+ private int maxcallbitrate = 384;
+
+ @Column(name = "mohsuggest")
+ @Element(data=true)
+ private String mohsuggest;
+
+ @Column(name = "md5secret")
+ @Element(data=true)
+ private String md5secret;
+
+ @Column(name = "musiconhold")
+ @Element(data=true)
+ private String musiconhold;
+
+ @Column(name = "name", nullable = false)
+ @Element(data=true)
+ private String name = "";
+
+ @Column(name = "nat", nullable = false)
+ @Element(data=true)
+ private String nat = "no";
+
+ @Column(name = "outboundproxy")
+ @Element(data=true)
+ private String outboundproxy;
+
+ @Column(name = "deny")
+ @Element(data=true)
+ private String deny;
+
+ @Column(name = "permit")
+ @Element(data=true)
+ private String permit;
+
+ @Column(name = "pickupgroup")
+ @Element(data=true)
+ private String pickupgroup;
+
+ @Column(name = "port", nullable = false)
+ @Element(data=true)
+ private String port = "";
+
+ // @Column(name = "progressinband")
+ @Column(name = "progressinband")
+ // @Enumerated(EnumType.STRING)
+ @Element(data=true)
+ private String progressinband = "no";
+ // private YesNoNever progressinband;
+
+ // @Column(name = "promiscredir")
+ @Column(name = "promiscredir")
+ // @Enumerated(EnumType.STRING)
+ @Element(data=true)
+ private String promiscredir = "no";
+
+ @Column(name = "qualify")
+ @Element(data=true)
+ private String qualify;
+
+ @Column(name = "regexten", nullable = false)
+ @Element(data=true)
+ private String regexten = "";
+
+ @Column(name = "regseconds", nullable = false)
+ @Element(data=true)
+ private int regseconds = 0;
+
+ // @Column(name = "rfc2833compensate")
+ @Column(name = "rfc2833compensate")
+ // @Enumerated(EnumType.STRING)
+ @Element(data=true)
+ private String rfc2833compensate = "no";
+
+ @Column(name = "rtptimeout")
+ @Element(data=true)
+ private String rtptimeout;
+
+ @Column(name = "rtpholdtimeout")
+ @Element(data=true)
+ private String rtpholdtimeout;
+
+ @Column(name = "secret")
+ @Element(data=true)
+ private String secret;
+
+ // @Column(name = "sendrpid")
+ @Column(name = "sendrpid")
+ // @Enumerated(EnumType.STRING)
+ @Element(data=true)
+ private String sendrpid = "yes";
+
+ @Column(name = "setvar", nullable = false)
+ @Element(data=true)
+ private String setvar = "";
+
+ @Column(name = "subscribecontext")
+ @Element(data=true)
+ private String subscribecontext;
+
+ @Column(name = "subscribemwi")
+ @Element(data=true)
+ private String subscribemwi;
+
+ // @Column(name = "t38pt_udptl")
+ @Column(name = "t38pt_udptl")
+ // @Enumerated(EnumType.STRING)
+ @Element(data=true)
+ private String t38pt_udptl = "no";
+
+ // @Column(name = "trustrpid")
+ @Column(name = "trustrpid")
+ // @Enumerated(EnumType.STRING)
+ @Element(data=true)
+ private String trustrpid = "no";
+
+ @Column(name = "type", nullable = false)
+ @Element(data=true)
+ private String type = "friend";
+
+ // @Column(name = "useclientcode")
+ @Column(name = "useclientcode")
+ // @Enumerated(EnumType.STRING)
+ @Element(data=true)
+ private String useclientcode = "no";
+
+ @Column(name = "username", nullable = false)
+ @Element(data=true)
+ private String username = "";
+
+ @Column(name = "usereqphone", nullable = false)
+ @Element(data=true)
+ private String usereqphone = "no";
+
+ // @Column(name = "videosupport")
+ @Column(name = "videosupport")
+ // @Enumerated(EnumType.STRING)
+ @Element(data=true)
+ private String videosupport = "yes";
+
+ @Column(name = "vmexten")
+ @Element(data=true)
+ private String vmexten;
+
+ // create unique index name on asterisk.sipusers (name);
+ // create index name_2 on asterisk.sipusers (name);
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public String getAccountcode() {
+ return accountcode;
+ }
+
+ public void setAccountcode(String accountcode) {
+ this.accountcode = accountcode;
+ }
+
+ public String getDisallow() {
+ return disallow;
+ }
+
+ public void setDisallow(String disallow) {
+ this.disallow = disallow;
+ }
+
+ public String getAllow() {
+ return allow;
+ }
+
+ public void setAllow(String allow) {
+ this.allow = allow;
+ }
+
+ public String getAllowoverlap() {
+ return allowoverlap;
+ }
+
+ public void setAllowoverlap(String allowoverlap) {
+ this.allowoverlap = allowoverlap;
+ }
+
+ public String getAllowsubscribe() {
+ return allowsubscribe;
+ }
+
+ public void setAllowsubscribe(String allowsubscribe) {
+ this.allowsubscribe = allowsubscribe;
+ }
+
+ public String getAllowtransfer() {
+ return allowtransfer;
+ }
+
+ public void setAllowtransfer(String allowtransfer) {
+ this.allowtransfer = allowtransfer;
+ }
+
+ public String getAmaflags() {
+ return amaflags;
+ }
+
+ public void setAmaflags(String amaflags) {
+ this.amaflags = amaflags;
+ }
+
+ public String getAutoframing() {
+ return autoframing;
+ }
+
+ public void setAutoframing(String autoframing) {
+ this.autoframing = autoframing;
+ }
+
+ public String getAuth() {
+ return auth;
+ }
+
+ public void setAuth(String auth) {
+ this.auth = auth;
+ }
+
+ public String getBuggymwi() {
+ return buggymwi;
+ }
+
+ public void setBuggymwi(String buggymwi) {
+ this.buggymwi = buggymwi;
+ }
+
+ public String getCallgroup() {
+ return callgroup;
+ }
+
+ public void setCallgroup(String callgroup) {
+ this.callgroup = callgroup;
+ }
+
+ public String getCallerid() {
+ return callerid;
+ }
+
+ public void setCallerid(String callerid) {
+ this.callerid = callerid;
+ }
+
+ public String getCid_number() {
+ return cid_number;
+ }
+
+ public void setCid_number(String cid_number) {
+ this.cid_number = cid_number;
+ }
+
+ public String getFullname() {
+ return fullname;
+ }
+
+ public void setFullname(String fullname) {
+ this.fullname = fullname;
+ }
+
+ public String getCallingpres() {
+ return callingpres;
+ }
+
+ public void setCallingpres(String callingpres) {
+ this.callingpres = callingpres;
+ }
+
+ public String getCanreinvite() {
+ return canreinvite;
+ }
+
+ public void setCanreinvite(String canreinvite) {
+ this.canreinvite = canreinvite;
+ }
+
+ public String getContext() {
+ return context;
+ }
+
+ public void setContext(String context) {
+ this.context = context;
+ }
+
+ public String getDefaultip() {
+ return defaultip;
+ }
+
+ public void setDefaultip(String defaultip) {
+ this.defaultip = defaultip;
+ }
+
+ public String getDtmfmode() {
+ return dtmfmode;
+ }
+
+ public void setDtmfmode(String dtmfmode) {
+ this.dtmfmode = dtmfmode;
+ }
+
+ public String getFromuser() {
+ return fromuser;
+ }
+
+ public void setFromuser(String fromuser) {
+ this.fromuser = fromuser;
+ }
+
+ public String getFromdomain() {
+ return fromdomain;
+ }
+
+ public void setFromdomain(String fromdomain) {
+ this.fromdomain = fromdomain;
+ }
+
+ public String getFullcontact() {
+ return fullcontact;
+ }
+
+ public void setFullcontact(String fullcontact) {
+ this.fullcontact = fullcontact;
+ }
+
+ public String getG726nonstandard() {
+ return g726nonstandard;
+ }
+
+ public void setG726nonstandard(String g726nonstandard) {
+ this.g726nonstandard = g726nonstandard;
+ }
+
+ public String getHost() {
+ return host;
+ }
+
+ public void setHost(String host) {
+ this.host = host;
+ }
+
+ public String getInsecure() {
+ return insecure;
+ }
+
+ public void setInsecure(String insecure) {
+ this.insecure = insecure;
+ }
+
+ public String getIpaddr() {
+ return ipaddr;
+ }
+
+ public void setIpaddr(String ipaddr) {
+ this.ipaddr = ipaddr;
+ }
+
+ public String getLanguage() {
+ return language;
+ }
+
+ public void setLanguage(String language) {
+ this.language = language;
+ }
+
+ public String getLastms() {
+ return lastms;
+ }
+
+ public void setLastms(String lastms) {
+ this.lastms = lastms;
+ }
+
+ public String getMailbox() {
+ return mailbox;
+ }
+
+ public void setMailbox(String mailbox) {
+ this.mailbox = mailbox;
+ }
+
+ public int getMaxcallbitrate() {
+ return maxcallbitrate;
+ }
+
+ public void setMaxcallbitrate(int maxcallbitrate) {
+ this.maxcallbitrate = maxcallbitrate;
+ }
+
+ public String getMohsuggest() {
+ return mohsuggest;
+ }
+
+ public void setMohsuggest(String mohsuggest) {
+ this.mohsuggest = mohsuggest;
+ }
+
+ public String getMd5secret() {
+ return md5secret;
+ }
+
+ public void setMd5secret(String md5secret) {
+ this.md5secret = md5secret;
+ }
+
+ public String getMusiconhold() {
+ return musiconhold;
+ }
+
+ public void setMusiconhold(String musiconhold) {
+ this.musiconhold = musiconhold;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getNat() {
+ return nat;
+ }
+
+ public void setNat(String nat) {
+ this.nat = nat;
+ }
+
+ public String getOutboundproxy() {
+ return outboundproxy;
+ }
+
+ public void setOutboundproxy(String outboundproxy) {
+ this.outboundproxy = outboundproxy;
+ }
+
+ public String getDeny() {
+ return deny;
+ }
+
+ public void setDeny(String deny) {
+ this.deny = deny;
+ }
+
+ public String getPermit() {
+ return permit;
+ }
+
+ public void setPermit(String permit) {
+ this.permit = permit;
+ }
+
+ public String getPickupgroup() {
+ return pickupgroup;
+ }
+
+ public void setPickupgroup(String pickupgroup) {
+ this.pickupgroup = pickupgroup;
+ }
+
+ public String getPort() {
+ return port;
+ }
+
+ public void setPort(String port) {
+ this.port = port;
+ }
+
+ public String getProgressinband() {
+ return progressinband;
+ }
+
+ public void setProgressinband(String progressinband) {
+ this.progressinband = progressinband;
+ }
+
+ public String getPromiscredir() {
+ return promiscredir;
+ }
+
+ public void setPromiscredir(String promiscredir) {
+ this.promiscredir = promiscredir;
+ }
+
+ public String getQualify() {
+ return qualify;
+ }
+
+ public void setQualify(String qualify) {
+ this.qualify = qualify;
+ }
+
+ public String getRegexten() {
+ return regexten;
+ }
+
+ public void setRegexten(String regexten) {
+ this.regexten = regexten;
+ }
+
+ public int getRegseconds() {
+ return regseconds;
+ }
+
+ public void setRegseconds(int regseconds) {
+ this.regseconds = regseconds;
+ }
+
+ public String getRfc2833compensate() {
+ return rfc2833compensate;
+ }
+
+ public void setRfc2833compensate(String rfc2833compensate) {
+ this.rfc2833compensate = rfc2833compensate;
+ }
+
+ public String getRtptimeout() {
+ return rtptimeout;
+ }
+
+ public void setRtptimeout(String rtptimeout) {
+ this.rtptimeout = rtptimeout;
+ }
+
+ public String getRtpholdtimeout() {
+ return rtpholdtimeout;
+ }
+
+ public void setRtpholdtimeout(String rtpholdtimeout) {
+ this.rtpholdtimeout = rtpholdtimeout;
+ }
+
+ public String getSecret() {
+ return secret;
+ }
+
+ public void setSecret(String secret) {
+ this.secret = secret;
+ }
+
+ public String getSendrpid() {
+ return sendrpid;
+ }
+
+ public void setSendrpid(String sendrpid) {
+ this.sendrpid = sendrpid;
+ }
+
+ public String getSetvar() {
+ return setvar;
+ }
+
+ public void setSetvar(String setvar) {
+ this.setvar = setvar;
+ }
+
+ public String getSubscribecontext() {
+ return subscribecontext;
+ }
+
+ public void setSubscribecontext(String subscribecontext) {
+ this.subscribecontext = subscribecontext;
+ }
+
+ public String getSubscribemwi() {
+ return subscribemwi;
+ }
+
+ public void setSubscribemwi(String subscribemwi) {
+ this.subscribemwi = subscribemwi;
+ }
+
+ public String getT38pt_udptl() {
+ return t38pt_udptl;
+ }
+
+ public void setT38pt_udptl(String t38pt_udptl) {
+ this.t38pt_udptl = t38pt_udptl;
+ }
+
+ public String getTrustrpid() {
+ return trustrpid;
+ }
+
+ public void setTrustrpid(String trustrpid) {
+ this.trustrpid = trustrpid;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getUseclientcode() {
+ return useclientcode;
+ }
+
+ public void setUseclientcode(String useclientcode) {
+ this.useclientcode = useclientcode;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getUsereqphone() {
+ return usereqphone;
+ }
+
+ public void setUsereqphone(String usereqphone) {
+ this.usereqphone = usereqphone;
+ }
+
+ public String getVideosupport() {
+ return videosupport;
+ }
+
+ public void setVideosupport(String videosupport) {
+ this.videosupport = videosupport;
+ }
+
+ public String getVmexten() {
+ return vmexten;
+ }
+
+ public void setVmexten(String vmexten) {
+ this.vmexten = vmexten;
+ }
}
\ No newline at end of file
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/asterisk/Extensions.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/asterisk/Extensions.java?rev=1367412&r1=1367411&r2=1367412&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/asterisk/Extensions.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/asterisk/Extensions.java Tue Jul 31 05:34:05 2012
@@ -27,30 +27,39 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.simpleframework.xml.Element;
+import org.simpleframework.xml.Root;
+
@Entity
@Table(name = "extensions")
+@Root(name="extension")
public class Extensions implements Serializable {
private static final long serialVersionUID = -2669622904594408644L;
@Id
@Column(name = "id")
@GeneratedValue(strategy = GenerationType.IDENTITY)
- Integer id;
+ @Element(data = true)
+ private Integer id;
@Column(name = "context", nullable = false)
- String context = "";
+ private String context = "";
@Column(name = "exten", nullable = false)
- String exten = "";
+ @Element(data = true)
+ private String exten = "";
@Column(name = "priority", nullable = false)
- Integer priority = 0;
+ @Element(data = true)
+ private Integer priority = 0;
@Column(name = "app", nullable = false)
- String app = "";
+ @Element(data = true)
+ private String app = "";
@Column(name = "appdata", nullable = false)
- String appdata = "";
+ @Element(data = true)
+ private String appdata = "";
public Integer getId() {
return id;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/asterisk/MeetMe.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/asterisk/MeetMe.java?rev=1367412&r1=1367411&r2=1367412&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/asterisk/MeetMe.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/sip/asterisk/MeetMe.java Tue Jul 31 05:34:05 2012
@@ -25,19 +25,27 @@ import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.simpleframework.xml.Element;
+import org.simpleframework.xml.Root;
+
@Entity
@Table(name = "meetme")
+@Root(name="member")
public class MeetMe implements Serializable {
private static final long serialVersionUID = 2789529517142208489L;
@Id
@Column(name = "confno", nullable = false)
- String confno = "0";
+ @Element(data=true)
+ private String confno = "0";
@Column(name = "pin")
- String pin;
+ @Element(data=true)
+ private String pin;
@Column(name = "adminpin")
- String adminpin;
+ @Element(data=true)
+ private String adminpin;
@Column(name = "members", nullable = false)
- Integer members = 0;
+ @Element(data=true)
+ private Integer members = 0;
public String getConfno() {
return confno;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/PrivateMessageFolder.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/PrivateMessageFolder.java?rev=1367412&r1=1367411&r2=1367412&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/PrivateMessageFolder.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/PrivateMessageFolder.java Tue Jul 31 05:34:05 2012
@@ -29,19 +29,24 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.simpleframework.xml.Element;
+import org.simpleframework.xml.Root;
+
@Entity
@Table(name = "private_messages_folder")
+@Root(name="privatemessagefolder")
public class PrivateMessageFolder implements Serializable {
-
private static final long serialVersionUID = 3689814412815025816L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
@Column(name="msg_folder_id")
+ @Element(data=true)
private long privateMessageFolderId;
@Column(name="folder_name")
+ @Element(data=true)
private String folderName;
@Column(name="user_id")
+ @Element(data=true)
private Long userId;
@Column(name="inserted")
private Date inserted;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/PrivateMessages.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/PrivateMessages.java?rev=1367412&r1=1367411&r2=1367412&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/PrivateMessages.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/PrivateMessages.java Tue Jul 31 05:34:05 2012
@@ -22,6 +22,8 @@ import java.io.Serializable;
import java.util.Date;
import org.openmeetings.app.persistence.beans.rooms.Rooms;
+import org.simpleframework.xml.Element;
+import org.simpleframework.xml.Root;
import javax.persistence.Column;
@@ -37,58 +39,78 @@ import javax.persistence.Table;
@Entity
@Table(name = "private_messages")
+@Root(name="privatemessage")
public class PrivateMessages implements Serializable {
-
private static final long serialVersionUID = 7541117437029707792L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
@Column(name="msg_id")
+ @Element(data=true)
private long privateMessageId;
+
@Column(name="subject")
+ @Element(data=true)
private String subject;
+
@Lob
@Column(name="message")
+ @Element(data=true)
private String message;
@Column(name="email")
private String email;
@Column(name="inserted")
+ @Element(data=true)
private Date inserted;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="from_id")
+ @Element(data=true, required=false)
private Users from;
+
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="to_id")
+ @Element(data=true, required=false)
private Users to;
+
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="owner_id")
+ @Element(data=true, required=false)
private Users owner;
@Column(name="booked_room")
+ @Element(data=true)
private Boolean bookedRoom;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="rooms_id")
+ @Element(data=true, required=false)
private Rooms room;
@Column(name="is_read")
+ @Element(data=true)
private Boolean isRead;
@Column(name="is_trash")
+ @Element(data=true)
private Boolean isTrash;
@Column(name="parent_message_id")
+ @Element(data=true)
private Long parentMessage;
+
@Column(name="private_message_folder_id")
+ @Element(data=true)
private Long privateMessageFolderId;
@Column(name="is_contact_request")
+ @Element(data=true)
private Boolean isContactRequest;
+
@Column(name="user_contact_id")
+ @Element(data=true)
private Long userContactId;
public long getPrivateMessageId() {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/UserContacts.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/UserContacts.java?rev=1367412&r1=1367411&r2=1367412&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/UserContacts.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/UserContacts.java Tue Jul 31 05:34:05 2012
@@ -32,31 +32,46 @@ import javax.persistence.ManyToOne;
import javax.persistence.JoinColumn;
import javax.persistence.Table;
+import org.simpleframework.xml.Element;
+import org.simpleframework.xml.Root;
+
@Entity
@Table(name = "user_contacts")
+@Root(name="usercontact")
public class UserContacts implements Serializable {
-
private static final long serialVersionUID = 2391405538978996206L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
@Column(name="user_contact_id")
+ @Element(data=true)
private long userContactId;
+
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="user_id")
+ @Element(data=true, required=false)
private Users contact;
+
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="owner_id")
+ @Element(data=true, required=false)
private Users owner;
+
@Column(name="pending")
+ @Element(data=true)
private Boolean pending;
+
@Column(name="hash")
+ @Element(data=true, required = false)
private String hash;
+
@Column(name="inserted")
private Date inserted;
+
@Column(name="updated")
private Date updated;
+
@Column(name="share_calendar")
+ @Element(data=true, required=false)
private Boolean shareCalendar;
public long getUserContactId() {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/UserSipData.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/UserSipData.java?rev=1367412&r1=1367411&r2=1367412&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/UserSipData.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/UserSipData.java Tue Jul 31 05:34:05 2012
@@ -29,24 +29,34 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.simpleframework.xml.Element;
+import org.simpleframework.xml.Root;
+
@Entity
@Table(name = "user_sip_data")
+@Root()
public class UserSipData implements Serializable {
-
private static final long serialVersionUID = 3438146320304686554L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
@Column(name="user_sip_data_id")
private long userSipDataId;
+
@Column(name="username")
+ @Element(name="sip_username", data=true, required=false)
private String username;
+
@Column(name="userpass")
+ @Element(name="sip_userpass", data=true, required=false)
private String userpass;
+
@Column(name="authId")
+ @Element(name="sip_authid", data=true, required=false)
private String authId;
+
@Column(name="inserted")
private Date inserted;
+
@Column(name="updated")
private Date updated;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java?rev=1367412&r1=1367411&r2=1367412&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java Tue Jul 31 05:34:05 2012
@@ -45,6 +45,9 @@ import org.openmeetings.app.persistence.
import org.openmeetings.app.persistence.beans.basic.Server;
import org.openmeetings.app.persistence.beans.basic.Sessiondata;
import org.openmeetings.app.persistence.beans.domain.Organisation_Users;
+import org.simpleframework.xml.Element;
+import org.simpleframework.xml.ElementList;
+import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
@@ -54,101 +57,156 @@ import org.openmeetings.app.persistence.
query="SELECT u FROM Users u WHERE u.deleted = false AND u.organisation_users.organisation.organisation_id = :organisation_id")
})
@Table(name = "users")
+@Root(name="user")
public class Users implements Serializable {
-
private static final long serialVersionUID = -2265479712596674065L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "user_id")
+ @Element(data=true)
private Long user_id;
@Column(name = "age")
+ @Element(data=true)
private Date age;
+
@Column(name = "availible")
+ @Element(data=true, required=false)
private Integer availible;
+
@Column(name = "firstname")
+ @Element(data=true, required=false)
private String firstname;
+
@Column(name = "lastlogin")
private Date lastlogin;
+
@Column(name = "lastname")
+ @Element(data=true, required=false)
private String lastname;
+
@Column(name = "lasttrans")
+ @Element(data=true, required=false)
private Long lasttrans;
+
@Column(name = "level_id")
+ @Element(data=true, required=false)
private Long level_id;
+
@Column(name = "login")
+ @Element(data=true)
private String login;
+
@Column(name = "password")
+ @Element(name="pass", data=true)
private String password;
+
@Column(name = "regdate")
+ @Element(data=true)
private Date regdate;
+
@Column(name = "status")
+ @Element(data=true, required=false)
private Integer status;
+
@Column(name = "title_id")
+ @Element(data=true, required=false)
private Integer title_id;
+
@Column(name = "starttime")
private Date starttime;
+
@Column(name = "updatetime")
private Date updatetime;
+
@Column(name = "pictureuri")
+ @Element(data=true, required=false)
private String pictureuri;
+
@Column(name = "deleted")
+ @Element(data=true)
private boolean deleted;
+
@Column(name = "language_id")
+ @Element(data=true, required=false)
private Long language_id;
+
@Column(name = "resethash")
+ @Element(data=true, required=false)
private String resethash;
+
@Column(name = "activatehash")
+ @Element(data=true, required=false)
private String activatehash;
@ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
@JoinColumn(name = "adresses_id", insertable = true, updatable = true)
+ @Element(name="address", required=false)
private Adresses adresses;
@Transient
private Userlevel userlevel;
+
@Transient
private Userdata rechnungsaddressen;
+
@Transient
private Userdata lieferadressen;
@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
@JoinColumn(name = "user_id", insertable = true, updatable = true)
+ @ElementList(name="organisations")
private List<Organisation_Users> organisation_users = new ArrayList<Organisation_Users>();
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "userSipDataId", insertable = true, updatable = true)
+ @Element(name="sipData", required=false)
private UserSipData userSipData;
// Vars to simulate external Users
@Column(name = "externalUserId")
+ @Element(data=true, required=false)
private String externalUserId;
+
@Column(name = "externalUserType")
+ @Element(data=true, required=false)
private String externalUserType;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "omtimezoneId", insertable = true, updatable = true)
+ @Element(data=true, required=false)
private OmTimeZone omTimeZone; // In UTC +/- hours
@Transient
private Sessiondata sessionData;
+
@Column(name = "forceTimeZoneCheck")
+ @Element(data=true, required=false)
private Boolean forceTimeZoneCheck;
@Column(name = "sendSMS")
private boolean sendSMS;
@Column(name = "user_offers")
+ @Element(data=true, required=false)
private String userOffers;
+
@Column(name = "user_searchs")
+ @Element(data=true, required=false)
private String userSearchs;
+
@Column(name = "show_contact_data")
+ @Element(data=true, required=false)
private Boolean showContactData;
+
@Column(name = "show_contact_data_to_contacts")
+ @Element(data=true, required=false)
private Boolean showContactDataToContacts;
+
@OneToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "server_id")
+ @Element(required=false)
private Server server;
public Long getUser_id() {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java?rev=1367412&r1=1367411&r2=1367412&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java Tue Jul 31 05:34:05 2012
@@ -973,9 +973,11 @@ public class FLVRecorderService implemen
try {
long fileSize = 0;
- File tFile = new File(OmFileHelper.getStreamsHibernateDir(), rec.getFileHash());
- if (tFile.exists()) {
- fileSize += tFile.length();
+ if (rec.getFileHash() != null) {
+ File tFile = new File(OmFileHelper.getStreamsHibernateDir(), rec.getFileHash());
+ if (tFile.exists()) {
+ fileSize += tFile.length();
+ }
}
if (rec.getAlternateDownload() != null) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/PollService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/PollService.java?rev=1367412&r1=1367411&r2=1367412&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/PollService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/PollService.java Tue Jul 31 05:34:05 2012
@@ -152,8 +152,7 @@ public class PollService implements IPen
&& rcl.getIsScreenClient()) {
// continue;
} else {
- if (rcl.getRoom_id().equals(rc.getRoom_id())
- && rcl.getRoom_id() != null) {
+ if (rcl.getRoom_id() != null && rcl.getRoom_id().equals(rc.getRoom_id())) {
((IServiceCapableConnection) conn).invoke(
clientFunction, obj,
scopeApplicationAdapter);