Commit graph

5 commits

Author SHA1 Message Date
Brian Clements
05ddcce572 Issue #2827 fixed collab dataserver returning empty body with 200
we check if a file exists in and out of the lock when reading
if the file is deleted between checks, the inner check attempts to return an error
we had already access the output stream from the response object so it is committed to 200
fixed by waiting to get the output stream until after the second check


Former-commit-id: 2aa9dcb248 [formerly ce1038723d] [formerly bfde9c37ce] [formerly 2aa9dcb248 [formerly ce1038723d] [formerly bfde9c37ce] [formerly d44c55e976 [formerly bfde9c37ce [formerly 31c42d161146b0367435c66535d4da700a572f24]]]]
Former-commit-id: d44c55e976
Former-commit-id: fb6be670b1 [formerly ab86cda554] [formerly 1b8f3ce536ab968c6e5e63d5bfe2ffc91722e548 [formerly d693c07bb4]]
Former-commit-id: 199f3f09805b232480df05d4c222e11bab11f4ce [formerly 22d6302151]
Former-commit-id: 560f51d226
2014-03-12 08:27:22 -05:00
Brian Clements
ab62759518 Issue #2756 reworked collaboration dataserver build
replaced install ant script with build script that also deploys
new build uses feature explorer, but handles its own compile stage
updated deployment and start script to match new build
added logging level control argument


Former-commit-id: a97d1a1fb5 [formerly acbd4910fe] [formerly fac33a8915] [formerly a97d1a1fb5 [formerly acbd4910fe] [formerly fac33a8915] [formerly cde0d05820 [formerly fac33a8915 [formerly 8e1da85b9d3da580c8d5b53783e2b17c6ee8d00e]]]]
Former-commit-id: cde0d05820
Former-commit-id: eab142e86d [formerly 2b3aaeff26] [formerly 697372d2b5104a735c926c344d998b56abd81e2a [formerly eb54c46b3c]]
Former-commit-id: 6b56107fae632a677b51c2edb24a65ae6832f176 [formerly db510daf06]
Former-commit-id: f962ac4159
2014-03-06 11:49:57 -06:00
Brian Clements
3aaee14c5f Issue #2756 added security toggle to collaboration
security on HTTP server can be disabled for legacy clients from openfire settings
added xmpp connection retry to http server so servers can be started in any order


Former-commit-id: 2482a58273 [formerly cd0e1e271a] [formerly 7b085f62de] [formerly 2482a58273 [formerly cd0e1e271a] [formerly 7b085f62de] [formerly f44f1212dd [formerly 7b085f62de [formerly 1e52606fe709f2cf27f835363ca5ab2bf6ada912]]]]
Former-commit-id: f44f1212dd
Former-commit-id: 19bb5d8de9 [formerly c446513912] [formerly c63989e0c0ae952f12584b6484f4cc133f757e99 [formerly 0790849f03]]
Former-commit-id: ac49a09e913b78ca7f067ef864505a1f0acc5ede [formerly 8b1a00fb2f]
Former-commit-id: 8d9da2b63e
2014-03-04 16:02:25 -06:00
Brian Clements
e9604a9700 Issue #2756 implemented HTTP public key auth scheme
collaboration HTTP server now requires auth header (configured via openfire)
added auth to cave client


Former-commit-id: fd18963221 [formerly 9d0b02e0a4] [formerly ce24bd1018] [formerly fd18963221 [formerly 9d0b02e0a4] [formerly ce24bd1018] [formerly d8e283e1b4 [formerly ce24bd1018 [formerly e0e4dfdedff283c809060257fbf04e777faf318d]]]]
Former-commit-id: d8e283e1b4
Former-commit-id: 43c19f09ba [formerly f56cbac9fb] [formerly effe9ab4a85983edf2b983ee5e4b964df8a78343 [formerly edd72cbde4]]
Former-commit-id: 667a1021c89300b5befe11701d18fc1d06fbb6bb [formerly 6d4abdc37c]
Former-commit-id: f00f8eb1d9
2014-02-28 16:15:17 -06:00
Brian Clements
c0da4f94d4 Issue #2756 new collaboration openfire plugin and http service
new servlet http service that communicates with openfire for configuration
new openfire plugin to reflect new http service
openfire and http service no longer need to be on same machine
moved http header parsing code from ogc to common util
updated collaboration http code to prefer XML instead of HTML


Former-commit-id: 68fac79fe7 [formerly f0c89ef6c6] [formerly f6b2827434] [formerly 68fac79fe7 [formerly f0c89ef6c6] [formerly f6b2827434] [formerly 5b4f1e8288 [formerly f6b2827434 [formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]]]]
Former-commit-id: 5b4f1e8288
Former-commit-id: 74d08f1d19 [formerly 02319f36e4] [formerly 9b1edc285732dbc80b9bea2223564bca70eef005 [formerly a1d9e40bd4]]
Former-commit-id: 30b1054d786354e5944fa7b6968a4b2cddf1c07a [formerly 5889341612]
Former-commit-id: f866ac4365
2014-02-18 10:03:12 -06:00