Ben Steffensmeier
d3043fda5a
Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.
...
Former-commit-id: 9122b6da998650074737
2014-03-07 18:15:32 -06:00
Steve Harris
708485427e
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 873bd6b889f60aba35d6
2014-03-07 15:43:40 -06:00
Mike Duff
9051daf05f
Issue #2876 - Fix manifest file.
...
Change-Id: If02046664c5d60f2f3c30cbf7f502189eb5874f9
Former-commit-id: 618dbec5854cefac4658
2014-03-07 15:41:24 -06:00
Steve Harris
f992a6b046
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 92232fa06340b543f9a8
2014-03-07 15:16:18 -06:00
Richard Peter
29250be003
Merge "Issue #2876 - Pluginize NDM review comments" into development
...
Former-commit-id: 4568108a3cc9dfa75d1c
2014-03-07 13:04:14 -06:00
Mike Duff
7bb9ada00d
Issue #2876 - Pluginize NDM
...
review comments
Change-Id: I9911c531a0e2ac735df949cc3f9aa72dc192483d
Former-commit-id: 944fca16b8c388cb839b
2014-03-07 12:47:46 -06:00
Brian.Dyke
0c4b9469b0
Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1
...
Former-commit-id: 3ac2a612181fe5504d4c
2014-03-07 11:50:06 -05:00
Brian.Dyke
6ced1bedc2
Merge branch 'master_14.1.1' into master_14.2.1
...
Former-commit-id: 394076196b7b798ab5d2
2014-03-07 09:01:09 -05:00
Brian.Dyke
2f94480121
Merge branch 'fun_merge' into master_14.2.1
...
Former-commit-id: 312cd8a3e86414bdab57
2014-03-07 08:57:07 -05:00
Brian.Dyke
a4c136fd60
14.1.1-22 baseline
...
Former-commit-id: 21f17d4f9b08d8f1a0ee
2014-03-07 08:49:00 -05:00
Steve Harris
7fbbc1e118
Merge branch 'omaha_14.2.1' into development (from 14.2.1-9)
...
Former-commit-id: 8b6263bfbd1c64a5c025
2014-03-06 18:31:10 -06:00
Steve Harris
8ec20fc5e9
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 7f1ad89df9a2e36f4c6c
2014-03-06 18:19:55 -06:00
Brad Gonzales
66386f340a
Issue #2885 Updated java version in build.properties.p2.
...
Change-Id: Ifb266696902142ab59977025ae75010540836ed5
Former-commit-id: 2e224094adb47dc5df40
2014-03-06 17:35:43 -06:00
Brad Gonzales
78d35d4033
Issue #2885 Updated all of the PDE builds to Java 1.7.
...
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b
Former-commit-id: 0e3dc17872dea17a19da
2014-03-06 16:29:37 -06:00
Nate Jensen
46fda0511c
Merge "Issue #2756 reworked collaboration dataserver build" into development
...
Former-commit-id: 911253bf2568f8cd5ebe
2014-03-06 16:19:23 -06:00
Ben Steffensmeier
062e3ddb48
Issue #2831 Fix No Data Value in collaboration images.
...
Former-commit-id: 82b87900506962f80c5a
2014-03-06 13:37:08 -06:00
Brian Clements
eb54c46b3c
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: fac33a8915cde0d05820
2014-03-06 11:49:57 -06:00
Brad Gonzales
e54ab69bf7
Issue #2885 Update PDE build to Java 1.7. Fix code that is now an error in Java 1.7.
...
Amend: changed to use set method.
Change-Id: I39cb36937fb9faafe24f2e87a897ae78c7c660e1
Former-commit-id: 08ee82c39ab535c90a23
2014-03-06 10:38:30 -06:00
Brian.Dyke
8c16576a82
Merge 13.5.3 DR_16824
...
Former-commit-id: b8fd0f16eddafe7e6a42
2014-03-06 11:22:08 -05:00
Brian.Dyke
c6dae5a81f
ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change)
...
Former-commit-id: 1778d20745010b7a1df5
2014-03-06 11:04:34 -05:00
Brian.Dyke
3fdb85c62d
ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf)
...
Former-commit-id: 2dbac1697dcb1b4a7ac5
2014-03-06 10:56:44 -05:00
Brian.Dyke
b657767cb1
ASM #124 - Display GLD360 lightning data
...
Former-commit-id: db274c890feefe8c45fe
2014-03-06 10:54:15 -05:00
Steve Harris
96658d8ce0
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
...
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: 069093884fffcc34f8d4
2014-03-06 08:39:43 -06:00
Nate Jensen
59a152c613
Merge "Issue #2702 replaced openfire source tarball with 3.9.1" into development
...
Former-commit-id: bc0b6ca067f60fba58b1
2014-03-05 15:44:36 -06:00
Brian Clements
3f0115d329
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: ad3d10074ae1819cd4e2
2014-03-05 15:29:27 -06:00
Nate Jensen
fb50424456
Merge "Issue #2791 Move D2D Grids to direct memory." into development
...
Former-commit-id: be9cc9397fa91e941d3e
2014-03-05 15:02:46 -06:00
Ben Steffensmeier
a06a98750f
Issue #2791 Move D2D Grids to direct memory.
...
Former-commit-id: 12ed63619a775c29e77c
2014-03-05 14:57:28 -06:00
Nate Jensen
d3f18729c3
Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development
...
Former-commit-id: cf4631f9bf48fa8f8d1b
2014-03-05 14:41:12 -06:00
Mike Duff
c0bf150e15
Issue #2798 - Fix user presence messages and settings
...
Peer review comments
Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa
Former-commit-id: e97e745b619c873e6dd9
2014-03-05 14:39:55 -06:00
Nate Jensen
17ee130b2a
Merge "Issue #2861 added synchronized blocks where necessary" into development
...
Former-commit-id: 59dcb3a97d2eea0b9205
2014-03-05 14:14:25 -06:00
Max Schenkelberg
0fbc2df17d
Issue #2861 added synchronized blocks where necessary
...
Change-Id: I86a483612f618b04c1ef938ebc8f95decb496811
Former-commit-id: 10bfa59aefb5ed7ac361
2014-03-05 13:51:06 -06:00
Steve Harris
6e361c0a57
Merge branch 'master_14.2.1' into ncep_14.2.1
...
Former-commit-id: 167ce61d6c4b01c57c0a
2014-03-05 13:00:23 -06:00
Mike Duff
3bdf20dea3
Issue #2632 - Fix problem with multiple notifiers per user.
...
Change-Id: Ia6f9d18e9217c74e6ecf6a2df324860a2b817000
Former-commit-id: 8c693a5f709963324b60
2014-03-05 12:02:33 -06:00
Nate Jensen
d82a7d3640
Merge "Issue #2843 Harden recycle." into development
...
Former-commit-id: 7a2a489c77308ab7c314
2014-03-05 11:41:05 -06:00
Greg Armendariz
d67748198f
Merge "Issue #2627 shorten wrapper arg for retaining failed data" into development
...
Former-commit-id: a9e861834bd2510ab641
2014-03-05 11:29:43 -06:00
Ben Steffensmeier
af1bdf1b53
Issue #2843 Harden recycle.
...
Former-commit-id: 26c1a8e4943cd6b29e75
2014-03-05 11:16:12 -06:00
Nate Jensen
08ac542f2f
Issue #2627 shorten wrapper arg for retaining failed data
...
Change-Id: Ib02246cef47d3a19caa61baedbc5538c07d073d7
Former-commit-id: c07f2e829d0dc5dfae82
2014-03-05 09:04:10 -06:00
Brian Clements
d06182573e
Issue #2837 collaboration icon changes
...
changed add/remove group icon colors
created icons for add/remove contact, alias contact and rename group
Former-commit-id: c0e4615967c9906cde88
2014-03-05 09:00:57 -06:00
Lee Venable
98daa663b4
Issue #2833 - fixed a widget disposed error.
...
Former-commit-id: e71dad9c80980e21ca5a
2014-03-05 08:37:13 -06:00
Richard Peter
c12b4fb4ea
Merge "Issue #2627 harden static initialization on edex main thread" into development
...
Former-commit-id: 7c02ab6b666b08aaf55c
2014-03-04 17:54:09 -06:00
Nate Jensen
81a6675a14
Issue #2627 harden static initialization on edex main thread
...
Change-Id: Icff0a2fd60bec882ac96fc218deb88b16eaeaaff
Former-commit-id: b989b7240c660998ac72
2014-03-04 17:19:24 -06:00
Brian Clements
0790849f03
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: 7b085f62def44f1212dd
2014-03-04 16:02:25 -06:00
Nate Jensen
ddf96ad45b
Merge "Issue #2832 fix watches and warnings in collaboration displays" into development
...
Former-commit-id: 67fa21cfd9faf3dbb670
2014-03-04 13:59:01 -06:00
Benjamin Phillippe
cd04d7dcbe
Issue #2769 : Added batching to registry sync
...
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db
Former-commit-id: 59323be87e9fd35140f0
2014-03-04 13:31:41 -06:00
Nate Jensen
4c0df85caf
Issue #2832 fix watches and warnings in collaboration displays
...
Change-Id: Id24366f8ee0cc9e13d3822fefaee13e92b95126f
Former-commit-id: e3d211c8d73c3e483d18
2014-03-04 13:18:16 -06:00
Richard Peter
3b800bcc09
Merge "Issue #2769 : Registry database deadlocking fixes/performance improvements" into omaha_14.2.1
...
Former-commit-id: aa8e1a3625f9bd27c061
2014-03-04 12:54:23 -06:00
Richard Peter
2a5b0fb3ba
Merge "Issue #2791 Use Data Source for all grid data access." into development
...
Former-commit-id: f87a913017873fa00fac
2014-03-04 12:43:17 -06:00
Nate Jensen
471492201c
Merge "Issue #2870 log product id when generic packet fails to find corresponding packet class" into development
...
Former-commit-id: ea0248ff964547cbcfea
2014-03-04 12:39:13 -06:00
Richard Peter
363e9e294f
Merge "Issue #2829 - fix the spelling of 'coordinate' in GfeUtil" into development
...
Former-commit-id: bd94f6bf994fbb2f0059
2014-03-04 12:38:30 -06:00
Richard Peter
e350b5bae1
Merge "Issue #2713 Update path for MADIS-Harvester.xml Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788" into development
...
Former-commit-id: bc8b838a41178bfc0b79
2014-03-04 12:38:07 -06:00
