Branching sipX 3.6

git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/3.6@7633 a612230a-c5fa-0310-af8b-88eea846685b
Fix sipXconfig version number

git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/3.6@7635 a612230a-c5fa-0310-af8b-88eea846685b
fixes http://track.sipfoundry.org/browse/XPB-791
java-sun has been upgraded at jpackage and sun to _09


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/3.6@7639 a612230a-c5fa-0310-af8b-88eea846685b
added default value for SIP_PROXY_DEFAULT_SERIAL_EXPIRES
fixes http://track.sipfoundry.org/browse/XCF-1037


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/3.6@7641 a612230a-c5fa-0310-af8b-88eea846685b
XCF-1293 ManageDomain page was not retrieving localized message from properties.


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/3.6@7643 a612230a-c5fa-0310-af8b-88eea846685b
Set up merge properties on sipX 3.6 branch.


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/3.6@7648 a612230a-c5fa-0310-af8b-88eea846685b
Allow the default installation directory to be set
with the environment variable SIPX_INSTALLDIR.
This restores a feature lost in the conversion to the
new (and better) build system.


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/3.6@7693 a612230a-c5fa-0310-af8b-88eea846685b
[XCF-1278] fix replication.cgi for caller-alias database


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/3.6@7694 a612230a-c5fa-0310-af8b-88eea846685b
XCF-1196 nasty problem in Group.inheritSettingsForEdit: If bean from which settings to be inherited were retrieved happened to be the member of the group that we were editing, than changing the value of the setting was also changing the default value of the settings. Since the default value was the same as the value, subsequent  edits were removing the setting. It lead to strange UI behavior with default group values randomly reverting to previous defaults.
Fixed by simplifying GroupSettingModel and cleaning the model in the settings that serve as base settings for the group.



git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/3.6@7695 a612230a-c5fa-0310-af8b-88eea846685b
Clarification of Music on Hold support requested by Martin.


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/3.6@7704 a612230a-c5fa-0310-af8b-88eea846685b
XCF-1302 clicking on a link to Caller Sensitive dialing did not save current page - it caused exceptions if the rule has never been save by the user (i.e. when creating a new emergency rule)
reorgainzed the page to display the link only when "Use Caller Sensitive Routing" box is selected, hide the list of gateways when caller sensitive routing is used


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/3.6@7706 a612230a-c5fa-0310-af8b-88eea846685b
XCF-1085 add "required" validator to alias and alias domain
fix ManageDomain.commit to actually use validators


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/3.6@7708 a612230a-c5fa-0310-af8b-88eea846685b
XCF-1085 implement excluding certain text fields from the index, added pintoken and sip password to list of sensitive field


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/3.6@7709 a612230a-c5fa-0310-af8b-88eea846685b
XCF-1099 Fixed Hibernate exception when saving user who is supervising its own group.
Changed cascade parameter on user->supervised groups associations from "save-update" to "none" - the drawback is that you have to pass saved groups to User.addSupervisorForGroup method, but it this function only worked reliable if saved groups were passed.
Added "saveNew" parameter to SettingDao.getGroupsByString to allow for one step adding and saving of groups. 


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/3.6@7710 a612230a-c5fa-0310-af8b-88eea846685b
XCF-1153 Implemented SipxServer.reset that clears setting cache and is called when Cancel button is pressed. Clean validation errors before calling cancel listener.


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/3.6@7714 a612230a-c5fa-0310-af8b-88eea846685b
XCF-1281 Fix phone group edit page to default to polycom 2.0 v.s. 1.6

git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/3.6@7725 a612230a-c5fa-0310-af8b-88eea846685b
[XPB-808] Correct spelling of namespace (prevents bogus warning at
          startup)
          Added a couple of files to the snapshot.


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/3.6@7731 a612230a-c5fa-0310-af8b-88eea846685b
XCF-581 sipXconfig used to ignore error code reported by backup script - I changed it so that whenever at least one of the backup scripts reports error condition we log the error and display generic failure message on backup screen


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/3.6@7732 a612230a-c5fa-0310-af8b-88eea846685b
XCF-1318 change log4j configuration to only log warings and errors once


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/3.6@7733 a612230a-c5fa-0310-af8b-88eea846685b
mergefrom sipx-main 7723

mergefrom pingtel-main 7063,7092
In CpPeerCall::handleGetSession and handleGetInvite, revise the search
for the call in question to always compare the call-ID and to compare
the address both with its tag and without, because the address is
recorded in the SipConnection without its tag before the call is
established.  The previous test always used the tag, so both methods
failed when applied to ringing calls.
Improve debugging prints.
Also, make some edits to new code in this branch to match the changes
in the CpPeerCall functions.


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/3.6@7734 a612230a-c5fa-0310-af8b-88eea846685b