Build: #2965 was successful Changes by Dan Caseley
Code commits
Openfire (master)
-
Dan Caseley 022e54aa4fe7fa5840680c08dfa5678dc999587f
OF-3189: Update doap file to include XEP-0157 and XEP-0232
Also made XEP-0128 a first class citizen, since there's now generic capability here.- documentation/openfire.doap (version 022e54aa4fe7fa5840680c08dfa5678dc999587f)
-
Dan Caseley 5ae21381ce2d27c9878c1aa543842e6cb5a74e0d
OF-3188: Add ExtendedDiscoInfoProvider to provide generic support for XEP-0128
ExtendedDiscoInfoProviders can be registered with IQDiscoInfoHandler, and each will be called on disco requests to potentially add forms or form fields to the response.- xmppserver/src/main/java/org/jivesoftware/openfire/disco/ExtendedDiscoInfoProvider.java (version 5ae21381ce2d27c9878c1aa543842e6cb5a74e0d)
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version 5ae21381ce2d27c9878c1aa543842e6cb5a74e0d)
- xmppserver/src/test/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandlerTest.java (version 5ae21381ce2d27c9878c1aa543842e6cb5a74e0d)
-
Dan Caseley 1a9b52345ba0f10569f9a343500ad1bac91b7668
OF-3188: Extract Contact Addresses and Software Info to separate ExtendedDiscoInfoProviders
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/ContactAddressesExtendedDiscoInfoProvider.java (version 1a9b52345ba0f10569f9a343500ad1bac91b7668)
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version 1a9b52345ba0f10569f9a343500ad1bac91b7668)
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/SoftwareInfoExtendedDiscoInfoProvider.java (version 1a9b52345ba0f10569f9a343500ad1bac91b7668)
- xmppserver/src/test/java/org/jivesoftware/openfire/disco/ContactAddressesExtendedDiscoInfoProviderTest.java (version 1a9b52345ba0f10569f9a343500ad1bac91b7668)
- xmppserver/src/test/java/org/jivesoftware/openfire/disco/SoftwareInfoExtendedDiscoInfoProviderTest.java (version 1a9b52345ba0f10569f9a343500ad1bac91b7668)
-
Dan Caseley dd213c5f9b8090ecf29e00a23e51b0a1b81f4c5a
OF-3188: Remove a pointless test, and fix their docs
- xmppserver/src/test/java/org/jivesoftware/openfire/disco/ContactAddressesExtendedDiscoInfoProviderTest.java (version dd213c5f9b8090ecf29e00a23e51b0a1b81f4c5a)
- xmppserver/src/test/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandlerTest.java (version dd213c5f9b8090ecf29e00a23e51b0a1b81f4c5a)
- xmppserver/src/test/java/org/jivesoftware/openfire/disco/SoftwareInfoExtendedDiscoInfoProviderTest.java (version dd213c5f9b8090ecf29e00a23e51b0a1b81f4c5a)
-
Dan Caseley 36d18d8f960bc13dc1435e25cf729aa251fa9a35
OF-3188: (code review) Use thread-safe CopyOnWriteArrayList
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version 36d18d8f960bc13dc1435e25cf729aa251fa9a35)
-
Dan Caseley c4ce89f52876e2172e9bb7b82f10d502c41e2b64
OF-3188: Migrate admin.disable-exposure from JiveGlobals to SystemProperty
- i18n/src/main/resources/openfire_i18n.properties (version c4ce89f52876e2172e9bb7b82f10d502c41e2b64)
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/ContactAddressesExtendedDiscoInfoProvider.java (version c4ce89f52876e2172e9bb7b82f10d502c41e2b64)
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/ExtendedDiscoInfoProvider.java (version c4ce89f52876e2172e9bb7b82f10d502c41e2b64)
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version c4ce89f52876e2172e9bb7b82f10d502c41e2b64)
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/SoftwareInfoExtendedDiscoInfoProvider.java (version c4ce89f52876e2172e9bb7b82f10d502c41e2b64)
-
Dan Caseley c6a248313c996d3849763c9b819ef8ae29bd1009
OF-3188: Move methods up to IQDiscoInfoHandler, and call from handleIQ
This means that we'll see requests to Conference, PubSub, etc be routed through this method. It adds a domain to the method signature in ExtendedDiscoInfoProvider.getExtendedInfos to allow an ExtendedDiscoInfoProvider to apply domain-specific logic.- xmppserver/src/main/java/org/jivesoftware/openfire/disco/ContactAddressesExtendedDiscoInfoProvider.java (version c6a248313c996d3849763c9b819ef8ae29bd1009)
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/ExtendedDiscoInfoProvider.java (version c6a248313c996d3849763c9b819ef8ae29bd1009)
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version c6a248313c996d3849763c9b819ef8ae29bd1009)
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/SoftwareInfoExtendedDiscoInfoProvider.java (version c6a248313c996d3849763c9b819ef8ae29bd1009)
- xmppserver/src/test/java/org/jivesoftware/openfire/disco/ContactAddressesExtendedDiscoInfoProviderTest.java (version c6a248313c996d3849763c9b819ef8ae29bd1009)
- xmppserver/src/test/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandlerTest.java (version c6a248313c996d3849763c9b819ef8ae29bd1009)
- xmppserver/src/test/java/org/jivesoftware/openfire/disco/SoftwareInfoExtendedDiscoInfoProviderTest.java (version c6a248313c996d3849763c9b819ef8ae29bd1009)
-
Dan Caseley ddf6791e320677acd7a80e9192bd43cbead4a043
OF-3188: Add JavaDoc for the two extended disco info providers
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/ContactAddressesExtendedDiscoInfoProvider.java (version ddf6791e320677acd7a80e9192bd43cbead4a043)
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/SoftwareInfoExtendedDiscoInfoProvider.java (version ddf6791e320677acd7a80e9192bd43cbead4a043)
-
Dan Caseley b6dafd5f724b0e50644802bc16caf2c1e2853a12
OF-3188: (code review) Protect against unexpected null inputs and later NPEs
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version b6dafd5f724b0e50644802bc16caf2c1e2853a12)
-
Dan Caseley 057be626c6e3d596962d426ff179f02afbde7b2c
OF-3188: (code review) Ensure the test uses one handler at a time
- xmppserver/src/test/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandlerTest.java (version 057be626c6e3d596962d426ff179f02afbde7b2c)