1. 16 Mar, 2017 3 commits
    • Christian Schudt's avatar
      Remove ofmeet plugin · 2f0ea660
      Christian Schudt authored
      2f0ea660
    • Christian Schudt's avatar
      Migrate build process from Ant to Maven (WIP). · f5ee1de2
      Christian Schudt authored
      The Maven structure is:
      -/
      --dbutil (used by xmppserver)
      --i18n (used by starter and xmppserver)
      --starter (launcher and starter package, startup.jar)
      --xmppserver (nearly everything in the src dir, openfire.jar)
      --webadmin (admin plugin)
      --plugins
      ---broadcast
      ---...
      
      I've also added Maven plugins to mimic partial behavior of the Ant build (copying dependencies, bin/conf folder, ...)
      
      This commit addresses issues OF-546.
      
      I reconfigured the pom.xmls to work with the existing directory structure, (instead of default src/main/java), so that the current src folder stays untouched.
      
      What it can do:
      - Run tests successfully
      - Generate JavaDoc
      - Assemble most plugin jars (without JSP)
      - Assemble admin plugin (without JSP)
      - Generate a source zip/tar.gz for distribution (as the download page offers it currently)
      - Build the startup.jar and openfire.jar, copy it in the right directory, so that Openfire can be run with `java -jar startup.jar`
      
      What it can't do:
      - Build executables for every platform (e.g. install4j, *.dmg, ...)
      - Build some plugins (e.g. ofmeet) due to non-Maven dependencies.
      
      Todos:
      - Fix these issues
      - Move source code to the correct paths, e.g. /src to xmppserver/src/main/java
      f5ee1de2
    • Christian Schudt's avatar
      Add dbutil project. · 468bec8e
      Christian Schudt authored
      This was referenced by Openfire as dbutil.jar, but because this cannot be referenced via Maven Central, we add it as module for Openfire.
      468bec8e
  2. 06 Mar, 2017 1 commit
  3. 24 Feb, 2017 2 commits
  4. 18 Feb, 2017 1 commit
  5. 17 Feb, 2017 4 commits
    • Dave Cridland's avatar
      Merge pull request #721 from surevine/of1195 · 1146587e
      Dave Cridland authored
      OF-1195 Correct SCRAM supported logic
      1146587e
    • Dave Cridland's avatar
      OF-1278 Do not be such an idiot while recursing (#751) · a1978314
      Dave Cridland authored
      * OF-1278 Recurse more sensibly in SCRAM code
      
      Previously, we called setPassword if (and only if) there was a plaintext password present AND the configuration was for SCRAM hashed passwords only.
      
      However, we would then retest to see if there was a salt present, and then recurse, if there was a plaintext password present.
      
      This meant that if there were pre-existing users (with only plaintext or encrypted passwords) but with no SCRAM information, and the userInfo.salt was unset, recursion would continue indefinitely.
      
      * OF-1278 Recurse more sensibly in SCRAM code
      
      This patch further proofs against infinite recursion, and is more aggressive about SCRAMming pre-existing users.
      
      Recursion is now prevented from being more than one deep, as designed.
      a1978314
    • akrherz's avatar
      OF-1281 Update bundled JRE to 1.8.0u121 · 0f15343c
      akrherz authored
      0f15343c
    • Dave Cridland's avatar
      OF-1271 Copy elements correctly · c085118f
      Dave Cridland authored
      Adding elements and attributes to the new element doesn't work, since reparenting the old elements generates an exception. This exception wasn't logged.
      
      * Exception logged
      * id attribute copied, if present.
      * Elements copied deeply/properly.
      
      Test stanza:
      
      ```
      <message xmlns="jabber:client" to="blah@conference.cridland.im" type="groupchat" id="5260">
      <body>This is a message with a label.</body>
      <custom xmlns='tmp:custom'/>
      <custom-attr xmlns='tmp:custom2' attr='value'/>
      <custom-child xmlns='tmp:custom3'>
      <child>element</child>
      </custom-child>
      <custom-text xmlns='tmp:custom4'>Text here</custom-text>
      </message>
      ```
      c085118f
  6. 16 Feb, 2017 9 commits
  7. 13 Feb, 2017 1 commit
  8. 01 Feb, 2017 1 commit
  9. 28 Jan, 2017 1 commit
  10. 14 Jan, 2017 1 commit
    • wroot's avatar
      OF-1270 fix Readme · f02f9328
      wroot authored
      Version and build date are already in the changelog. Other than that Readme is static. Fixed a few links and removed cheerful thanking. When user looks at it online, he hasn't yet downloaded anything. When he has installed it already, thanking for downloading seems out of place.
      f02f9328
  11. 12 Jan, 2017 1 commit
  12. 04 Jan, 2017 1 commit
  13. 31 Dec, 2016 1 commit
  14. 30 Dec, 2016 2 commits
  15. 29 Dec, 2016 1 commit
  16. 27 Dec, 2016 1 commit
  17. 24 Dec, 2016 1 commit
  18. 22 Dec, 2016 1 commit
    • Guus der Kinderen's avatar
      OF-1254 and OF-1255: Fix various database scripts. (#724) · db51e056
      Guus der Kinderen authored
      * OF-1254: Correct database version in update script 25.
      
      Most database update scripts version 25 identify themselfs incorrectly as 24. This causes the update script to be executed each time that Openfire starts.
      
      * OF-1255: Fix Mysql installation script.
      
      This removes an offending semicolon.
      db51e056
  19. 21 Dec, 2016 7 commits