Build #1,382

Plan branch:
Verifies the integrety of the projects, as builds are executed immediately after a code change was detected. This plan provides no artifiacts (use a nightly build instead).

Build: #1382 was successful Changes by Dave Cridland <dave@cridland.net>

Code commits

Openfire (master)

  • Dave Cridland <dave@cridland.net>

    Dave Cridland <dave@cridland.net> aa8ad82b81a2158834103e8171eda7a7d0eb70df

    Merge pull request #797 from GregDThomas/OF-1159
    Fix OF-1159 - add database column to identify encryption status

  • Greg Thomas <greg.d.thomas@gmail.com>

    Greg Thomas <greg.d.thomas@gmail.com> 428b733c972150f133c92dcd7b7205dc10dd968b m

    Remove premature optimisation that could accidentally cause the encryption indicator to be lost

    • src/java/org/jivesoftware/util/JiveProperties.java (version 428b733c972150f133c92dcd7b7205dc10dd968b)
  • Greg Thomas <greg.d.thomas@gmail.com>

    Greg Thomas <greg.d.thomas@gmail.com> 5156f65268b78e85e235aff3c0592c5baf4cd66b m

    Be more aggressive over updating security.conf

    • src/java/org/jivesoftware/util/JiveProperties.java (version 5156f65268b78e85e235aff3c0592c5baf4cd66b)
  • Greg Thomas <greg.d.thomas@gmail.com>

    Greg Thomas <greg.d.thomas@gmail.com> ce19ac9c82f4c049e82811dda1c825bad16a01b4 m

    Only update the security.conf if something changes

    • src/java/org/jivesoftware/util/JiveGlobals.java (version ce19ac9c82f4c049e82811dda1c825bad16a01b4)
  • Greg Thomas <greg.d.thomas@gmail.com>

    Greg Thomas <greg.d.thomas@gmail.com> bc6c95a297d47e428a3e2af1e5067fa3c972105e m

    Ensure that when un-encrpyting a property the indicator is removed from security.conf

    • src/java/org/jivesoftware/util/JiveGlobals.java (version bc6c95a297d47e428a3e2af1e5067fa3c972105e)
    • src/java/org/jivesoftware/util/JiveProperties.java (version bc6c95a297d47e428a3e2af1e5067fa3c972105e)
  • Greg Thomas <greg.d.thomas@gmail.com>

    Greg Thomas <greg.d.thomas@gmail.com> bda407920a73d1f614e95eafa61329338a9b069b m

    Add missing db file

    • src/database/upgrade/26/openfire_sybase.sql (version bda407920a73d1f614e95eafa61329338a9b069b)
  • Greg Thomas <greg.d.thomas@gmail.com>

    Greg Thomas <greg.d.thomas@gmail.com> 474549c735b40331152f2875b5844badd3cd05d4 m

    Fix OF-1159; use a column in the database

    • src/database/openfire_db2.sql (version 474549c735b40331152f2875b5844badd3cd05d4)
    • src/database/openfire_hsqldb.sql (version 474549c735b40331152f2875b5844badd3cd05d4)
    • src/database/openfire_mysql.sql (version 474549c735b40331152f2875b5844badd3cd05d4)
    • src/database/openfire_oracle.sql (version 474549c735b40331152f2875b5844badd3cd05d4)
    • src/database/openfire_postgresql.sql (version 474549c735b40331152f2875b5844badd3cd05d4)
    • src/database/openfire_sqlserver.sql (version 474549c735b40331152f2875b5844badd3cd05d4)
    • src/database/openfire_sybase.sql (version 474549c735b40331152f2875b5844badd3cd05d4)
    • src/database/upgrade/26/openfire_db2.sql (version 474549c735b40331152f2875b5844badd3cd05d4)
    • src/database/upgrade/26/openfire_hsqldb.sql (version 474549c735b40331152f2875b5844badd3cd05d4)
    • src/database/upgrade/26/openfire_mysql.sql (version 474549c735b40331152f2875b5844badd3cd05d4)
    • src/database/upgrade/26/openfire_oracle.sql (version 474549c735b40331152f2875b5844badd3cd05d4)
    • src/database/upgrade/26/openfire_postgresql.sql (version 474549c735b40331152f2875b5844badd3cd05d4)
    • src/database/upgrade/26/openfire_sqlserver.sql (version 474549c735b40331152f2875b5844badd3cd05d4)
    • src/database/upgrade/26/openfire_sybase.sql (version 474549c735b40331152f2875b5844badd3cd05d4)
    • src/java/org/jivesoftware/database/SchemaManager.java (version 474549c735b40331152f2875b5844badd3cd05d4)
    • src/java/org/jivesoftware/util/JiveGlobals.java (version 474549c735b40331152f2875b5844badd3cd05d4)
    • src/java/org/jivesoftware/util/JiveProperties.java (version 474549c735b40331152f2875b5844badd3cd05d4)
    • src/java/org/jivesoftware/util/PropertyClusterEventTask.java (version 474549c735b40331152f2875b5844badd3cd05d4)
    • src/java/org/jivesoftware/util/XMLProperties.java (version 474549c735b40331152f2875b5844badd3cd05d4)
    • src/web/server-properties.jsp (version 474549c735b40331152f2875b5844badd3cd05d4)