1. 26 Apr, 2017 2 commits
  2. 25 Apr, 2017 4 commits
  3. 24 Apr, 2017 6 commits
    • Guus der Kinderen's avatar
      OF-546: Allow plugin name override. (#781) · db179b23
      Guus der Kinderen authored
      By default, the Maven structure uses the Maven artifactId value as the name for a plugin.
      Maven artifactIds typically include tokens that will cause problems, such as dashes and dots.
      The plugin name is used in various places, that all have limitations: filenames (the jar file
      itself, the i18n files), package names (for the java files generated from JSPs), etc.
      
      This commit allows the name of the plugin to be overridden using a maven property 'plugin.name'
      and includes instructions on what the best format is.
      db179b23
    • Guus der Kinderen's avatar
      OF-546: Distribute custom tags in a library. · 54687deb
      Guus der Kinderen authored
      For plugins to be able to use the tags used in the admin console, the tags should be distributed in a library. By making this library a Maven module, plugins can define the library as a dependency.
      
      Note that the admin.tld file is duplicated, but *slightly* modified in the Maven module: the path of the tags is different (META-INF vs WEB-INF).
      54687deb
    • Guus der Kinderen's avatar
      OF-546: Update HSQLDB dependency to match included library. · 404a63d9
      Guus der Kinderen authored
      The HSQLDB library that ships with Openfire (for Ant) is newer than the
      dependency that's defined in Maven. This introduces a compatibility issue
      at runtime:
      
      > org.jivesoftware.database.SchemaManager - Unexpected token: FILES in statement [ SET FILES]
      
      The difference is likely an oversight, caused by us taking a very long time
      to merge the Maven PR. At the time it was created, the dependency was still okay.
      404a63d9
    • Guus der Kinderen's avatar
      OF-546: Exclude Avalon from Proxool · 311ab09b
      Guus der Kinderen authored
      The Avalon framework is a dependency of the Proxool Maven artificat, but was
      never included as a library to Openfire prior the move to Maven (so, we can
      do without).
      
      The Avalon dependency itself has a dependency of servlet-api 2.3, which is
      unwanted, and causes issues when compiling JSPs.
      311ab09b
    • Guus der Kinderen's avatar
      OF-546: Plugin artifact rework · 4b9c341e
      Guus der Kinderen authored
      Previously, the openfire-plugin-assembly artifact replaced the default artifact. When using
      plugin project as a Maven dependency, this causes oddities: the dependency still is a JAR file,
      but does not conform to a standard archive. This results in missing classes. Instead, this commit
      retains the original project artifact. This is expected to be more useful.
      
      Sadly, we appear to can pick only one of these options:
      
      - Attach the openfire-plugin-assembly artifact (making it referencable)
      - Define a finalName for this artifact (<artifactname>.plugin)
      
      Both options appear to be mutually exclusive.
      
      More annoyance is prevented by giving the plugin jar file a 'proper' name, I suspect, which is why
      I opted for doing that. For the other option, set 'appendAssemblyId' to true, and remove the
      'attach' element of the 'make-assembly' block.
      
      The removed openfire-plugin-jar assembly does not appear to have a practical purpose: it builds a
      jar file that is pretty similar to the standard artifact (it misses some metadata, and its final
      name is different). Removing this assembly reduces complexity, at the cost of a benefit that I
      cannot see.
      4b9c341e
    • Guus der Kinderen's avatar
      6fbd4127
  4. 19 Apr, 2017 6 commits
  5. 14 Apr, 2017 5 commits
  6. 13 Apr, 2017 1 commit
  7. 10 Apr, 2017 1 commit
  8. 03 Apr, 2017 1 commit
  9. 29 Mar, 2017 1 commit
    • Guus der Kinderen's avatar
      OF-1305: Make escaping of multibyte characters in LDAP search optional. (#767) · db11f0d3
      Guus der Kinderen authored
      A new property (ldap.encodeMultibyteCharacters) is introduced that controls if multibyte characters in LDAP search queries are escaped.
      
      Escaping of these characters started with the fix for OF-830, which appears to have caused OF-1305. Although I can't say that escaping of characters is wrong (per RFC 4515), it does cause real-world problems.
      
      This fix defaults to not encoding again (reverting back to the behavior pre OF-830, without affecting other changes made in OF-830).
      db11f0d3
  10. 21 Mar, 2017 1 commit
  11. 20 Mar, 2017 1 commit
  12. 19 Mar, 2017 3 commits
  13. 16 Mar, 2017 8 commits
    • Guus der Kinderen's avatar
      287b5296
    • Guus der Kinderen's avatar
      Another few Maven dependencies. (#762) · 0709c399
      Guus der Kinderen authored
      This commit introduces some dependencies that were added to Openfire since the original Maven stucture was build. With these, the Maven build should compile again.
      0709c399
    • Christian Schudt's avatar
      Also remove commons-logging from the monitoring plugin · 42a6ba62
      Christian Schudt authored
      (dwr has transitive dependency to it)
      42a6ba62
    • Christian Schudt's avatar
      Upgrade Jetty to 9.2.14 · 8e561fa3
      Christian Schudt authored
      8e561fa3
    • Christian Schudt's avatar
      d5ce5e5c
    • Christian Schudt's avatar
      Work on compiling plugins with JspC · 2fbd1a3d
      Christian Schudt authored
      2fbd1a3d
    • 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