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/12/19 18:45:28 UTC
svn commit: r1423983 [2/3] - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/WEB-INF/ WebContent/src/base/auth/
WebContent/src/base/hibernate/ WebContent/src/modules/admin/roomadmin/
WebContent/src/modules/admin/useradmin/ src/ src/META-INF/ ...
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateThumbs.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateThumbs.java?rev=1423983&r1=1423982&r2=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateThumbs.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateThumbs.java Wed Dec 19 17:45:27 2012
@@ -22,27 +22,24 @@ import java.io.File;
import java.io.IOException;
import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.flvrecord.converter.BaseConverter;
import org.apache.openmeetings.documents.beans.ConverterProcessResult;
import org.apache.openmeetings.utils.ProcessHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-public class GenerateThumbs {
+public class GenerateThumbs extends BaseConverter {
private static final Logger log = Red5LoggerFactory
.getLogger(GenerateThumbs.class, OpenmeetingsVariables.webAppRootKey);
- @Autowired
- private GenerateImage generateImage;
-
public ConverterProcessResult generateThumb(String pre, File f, Integer thumbSize) throws IOException {
// Init variables
String name = f.getName();
File parent = f.getParentFile();
String[] argv = new String[] {
- generateImage.getPathToImageMagic()
+ getPathToImageMagick()
, "-thumbnail"
, Integer.toString(thumbSize) + "x" + Integer.toString(thumbSize)
, f.getCanonicalPath()
@@ -64,7 +61,7 @@ public class GenerateThumbs {
public ConverterProcessResult decodePDF(String inputfile, String outputfile) {
- String[] argv = new String[] { generateImage.getPathToImageMagic(), // FIXME
+ String[] argv = new String[] { getPathToImageMagick(),
inputfile, outputfile };
if (System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") == -1) {
@@ -79,7 +76,7 @@ public class GenerateThumbs {
if (System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") == -1) {
String[] argv = new String[] {
- generateImage.getPathToImageMagic()
+ getPathToImageMagick()
, "-thumbnail" // FIXME
, Integer.toString(thumbSize)
, inputfile.getCanonicalPath()
@@ -90,7 +87,7 @@ public class GenerateThumbs {
} else {
String[] argv = new String[] {
- generateImage.getPathToImageMagic()
+ getPathToImageMagick()
, "-thumbnail" // FIXME
, Integer.toString(thumbSize)
, inputfile.getCanonicalPath()
@@ -107,7 +104,7 @@ public class GenerateThumbs {
String current_dir, String inputfile, String outputpath,
Integer thumbWidth, String pre) {
- String[] argv = new String[] { generateImage.getPathToImageMagic(),
+ String[] argv = new String[] { getPathToImageMagick(),
"-resize", Integer.toString(thumbWidth), inputfile,
outputpath + "_" + pre + "_page.png" };
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1423983&r1=1423982&r2=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java Wed Dec 19 17:45:27 2012
@@ -374,102 +374,13 @@ public class ImportInitvalues {
null, "Enable to enable the red5SIP integration ");
configurationDaoImpl.addConfByKey("red5sip.room_prefix",
cfg.red5SipRoomPrefix, null,
- "Enable to enable the red5SIP integration ");
+ "Numerical prefix for OM rooms created inside the SIP");
configurationDaoImpl.addConfByKey("red5sip.exten_context",
cfg.red5SipExtenContext, null,
"Enable to enable the red5SIP integration ");
// ***************************************
// ***************************************
- // SIP Applet Configuration Values
- // ***************************************
-
- configurationDaoImpl.addConfByKey("sip.enable", cfg.sipEnable, null,
- "Enable to load the SIP Applet in the Client and "
- + "call the SIP Applet whenever you enter a Room");
-
- configurationDaoImpl.addConfByKey("sip.realm", cfg.sipRealm, null,
- "So called *Domain of the SIP Provider*");
-
- configurationDaoImpl.addConfByKey("sip.port", cfg.sipPort, null,
- "SIP Port");
-
- configurationDaoImpl.addConfByKey("sip.proxyname", cfg.sipProxyName,
- null, "SIP Proxy name (this is the outbound proxy)");
-
- configurationDaoImpl
- .addConfByKey("sip.tunnel", cfg.sipTunnel, null,
- "SIP Tunnel IP + Port, format domain:port, for example 10.0.0.0:443");
-
- configurationDaoImpl.addConfByKey("sip.codebase", cfg.sipCodebase,
- null, "The Base-URL to load the Ringtone from");
-
- configurationDaoImpl.addConfByKey("sip.forcetunnel",
- cfg.sipForceTunnel, null, "Force usage of the tunnel");
-
- // ***************************************
- // ***************************************
- // OpenXG Configuration Values
- // ***************************************
-
- configurationDaoImpl.addConfByKey("sip.openxg.enable",
- cfg.sipOpenxgEnable, null,
- "Enable the OpenXG XML-RPC Gateway through the Wrapper URL");
-
- configurationDaoImpl
- .addConfByKey(
- "openxg.wrapper.url",
- cfg.openxgWrapperUrl,
- null,
- "openxg_wrapper_url, null, OpenXG XML-RPC Wrapper URL, the Wrapper can only "
- + "be located on 127.0.01 by default, "
- + "for example http://127.0.0.1:5080/rpc_client/rpc_gateway_wrapper.php");
-
- configurationDaoImpl.addConfByKey("openxg.client.id",
- cfg.openxgClientId, null, "OpenXG XML-RPC Client ID");
-
- configurationDaoImpl.addConfByKey("openxg.client.secret",
- cfg.openxgClientSecret, null, "OpenXG XML-RPC Client Secret");
-
- configurationDaoImpl.addConfByKey("openxg.client.domain",
- cfg.openxgClientDomain, null, "OpenXG Domain");
-
- configurationDaoImpl.addConfByKey("openxg.community.code",
- cfg.openxgCommunityCode, null, "OpenXG Community Code");
-
- configurationDaoImpl.addConfByKey("openxg.language.code",
- cfg.openxgLanguageCode, null, "OpenXG Language Code");
-
- configurationDaoImpl.addConfByKey("openxg.adminid", cfg.openxgAdminId,
- null, "OpenXG Admin ID");
-
- // ***************************************
- // ***************************************
- // Phone Range Configuration Values
- // ***************************************
-
- configurationDaoImpl.addConfByKey("sip.language.phonecode",
- cfg.sipLanguagePhoneCode, null, "For example +358 for Finland");
-
- configurationDaoImpl
- .addConfByKey("sip.phonerange.start", cfg.sipPhoneRangeStart,
- null,
- "The first number in the Range of Phone Numbers in national format");
-
- configurationDaoImpl.addConfByKey("sip.phonerange", cfg.sipPhoneRange,
- null, "Amount of numbers in the Phone Range available");
-
- configurationDaoImpl.addConfByKey("sip.phonerange.currentindex",
- "" + 0, null,
- "Number of used Phone Numbers in the sip.phonerange");
-
- configurationDaoImpl
- .addConfByKey("sip.phonerange.conference.currentindex", "" + 0,
- null,
- "Number of used Phone Numbers in the sip.phonerange for the conferences");
-
- // ***************************************
- // ***************************************
// Timezone settings
// ***************************************
@@ -604,7 +515,7 @@ public class ImportInitvalues {
roommanagement.addRoom(3, "public Interview Room", interview_Id,
"", new Long(16), true, null, false, false, null, false,
- null, true, false, false, "", "", "", null, null, null,
+ null, true, false, false, "", "", null, null, null,
false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
@@ -621,7 +532,7 @@ public class ImportInitvalues {
roommanagement.addRoom(3, "public Conference Room", conference_Id,
"", new Long(32), true, null, false, false, null, false,
- null, true, false, false, "", "", "", null, null, null,
+ null, true, false, false, "", "", null, null, null,
false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
@@ -638,7 +549,7 @@ public class ImportInitvalues {
roommanagement.addRoom(3, "public Video Only Room", conference_Id,
"", new Long(32), true, null, false, false, null, false,
- null, true, false, false, "", "", "", null, null, null,
+ null, true, false, false, "", "", null, null, null,
false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
@@ -655,7 +566,7 @@ public class ImportInitvalues {
roommanagement.addRoom(3, "public Video And Whiteboard Room",
conference_Id, "", new Long(32), true, null, false, false,
- null, false, null, true, false, false, "", "", "", null,
+ null, false, null, true, false, false, "", "", null,
null, null, false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
@@ -672,7 +583,7 @@ public class ImportInitvalues {
roommanagement.addRoom(3, "public Restricted Room", restricted_Id,
"", new Long(100), true, null, false, false, null, false,
- null, true, false, false, "", "", "", null, null, null,
+ null, true, false, false, "", "", null, null, null,
false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
@@ -689,7 +600,7 @@ public class ImportInitvalues {
roommanagement.addRoom(3, "restricted room with micro option set",
restricted_Id, "", new Long(100), true, null, false, false,
- null, false, null, true, false, false, "", "", "", null,
+ null, false, null, true, false, false, "", "", null,
null, null, false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
@@ -706,7 +617,7 @@ public class ImportInitvalues {
roommanagement.addRoom(3, "conference room with micro option set",
conference_Id, "", new Long(32), true, null, false, false,
- null, false, null, true, false, false, "", "", "", null,
+ null, false, null, true, false, false, "", "", null,
null, null, false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
@@ -723,7 +634,7 @@ public class ImportInitvalues {
long room2 = roommanagement.addRoom(3, "private Conference Room",
conference_Id, "", new Long(32), false, null, false, false,
- null, false, null, true, false, false, "", "", "", null,
+ null, false, null, true, false, false, "", "", null,
null, null, false, // hideTopBar
false, // hideChat
false, // hideActivitiesAndActions
@@ -763,7 +674,6 @@ public class ImportInitvalues {
new java.util.Date(), "street", "no", "fax", "zip", 1,
"town", default_lang_id, false,
Arrays.asList(organisation_id), "phone", false, "", false,
- "", "", "", false,
omTimeZoneDaoImpl.getOmTimeZoneByIcal(ical_timeZone),
false, "", "", false, true);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java?rev=1423983&r1=1423982&r2=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java Wed Dec 19 17:45:27 2012
@@ -51,24 +51,6 @@ public class InstallationConfig {
public String urlFeed2 = "http://mail-archives.apache.org/mod_mbox/incubator-openmeetings-dev/?format=atom";
public String sendEmailWithVerficationCode = "0";
public String defaultExportFont = "TimesNewRoman";
- public String sipEnable = "0";
- public String sipProxyName = "";
- public String sipPort = "";
- public String sipTunnel = "";
- public String sipRealm = "";
- public String sipOpenxgEnable = "0";
- public String sipForceTunnel = "";
- public String sipCodebase = "";
- public String openxgClientSecret = "";
- public String openxgWrapperUrl = "";
- public String openxgClientId = "";
- public String openxgClientDomain = "";
- public String openxgCommunityCode = "";
- public String openxgLanguageCode = "";
- public String openxgAdminId = "";
- public String sipLanguagePhoneCode = "";
- public String sipPhoneRangeStart = "";
- public String sipPhoneRange = "";
public String red5SipEnable = "no";
public String red5SipRoomPrefix = "400";
public String red5SipExtenContext = "rooms";
@@ -90,21 +72,7 @@ public class InstallationConfig {
+ sendEmailAtRegister + ", urlFeed=" + urlFeed + ", urlFeed2="
+ urlFeed2 + ", sendEmailWithVerficationCode="
+ sendEmailWithVerficationCode + ", defaultExportFont="
- + defaultExportFont
- + ", sipEnable=" + sipEnable + ", sipProxyName=" + sipProxyName
- + ", sipPort=" + sipPort + ", sipTunnel=" + sipTunnel
- + ", sipRealm=" + sipRealm + ", sipOpenxgEnable="
- + sipOpenxgEnable + ", sipForceTunnel=" + sipForceTunnel
- + ", sipCodebase=" + sipCodebase + ", openxgClientSecret="
- + openxgClientSecret + ", openxgWrapperUrl=" + openxgWrapperUrl
- + ", openxgClientId=" + openxgClientId
- + ", openxgClientDomain=" + openxgClientDomain
- + ", openxgCommunityCode=" + openxgCommunityCode
- + ", openxgLanguageCode=" + openxgLanguageCode
- + ", openxgAdminId=" + openxgAdminId
- + ", sipLanguagePhoneCode=" + sipLanguagePhoneCode
- + ", sipPhoneRangeStart=" + sipPhoneRangeStart
- + ", sipPhoneRange=" + sipPhoneRange + ", red5SipEnable="
+ + defaultExportFont + ", red5SipEnable="
+ red5SipEnable + ", red5SipRoomPrefix=" + red5SipRoomPrefix
+ ", red5SipExtenContext=" + red5SipExtenContext
+ ", replyToOrganizer=" + replyToOrganizer
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java?rev=1423983&r1=1423982&r2=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java Wed Dec 19 17:45:27 2012
@@ -34,11 +34,13 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
import org.apache.openmeetings.data.user.Usermanagement;
import org.apache.openmeetings.data.user.dao.StateDao;
+import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.ldap.config.ConfigReader;
import org.apache.openmeetings.persistence.beans.adresses.States;
import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.apache.openmeetings.utils.OmFileHelper;
+import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,15 +52,13 @@ import org.springframework.beans.factory
*
*/
public class LdapLoginManagement {
-
-
private static final Logger log = Red5LoggerFactory.getLogger(
LdapLoginManagement.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
private Sessionmanagement sessionManagement;
@Autowired
- private ConfigurationDao configurationDaoImpl;
+ private ConfigurationDao configDao;
@Autowired
private Usermanagement userManagement;
@Autowired
@@ -67,6 +67,10 @@ public class LdapLoginManagement {
private LdapConfigDao ldapConfigDao;
@Autowired
private OmTimeZoneDao omTimeZoneDaoImpl;
+ @Autowired
+ private ManageCryptStyle cryptManager;
+ @Autowired
+ private UsersDao usersDao;
// External User Types
public static final String EXTERNAL_USER_TYPE_LDAP = "LDAP";
@@ -269,8 +273,7 @@ public class LdapLoginManagement {
.get(CONFIGKEY_LDAP_FIELDNAME_USER_PRINCIPAL);
// Wether or not we'll store Ldap passwd into OM db
- String ldap_sync_passwd_to_om = configData
- .get(CONFIGKEY_LDAP_SYNC_PASSWD_OM);
+ boolean ldap_sync_passwd_to_om = "no".equals(configData.get(CONFIGKEY_LDAP_SYNC_PASSWD_OM));
/***
* for future use (lemeur) // Ldap user filter to refine the search
@@ -480,8 +483,7 @@ public class LdapLoginManagement {
try {
// Create User with LdapData
Long userid;
- if (ldap_sync_passwd_to_om != null
- && ldap_sync_passwd_to_om.equals("no")) {
+ if (ldap_sync_passwd_to_om) {
Random r = new Random();
String token = Long.toString(Math.abs(r.nextLong()), 36);
log.debug("Synching Ldap user to OM DB with RANDOM password: "
@@ -554,13 +556,13 @@ public class LdapLoginManagement {
return new Long(-35);
}
- // Update password (could have changed in LDAP)
- if (ldap_sync_passwd_to_om == null
- || !ldap_sync_passwd_to_om.equals("no")) {
- u.setPassword(passwd);
- }
try {
- userManagement.updateUserObject(u, true);
+ // Update password (could have changed in LDAP)
+ if (ldap_sync_passwd_to_om) {
+ u.updatePassword(cryptManager, configDao, passwd);
+ }
+
+ usersDao.update(u, 1L);
} catch (Exception e) {
log.error("Error updating user : " + e.getMessage());
return new Long(-1);
@@ -638,7 +640,7 @@ public class LdapLoginManagement {
jName_timeZone = userdata.get(ldapAttrs.get("timezoneAttr"));
if (omTimeZoneDaoImpl.getOmTimeZone(jName_timeZone) == null) {
- jName_timeZone = configurationDaoImpl.getConfValue(
+ jName_timeZone = configDao.getConfValue(
"default.timezone", String.class, "Europe/Berlin");
}
@@ -688,18 +690,16 @@ public class LdapLoginManagement {
new java.util.Date(), //age
street,
additionalname, fax, zip, state_id, town,
- configurationDaoImpl.getConfValue("default_lang_id",
+ configDao.getConfValue("default_lang_id",
Long.class, "0"), // language_id
false, // sendWelcomeMessage
- Arrays.asList(configurationDaoImpl.getConfValue(
+ Arrays.asList(configDao.getConfValue(
"default_domain_id", Long.class, null)), // organozation
// Ids
phone,
false,
"",// BaseURL is empty as we do not send an Email here
false,// send verification code
- "", "", "",// sip_user, sip_pass, sip_auth
- true, // generate SIP Data if the config is enabled
jName_timeZone,
false, // forceTimeZoneCheck
"", //userOffers
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java?rev=1423983&r1=1423982&r2=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java Wed Dec 19 17:45:27 2012
@@ -36,12 +36,15 @@ import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.PrimaryKeyJoinColumn;
import javax.persistence.Table;
import javax.persistence.Transient;
import org.apache.openjpa.persistence.ElementDependent;
import org.apache.openmeetings.conference.room.RoomClient;
import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
+import org.apache.openmeetings.persistence.beans.sip.asterisk.MeetMe;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.ElementList;
import org.simpleframework.xml.Root;
@@ -127,10 +130,6 @@ public class Rooms implements Serializab
@Element(data = true, required = false)
private Boolean allowUserQuestions;
- @Column(name = "sip_number")
- @Element(data = true, required = false)
- private String sipNumber;
-
@Column(name = "conference_pin")
@Element(data = true, required = false)
private String conferencePin;
@@ -216,6 +215,11 @@ public class Rooms implements Serializab
@ElementList(name = "room_moderators", required=false)
private List<RoomModerators> moderators;
+ @OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+ @PrimaryKeyJoinColumn(name="confno", referencedColumnName="confno")
+ @Element(name = "meetme", required = false)
+ private MeetMe meetme;
+
@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
@JoinColumn(name = "rooms_id", insertable = true, updatable = true)
@ElementDependent
@@ -361,14 +365,6 @@ public class Rooms implements Serializab
this.allowUserQuestions = allowUserQuestions;
}
- public String getSipNumber() {
- return sipNumber;
- }
-
- public void setSipNumber(String sipNumber) {
- this.sipNumber = sipNumber;
- }
-
public String getConferencePin() {
return conferencePin;
}
@@ -537,4 +533,12 @@ public class Rooms implements Serializab
this.autoVideoSelect = autoVideoSelect;
}
+ public MeetMe getMeetme() {
+ return meetme;
+ }
+
+ public void setMeetme(MeetMe meetme) {
+ this.meetme = meetme;
+ }
+
}
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/sip/asterisk/AsteriskSipUser.java (from r1423759, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/sip/asterisk/AsteriskSipUsers.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/sip/asterisk/AsteriskSipUser.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/sip/asterisk/AsteriskSipUser.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/sip/asterisk/AsteriskSipUsers.java&r1=1423759&r2=1423983&rev=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/sip/asterisk/AsteriskSipUsers.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/sip/asterisk/AsteriskSipUser.java Wed Dec 19 17:45:27 2012
@@ -33,419 +33,101 @@ import org.simpleframework.xml.Root;
@Entity
@Table(name = "sipusers")
@Root(name="asterisksipuser")
-public class AsteriskSipUsers implements Serializable {
+public class AsteriskSipUser implements Serializable {
private static final long serialVersionUID = -565831761546365623L;
@Id
@Column(name = "id")
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Element(data = true)
- private int id;
+ private long id;
- @Column(name = "accountcode")
- @Element(data = true, required = false)
- private String accountcode;
-
- @Column(name = "disallow")
- @Element(data = true, required = false)
- private String disallow = null;
-
- @Column(name = "allow")
- @Element(data = true, required = false)
- private String allow = "ulaw";
-
- @Column(name = "allowoverlap")
- @Element(data = true, required = false)
- private String allowoverlap = "yes";
-
- @Column(name = "allowsubscribe")
- @Element(data = true, required = false)
- private String allowsubscribe = "yes";
-
- @Column(name = "allowtransfer")
- @Element(data = true, required = false)
- private String allowtransfer;
-
- @Column(name = "amaflags")
- @Element(data = true, required = false)
- private String amaflags;
-
- @Column(name = "autoframing")
- @Element(data = true, required = false)
- private String autoframing;
-
- @Column(name = "auth")
- @Element(data = true, required = false)
- private String auth;
-
- @Column(name = "buggymwi")
- @Element(data=true, required = false)
- private String buggymwi = "no";
-
- @Column(name = "callgroup")
- @Element(data=true, required = false)
- private String callgroup;
-
- @Column(name = "callerid")
- @Element(data=true, required = false)
- private String callerid;
-
- @Column(name = "cid_number")
- @Element(data=true, required = false)
- private String cid_number;
-
- @Column(name = "fullname")
- @Element(data=true, required = false)
- private String fullname;
-
- // TODO: error
- // @Column(name = "call-limit")
- // private int callLimit;
-
- @Column(name = "callingpres")
- @Element(data=true, required = false)
- private String callingpres;
-
- @Column(name = "canreinvite")
- @Element(data=true, required = false)
- private String canreinvite = "yes";
-
- @Column(name = "context")
- @Element(data=true, required = false)
- private String context;
-
- @Column(name = "defaultip")
- @Element(data=true, required = false)
- private String defaultip;
-
- @Column(name = "dtmfmode")
- @Element(data=true, required = false)
- private String dtmfmode;
-
- @Column(name = "fromuser")
- @Element(data=true, required = false)
- private String fromuser;
-
- @Column(name = "fromdomain")
- @Element(data=true, required = false)
- private String fromdomain;
-
- @Column(name = "fullcontact")
- @Element(data=true, required = false)
- private String fullcontact;
-
- // @Column(name = "g726nonstandard")
- @Column(name = "g726nonstandard")
- // @Enumerated(EnumType.STRING)
- @Element(data=true, required = false)
- private String g726nonstandard = "no";
-
- @Column(name = "host", nullable = false)
- @Element(data=true, required = false)
- private String host = "dynamic";
-
- @Column(name = "insecure")
- @Element(data=true, required = false)
- private String insecure;
-
- @Column(name = "ipaddr", nullable = false)
+ @Column(name = "type", nullable = false, length=6)
@Element(data=true, required=false)
- private String ipaddr = "";
-
- @Column(name = "language")
- @Element(data=true, required = false)
- private String language;
-
- @Column(name = "lastms")
- @Element(data=true, required = false)
- private String lastms;
-
- @Column(name = "mailbox")
- @Element(data=true, required = false)
- private String mailbox;
-
- @Column(name = "maxcallbitrate")
- @Element(data=true, required = false)
- private int maxcallbitrate = 384;
-
- @Column(name = "mohsuggest")
- @Element(data=true, required = false)
- private String mohsuggest;
-
- @Column(name = "md5secret")
- @Element(data=true, required = false)
- private String md5secret;
-
- @Column(name = "musiconhold")
- @Element(data=true, required = false)
- private String musiconhold;
-
- @Column(name = "name", nullable = false)
+ private String type = "friend"; // Varchar 6
+
+ @Column(name = "name", nullable = false, length=128)
@Element(data=true, required=false)
- private String name = "";
-
- @Column(name = "nat", nullable = false)
+ private String name = ""; // Varchar 128
+
+ @Column(name = "secret", length=128)
@Element(data=true, required = false)
- private String nat = "no";
-
- @Column(name = "outboundproxy")
+ private String secret; // Varchar 128
+
+ @Column(name = "context", length=128)
@Element(data=true, required = false)
- private String outboundproxy;
-
- @Column(name = "deny")
- @Element(data=true, required = false)
- private String deny;
-
- @Column(name = "permit")
+ private String context; // Varchar 128
+
+ @Column(name = "host", nullable = false, length=128)
@Element(data=true, required = false)
- private String permit;
-
- @Column(name = "pickupgroup")
- @Element(data=true, required = false)
- private String pickupgroup;
-
- @Column(name = "port", nullable = false)
+ private String host = "dynamic"; // Varchar 128
+
+ @Column(name = "ipaddr", nullable = false, length=128)
@Element(data=true, required=false)
- private String port = "";
-
- // @Column(name = "progressinband")
- @Column(name = "progressinband")
- // @Enumerated(EnumType.STRING)
- @Element(data=true, required = false)
- private String progressinband = "no";
- // private YesNoNever progressinband;
-
- // @Column(name = "promiscredir")
- @Column(name = "promiscredir")
- // @Enumerated(EnumType.STRING)
- @Element(data=true, required = false)
- private String promiscredir = "no";
-
- @Column(name = "qualify")
- @Element(data=true, required = false)
- private String qualify;
-
- @Column(name = "regexten", nullable = false)
+ private String ipaddr = ""; // Varchar 128
+
+ @Column(name = "port", nullable = false, length=5)
@Element(data=true, required=false)
- private String regexten = "";
-
+ private String port = ""; // Varchar 5
+
@Column(name = "regseconds", nullable = false)
@Element(data=true, required = false)
- private int regseconds = 0;
-
- // @Column(name = "rfc2833compensate")
- @Column(name = "rfc2833compensate")
- // @Enumerated(EnumType.STRING)
- @Element(data=true, required = false)
- private String rfc2833compensate = "no";
-
- @Column(name = "rtptimeout")
- @Element(data=true, required = false)
- private String rtptimeout;
-
- @Column(name = "rtpholdtimeout")
+ private Long regseconds = 0L; // Bigint
+
+ @Column(name = "defaultuser", nullable = true, length=128)
+ @Element(data=true, required = false)
+ private String defaultuser; // Varchar 128
+
+ @Column(name = "fullcontact", length=128)
+ @Element(data=true, required = false)
+ private String fullcontact; // Varchar 128
+
+ @Column(name = "regserver", nullable = true, length=128)
+ @Element(data=true, required = false)
+ private String regserver; // Varchar 128
+
+ @Column(name = "useragent", nullable = true, length=128)
@Element(data=true, required = false)
- private String rtpholdtimeout;
-
- @Column(name = "secret")
- @Element(data=true, required = false)
- private String secret;
-
- // @Column(name = "sendrpid")
- @Column(name = "sendrpid")
- // @Enumerated(EnumType.STRING)
- @Element(data=true, required = false)
- private String sendrpid = "yes";
-
- @Column(name = "setvar", nullable = false)
- @Element(data=true, required=false)
- private String setvar = "";
-
- @Column(name = "subscribecontext")
- @Element(data=true, required = false)
- private String subscribecontext;
-
- @Column(name = "subscribemwi")
- @Element(data=true, required = false)
- private String subscribemwi;
-
- // @Column(name = "t38pt_udptl")
- @Column(name = "t38pt_udptl")
- // @Enumerated(EnumType.STRING)
- @Element(data=true, required = false)
- private String t38pt_udptl = "no";
-
- // @Column(name = "trustrpid")
- @Column(name = "trustrpid")
- // @Enumerated(EnumType.STRING)
- @Element(data=true, required = false)
- private String trustrpid = "no";
-
- @Column(name = "type", nullable = false)
- @Element(data=true, required=false)
- private String type = "friend";
-
- // @Column(name = "useclientcode")
- @Column(name = "useclientcode")
- // @Enumerated(EnumType.STRING)
- @Element(data=true, required=false)
- private String useclientcode = "no";
-
- @Column(name = "username", nullable = false)
- @Element(data=true, required=false)
- private String username = "";
-
- @Column(name = "usereqphone", nullable = false)
- @Element(data=true, required=false)
- private String usereqphone = "no";
-
- // @Column(name = "videosupport")
- @Column(name = "videosupport")
- // @Enumerated(EnumType.STRING)
+ private String useragent; // Varchar 128
+
+ @Column(name = "lastms")
@Element(data=true, required = false)
- private String videosupport = "yes";
-
- @Column(name = "vmexten")
+ private Integer lastms; // Integer
+
+ @Column(name = "md5secret")
@Element(data=true, required = false)
- private String vmexten;
-
- // create unique index name on asterisk.sipusers (name);
- // create index name_2 on asterisk.sipusers (name);
+ private String md5secret;
- public int getId() {
+ public long getId() {
return id;
}
- public void setId(int id) {
+ public void setId(long 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 String getType() {
+ return type;
}
- public void setFullname(String fullname) {
- this.fullname = fullname;
+ public void setType(String type) {
+ this.type = type;
}
- public String getCallingpres() {
- return callingpres;
+ public String getName() {
+ return name;
}
- public void setCallingpres(String callingpres) {
- this.callingpres = callingpres;
+ public void setName(String name) {
+ this.name = name;
}
- public String getCanreinvite() {
- return canreinvite;
+ public String getSecret() {
+ return secret;
}
- public void setCanreinvite(String canreinvite) {
- this.canreinvite = canreinvite;
+ public void setSecret(String secret) {
+ this.secret = secret;
}
public String getContext() {
@@ -456,54 +138,6 @@ public class AsteriskSipUsers implements
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;
}
@@ -512,14 +146,6 @@ public class AsteriskSipUsers implements
this.host = host;
}
- public String getInsecure() {
- return insecure;
- }
-
- public void setInsecure(String insecure) {
- this.insecure = insecure;
- }
-
public String getIpaddr() {
return ipaddr;
}
@@ -528,110 +154,6 @@ public class AsteriskSipUsers implements
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;
}
@@ -640,171 +162,59 @@ public class AsteriskSipUsers implements
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() {
+ public Long getRegseconds() {
return regseconds;
}
- public void setRegseconds(int regseconds) {
+ public void setRegseconds(Long 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 getDefaultuser() {
+ return defaultuser;
}
- 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 void setDefaultuser(String defaultuser) {
+ this.defaultuser = defaultuser;
}
- 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 String getFullcontact() {
+ return fullcontact;
}
- public void setUseclientcode(String useclientcode) {
- this.useclientcode = useclientcode;
+ public void setFullcontact(String fullcontact) {
+ this.fullcontact = fullcontact;
}
- public String getUsername() {
- return username;
+ public String getRegserver() {
+ return regserver;
}
- public void setUsername(String username) {
- this.username = username;
+ public void setRegserver(String regserver) {
+ this.regserver = regserver;
}
- public String getUsereqphone() {
- return usereqphone;
+ public String getUseragent() {
+ return useragent;
}
- public void setUsereqphone(String usereqphone) {
- this.usereqphone = usereqphone;
+ public void setUseragent(String useragent) {
+ this.useragent = useragent;
}
- public String getVideosupport() {
- return videosupport;
+ public Integer getLastms() {
+ return lastms;
}
- public void setVideosupport(String videosupport) {
- this.videosupport = videosupport;
+ public void setLastms(Integer lastms) {
+ this.lastms = lastms;
}
- public String getVmexten() {
- return vmexten;
+ public String getMd5secret() {
+ return md5secret;
}
- public void setVmexten(String vmexten) {
- this.vmexten = vmexten;
+ public void setMd5secret(String md5secret) {
+ this.md5secret = md5secret;
}
}
\ No newline at end of file
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java?rev=1423983&r1=1423982&r2=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java Wed Dec 19 17:45:27 2012
@@ -19,6 +19,7 @@
package org.apache.openmeetings.persistence.beans.user;
import java.io.Serializable;
+import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -36,6 +37,8 @@ import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.PrimaryKeyJoinColumn;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -44,12 +47,16 @@ import org.apache.openjpa.persistence.Fe
import org.apache.openjpa.persistence.FetchGroup;
import org.apache.openjpa.persistence.FetchGroups;
import org.apache.openjpa.persistence.LoadFetchGroup;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
import org.apache.openmeetings.persistence.beans.adresses.Adresses;
import org.apache.openmeetings.persistence.beans.adresses.States;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
+import org.apache.openmeetings.persistence.beans.sip.asterisk.AsteriskSipUser;
+import org.apache.openmeetings.utils.crypt.MD5;
+import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.ElementList;
import org.simpleframework.xml.Root;
@@ -186,10 +193,10 @@ public class Users implements Serializab
@ElementDependent
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;
+ @OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+ @PrimaryKeyJoinColumn(name="sip_user_id", referencedColumnName="id")
+ @Element(name = "sipUser", required = false)
+ private AsteriskSipUser sipUser;
// Vars to simulate external Users
@Column(name = "externalUserId")
@@ -338,10 +345,38 @@ public class Users implements Serializab
this.login = login;
}
+ public void updatePassword(ManageCryptStyle crypt, ConfigurationDao configDao, String pass) throws NoSuchAlgorithmException {
+ Integer userPassMinimumLength = configDao.getConfValue("user.pass.minimum.length", Integer.class, "4");
+
+ if (userPassMinimumLength == null) {
+ throw new RuntimeException("user.pass.minimum.length problem");
+ }
+ if (pass == null || pass.length() < userPassMinimumLength) {
+ throw new RuntimeException("Password of invalid length is provided");
+ }
+ String sipEnabled = configDao.getConfValue("red5sip.enable", String.class, "no");
+ if("yes".equals(sipEnabled)) {
+ if (getSipUser() == null) {
+ setSipUser(new AsteriskSipUser());
+ }
+ AsteriskSipUser u = getSipUser();
+ String defaultRoomContext = configDao.getConfValue("red5sip.exten_context", String.class, "rooms");
+ u.setName(login);
+ u.setDefaultuser(login);
+ u.setMd5secret(MD5.do_checksum(login + ":asterisk:" + pass));
+ u.setContext(defaultRoomContext);
+ u.setHost("dynamic");
+ } else {
+ setSipUser(null);
+ }
+ password = crypt.getInstanceOfCrypt().createPassPhrase(pass);
+ }
+
public String getPassword() {
return password;
}
+ @Deprecated //should not be used directly (for bean usage only)
public void setPassword(String password) {
this.password = password;
}
@@ -477,12 +512,12 @@ public class Users implements Serializab
this.sessionData = sessionData;
}
- public UserSipData getUserSipData() {
- return userSipData;
+ public AsteriskSipUser getSipUser() {
+ return sipUser;
}
- public void setUserSipData(UserSipData userSipData) {
- this.userSipData = userSipData;
+ public void setSipUser(AsteriskSipUser sipUser) {
+ this.sipUser = sipUser;
}
public OmTimeZone getOmTimeZone() {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java?rev=1423983&r1=1423982&r2=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java Wed Dec 19 17:45:27 2012
@@ -561,8 +561,7 @@ public class ConferenceService {
.toString()), Boolean
.valueOf(argObjectMap.get("isClosed")
.toString()),
- argObjectMap.get("redirectURL").toString(),
- argObjectMap.get("sipNumber").toString(), argObjectMap
+ argObjectMap.get("redirectURL").toString(), argObjectMap
.get("conferencePin").toString(),
Long.valueOf(argObjectMap.get("ownerId").toString())
.longValue(), Boolean.valueOf(argObjectMap.get(
@@ -614,7 +613,6 @@ public class ConferenceService {
Boolean.valueOf(argObjectMap.get("isClosed")
.toString()),
argObjectMap.get("redirectURL").toString(),
- argObjectMap.get("sipNumber").toString(),
argObjectMap.get("conferencePin").toString(),
Long.valueOf(
argObjectMap.get("ownerId").toString())
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LanguageService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LanguageService.java?rev=1423983&r1=1423982&r2=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LanguageService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LanguageService.java Wed Dec 19 17:45:27 2012
@@ -81,10 +81,7 @@ public class LanguageService {
}
public Integer getDefaultLanguage() {
- return Integer.valueOf(
- configurationDaoImpl.getConfKey("default_lang_id")
- .getConf_value())
- .intValue();
+ return configurationDaoImpl.getConfValue("default_lang_id", Integer.class, "1");
}
/**
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java?rev=1423983&r1=1423982&r2=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java Wed Dec 19 17:45:27 2012
@@ -85,7 +85,7 @@ public class MainService implements IPen
@Autowired
private Sessionmanagement sessionManagement;
@Autowired
- private ConfigurationDao configurationDaoImpl;
+ private ConfigurationDao configDao;
@Autowired
private Usermanagement userManagement;
@Autowired
@@ -609,15 +609,7 @@ public class MainService implements IPen
userObject.getExternalUserType());
if (user == null) {
-
- Configuration conf = configurationDaoImpl
- .getConfKey(
- "default.timezone");
- String jName_timeZone = "";
-
- if (conf != null) {
- jName_timeZone = conf.getConf_value();
- }
+ String jName_timeZone = configDao.getConfValue("default.timezone", String.class, "");
long userId = userManagement
.addUserWithExternalKey(1, 0, 0,
@@ -683,7 +675,7 @@ public class MainService implements IPen
try {
sessionManagement.updateUserWithoutSession(SID, -1L);
- Long defaultRpcUserid = configurationDaoImpl.getConfValue(
+ Long defaultRpcUserid = configDao.getConfValue(
"default.rpc.userid", Long.class, "-1");
Users defaultRpcUser = userManagement.getUserById(defaultRpcUserid);
@@ -743,7 +735,7 @@ public class MainService implements IPen
* @return configuration with key "allow_frontend_register"
*/
public Configuration allowFrontendRegister(String SID) {
- return configurationDaoImpl.getConfKey("allow_frontend_register");
+ return configDao.get("allow_frontend_register");
}
public List<Configuration> getGeneralOptions(String SID) {
@@ -751,10 +743,9 @@ public class MainService implements IPen
List<Configuration> cList = new LinkedList<Configuration>();
- cList.add(configurationDaoImpl
- .getConfKey("exclusive.audio.keycode"));
- cList.add(configurationDaoImpl.getConfKey("red5sip.enable"));
- cList.add(configurationDaoImpl.getConfKey("max_upload_size"));
+ cList.add(configDao.get("exclusive.audio.keycode"));
+ cList.add(configDao.get("red5sip.enable"));
+ cList.add(configDao.get("max_upload_size"));
return cList;
@@ -768,16 +759,16 @@ public class MainService implements IPen
try {
List<Configuration> cList = new LinkedList<Configuration>();
- cList.add(configurationDaoImpl
- .getConfKey("allow_frontend_register"));
- cList.add(configurationDaoImpl.getConfKey("show.facebook.login"));
- cList.add(configurationDaoImpl
- .getConfKey("user.login.minimum.length"));
- cList.add(configurationDaoImpl
- .getConfKey("user.pass.minimum.length"));
- cList.add(configurationDaoImpl
- .getConfKey("user.pass.minimum.length"));
- cList.add(configurationDaoImpl.getConfKey("ldap_default_id"));
+ cList.add(configDao
+ .get("allow_frontend_register"));
+ cList.add(configDao.get("show.facebook.login"));
+ cList.add(configDao
+ .get("user.login.minimum.length"));
+ cList.add(configDao
+ .get("user.pass.minimum.length"));
+ cList.add(configDao
+ .get("user.pass.minimum.length"));
+ cList.add(configDao.get("ldap_default_id"));
return cList;
} catch (Exception err) {
@@ -995,27 +986,6 @@ public class MainService implements IPen
}
}
- public Boolean getSIPModuleStatus() {
- try {
-
- Configuration conf = configurationDaoImpl.getConfKey("sip.enable");
-
- if (conf == null) {
- return false;
- } else {
-
- if (conf.getConf_value().equals("yes")) {
- return true;
- }
-
- }
-
- } catch (Exception err) {
- log.error("[getSIPModuleStatus]", err);
- }
- return false;
- }
-
public int closeRoom(String SID, Long room_id, Boolean status) {
try {
Long users_id = sessionManagement.checkSession(SID);
@@ -1051,7 +1021,7 @@ public class MainService implements IPen
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
if (authLevelManagement.checkUserLevel(user_level)) {
- return configurationDaoImpl.getConfKeys(new String[] {
+ return configDao.getConfKeys(new String[] {
"dashboard.show.chat", //
"dashboard.show.myrooms", //
"dashboard.show.rssfeed", //
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java?rev=1423983&r1=1423982&r2=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java Wed Dec 19 17:45:27 2012
@@ -105,7 +105,7 @@ public class UserService {
@Autowired
private Organisationmanagement organisationmanagement;
@Autowired
- private ManageCryptStyle manageCryptStyle;
+ private ManageCryptStyle cryptManager;
@Autowired
private Roommanagement roommanagement;
@Autowired
@@ -414,12 +414,6 @@ public class UserService {
.booleanValue(),
"",
false,
- argObjectMap.get("sip_user").toString(),
- argObjectMap.get("sip_pass").toString(),
- argObjectMap.get("sip_auth").toString(),
- Boolean.valueOf(
- argObjectMap.get("generateSipUserData")
- .toString()).booleanValue(),
argObjectMap.get("jNameTimeZone").toString(),
Boolean.valueOf(
argObjectMap.get("forceTimeZoneCheck")
@@ -467,12 +461,6 @@ public class UserService {
argObjectMap.get("phone").toString(),
Boolean.valueOf(argObjectMap.get("sendSMS").toString())
.booleanValue(),
- argObjectMap.get("sip_user").toString(),
- argObjectMap.get("sip_pass").toString(),
- argObjectMap.get("sip_auth").toString(),
- Boolean.valueOf(
- argObjectMap.get("generateSipUserData")
- .toString()).booleanValue(),
argObjectMap.get("jNameTimeZone").toString(),
Boolean.valueOf(
argObjectMap.get("forceTimeZoneCheck")
@@ -657,7 +645,7 @@ public class UserService {
return -45L;
}
- String hash = manageCryptStyle
+ String hash = cryptManager
.getInstanceOfCrypt()
.createPassPhrase(
CalendarPatterns
@@ -1023,7 +1011,6 @@ public class UserService {
false, // isAudioOnly
false, // isClosed
"", // redirectURL
- "", // sipNumber
"", // conferencePIN
null, // ownerId
null, null, false, // hideTopBar
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1423983&r1=1423982&r2=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Wed Dec 19 17:45:27 2012
@@ -2624,8 +2624,7 @@ public class ScopeApplicationAdapter ext
.getClientByPublicSID(publicSID, false, null);
if (currentClient == null) {
- currentClient = this.clientListManager
- .getClientByUserId(user_id);
+ currentClient = clientListManager.getClientByUserId(user_id);
}
Collection<Set<IConnection>> conCollection = null;
@@ -3016,10 +3015,10 @@ public class ScopeApplicationAdapter ext
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
RoomClient currentClient = this.clientListManager.getClientByStreamId(streamid, null);
- Rooms rooms = roomDao.get(currentClient.getRoom_id());
- log.debug("asterisk -rx \"originate Local/" + number + "@rooms extension " + rooms.getSipNumber() + "@rooms\"");
try {
- Runtime.getRuntime().exec(new String[]{"asterisk", "-rx", "originate Local/" + number + "@rooms extension " + rooms.getSipNumber() + "@rooms"});
+ String sipNumber = getSipNumber(currentClient.getRoom_id());
+ log.debug("asterisk -rx \"originate Local/" + number + "@rooms extension " + sipNumber + "@rooms\"");
+ Runtime.getRuntime().exec(new String[]{"asterisk", "-rx", "originate Local/" + number + "@rooms extension " + sipNumber + "@rooms"});
} catch (IOException e) {
log.error("Executing asterisk originate error: ", e);
}
@@ -3027,9 +3026,9 @@ public class ScopeApplicationAdapter ext
public synchronized String getSipNumber(Long room_id) {
Rooms rooms = roomDao.get(room_id);
- if(rooms != null) {
- log.debug("getSipNumber: room_id: {}, sipNumber: {}", new Object[]{room_id, rooms.getSipNumber()});
- return rooms.getSipNumber();
+ if(rooms != null && rooms.getMeetme() != null) {
+ log.debug("getSipNumber: room_id: {}, sipNumber: {}", new Object[]{room_id, rooms.getMeetme().getConfno()});
+ return rooms.getMeetme().getConfno();
}
return null;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/rss/LoadAtomRssFeed.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/rss/LoadAtomRssFeed.java?rev=1423983&r1=1423982&r2=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/rss/LoadAtomRssFeed.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/rss/LoadAtomRssFeed.java Wed Dec 19 17:45:27 2012
@@ -39,7 +39,7 @@ public class LoadAtomRssFeed {
private static final Logger log = Red5LoggerFactory.getLogger(
LoadAtomRssFeed.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
- private ConfigurationDao configurationDaoImpl;
+ private ConfigurationDao configDao;
@Autowired
private AuthLevelmanagement authLevelmanagement;
@@ -49,12 +49,10 @@ public class LoadAtomRssFeed {
if (authLevelmanagement.checkUserLevel(user_level)) {
LinkedHashMap<String, LinkedHashMap<String, LinkedHashMap<String, LinkedHashMap<String, Object>>>> returnMap = new LinkedHashMap<String, LinkedHashMap<String, LinkedHashMap<String, LinkedHashMap<String, Object>>>>();
- String url1 = configurationDaoImpl.getConfKey("rss_feed1")
- .getConf_value();
+ String url1 = configDao.getConfValue("rss_feed1", String.class, "");
returnMap.put("feed1", this.parseRssFeed(url1));
- String url2 = configurationDaoImpl.getConfKey("rss_feed2")
- .getConf_value();
+ String url2 = configDao.getConfValue("rss_feed2", String.class, "");
returnMap.put("feed2", this.parseRssFeed(url2));
return returnMap;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java?rev=1423983&r1=1423982&r2=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java Wed Dec 19 17:45:27 2012
@@ -81,7 +81,7 @@ public class ScreenSharerFrame extends J
private NumberSpinner spinnerY;
private NumberSpinner spinnerWidth;
private NumberSpinner spinnerHeight;
- private JComboBox comboQuality;
+ private JComboBox<KeyValue<ScreenQuality>> comboQuality;
private JTextField textPublishHost;
private JTextField textPublishApp;
private JTextField textPublishId;
@@ -409,7 +409,7 @@ public class ScreenSharerFrame extends J
labelQuality.setBounds(250, 140, 200, 24);
panelScreen.add(labelQuality);
- comboQuality = new JComboBox();
+ comboQuality = new JComboBox<KeyValue<ScreenQuality>>();
comboQuality.addItem(new KeyValue<ScreenQuality>(getTextLabel(textLabels, 19), ScreenQuality.VeryHigh)); //#id 1090
comboQuality.addItem(new KeyValue<ScreenQuality>(getTextLabel(textLabels, 20), ScreenQuality.High)); //#id 1091
comboQuality.addItem(new KeyValue<ScreenQuality>(getTextLabel(textLabels, 21), ScreenQuality.Medium)); //#id 1092
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java?rev=1423983&r1=1423982&r2=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java Wed Dec 19 17:45:27 2012
@@ -102,12 +102,11 @@ public class ActivateUser extends Veloci
String hash = httpServletRequest.getParameter("u");
String loginURL = OpenmeetingsVariables.webAppRootPath;
+ Long default_lang_id = getConfigurationmanagement()
+ .getConfValue("default_lang_id", Long.class, "1");
ctx.put("APP_NAME", getConfigurationmanagement().getAppName());
if (hash == null) {
// No hash
- Long default_lang_id = Long.valueOf(
- getConfigurationmanagement().getConfKey(
- "default_lang_id").getConf_value()).longValue();
Fieldlanguagesvalues labelid669 = getFieldmanagment()
.getFieldByIdAndLanguage(new Long(669), default_lang_id);
Fieldlanguagesvalues labelid672 = getFieldmanagment()
@@ -125,10 +124,6 @@ public class ActivateUser extends Veloci
if (user == null) {
// No User Found with this Hash
- Long default_lang_id = Long.valueOf(
- getConfigurationmanagement().getConfKey(
- "default_lang_id").getConf_value()).longValue();
-
Fieldlanguagesvalues labelid669 = getFieldmanagment()
.getFieldByIdAndLanguage(new Long(669), default_lang_id);
Fieldlanguagesvalues labelid672 = getFieldmanagment()
@@ -143,10 +138,6 @@ public class ActivateUser extends Veloci
} else if (user.getStatus() == 1) {
// already activated
- Long default_lang_id = Long.valueOf(
- getConfigurationmanagement().getConfKey(
- "default_lang_id").getConf_value()).longValue();
-
Fieldlanguagesvalues labelid670 = getFieldmanagment()
.getFieldByIdAndLanguage(new Long(670), default_lang_id);
Fieldlanguagesvalues labelid672 = getFieldmanagment()
@@ -166,10 +157,6 @@ public class ActivateUser extends Veloci
getUsermanagement().updateUser(user);
- Long default_lang_id = Long.valueOf(
- getConfigurationmanagement().getConfKey(
- "default_lang_id").getConf_value()).longValue();
-
Fieldlanguagesvalues labelid671 = getFieldmanagment()
.getFieldByIdAndLanguage(new Long(671), default_lang_id);
Fieldlanguagesvalues labelid672 = getFieldmanagment()
@@ -184,10 +171,6 @@ public class ActivateUser extends Veloci
} else {
// unkown Status
- Long default_lang_id = Long.valueOf(
- getConfigurationmanagement().getConfKey(
- "default_lang_id").getConf_value()).longValue();
-
Fieldlanguagesvalues labelid672 = getFieldmanagment()
.getFieldByIdAndLanguage(new Long(672), default_lang_id);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java?rev=1423983&r1=1423982&r2=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java Wed Dec 19 17:45:27 2012
@@ -79,7 +79,6 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.rooms.Rooms;
import org.apache.openmeetings.persistence.beans.user.PrivateMessages;
import org.apache.openmeetings.persistence.beans.user.Users;
-import org.apache.openmeetings.sip.api.impl.asterisk.dao.AsteriskDAOImpl;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.utils.math.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
@@ -142,8 +141,6 @@ public class BackupExport {
private PollManagement pollManagement;
@Autowired
private ConfigurationDao configurationDaoImpl;
- @Autowired
- private AsteriskDAOImpl asteriskDAOImpl;
public void performExport(File filePath, File backup_dir,
boolean includeFiles) throws Exception {
@@ -347,25 +344,6 @@ public class BackupExport {
writeList(serializer, backup_dir, "configs.xml", "configs", list);
}
- /*
- * ##################### Asterisk SIP Data
- */
- writeList(simpleSerializer, backup_dir, "asterisksipusers.xml",
- "asterisksipusers", asteriskDAOImpl.getAsteriskSipUsers());
-
- /*
- * ##################### Asterisk SIP Extensions
- */
- writeList(simpleSerializer, backup_dir, "extensions.xml",
- "extensions", asteriskDAOImpl.getExtensions());
-
- /*
- * ##################### Asterisk SIP Meetme
- */
- writeList(simpleSerializer, backup_dir, "members.xml",
- "members", asteriskDAOImpl.getMembers());
-
-
if (includeFiles) {
/*
* ##################### Backup Room Files
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1423983&r1=1423982&r2=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java Wed Dec 19 17:45:27 2012
@@ -94,16 +94,11 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.rooms.RoomTypes;
import org.apache.openmeetings.persistence.beans.rooms.Rooms;
import org.apache.openmeetings.persistence.beans.rooms.Rooms_Organisation;
-import org.apache.openmeetings.persistence.beans.sip.asterisk.AsteriskSipUsers;
-import org.apache.openmeetings.persistence.beans.sip.asterisk.Extensions;
-import org.apache.openmeetings.persistence.beans.sip.asterisk.MeetMe;
import org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder;
import org.apache.openmeetings.persistence.beans.user.PrivateMessages;
import org.apache.openmeetings.persistence.beans.user.UserContacts;
-import org.apache.openmeetings.persistence.beans.user.UserSipData;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
-import org.apache.openmeetings.sip.api.impl.asterisk.dao.AsteriskDAOImpl;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.utils.math.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
@@ -172,8 +167,6 @@ public class BackupImportController exte
private PollManagement pollManagement;
@Autowired
private ConfigurationDao configurationDao;
- @Autowired
- private AsteriskDAOImpl asteriskDAOImpl;
private final HashMap<Long, Long> usersMap = new HashMap<Long, Long>();
private final HashMap<Long, Long> organisationsMap = new HashMap<Long, Long>();
@@ -287,8 +280,8 @@ public class BackupImportController exte
u.setStarttime(new Date());
long userId = u.getUser_id();
u.setUser_id(null);
- Long actualNewUserId = userManagement.addUserBackup(u);
- usersMap.put(userId, actualNewUserId);
+ usersDao.update(u, 1L);
+ usersMap.put(userId, u.getUser_id());
}
}
@@ -572,7 +565,7 @@ public class BackupImportController exte
List<Configuration> list = readList(serializer, f, "configs.xml", "configs", Configuration.class, true);
for (Configuration c : list) {
- Configuration cfg = configurationDao.getConfKey(c
+ Configuration cfg = configurationDao.get(c
.getConf_key());
c.setConfiguration_id(cfg == null ? null : cfg.getConfiguration_id());
if (c.getUser() != null && c.getUser().getUser_id() == null) {
@@ -582,45 +575,7 @@ public class BackupImportController exte
}
}
- log.info("Configs import complete, starting asteriskSipUsersFile import");
- /*
- * ##################### Import AsteriskSipUsers
- */
- {
- List<AsteriskSipUsers> list = readList(simpleSerializer, f, "asterisksipusers.xml"
- , "asterisksipusers", AsteriskSipUsers.class, true);
- for (AsteriskSipUsers au : list) {
- au.setId(0);
- asteriskDAOImpl.saveAsteriskSipUsers(au);
- }
- }
-
- log.info("AsteriskSipUsers import complete, starting extensions import");
- /*
- * ##################### Import Extensions
- */
- {
- List<Extensions> list = readList(simpleSerializer, f, "extensions.xml"
- , "extensions", Extensions.class, true);
- for (Extensions e : list) {
- e.setId(null);
- asteriskDAOImpl.saveExtensions(e);
- }
- }
-
- log.info("Extensions import complete, starting MeetMe members import");
- /*
- * ##################### Import MeetMe
- */
- {
- List<MeetMe> list = readList(simpleSerializer, f, "members.xml"
- , "members", MeetMe.class, true);
- for (MeetMe mm : list) {
- asteriskDAOImpl.saveMeetMe(mm);
- }
- }
-
- log.info("Members import complete, starting copy of files and folders");
+ log.info("Configs import complete, starting copy of files and folders");
/*
* ##################### Import real files and folders
*/
@@ -726,7 +681,6 @@ public class BackupImportController exte
Serializer ser = new Persister(strategy);
registry.bind(Organisation.class, new OrganisationConverter(orgDao, organisationsMap));
- //registry.bind(UserSipData.class, UserSipDataConverter.class);
registry.bind(OmTimeZone.class, new OmTimeZoneConverter(omTimeZoneDaoImpl));
registry.bind(States.class, new StateConverter(statemanagement));
registry.bind(Date.class, DateConverter.class);
@@ -757,27 +711,20 @@ public class BackupImportController exte
List<Users> list = new ArrayList<Users>();
InputNode root = NodeBuilder.read(new StringReader(sw.toString()));
InputNode root1 = NodeBuilder.read(new StringReader(sw.toString())); //HACK to handle Adresses inside user
- InputNode root2 = NodeBuilder.read(new StringReader(sw.toString())); //HACK to handle UserSipData inside user
InputNode listNode = root.getNext();
InputNode listNode1 = root1.getNext(); //HACK to handle Adresses inside user
- InputNode listNode2 = root2.getNext(); //HACK to handle UserSipData inside user
if (listNodeName.equals(listNode.getName())) {
InputNode item = listNode.getNext();
InputNode item1 = listNode1.getNext(); //HACK to handle Adresses inside user
- InputNode item2 = listNode2.getNext(); //HACK to handle UserSipData inside user
while (item != null) {
try {
Users u = ser.read(Users.class, item, false);
- //HACK to handle Adresses and UserSipData inside user
+ //HACK to handle Adresses inside user
if (u.getAdresses() == null) {
Adresses a = ser.read(Adresses.class, item1, false);
u.setAdresses(a);
}
- if (u.getUserSipData() == null) {
- UserSipData usd = ser.read(UserSipData.class, item2, false);
- u.setUserSipData(usd);
- }
list.add(u);
} catch (Exception e) {
log.debug("Exception While reading node of type: " + Users.class, e);
@@ -786,9 +733,6 @@ public class BackupImportController exte
do {
item1 = listNode1.getNext(); //HACK to handle Adresses inside user
} while (item != null && !"user".equals(item1.getName()));
- do {
- item2 = listNode2.getNext(); //HACK to handle UserSipData inside user
- } while (item != null && !"user".equals(item2.getName()));
}
}
return list;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DefaultIndex.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DefaultIndex.java?rev=1423983&r1=1423982&r2=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DefaultIndex.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DefaultIndex.java Wed Dec 19 17:45:27 2012
@@ -26,7 +26,6 @@ import javax.servlet.http.HttpServletRes
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.persistence.beans.basic.Configuration;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
@@ -67,78 +66,8 @@ public class DefaultIndex extends Veloci
"booting.vm");
}
- String template = "sip_template.vm";
-
- // Enable SIP Template or not
- Configuration SIP_ENABLE = getConfigurationDaoImpl().getConfKey(
- "sip.enable");
-
- // SIP_REALM
- ctx.put("APP_NAME", getConfigurationDaoImpl().getAppName());
-
- if (SIP_ENABLE == null || !SIP_ENABLE.getConf_value().equals("yes")) {
-
- template = "usual_template.vm";
-
- } else {
-
- // Set all the Params for the Applet Configuration
-
- // SIP_REALM
- Configuration SIP_REALM = getConfigurationDaoImpl()
- .getConfKey("sip.realm");
- if (SIP_REALM == null) {
- ctx.put("SIP_REALM", "");
- } else {
- ctx.put("SIP_REALM", SIP_REALM.getConf_value());
- }
-
- // SIP_PORT
- Configuration SIP_PORT = getConfigurationDaoImpl()
- .getConfKey("sip.port");
- if (SIP_PORT == null) {
- ctx.put("SIP_PORT", "");
- } else {
- ctx.put("SIP_PORT", SIP_PORT.getConf_value());
- }
-
- // SIP_PROXYNAME
- Configuration SIP_PROXYNAME = getConfigurationDaoImpl()
- .getConfKey("sip.proxyname");
- if (SIP_PROXYNAME == null) {
- ctx.put("SIP_PROXYNAME", "");
- } else {
- ctx.put("SIP_PROXYNAME", SIP_PROXYNAME.getConf_value());
- }
-
- // SIP_TUNNEL
- Configuration SIP_TUNNEL = getConfigurationDaoImpl()
- .getConfKey("sip.tunnel");
- if (SIP_TUNNEL == null) {
- ctx.put("SIP_TUNNEL", "");
- } else {
- ctx.put("SIP_TUNNEL", SIP_TUNNEL.getConf_value());
- }
-
- // SIP_CODEBASE
- Configuration SIP_CODEBASE = getConfigurationDaoImpl()
- .getConfKey("sip.codebase");
- if (SIP_CODEBASE == null) {
- ctx.put("SIP_CODEBASE", "");
- } else {
- ctx.put("SIP_CODEBASE", SIP_CODEBASE.getConf_value());
- }
-
- // SIP_FORCETUNNEL
- Configuration SIP_FORCETUNNEL = getConfigurationDaoImpl()
- .getConfKey("sip.forcetunnel");
- if (SIP_FORCETUNNEL == null) {
- ctx.put("SIP_FORCETUNNEL", "");
- } else {
- ctx.put("SIP_FORCETUNNEL", SIP_FORCETUNNEL.getConf_value());
- }
- }
-
+ String template = "usual_template.vm";
+ ctx.put("APP_NAME", getConfigurationDaoImpl().getAppName());
// Parse the Param for the SWF URL
String swf = httpServletRequest.getParameter("swf");
if (swf == null) {
@@ -152,8 +81,7 @@ public class DefaultIndex extends Veloci
// Load params from URL and set into wrapper code
if (httpServletRequest.getParameterMap() != null) {
- for (@SuppressWarnings("unchecked")
- Iterator<String> iter = httpServletRequest.getParameterMap()
+ for (Iterator<String> iter = httpServletRequest.getParameterMap()
.keySet().iterator(); iter.hasNext();) {
String paramKey = iter.next();
SWF_FLASHVARS += paramKey
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Install.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Install.java?rev=1423983&r1=1423982&r2=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Install.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Install.java Wed Dec 19 17:45:27 2012
@@ -247,30 +247,6 @@ public class Install extends VelocityVie
cfg.red5SipRoomPrefix = httpServletRequest.getParameter("red5sip_room_prefix");
cfg.red5SipExtenContext = httpServletRequest.getParameter("red5sip_exten_context");
- // SIP Applet Configuration
- cfg.sipEnable = httpServletRequest.getParameter("sip_enable");
- cfg.sipRealm = httpServletRequest.getParameter("sip_realm");
- cfg.sipPort = httpServletRequest.getParameter("sip_port");
- cfg.sipProxyName = httpServletRequest.getParameter("sip_proxyname");
- cfg.sipTunnel = httpServletRequest.getParameter("sip_tunnel");
- cfg.sipCodebase = httpServletRequest.getParameter("sip_codebase");
- cfg.sipForceTunnel = httpServletRequest.getParameter("sip_forcetunnel");
-
- // OpenXG / OpenSIPg Configuration
- cfg.sipOpenxgEnable = httpServletRequest.getParameter("sip_openxg_enable");
- cfg.openxgWrapperUrl = httpServletRequest.getParameter("openxg_wrapper_url");
- cfg.openxgClientId = httpServletRequest.getParameter("openxg_client_id");
- cfg.openxgClientSecret = httpServletRequest.getParameter("openxg_client_secret");
- cfg.openxgClientDomain = httpServletRequest.getParameter("openxg_client_domain");
- cfg.openxgCommunityCode = httpServletRequest.getParameter("openxg_community_code");
- cfg.openxgLanguageCode = httpServletRequest.getParameter("openxg_language_code");
- cfg.openxgAdminId = httpServletRequest.getParameter("openxg_adminid");
-
- // SIP Phone Range Configuration
- cfg.sipLanguagePhoneCode = httpServletRequest.getParameter("sip_language_phonecode");
- cfg.sipPhoneRangeStart = httpServletRequest.getParameter("sip_phonerange_start");
- cfg.sipPhoneRange = httpServletRequest.getParameter("sip_phonerange");
-
String timeZone = httpServletRequest.getParameter("timeZone");
cfg.ical_timeZone = timeZone;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java?rev=1423983&r1=1423982&r2=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java Wed Dec 19 17:45:27 2012
@@ -23,6 +23,7 @@ import static junit.framework.Assert.ass
import java.util.Date;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
import org.apache.openmeetings.data.user.Usermanagement;
import org.apache.openmeetings.data.user.dao.UsersDao;
@@ -30,6 +31,7 @@ import org.apache.openmeetings.installat
import org.apache.openmeetings.installation.InstallationConfig;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.user.Users;
+import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.red5.logging.Red5LoggerFactory;
@@ -60,6 +62,10 @@ public abstract class AbstractOpenmeetin
private UsersDao usersDao;
@Autowired
private ImportInitvalues importInitvalues;
+ @Autowired
+ private ConfigurationDao configDao;
+ @Autowired
+ private ManageCryptStyle cryptManager;
@Before
public void setUp() {
@@ -114,7 +120,7 @@ public abstract class AbstractOpenmeetin
users.setFirstname("firstname" + rnd);
users.setLastname("lastname" + rnd);
users.setLogin("login");
- users.setPassword("pass" + rnd);
+ users.updatePassword(cryptManager, configDao, "pass" + rnd);
users.setLanguage_id(1L);
Long user_id = userManagement.addUser(users);
assertTrue("Cann't add user", user_id > 0);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java?rev=1423983&r1=1423982&r2=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java Wed Dec 19 17:45:27 2012
@@ -62,7 +62,6 @@ import net.fortuna.ical4j.util.UidGenera
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.persistence.beans.basic.Configuration;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.apache.openmeetings.utils.mail.ByteArrayDataSource;
import org.apache.openmeetings.utils.mail.IcalHandler;
@@ -79,7 +78,7 @@ public class TestSendIcalMessage extends
OpenmeetingsVariables.webAppRootKey);
@Autowired
- private ConfigurationDao configurationDaoImpl;
+ private ConfigurationDao configDao;
private byte[] iCalMimeBody;
@@ -240,33 +239,20 @@ public class TestSendIcalMessage extends
log.debug("sendIcalMessage");
// Evaluating Configuration Data
- String smtpServer = configurationDaoImpl.getConfKey("smtp_server")
- .getConf_value();
- String smtpPort = configurationDaoImpl.getConfKey("smtp_port")
- .getConf_value();
- // String from = "openmeetings@xmlcrm.org";
- String from = configurationDaoImpl.getConfKey("system_email_addr")
- .getConf_value();
-
- String emailUsername = configurationDaoImpl
- .getConfKey("email_username")
- .getConf_value();
- String emailUserpass = configurationDaoImpl
- .getConfKey("email_userpass")
- .getConf_value();
+ String smtpServer = configDao.getConfValue("smtp_server", String.class, "");
+ String smtpPort = configDao.getConfValue("smtp_port", String.class, "");
+ String from = configDao.getConfValue("system_email_addr", String.class, "");
+ String emailUsername = configDao.getConfValue("email_username", String.class, "");
+ String emailUserpass = configDao.getConfValue("email_userpass", String.class, "");
Properties props = System.getProperties();
props.put("mail.smtp.host", smtpServer);
props.put("mail.smtp.port", smtpPort);
- Configuration conf = configurationDaoImpl
- .getConfKey(
- "mail.smtp.starttls.enable");
- if (conf != null) {
- if (conf.getConf_value().equals("1")) {
- props.put("mail.smtp.starttls.enable", "true");
- }
+ boolean isTls = (1 == configDao.getConfValue("mail.smtp.starttls.enable", Integer.class, "0"));
+ if (isTls) {
+ props.put("mail.smtp.starttls.enable", "true");
}
// Check for Authentification
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/config/TestConfig.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/config/TestConfig.java?rev=1423983&r1=1423982&r2=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/config/TestConfig.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/config/TestConfig.java Wed Dec 19 17:45:27 2012
@@ -48,7 +48,7 @@ public class TestConfig extends Abstract
System.err.println("THIS");
Configuration smtp_server = configurationmanagement
- .getConfKey(
+ .get(
"smtp_server");
System.err.println("smtp_server " + smtp_server.getUser());
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/rtmp/SimulateLoad.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/rtmp/SimulateLoad.java?rev=1423983&r1=1423982&r2=1423983&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/rtmp/SimulateLoad.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/rtmp/SimulateLoad.java Wed Dec 19 17:45:27 2012
@@ -54,6 +54,7 @@ public class SimulateLoad extends Thread
} catch (Exception er) {
er.printStackTrace();
+ log.error("Error", er);
}
}