Openfire (master)

• 

  Guus der Kinderen 25 May 2017 44b23b75c6a1281df44249eb496e3ae9adaba791

  OF-546: Add metadata filter
  This commit allows a plugin.xml to use a reference to data defined in the pom.xml. This reduces duplicate data.
  
  For instance, in plugin.xml, one could now define the version number by referring to the version number of the
  maven artifact:
  
    <version>${project.version}</version>
  
  Note that plugin.xml files that are processed using the old Apache Ant based build, will not be processed correctly.

  • src/plugins/openfire-plugin-assembly-descriptor/src/main/resources/assemblies/openfire-plugin-assembly.xml (version 44b23b75c6a1281df44249eb496e3ae9adaba791)
• 

  Guus der Kinderen 25 May 2017 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a

  OF-546: Move Maven POM files into source directory.
  I continue to be thoroughly confused by having two directories per plugin, one for the plugin sources, and one for the maven build. This commit merges both directories.
  
  As a side effect, various plugin unit tests are now executed by default. Some failed, for which I applied fixes.
  
  This commit also adds some plugins to the Maven structure that previously were not.

  • plugins/broadcast/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/callbackOnOffline/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/clientControl/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/clustering/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/contentFilter/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/dbaccess/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/emailListener/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/emailOnAway/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/fastpath/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/gojara/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/hazelcast/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/jingleNodes/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/jmxweb/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/justmarried/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/kraken/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/loadStats/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/monitoring/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/motd/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/mucservice/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/nodejs/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/openfire-plugin-assembly-descriptor/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/openfire-plugin-assembly-descriptor/src/main/resources/assemblies/openfire-plugin-assembly.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/packetFilter/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/presence/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/rayo/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/registration/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/restAPI/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/search/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/sip/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/stunserver/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/subscription/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/userCreation/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/userImportExport/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/userservice/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/websocket/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • plugins/xmldebugger/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/avatarResizer/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/avatarResizer/src/java/org/igniterealtime/openfire/plugin/avatarresizer/Resizer.java (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/bookmarks/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/broadcast/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/callbackOnOffline/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/callbackOnOffline/src/java/com/fotsum/CallbackOnOffline.java (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/clientControl/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/clustering/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/contentFilter/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/contentFilter/src/test/java/org/jivesoftware/openfire/plugin/ContentFilterTest.java (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/dbaccess/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/emailListener/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/emailOnAway/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/fastpath/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/gojara/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/hazelcast/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/jingleNodes/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/jmxweb/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/justmarried/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/kraken/kraken.iml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/kraken/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/loadStats/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/monitoring/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/motd/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/mucservice/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/nodejs/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/nonSaslAuthentication/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/openfire-plugin-assembly-descriptor/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/openfire-plugin-assembly-descriptor/src/main/resources/assemblies/openfire-plugin-assembly.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/packetFilter/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/presence/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/rayo/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/registration/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/restAPI/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/search/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/sip/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/stunserver/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/subscription/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/tikitoken/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userCreation/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/java/log4j.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/java/org/jivesoftware/openfire/plugin/OpenfireExporterTest.java (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/java/org/jivesoftware/openfire/plugin/Xep227ExporterTest.java (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/java/org/jivesoftware/openfire/plugin/test-openfire-import.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/java/org/jivesoftware/openfire/plugin/test-openfire.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/java/org/jivesoftware/openfire/plugin/test-xepp227-import.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/java/test-export-xinclude/sub/61/admin.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/java/test-export-xinclude/sub/61/anno.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/java/test-export-xinclude/sub/6a/ju001.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/java/test-export-xinclude/sub/6a/ju0011.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/java/test-export-xinclude/sub/6a/ju0012.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/java/test-export-xinclude/sub/6a/ju00122.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/java/test-export-xinclude/sub/74/test1.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/java/test-export-xinclude/sub/74/test2.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/java/test-export-xinclude/test-import.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/java/test-export-xinclude/xep227.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/resources/log4j.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/resources/test-export-xinclude/sub/61/admin.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/resources/test-export-xinclude/sub/61/anno.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/resources/test-export-xinclude/sub/6a/ju001.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/resources/test-export-xinclude/sub/6a/ju0011.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/resources/test-export-xinclude/sub/6a/ju0012.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/resources/test-export-xinclude/sub/6a/ju00122.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/resources/test-export-xinclude/sub/74/test1.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/resources/test-export-xinclude/sub/74/test2.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/resources/test-export-xinclude/test-import.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/resources/test-export-xinclude/xep227.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/resources/test-openfire-import.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/resources/test-openfire.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userImportExport/src/test/resources/test-xepp227-import.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/userservice/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/websocket/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • src/plugins/xmldebugger/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
  • xmppserver/pom.xml (version 79ae79bf460e4800f5fb2ebab5aaf105dd9b7f5a)
• 

  Guus der Kinderen 25 May 2017 3f2e8b0c64fbec0ddcaa371827e525c89257386d

  OF-546: Add metadata to pom.xml
  This commit copies version number, author and description from plugin.xml to pom.xml. This makes the same information available as Maven metadata.
  
  When Ant support is dropped, the duplicate data in the plugin.xml should be replaced by a filter (which takes the data from the pom.xml).

  • src/plugins/avatarResizer/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/bookmarks/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/broadcast/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/callbackOnOffline/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/clientControl/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/clustering/plugin.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/clustering/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/contentFilter/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/dbaccess/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/emailListener/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/emailOnAway/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/fastpath/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/gojara/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/hazelcast/plugin.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/hazelcast/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/jingleNodes/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/jmxweb/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/justmarried/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/kraken/plugin.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/kraken/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/loadStats/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/monitoring/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/motd/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/mucservice/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/nodejs/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/nonSaslAuthentication/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/packetFilter/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/presence/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/rayo/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/stunserver/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/subscription/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/tikitoken/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/userCreation/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/userImportExport/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/userservice/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/websocket/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
  • src/plugins/xmldebugger/pom.xml (version 3f2e8b0c64fbec0ddcaa371827e525c89257386d)
• 

  Guus der Kinderen 25 May 2017 04adbb3cc3fb5b7b965d7a43f23fb6c08530d746

  Intellij project files should not be in version control.

  • build/projects/Admin.iml (version 04adbb3cc3fb5b7b965d7a43f23fb6c08530d746)
  • build/projects/Openfire.iml (version 04adbb3cc3fb5b7b965d7a43f23fb6c08530d746)
  • build/projects/Plugins.iml (version 04adbb3cc3fb5b7b965d7a43f23fb6c08530d746)
  • build/projects/Spank.iml (version 04adbb3cc3fb5b7b965d7a43f23fb6c08530d746)
  • src/plugins/avatarResizer/pom.xml (version 04adbb3cc3fb5b7b965d7a43f23fb6c08530d746)
  • src/plugins/nonSaslAuthentication/pom.xml (version 04adbb3cc3fb5b7b965d7a43f23fb6c08530d746)
• 

  Guus der Kinderen 25 May 2017 8fdaa6540905a4a085d2c7a54d9aa325c576c418

  Skip platform-dependant unit tests.

  • src/plugins/userImportExport/pom.xml (version 8fdaa6540905a4a085d2c7a54d9aa325c576c418)