Permalink
Browse files

Merge branch 'release-4.6'

Conflicts:
	sipXconfig/web/context/WEB-INF/sipXconfig-web.properties
	sipXpolycom/etc/Makefile.am
	sipXpolycom/etc/polycom/000000000000.cfg.vm
	sipXpolycom/etc/polycom/line-40.xml
	sipXpolycom/etc/polycom/mac-address.cfg.vm
	sipXpolycom/etc/polycom/mac-address.d.40/applications.cfg.vm
	sipXpolycom/etc/polycom/mac-address.d.40/sip-interop.cfg.vm
	sipXpolycom/etc/polycom/mac-address.d.40/site.cfg.vm
	sipXpolycom/etc/polycom/mac-address.d.40/video.cfg.vm
	sipXpolycom/etc/polycom/phone-32.xml
	sipXpolycom/etc/polycom/phone-40.properties
	sipXpolycom/etc/polycom/phone-40.xml
	sipXpolycom/etc/polycom/phone.xml
	sipXpolycom/etc/polycom/polycom_phone1_2.1.X.cfg
	sipXpolycom/etc/polycom/polycom_sip_2.1.X.cfg
	sipXpolycom/etc/polycom/types.xml
	sipXpolycom/etc/polycom/upload.properties
	sipXpolycom/etc/polycom/upload.xml
	sipXpolycom/src/org/sipfoundry/sipxconfig/phone/polycom/FirmwareUpdateListener.java
	sipXpolycom/src/org/sipfoundry/sipxconfig/phone/polycom/PhoneConfiguration.java
	sipXpolycom/src/org/sipfoundry/sipxconfig/phone/polycom/PhoneUpdateResource.java
	sipXpolycom/src/org/sipfoundry/sipxconfig/phone/polycom/PolycomModel.java
	sipXpolycom/src/org/sipfoundry/sipxconfig/phone/polycom/PolycomPhone.java
	sipXpolycom/src/org/sipfoundry/sipxconfig/phone/polycom/RegAdvancedConfiguration.java
	sipXpolycom/src/org/sipfoundry/sipxconfig/phone/polycom/SiteConfiguration.java
	sipXpolycom/src/sipxplugin.beans.xml
	sipXpolycom/test/org/sipfoundry/sipxconfig/phone/polycom/CodecGroupsTest.java
	sipXpolycom/test/org/sipfoundry/sipxconfig/phone/polycom/PhoneConfigurationTest.java
	sipXpolycom/test/org/sipfoundry/sipxconfig/phone/polycom/PhoneUpdateResourceTest.java
	sipXpolycom/test/org/sipfoundry/sipxconfig/phone/polycom/expected-macaddress.cfg
	sipXprovision/src/org/sipfoundry/sipxprovision/auto/Servlet.java
	sipXsupervisor/etc/iptables.erb
  • Loading branch information...
2 parents a9d7ed1 + 7fbc400 commit a64f1a986751fddb921c59f0edb6908bac1c73f8 Cristi Starasciuc committed Jan 17, 2013
Showing with 13,428 additions and 1,103 deletions.
  1. +0 −1 config/checkstyle/checkstyle.xml
  2. +13 −1 mak/build.mk.in
  3. +2 −1 sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/bulk/RowInserter.java
  4. +2 −2 sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/bulk/csv/BulkManager.java
  5. +4 −4 sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/bulk/csv/BulkManagerImpl.java
  6. +5 −2 sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/bulk/csv/CsvRowInserter.java
  7. +1 −1 sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/bulk/ldap/LdapImportManagerImpl.java
  8. +5 −1 sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/bulk/ldap/LdapRowInserter.java
  9. +6 −0 sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/phone/Phone.java
  10. +11 −11 sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/phone/PhoneTestDriver.java
  11. +75 −75 sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/test/TestHelper.java
  12. +10 −10 sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/bulk/csv/BulkManagerImplTestIntegration.java
  13. +1 −1 sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/bulk/ldap/LdapRowInserterTest.java
  14. +7 −7 sipXconfig/web/.classpath
  15. +13 −0 sipXconfig/web/context/WEB-INF/phone/EditPhoneForm.html
  16. +1 −0 sipXconfig/web/context/WEB-INF/phone/EditPhoneForm.properties
  17. +1 −1 sipXconfig/web/src/org/sipfoundry/sipxconfig/site/admin/BulkImport.java
  18. +9 −0 sipXconfig/web/src/org/sipfoundry/sipxconfig/site/phone/EditPhoneForm.java
  19. +3 −0 sipXpolycom/etc/Makefile.am
  20. +36 −9 sipXpolycom/etc/polycom/000000000000.cfg.vm
  21. +0 −71 sipXpolycom/etc/polycom/line-40.xml
  22. +242 −0 sipXpolycom/etc/polycom/line-41.properties
  23. +388 −0 sipXpolycom/etc/polycom/line-41.xml
  24. +65 −0 sipXpolycom/etc/polycom/mac-address-31.cfg.vm
  25. +66 −0 sipXpolycom/etc/polycom/mac-address-41.cfg.vm
  26. +30 −0 sipXpolycom/etc/polycom/mac-address-directory-41.xml.vm
  27. +2 −3 sipXpolycom/etc/polycom/mac-address.cfg.vm
  28. +4 −2 sipXpolycom/etc/polycom/mac-address.d.40/applications.cfg.vm
  29. +0 −6 sipXpolycom/etc/polycom/mac-address.d.40/sip-interop.cfg.vm
  30. +28 −82 sipXpolycom/etc/polycom/mac-address.d.40/site.cfg.vm
  31. +29 −7 sipXpolycom/etc/polycom/mac-address.d.40/video.cfg.vm
  32. +44 −0 sipXpolycom/etc/polycom/mac-address.d.41/applications.cfg.vm
  33. +136 −0 sipXpolycom/etc/polycom/mac-address.d.41/features.cfg.vm
  34. +84 −0 sipXpolycom/etc/polycom/mac-address.d.41/reg-advanced.cfg.vm
  35. +50 −0 sipXpolycom/etc/polycom/mac-address.d.41/region.cfg.vm
  36. +17 −0 sipXpolycom/etc/polycom/mac-address.d.41/sip-basic.cfg.vm
  37. +176 −0 sipXpolycom/etc/polycom/mac-address.d.41/sip-interop.cfg.vm
  38. +353 −0 sipXpolycom/etc/polycom/mac-address.d.41/site.cfg.vm
  39. +83 −0 sipXpolycom/etc/polycom/mac-address.d.41/video.cfg.vm
  40. +1 −8 sipXpolycom/etc/polycom/phone-32.xml
  41. +516 −0 sipXpolycom/etc/polycom/phone-40.properties
  42. +1,431 −64 sipXpolycom/etc/polycom/phone-40.xml
  43. +2,502 −0 sipXpolycom/etc/polycom/phone-41.properties
  44. +5,177 −0 sipXpolycom/etc/polycom/phone-41.xml
  45. +1 −8 sipXpolycom/etc/polycom/phone.xml
  46. +31 −0 sipXpolycom/etc/polycom/polycom_phone1_2.1.X.cfg
  47. +562 −0 sipXpolycom/etc/polycom/polycom_sip_2.1.X.cfg
  48. +19 −1 sipXpolycom/etc/polycom/types.xml
  49. +1 −1 sipXpolycom/etc/polycom/upload.properties
  50. +8 −7 sipXpolycom/etc/polycom/upload.xml
  51. +1 −0 sipXpolycom/src/common.am
  52. +8 −3 sipXpolycom/src/org/sipfoundry/sipxconfig/phone/polycom/FirmwareUpdateListener.java
  53. +1 −1 sipXpolycom/src/org/sipfoundry/sipxconfig/phone/polycom/PhoneConfiguration.java
  54. +16 −24 sipXpolycom/src/org/sipfoundry/sipxconfig/phone/polycom/PhoneUpdateResource.java
  55. +5 −3 sipXpolycom/src/org/sipfoundry/sipxconfig/phone/polycom/PolycomModel.java
  56. +117 −19 sipXpolycom/src/org/sipfoundry/sipxconfig/phone/polycom/PolycomPhone.java
  57. +0 −2 sipXpolycom/src/org/sipfoundry/sipxconfig/phone/polycom/RegAdvancedConfiguration.java
  58. +24 −0 sipXpolycom/src/org/sipfoundry/sipxconfig/phone/polycom/SiteConfiguration.java
  59. +7 −5 sipXpolycom/src/sipxplugin.beans.xml
  60. +70 −12 sipXpolycom/test/org/sipfoundry/sipxconfig/phone/polycom/ApplicationConfigurationTest.java
  61. +28 −28 sipXpolycom/test/org/sipfoundry/sipxconfig/phone/polycom/CodecConfigurationForModelTest.java
  62. +39 −39 sipXpolycom/test/org/sipfoundry/sipxconfig/phone/polycom/CodecGroupsTest.java
  63. +18 −18 sipXpolycom/test/org/sipfoundry/sipxconfig/phone/polycom/PhoneConfigurationTest.java
  64. +5 −1 sipXpolycom/test/org/sipfoundry/sipxconfig/phone/polycom/PhoneUpdateResourceTest.java
  65. +14 −0 sipXpolycom/test/org/sipfoundry/sipxconfig/phone/polycom/PolycomModelTest.java
  66. +2 −2 sipXpolycom/test/org/sipfoundry/sipxconfig/phone/polycom/SipConfigurationTest.java
  67. +3 −3 sipXpolycom/test/org/sipfoundry/sipxconfig/phone/polycom/expected-macaddress.cfg
  68. +17 −0 sipXpolycom/test/org/sipfoundry/sipxconfig/phone/polycom/expected-macaddress31.cfg
  69. +17 −0 sipXpolycom/test/org/sipfoundry/sipxconfig/phone/polycom/expected-macaddress40.cfg
  70. +1 −0 sipXportLib/include/Makefile.am
  71. +6 −12 sipXportLib/include/os/OsMsgQ.h
  72. +152 −0 sipXportLib/include/os/OsPooledTask.h
  73. +1 −11 sipXportLib/include/os/OsTimer.h
  74. +110 −40 sipXportLib/include/os/shared/OsMsgQShared.h
  75. +1 −0 sipXportLib/src/Makefile.am
  76. +10 −0 sipXportLib/src/os/OsDatagramSocket.cpp
  77. +119 −0 sipXportLib/src/os/OsPooledTask.cpp
  78. +10 −0 sipXportLib/src/os/OsSocket.cpp
  79. +25 −40 sipXportLib/src/os/OsTimer.cpp
  80. +35 −341 sipXportLib/src/os/shared/OsMsgQShared.cpp
  81. +1 −0 sipXportLib/src/test/Makefile.am
  82. +24 −23 sipXportLib/src/test/os/OsConfigDbTest.cpp
  83. +118 −0 sipXportLib/src/test/os/OsPooledEventTest.cpp
  84. +2 −2 sipXprovision/src/org/sipfoundry/sipxprovision/auto/Servlet.java
  85. +35 −1 sipXprovision/test/org/sipfoundry/sipxprovision/auto/ServletTest.java
  86. +5 −0 sipXproxy/lib/authplugins/NatTraversalAgent/DialogTracker.cpp
  87. +1 −5 sipXsaa/src/Appearance.cpp
  88. +3 −3 sipXsaa/src/AppearanceGroup.cpp
  89. +12 −7 sipXsaa/src/AppearanceGroupSet.cpp
  90. +21 −1 sipXsaa/src/AppearanceGroupSet.h
  91. +6 −6 sipXsupervisor/etc/iptables.erb
  92. +3 −0 sipXtackLib/include/net/SdpBody.h
  93. +1 −2 sipXtackLib/include/net/SipTransactionList.h
  94. +1 −12 sipXtackLib/include/net/SipUserAgent.h
  95. +21 −0 sipXtackLib/src/net/SdpBody.cpp
  96. +2 −1 sipXtackLib/src/net/SipClient.cpp
  97. +11 −5 sipXtackLib/src/net/SipSubscribeClient.cpp
  98. +36 −10 sipXtackLib/src/net/SipTransaction.cpp
  99. +10 −23 sipXtackLib/src/net/SipTransactionList.cpp
  100. +2 −11 sipXtackLib/src/net/SipUserAgent.cpp
@@ -161,7 +161,6 @@
<property name="tokens" value="NUM_DOUBLE, NUM_FLOAT"/>
</module>
<module name="MissingSwitchDefault"/>
- <module name="RedundantThrows"/>
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
<module name="DeclarationOrder"/>
View
@@ -59,7 +59,8 @@ help.{1|2|6}.dist = Build archive, typically compressed tar
%.dist : %.autoreconf %.configure %.dist_;
%.dist_ :;$(MAKE) -C $(PROJ) dist
-%.dist-by-dep :
+.SECONDEXPANSION:
+%.dist-by-dep : $$(addsuffix .dist-by-dep,$$($$*_DEPS))
@if test -f $($(PROJ)_TAR) ; then \
x=`find $(SRC)/$(PROJ)/ -type f \( \
-not -name configure \
@@ -69,6 +70,17 @@ help.{1|2|6}.dist = Build archive, typically compressed tar
rm $($(PROJ)_TAR); \
fi; \
fi
+ @if test -f $($(PROJ)_TAR) ; then \
+ if [ -n "$($(PROJ)_DEPS)" ]; then \
+ for t in $(foreach P,$($(PROJ)_DEPS),$($(P)_TAR)) ; do \
+ if test -f $($(PROJ)_TAR); then \
+ if [ $$t -nt $($(PROJ)_TAR) ]; then \
+ rm $($(PROJ)_TAR); \
+ fi \
+ fi \
+ done \
+ fi \
+ fi
@if ! test -f $($(PROJ)_TAR) ; then \
$(MAKE) $(PROJ).dist; \
fi
@@ -78,8 +78,9 @@ protected RowResult checkRowData(T input) {
/**
* Called before inserting begins, before the first time insertRow is called
+ * @param inputs
*/
- public void beforeInserting() {
+ public void beforeInserting(Object... inputs) {
// do nothing
}
@@ -15,7 +15,7 @@
public interface BulkManager {
public static final String CONTEXT_BEAN_NAME = "bulkManager";
- void insertFromCsv(Reader reader);
+ void insertFromCsv(Reader reader, boolean disableEmailNotifications);
- void insertFromCsv(File file, boolean deleteOnImport);
+ void insertFromCsv(File file, boolean deleteOnImport, boolean emailNotifications);
}
@@ -31,17 +31,17 @@ public void setRowInserter(CsvRowInserter rowInserter) {
m_rowInserter = rowInserter;
}
- public void insertFromCsv(Reader reader) {
- m_rowInserter.beforeInserting();
+ public void insertFromCsv(Reader reader, boolean disableEmailNotifications) {
+ m_rowInserter.beforeInserting(disableEmailNotifications);
m_csvParser.parse(reader, m_rowInserter);
m_rowInserter.afterInserting();
}
- public void insertFromCsv(File file, boolean deleteOnImport) {
+ public void insertFromCsv(File file, boolean deleteOnImport, boolean disableEmailNotifications) {
Reader reader = null;
try {
reader = new FileReader(file);
- insertFromCsv(reader);
+ insertFromCsv(reader, disableEmailNotifications);
reader.close();
if (deleteOnImport) {
file.delete();
@@ -170,7 +170,7 @@ protected void insertRow(String[] row) {
*
* @return modified (but not saved used object)
*/
- User userFromRow(String[] row) {
+ public User userFromRow(String[] row) {
String userName = Index.USERNAME.get(row);
if (userName.length() == 0) {
return null;
@@ -181,8 +181,11 @@ User userFromRow(String[] row) {
user = m_coreContext.newUser();
user.setUserName(userName);
}
- Index.PIN.setProperty(user, row);
+ // disable user email notification
+ user.setNotified(true);
+
+ Index.PIN.setProperty(user, row);
String voicemailPin = Index.VOICEMAIL_PIN.get(row);
if (isHashed(voicemailPin)) {
user.setVoicemailPintoken(voicemailPin);
@@ -50,7 +50,7 @@ public void insert(int connectionId) {
try {
m_rowInserter.setAttrMap(m_ldapManager.getAttrMap(connectionId));
m_rowInserter.setDomain(m_ldapManager.getConnectionParams(connectionId).getDomain());
- m_rowInserter.beforeInserting();
+ m_rowInserter.beforeInserting(null);
NameClassPairCallbackHandler handler = new NameClassPairMapperClosureAdapter(
m_rowInserter);
runSearch(handler, 0, connectionId);
@@ -52,7 +52,7 @@
private boolean m_preserveMissingUsers;
@Override
- public void beforeInserting() {
+ public void beforeInserting(Object... inputs) {
// Make sure m_userMapper's AttrMap is set up.
m_userMapper.setAttrMap(m_attrMap);
// get all the users from LDAP group
@@ -96,6 +96,10 @@ void insertRow(SearchResult searchResult, Attributes attrs) {
user = m_coreContext.newUser();
user.setUserName(userName);
}
+
+ // disable user email notification
+ user.setNotified(true);
+
m_existingUserNames.remove(userName);
m_userMapper.setUserProperties(user, attrs);
@@ -10,6 +10,7 @@
package org.sipfoundry.sipxconfig.phone;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -267,4 +268,9 @@ public Line createSpecialPhoneProvisionUserLine() {
line.setPhone(this);
return line;
}
+
+ public Collection<? extends PhoneModel> getModelIdsForSelection(String beanId) {
+ return null;
+ }
+
}
@@ -270,18 +270,18 @@ public String getCallRetrieveCode() {
replay(addressManager);
defaults.setAddressManager(addressManager);
-// SipxService registrarService = new SipxRegistrarService();
-// registrarService.setModelFilesContext(TestHelper.getModelFilesContext());
-// registrarService.setBeanId(SipxRegistrarService.BEAN_ID);
-// registrarService.setModelName("sipxregistrar.xml");
-// registrarService.setModelDir("sipxregistrar");
+// SipxService registrarService = new SipxRegistrarService();
+// registrarService.setModelFilesContext(TestHelper.getModelFilesContext());
+// registrarService.setBeanId(SipxRegistrarService.BEAN_ID);
+// registrarService.setModelName("sipxregistrar.xml");
+// registrarService.setModelDir("sipxregistrar");
//
-// SipxService proxyService = new SipxProxyService();
-// proxyService.setModelFilesContext(TestHelper.getModelFilesContext());
-// proxyService.setBeanId(SipxProxyService.BEAN_ID);
-// proxyService.setModelName("sipxproxy.xml");
-// proxyService.setModelDir("sipxproxy");
-// proxyService.setSipPort("5555");
+// SipxService proxyService = new SipxProxyService();
+// proxyService.setModelFilesContext(TestHelper.getModelFilesContext());
+// proxyService.setBeanId(SipxProxyService.BEAN_ID);
+// proxyService.setModelName("sipxproxy.xml");
+// proxyService.setModelDir("sipxproxy");
+// proxyService.setSipPort("5555");
return defaults;
}
Oops, something went wrong.

0 comments on commit a64f1a9

Please sign in to comment.