Commit graph

313 commits

Author SHA1 Message Date
Nate Jensen
7e19d70363 Issue #2907 fix datauri doc utility
Change-Id: Iafb1feb73e416acac28369c3c96acbc305928b22

Former-commit-id: 948b1c1eb060963c943eccc31033af27b70804b0
2014-04-15 10:54:39 -05:00
Nate Jensen
247e5d7889 Issue #2907 fix datauri doc utility
Change-Id: Iafb1feb73e416acac28369c3c96acbc305928b22

Former-commit-id: 7e19d70363 [formerly 8a4e3b8088 [formerly 0845eef927] [formerly 7e19d70363 [formerly 948b1c1eb060963c943eccc31033af27b70804b0]]]
Former-commit-id: 8a4e3b8088 [formerly 0845eef927]
Former-commit-id: 8a4e3b8088
Former-commit-id: cd6754fe7f
2014-04-15 10:54:39 -05:00
Nate Jensen
a770a98ba4 Issue #2907 fix datauri doc utility
Change-Id: Iafb1feb73e416acac28369c3c96acbc305928b22

Former-commit-id: 247e5d7889 [formerly cd6754fe7f] [formerly 8a4e3b8088] [formerly 8a4e3b8088 [formerly 0845eef927]] [formerly 247e5d7889 [formerly cd6754fe7f] [formerly 8a4e3b8088] [formerly 8a4e3b8088 [formerly 0845eef927]] [formerly 7e19d70363 [formerly 8a4e3b8088 [formerly 0845eef927] [formerly 7e19d70363 [formerly 948b1c1eb060963c943eccc31033af27b70804b0]]]]]
Former-commit-id: 7e19d70363
Former-commit-id: d70e32ac91 [formerly 83e3028473] [formerly cdf8aeef79] [formerly 4c5679781a747c793ff9ca316d7d8d8ea962a922 [formerly 55452996b3a7cbca5069dc64642b3235e7c3d3b1] [formerly cdf8aeef79 [formerly 27cfffb1ea]]]
Former-commit-id: 91bcb3b09e2c9c5f6aa69f665438903161f1ce5e [formerly 56d54227251b4e4b65bfe037aa45bd57e9e1d607] [formerly 2eccbcf3fe [formerly 4b8bda3abf]]
Former-commit-id: 00bc4566a67f0d04415d838f551d009bc5c3fcb2 [formerly 2eccbcf3fe]
Former-commit-id: 4c5fe0b79f
2014-04-15 10:54:39 -05:00
Brad Gonzales
535611f556 Issue #2937 Moved presence/site determination from feed log to feed listener.
Use MUCRoom to get presence and role because UserManager is not able to understand nicnames.

Change-Id: Ie27d804cfea37a27df7e3c0d4445b16f3f2c12a7

Former-commit-id: e975a825046c8d0505223093e5765d5283425b2f
2014-04-14 14:30:18 -05:00
Brad Gonzales
5d32a347ca Issue #2937 Moved presence/site determination from feed log to feed listener.
Use MUCRoom to get presence and role because UserManager is not able to understand nicnames.

Change-Id: Ie27d804cfea37a27df7e3c0d4445b16f3f2c12a7

Former-commit-id: 535611f556 [formerly 45264a2cde [formerly 189282166d] [formerly 535611f556 [formerly e975a825046c8d0505223093e5765d5283425b2f]]]
Former-commit-id: 45264a2cde [formerly 189282166d]
Former-commit-id: 45264a2cde
Former-commit-id: 10a8b59e4e
2014-04-14 14:30:18 -05:00
Brad Gonzales
91216c10f7 Issue #2937 Moved presence/site determination from feed log to feed listener.
Use MUCRoom to get presence and role because UserManager is not able to understand nicnames.

Change-Id: Ie27d804cfea37a27df7e3c0d4445b16f3f2c12a7

Former-commit-id: 5d32a347ca [formerly 10a8b59e4e] [formerly 45264a2cde] [formerly 45264a2cde [formerly 189282166d]] [formerly 5d32a347ca [formerly 10a8b59e4e] [formerly 45264a2cde] [formerly 45264a2cde [formerly 189282166d]] [formerly 535611f556 [formerly 45264a2cde [formerly 189282166d] [formerly 535611f556 [formerly e975a825046c8d0505223093e5765d5283425b2f]]]]]
Former-commit-id: 535611f556
Former-commit-id: 316e6b9359 [formerly c67332f5c8] [formerly b18cefb6bd] [formerly e47b3a94ffcea4f0f5df7bfd32c856257b4f1b55 [formerly 31d35028c1bb41e7e74a7a5b46e8631cb1b8dfcd] [formerly b18cefb6bd [formerly 7384a458eb]]]
Former-commit-id: a49d6e01a3935e514b07f73228aee2a4320307b8 [formerly 367c707f1bd822d87a28e02e2aab93478cdbc4b7] [formerly 7876b83c15 [formerly a347010ad4]]
Former-commit-id: 7876b83c15
Former-commit-id: 22395cc880
2014-04-14 14:30:18 -05:00
Brad Gonzales
f76e4e8fea Issue #2937 Fixed from user in xmpp message.
Change-Id: I9d7ad994a3f683f2fb3dce37a71ebdcec04f4890

Former-commit-id: 67ccbb2e7eb96028137b9f82bca550bfb9e89345
2014-04-14 14:30:18 -05:00
Brad Gonzales
4b80f0f420 Issue #2937 Fixed from user in xmpp message.
Change-Id: I9d7ad994a3f683f2fb3dce37a71ebdcec04f4890

Former-commit-id: f76e4e8fea [formerly 98476d4813 [formerly 023622a2c5] [formerly f76e4e8fea [formerly 67ccbb2e7eb96028137b9f82bca550bfb9e89345]]]
Former-commit-id: 98476d4813 [formerly 023622a2c5]
Former-commit-id: 98476d4813
Former-commit-id: 496a56dccb
2014-04-14 14:30:18 -05:00
Brad Gonzales
541fa8bfad Issue #2937 Fixed from user in xmpp message.
Change-Id: I9d7ad994a3f683f2fb3dce37a71ebdcec04f4890

Former-commit-id: 4b80f0f420 [formerly 496a56dccb] [formerly 98476d4813] [formerly 98476d4813 [formerly 023622a2c5]] [formerly 4b80f0f420 [formerly 496a56dccb] [formerly 98476d4813] [formerly 98476d4813 [formerly 023622a2c5]] [formerly f76e4e8fea [formerly 98476d4813 [formerly 023622a2c5] [formerly f76e4e8fea [formerly 67ccbb2e7eb96028137b9f82bca550bfb9e89345]]]]]
Former-commit-id: f76e4e8fea
Former-commit-id: ddf4ffa5bc [formerly 886d42182e] [formerly 2812984f88] [formerly b7812ffd829d3aa3271640031d54e4c8bca048aa [formerly 272e6f46892b04f72888134b64bcf72189d571a5] [formerly 2812984f88 [formerly 1f1806de88]]]
Former-commit-id: 7960145a88f2d145d5f7c05ed312186df1d396dc [formerly 42f92b4b0b332859a72f27a74183f3c06841a34c] [formerly 7f09051250 [formerly 5f5ac23d05]]
Former-commit-id: 7f09051250
Former-commit-id: 8034ad83c3
2014-04-14 14:30:18 -05:00
Brad Gonzales
d50f39e98d Issue #2937 Consolidated LogEntry to string and from string conversions in utility
methods.  Made LogEntry immutable.  Error handling updates processing LogEntries
read from the log and when processing room updates.

Amend: Create new DateFormatter for the the DetailedFeedLogPlugin purge thread.
       Added patterns and pipe constant to LogEntry.

Change-Id: I0d4963a54f5cf9fe236fef46fdd41f6c6822a0db

Former-commit-id: 38594a026e343bcf9db7d55816ae29fa77716f05
2014-04-09 18:47:09 -05:00
Brad Gonzales
f9c5590eba Issue #2937 Consolidated LogEntry to string and from string conversions in utility
methods.  Made LogEntry immutable.  Error handling updates processing LogEntries
read from the log and when processing room updates.

Amend: Create new DateFormatter for the the DetailedFeedLogPlugin purge thread.
       Added patterns and pipe constant to LogEntry.

Change-Id: I0d4963a54f5cf9fe236fef46fdd41f6c6822a0db

Former-commit-id: d50f39e98d [formerly fe95275a34 [formerly 056dbdbdff] [formerly d50f39e98d [formerly 38594a026e343bcf9db7d55816ae29fa77716f05]]]
Former-commit-id: fe95275a34 [formerly 056dbdbdff]
Former-commit-id: fe95275a34
Former-commit-id: 19f4b1b64a
2014-04-09 18:47:09 -05:00
Brad Gonzales
3706cd36e0 Issue #2937 Consolidated LogEntry to string and from string conversions in utility
methods.  Made LogEntry immutable.  Error handling updates processing LogEntries
read from the log and when processing room updates.

Amend: Create new DateFormatter for the the DetailedFeedLogPlugin purge thread.
       Added patterns and pipe constant to LogEntry.

Change-Id: I0d4963a54f5cf9fe236fef46fdd41f6c6822a0db

Former-commit-id: f9c5590eba [formerly 19f4b1b64a] [formerly fe95275a34] [formerly fe95275a34 [formerly 056dbdbdff]] [formerly f9c5590eba [formerly 19f4b1b64a] [formerly fe95275a34] [formerly fe95275a34 [formerly 056dbdbdff]] [formerly d50f39e98d [formerly fe95275a34 [formerly 056dbdbdff] [formerly d50f39e98d [formerly 38594a026e343bcf9db7d55816ae29fa77716f05]]]]]
Former-commit-id: d50f39e98d
Former-commit-id: 3046ec3554 [formerly ce28c5b32a] [formerly 7472fb8084] [formerly 1ab2601431e8dda41a214d7c5d69394a01cffbfb [formerly fdd1fbec562ec709c2e1ddc6bf77a84a8df0074a] [formerly 7472fb8084 [formerly 178e4fe8bb]]]
Former-commit-id: aafea771c9c6293f6d77e7f02153608c1badec23 [formerly 594fbd7a5cd20c9d9e2c10b81e484a4e90c1d0e0] [formerly 60f66cda85 [formerly ebcb2cb414]]
Former-commit-id: 8d8cf96e7e9a1ce1a6d82a24413fb7bbf65c1432 [formerly 60f66cda85]
Former-commit-id: c091089ad7
2014-04-09 18:47:09 -05:00
Brad Gonzales
f0189d61ca Issue #2886 Removed httpd-collaboration rpm Installation and added collab-dataserver
rpm to replace it.  Changed dependency references to httpd-collaboration to refer to collab-dataserver.

Amend:  Updated call to status in init script.
        Redirect start.sh error output to an error file.
        Use macro to define ant opts in component.spec.

Change-Id: I73369dc3e9079a1732ae9d06229d3135f82ef2f4

Former-commit-id: d7466d36140c94b5ef4e57fea25526231912e018
2014-04-03 17:47:58 -05:00
Brad Gonzales
c92b8ccb34 Issue #2886 Removed httpd-collaboration rpm Installation and added collab-dataserver
rpm to replace it.  Changed dependency references to httpd-collaboration to refer to collab-dataserver.

Amend:  Updated call to status in init script.
        Redirect start.sh error output to an error file.
        Use macro to define ant opts in component.spec.

Change-Id: I73369dc3e9079a1732ae9d06229d3135f82ef2f4

Former-commit-id: f0189d61ca [formerly fe8e6a1fa1 [formerly 4fa60427b4] [formerly f0189d61ca [formerly d7466d36140c94b5ef4e57fea25526231912e018]]]
Former-commit-id: fe8e6a1fa1 [formerly 4fa60427b4]
Former-commit-id: fe8e6a1fa1
Former-commit-id: 9ff7dd12aa
2014-04-03 17:47:58 -05:00
Brad Gonzales
d4691277b6 Issue #2886 Removed httpd-collaboration rpm Installation and added collab-dataserver
rpm to replace it.  Changed dependency references to httpd-collaboration to refer to collab-dataserver.

Amend:  Updated call to status in init script.
        Redirect start.sh error output to an error file.
        Use macro to define ant opts in component.spec.

Change-Id: I73369dc3e9079a1732ae9d06229d3135f82ef2f4

Former-commit-id: c92b8ccb34 [formerly 9ff7dd12aa] [formerly fe8e6a1fa1] [formerly fe8e6a1fa1 [formerly 4fa60427b4]] [formerly c92b8ccb34 [formerly 9ff7dd12aa] [formerly fe8e6a1fa1] [formerly fe8e6a1fa1 [formerly 4fa60427b4]] [formerly f0189d61ca [formerly fe8e6a1fa1 [formerly 4fa60427b4] [formerly f0189d61ca [formerly d7466d36140c94b5ef4e57fea25526231912e018]]]]]
Former-commit-id: f0189d61ca
Former-commit-id: 2ed6815f9c [formerly efb4981a15] [formerly 907d09bc20] [formerly a145c6b6da77e77839533634a79d5fab9d35c8d1 [formerly 7c33a8781ee872ff0c5e225ac1d343ecd2c0eaee] [formerly 907d09bc20 [formerly 3954cd6bae]]]
Former-commit-id: fbc967628102531432f388b95ccd3e7e2ce34a02 [formerly 2291558778d560b4564dfd6237e7c32f3bb038d2] [formerly cd22105a5e [formerly 69f7034551]]
Former-commit-id: cd22105a5e
Former-commit-id: 350514f204
2014-04-03 17:47:58 -05:00
Brad Gonzales
15e1b7a7f6 Issue #2937 Separate room logging into a subdirectory to separate room logs from
other logging. Updated abstract_setup.xml to check the javaUtilities baseline directory and the cots directory
for dependency jars so that symbolic links are not needed in order to build.  Fixes for Archive log access
and search.

Change-Id: I7ca111cebb4dae998ce1390f3bb73b0f48eb7174

Former-commit-id: 480c86e5bbe6866b8c4c285006d3d7f7fed2b056
2014-03-31 11:45:22 -05:00
Brad Gonzales
2bf330935d Issue #2937 Separate room logging into a subdirectory to separate room logs from
other logging. Updated abstract_setup.xml to check the javaUtilities baseline directory and the cots directory
for dependency jars so that symbolic links are not needed in order to build.  Fixes for Archive log access
and search.

Change-Id: I7ca111cebb4dae998ce1390f3bb73b0f48eb7174

Former-commit-id: 15e1b7a7f6 [formerly d4659c48a6 [formerly 404faeeca0] [formerly 15e1b7a7f6 [formerly 480c86e5bbe6866b8c4c285006d3d7f7fed2b056]]]
Former-commit-id: d4659c48a6 [formerly 404faeeca0]
Former-commit-id: d4659c48a6
Former-commit-id: 85911a9d01
2014-03-31 11:45:22 -05:00
Brad Gonzales
495cc358af Issue #2937 Separate room logging into a subdirectory to separate room logs from
other logging. Updated abstract_setup.xml to check the javaUtilities baseline directory and the cots directory
for dependency jars so that symbolic links are not needed in order to build.  Fixes for Archive log access
and search.

Change-Id: I7ca111cebb4dae998ce1390f3bb73b0f48eb7174

Former-commit-id: 2bf330935d [formerly 85911a9d01] [formerly d4659c48a6] [formerly d4659c48a6 [formerly 404faeeca0]] [formerly 2bf330935d [formerly 85911a9d01] [formerly d4659c48a6] [formerly d4659c48a6 [formerly 404faeeca0]] [formerly 15e1b7a7f6 [formerly d4659c48a6 [formerly 404faeeca0] [formerly 15e1b7a7f6 [formerly 480c86e5bbe6866b8c4c285006d3d7f7fed2b056]]]]]
Former-commit-id: 15e1b7a7f6
Former-commit-id: 40dc41ae6e [formerly c12c4cf7e2] [formerly 1c685a9eb6] [formerly ceb7ccb67ec42d2f0d020581bc76a1156c1ff415 [formerly f8fc71ad10a4d9dbd3464113660b2d2d68675fd5] [formerly 1c685a9eb6 [formerly 2f56fd3c9d]]]
Former-commit-id: c55c77ed104cc2dfe627b6c9074e4279771f8f00 [formerly 742e4cc46d2a1218def59e841a9507b8581e81ce] [formerly 5506e9362a [formerly 4940c40a7f]]
Former-commit-id: 5506e9362a
Former-commit-id: 2637e3c237
2014-03-31 11:45:22 -05:00
Brian Clements
d44c55e976 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: 31c42d161146b0367435c66535d4da700a572f24
2014-03-12 08:27:22 -05:00
Brian Clements
be28c7e1cd 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: d44c55e976 [formerly ce1038723d [formerly bfde9c37ce] [formerly d44c55e976 [formerly 31c42d161146b0367435c66535d4da700a572f24]]]
Former-commit-id: ce1038723d [formerly bfde9c37ce]
Former-commit-id: ce1038723d
Former-commit-id: 2aa9dcb248
2014-03-12 08:27:22 -05:00
Brian Clements
ac7fb206bf 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: be28c7e1cd [formerly 2aa9dcb248] [formerly ce1038723d] [formerly ce1038723d [formerly bfde9c37ce]] [formerly be28c7e1cd [formerly 2aa9dcb248] [formerly ce1038723d] [formerly ce1038723d [formerly bfde9c37ce]] [formerly d44c55e976 [formerly ce1038723d [formerly bfde9c37ce] [formerly d44c55e976 [formerly 31c42d161146b0367435c66535d4da700a572f24]]]]]
Former-commit-id: d44c55e976
Former-commit-id: 14204d18fa [formerly fb6be670b1] [formerly ab86cda554] [formerly 480c4c2e6512b4efe5880a9cde445ff156174829 [formerly 1b8f3ce536ab968c6e5e63d5bfe2ffc91722e548] [formerly ab86cda554 [formerly d693c07bb4]]]
Former-commit-id: 47b1cddfef5988964863c35dd5276f8a2453b976 [formerly 199f3f09805b232480df05d4c222e11bab11f4ce] [formerly 560f51d226 [formerly 22d6302151]]
Former-commit-id: 90bb23a9bb3f5094ae388d2325c03b8445fe87a8 [formerly 560f51d226]
Former-commit-id: 05ddcce572
2014-03-12 08:27:22 -05:00
Brad Gonzales
dea17a19da Issue #2885 Updated all of the PDE builds to Java 1.7.
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b

Former-commit-id: 6d2a542774db6c37cfc2a65f490ebf618f2e7954
2014-03-06 16:29:37 -06:00
Brad Gonzales
e317164318 Issue #2885 Updated all of the PDE builds to Java 1.7.
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b

Former-commit-id: dea17a19da [formerly a24cbcfa77 [formerly 0e3dc17872] [formerly dea17a19da [formerly 6d2a542774db6c37cfc2a65f490ebf618f2e7954]]]
Former-commit-id: a24cbcfa77 [formerly 0e3dc17872]
Former-commit-id: a24cbcfa77
Former-commit-id: 885a9567bc
2014-03-06 16:29:37 -06:00
Brad Gonzales
2b7d49ddb2 Issue #2885 Updated all of the PDE builds to Java 1.7.
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b

Former-commit-id: e317164318 [formerly 885a9567bc] [formerly a24cbcfa77] [formerly a24cbcfa77 [formerly 0e3dc17872]] [formerly e317164318 [formerly 885a9567bc] [formerly a24cbcfa77] [formerly a24cbcfa77 [formerly 0e3dc17872]] [formerly dea17a19da [formerly a24cbcfa77 [formerly 0e3dc17872] [formerly dea17a19da [formerly 6d2a542774db6c37cfc2a65f490ebf618f2e7954]]]]]
Former-commit-id: dea17a19da
Former-commit-id: 88556ffdc6 [formerly 09c083ce1f] [formerly 4ba60d8a6f] [formerly e670e0feade57e374fb1c735b6e19bb44c2507cb [formerly f2869efb05c763771e03bc02057aa196d29b6d1a] [formerly 4ba60d8a6f [formerly 78d35d4033]]]
Former-commit-id: 43355841aa7d98fe8c5428fbd0be540315ce710d [formerly f70dd002a68a434eb5e81131bb0b82d4784e717e] [formerly 4cbc3b1b05 [formerly c4064160ec]]
Former-commit-id: 4cbc3b1b05
Former-commit-id: e7295b16d2
2014-03-06 16:29:37 -06:00
Brian Clements
cde0d05820 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: 8e1da85b9d3da580c8d5b53783e2b17c6ee8d00e
2014-03-06 11:49:57 -06:00
Brian Clements
6c142629c4 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: cde0d05820 [formerly acbd4910fe [formerly fac33a8915] [formerly cde0d05820 [formerly 8e1da85b9d3da580c8d5b53783e2b17c6ee8d00e]]]
Former-commit-id: acbd4910fe [formerly fac33a8915]
Former-commit-id: acbd4910fe
Former-commit-id: a97d1a1fb5
2014-03-06 11:49:57 -06:00
Brian Clements
2cb7d4d2df 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: 6c142629c4 [formerly a97d1a1fb5] [formerly acbd4910fe] [formerly acbd4910fe [formerly fac33a8915]] [formerly 6c142629c4 [formerly a97d1a1fb5] [formerly acbd4910fe] [formerly acbd4910fe [formerly fac33a8915]] [formerly cde0d05820 [formerly acbd4910fe [formerly fac33a8915] [formerly cde0d05820 [formerly 8e1da85b9d3da580c8d5b53783e2b17c6ee8d00e]]]]]
Former-commit-id: cde0d05820
Former-commit-id: 8c8defaa63 [formerly eab142e86d] [formerly 2b3aaeff26] [formerly 179e95332cb365f34a7c3660f5ae0f0f8c415ce9 [formerly 697372d2b5104a735c926c344d998b56abd81e2a] [formerly 2b3aaeff26 [formerly eb54c46b3c]]]
Former-commit-id: 10d0d632d49ccb66d806fe9e96a3db1712b8c8b3 [formerly 6b56107fae632a677b51c2edb24a65ae6832f176] [formerly f962ac4159 [formerly db510daf06]]
Former-commit-id: f962ac4159
Former-commit-id: ab62759518
2014-03-06 11:49:57 -06:00
Brian Clements
e1819cd4e2 Issue #2702 replaced openfire source tarball with 3.9.1
removed 3.7.1 source from git
added 3.9.1 tarballs to /awipscm/awips2-static (coordinated with CM)
tweaked ant build to fetch source tarball when building plugins
replaced openfire cots jar with new version (only used for eclipse)


Former-commit-id: d8f30a7af43faa2fd4ac18769d2313ae6008cfd1
2014-03-05 15:29:27 -06:00
Brian Clements
66840a1bdd Issue #2702 replaced openfire source tarball with 3.9.1
removed 3.7.1 source from git
added 3.9.1 tarballs to /awipscm/awips2-static (coordinated with CM)
tweaked ant build to fetch source tarball when building plugins
replaced openfire cots jar with new version (only used for eclipse)


Former-commit-id: e1819cd4e2 [formerly bc8ac5e051 [formerly ad3d10074a] [formerly e1819cd4e2 [formerly d8f30a7af43faa2fd4ac18769d2313ae6008cfd1]]]
Former-commit-id: bc8ac5e051 [formerly ad3d10074a]
Former-commit-id: bc8ac5e051
Former-commit-id: e4d22971bd
2014-03-05 15:29:27 -06:00
Brian Clements
137ca3118d Issue #2702 replaced openfire source tarball with 3.9.1
removed 3.7.1 source from git
added 3.9.1 tarballs to /awipscm/awips2-static (coordinated with CM)
tweaked ant build to fetch source tarball when building plugins
replaced openfire cots jar with new version (only used for eclipse)


Former-commit-id: 66840a1bdd [formerly e4d22971bd] [formerly bc8ac5e051] [formerly bc8ac5e051 [formerly ad3d10074a]] [formerly 66840a1bdd [formerly e4d22971bd] [formerly bc8ac5e051] [formerly bc8ac5e051 [formerly ad3d10074a]] [formerly e1819cd4e2 [formerly bc8ac5e051 [formerly ad3d10074a] [formerly e1819cd4e2 [formerly d8f30a7af43faa2fd4ac18769d2313ae6008cfd1]]]]]
Former-commit-id: e1819cd4e2
Former-commit-id: 911d6407e6 [formerly 2267c2bb0b] [formerly 410ebf65f5] [formerly 01db24e1fbcc79bebe3149dc25ef088e84469a1b [formerly 3beb79dabe2b4fee26bcf793ea28d3ef4e8cebb4] [formerly 410ebf65f5 [formerly 3f0115d329]]]
Former-commit-id: 2c6dbc923dfcb8ff83d53dbefc1515d8f787b3b7 [formerly df339242e5ac9d41f04d641662b3a15d2535f802] [formerly 4a9c85e7ac [formerly 544c713135]]
Former-commit-id: 4a9c85e7ac
Former-commit-id: 6e79ad72ad
2014-03-05 15:29:27 -06:00
Brian Clements
f44f1212dd 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: 1e52606fe709f2cf27f835363ca5ab2bf6ada912
2014-03-04 16:02:25 -06:00
Brian Clements
7d4b92d90f 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: f44f1212dd [formerly cd0e1e271a [formerly 7b085f62de] [formerly f44f1212dd [formerly 1e52606fe709f2cf27f835363ca5ab2bf6ada912]]]
Former-commit-id: cd0e1e271a [formerly 7b085f62de]
Former-commit-id: cd0e1e271a
Former-commit-id: 2482a58273
2014-03-04 16:02:25 -06:00
Brian Clements
5feb3d0705 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: 7d4b92d90f [formerly 2482a58273] [formerly cd0e1e271a] [formerly cd0e1e271a [formerly 7b085f62de]] [formerly 7d4b92d90f [formerly 2482a58273] [formerly cd0e1e271a] [formerly cd0e1e271a [formerly 7b085f62de]] [formerly f44f1212dd [formerly cd0e1e271a [formerly 7b085f62de] [formerly f44f1212dd [formerly 1e52606fe709f2cf27f835363ca5ab2bf6ada912]]]]]
Former-commit-id: f44f1212dd
Former-commit-id: 22bdbf2894 [formerly 19bb5d8de9] [formerly c446513912] [formerly b1ec6b714e98e1e0b781c5dafe5e718ee5752089 [formerly c63989e0c0ae952f12584b6484f4cc133f757e99] [formerly c446513912 [formerly 0790849f03]]]
Former-commit-id: e67f5adabb46e3ed44049185dca8be65912fd836 [formerly ac49a09e913b78ca7f067ef864505a1f0acc5ede] [formerly 8d9da2b63e [formerly 8b1a00fb2f]]
Former-commit-id: 8d9da2b63e
Former-commit-id: 3aaee14c5f
2014-03-04 16:02:25 -06:00
Brian Clements
934ce73e4b Issue #2756 install script for collaboration http server
added check for non-edex deployment in plugin-methods.xml
added dataserver feature to use feature-based deployment scripts
moved start/stop scripts to subdirectory
reworked start script to work with external classpath jars


Former-commit-id: 7d476e67ad00cc8e9c494ed04c7ce0ecc691059a
2014-03-03 14:07:01 -06:00
Brian Clements
0170dbdb6f Issue #2756 install script for collaboration http server
added check for non-edex deployment in plugin-methods.xml
added dataserver feature to use feature-based deployment scripts
moved start/stop scripts to subdirectory
reworked start script to work with external classpath jars


Former-commit-id: 934ce73e4b [formerly a738448825 [formerly 3b6121b9fa] [formerly 934ce73e4b [formerly 7d476e67ad00cc8e9c494ed04c7ce0ecc691059a]]]
Former-commit-id: a738448825 [formerly 3b6121b9fa]
Former-commit-id: a738448825
Former-commit-id: 769ee18145
2014-03-03 14:07:01 -06:00
Brian Clements
0566f61516 Issue #2756 install script for collaboration http server
added check for non-edex deployment in plugin-methods.xml
added dataserver feature to use feature-based deployment scripts
moved start/stop scripts to subdirectory
reworked start script to work with external classpath jars


Former-commit-id: 0170dbdb6f [formerly 769ee18145] [formerly a738448825] [formerly a738448825 [formerly 3b6121b9fa]] [formerly 0170dbdb6f [formerly 769ee18145] [formerly a738448825] [formerly a738448825 [formerly 3b6121b9fa]] [formerly 934ce73e4b [formerly a738448825 [formerly 3b6121b9fa] [formerly 934ce73e4b [formerly 7d476e67ad00cc8e9c494ed04c7ce0ecc691059a]]]]]
Former-commit-id: 934ce73e4b
Former-commit-id: 73b7bb05a3 [formerly 11b30001d5] [formerly 75c179b06f] [formerly aa27597578b1b18bfcd6890f24bc3e43b61ba524 [formerly 066c81f999fa0b82f0f2cf806a4411393bd5ac3c] [formerly 75c179b06f [formerly a44c5f8d48]]]
Former-commit-id: 2cb0c6009302b78654861ac61b64800a830b1bd5 [formerly 0e0bd6fdd76a9a44b31ab23824202bfa97b827e6] [formerly 861716341a [formerly a36f303646]]
Former-commit-id: 861716341a
Former-commit-id: 08c686bfa7
2014-03-03 14:07:01 -06:00
Brian Clements
d8e283e1b4 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: e0e4dfdedff283c809060257fbf04e777faf318d
2014-02-28 16:15:17 -06:00
Brian Clements
f5ac60f8fa 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: d8e283e1b4 [formerly 9d0b02e0a4 [formerly ce24bd1018] [formerly d8e283e1b4 [formerly e0e4dfdedff283c809060257fbf04e777faf318d]]]
Former-commit-id: 9d0b02e0a4 [formerly ce24bd1018]
Former-commit-id: 9d0b02e0a4
Former-commit-id: fd18963221
2014-02-28 16:15:17 -06:00
Brian Clements
1911b583ec 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: f5ac60f8fa [formerly fd18963221] [formerly 9d0b02e0a4] [formerly 9d0b02e0a4 [formerly ce24bd1018]] [formerly f5ac60f8fa [formerly fd18963221] [formerly 9d0b02e0a4] [formerly 9d0b02e0a4 [formerly ce24bd1018]] [formerly d8e283e1b4 [formerly 9d0b02e0a4 [formerly ce24bd1018] [formerly d8e283e1b4 [formerly e0e4dfdedff283c809060257fbf04e777faf318d]]]]]
Former-commit-id: d8e283e1b4
Former-commit-id: 109da18301 [formerly 43c19f09ba] [formerly f56cbac9fb] [formerly a8497419fcf479ec1477a26ab09ecdbe904b7823 [formerly effe9ab4a85983edf2b983ee5e4b964df8a78343] [formerly f56cbac9fb [formerly edd72cbde4]]]
Former-commit-id: 531d5760af4db90b81cf4030ae20fc40a0889266 [formerly 667a1021c89300b5befe11701d18fc1d06fbb6bb] [formerly f00f8eb1d9 [formerly 6d4abdc37c]]
Former-commit-id: f00f8eb1d9
Former-commit-id: e9604a9700
2014-02-28 16:15:17 -06:00
Nate Jensen
39e167fc76 Issue #2638 wrote java utility for generating list of data URIs and
their field names

Change-Id: I44435ed2a3f1f812b79b3d4fa906913064c60863

Former-commit-id: a3e2218d1fcc7cf8c83443f5f29cd9982b7e6f46
2014-02-27 17:14:32 -06:00
Nate Jensen
c513e50b11 Issue #2638 wrote java utility for generating list of data URIs and
their field names

Change-Id: I44435ed2a3f1f812b79b3d4fa906913064c60863

Former-commit-id: 39e167fc76 [formerly 5b2f17826e [formerly 7fb97ffad0] [formerly 39e167fc76 [formerly a3e2218d1fcc7cf8c83443f5f29cd9982b7e6f46]]]
Former-commit-id: 5b2f17826e [formerly 7fb97ffad0]
Former-commit-id: 5b2f17826e
Former-commit-id: b64a89eff1
2014-02-27 17:14:32 -06:00
Nate Jensen
a2409cba97 Issue #2638 wrote java utility for generating list of data URIs and
their field names

Change-Id: I44435ed2a3f1f812b79b3d4fa906913064c60863

Former-commit-id: c513e50b11 [formerly b64a89eff1] [formerly 5b2f17826e] [formerly 5b2f17826e [formerly 7fb97ffad0]] [formerly c513e50b11 [formerly b64a89eff1] [formerly 5b2f17826e] [formerly 5b2f17826e [formerly 7fb97ffad0]] [formerly 39e167fc76 [formerly 5b2f17826e [formerly 7fb97ffad0] [formerly 39e167fc76 [formerly a3e2218d1fcc7cf8c83443f5f29cd9982b7e6f46]]]]]
Former-commit-id: 39e167fc76
Former-commit-id: b98302df6a [formerly 0e29ec5bb4] [formerly f3de646859] [formerly 0f862d935f7471e5f4744467088db7ed63b0d300 [formerly 76c109bc0aaf7a0a1405976cdefd262abdaf71dc] [formerly f3de646859 [formerly 8bf8302811]]]
Former-commit-id: 0ed09bd4b18eba1ca4fb443446230671434438d3 [formerly 0a41af5b8c365750116c369470ba9b31fd6bc188] [formerly b051dab483 [formerly f325498ec3]]
Former-commit-id: b051dab483
Former-commit-id: 879743ba05
2014-02-27 17:14:32 -06:00
Richard Peter
1c150e6e8b Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java

Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75

Former-commit-id: a47eaa9af45db41391fe46e36ec0793f70d06ad6
2014-02-27 15:18:26 -06:00
Richard Peter
39fbaeed62 Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java

Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75

Former-commit-id: 1c150e6e8b [formerly 7bd6a07913 [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]
Former-commit-id: 7bd6a07913 [formerly 0e25ae35c1]
Former-commit-id: 7bd6a07913
Former-commit-id: 79d3aa4e1a
2014-02-27 15:18:26 -06:00
Richard Peter
c97db8f979 Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java

Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75

Former-commit-id: 39fbaeed62 [formerly 79d3aa4e1a] [formerly 7bd6a07913] [formerly 7bd6a07913 [formerly 0e25ae35c1]] [formerly 39fbaeed62 [formerly 79d3aa4e1a] [formerly 7bd6a07913] [formerly 7bd6a07913 [formerly 0e25ae35c1]] [formerly 1c150e6e8b [formerly 7bd6a07913 [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 414ccec00e [formerly 1d6e9816e0] [formerly 50a1b270c5] [formerly d17e408d9521d3f82597dba5bf5fbdcd68561d6a [formerly 23c2e13876eeacd0c485ad3110006f8bd36a537c] [formerly 50a1b270c5 [formerly f13c86bc3e]]]
Former-commit-id: e37a848a29c926a114114630bab3b1b48d0a088f [formerly 1916128dada6d785b45f3c66eda571278ddb03d7] [formerly 5fab51d41b [formerly 9b3f8f9649]]
Former-commit-id: 5fab51d41b
Former-commit-id: ef2ff1d0f7
2014-02-27 15:18:26 -06:00
Brian Clements
5b4f1e8288 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: ff23569984eee43927c10ca041ca7e0ca4d40a3b
2014-02-18 10:03:12 -06:00
Brian Clements
673bcd6917 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: 5b4f1e8288 [formerly f0c89ef6c6 [formerly f6b2827434] [formerly 5b4f1e8288 [formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]]]
Former-commit-id: f0c89ef6c6 [formerly f6b2827434]
Former-commit-id: f0c89ef6c6
Former-commit-id: 68fac79fe7
2014-02-18 10:03:12 -06:00
Brian Clements
518c5eacc9 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: 673bcd6917 [formerly 68fac79fe7] [formerly f0c89ef6c6] [formerly f0c89ef6c6 [formerly f6b2827434]] [formerly 673bcd6917 [formerly 68fac79fe7] [formerly f0c89ef6c6] [formerly f0c89ef6c6 [formerly f6b2827434]] [formerly 5b4f1e8288 [formerly f0c89ef6c6 [formerly f6b2827434] [formerly 5b4f1e8288 [formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]]]]]
Former-commit-id: 5b4f1e8288
Former-commit-id: a8f377560a [formerly 74d08f1d19] [formerly 02319f36e4] [formerly 81b79c70534314231887805169abb1a873520b1a [formerly 9b1edc285732dbc80b9bea2223564bca70eef005] [formerly 02319f36e4 [formerly a1d9e40bd4]]]
Former-commit-id: 6646c888a483fe1aa4d6d6610273223c27ae8b51 [formerly 30b1054d786354e5944fa7b6968a4b2cddf1c07a] [formerly f866ac4365 [formerly 5889341612]]
Former-commit-id: f866ac4365
Former-commit-id: c0da4f94d4
2014-02-18 10:03:12 -06:00
Ron Anderson
2f067699f2 Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad
2014-02-13 10:10:34 -06:00
Ron Anderson
8ef94ea216 Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 2f067699f2 [formerly 3e78908bb5 [formerly fcf45916f4] [formerly 2f067699f2 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]
Former-commit-id: 3e78908bb5 [formerly fcf45916f4]
Former-commit-id: 3e78908bb5
Former-commit-id: 69ee4792ad
2014-02-13 10:10:34 -06:00