Max Schenkelberg
8d1b555c39
Issue #1638 Made Map scales more generalized for use outside of D2D
...
Amend: Added generalization to JaxbManager
Change-Id: Ic210b8b0d50b4f362321855268570147c439cc2a
Former-commit-id: dabffdbf79
[formerly fd375314cd
] [formerly e17d691400
[formerly 1e5812d9796a77559d70392be18619a8f7316f2d]]
Former-commit-id: e17d691400
Former-commit-id: 36e80c267e
2013-03-25 15:38:36 -05:00
Dustin Johnson
09d1d7b6cf
Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription
...
Amend:
Add constant for "CAVE".
Add preconditions on creating a subscription.
Change-Id: Icdd2bc0ebd1613724cea3a89d335415995e18cae
Former-commit-id: bd58534855
[formerly f8870c8946
] [formerly c4d4e37cad
[formerly 9a3bf6b1e59acea76f7f7973a599bc32c0d395f2]]
Former-commit-id: c4d4e37cad
Former-commit-id: d58306a92e
2013-03-21 16:14:49 -05:00
Max Schenkelberg
5617dfaa67
Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
...
Amend: Accepted ticket for work, again! Ensured uframe product project was not deleted
Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719
Former-commit-id: 2611980ca4
[formerly 4ed4ef8d71
] [formerly e0ba97d547
[formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]]
Former-commit-id: e0ba97d547
Former-commit-id: 6b1426dd34
2013-02-27 11:50:38 -06:00
Dustin Johnson
e8f382e7c0
Merge "Issue #1554 fix XmlGenericMapAdapter to work with null maps." into development
...
Former-commit-id: ab7e404ffa
[formerly 9004e0f57c
] [formerly 5c1c1ec582
[formerly 2d2dd4cc62a45794a3a912eb75c9d2745815dc4e]]
Former-commit-id: 5c1c1ec582
Former-commit-id: 12b6ac3d56
2013-02-12 07:59:24 -06:00
Ben Steffensmeier
ae0ac4e21c
Issue #1554 fix XmlGenericMapAdapter to work with null maps.
...
Former-commit-id: 4a7d94ecbd
[formerly 60c435861a
] [formerly 7220c4c6cc
[formerly 904e3387de59f534b6457c7a12e8f94d55974884]]
Former-commit-id: 7220c4c6cc
Former-commit-id: 21616e06ce
2013-02-11 16:08:58 -06:00
Dustin Johnson
73a5667256
Issue #1543 Add testing of current OpenDAP type retrievals.
...
- Add test for current behavior of SBN-like retrievals.
- Change session management to use a factory implementation.
- Add service locator strategy to find jaxbables.
- Tests cleanup.
- Add mock versions of OpenDAP service classes to test more OpenDAP retrieval functionality.
Amend:
Peer review comments.
Change to use Spring transactions.
Change-Id: Ifce73361a5d864c54fdd493240c40d5ae66ef366
Former-commit-id: 0d548bd66f
[formerly 8307af022c
] [formerly ef32853dc1
[formerly bb9ab0ceb479a8c6a727b9764433edb70eec31f1]]
Former-commit-id: ef32853dc1
Former-commit-id: e504a474f9
2013-02-11 14:21:57 -06:00
Ben Steffensmeier
a693a33f97
Issue #1390 fix envelope reprojection and add serializeable ojects for referenced envelopes
...
Change-Id: I2e79709d1323ed17879b4f59229361fe935aa0ea
Former-commit-id: b32d039c92
[formerly b77f1592a7
] [formerly 11d3ee3014
[formerly a6c7730ba1c0b07fdf21bef19717859fc7238724]]
Former-commit-id: 11d3ee3014
Former-commit-id: 9277840fad
2012-12-11 16:12:53 -06:00
Dustin Johnson
2d1e886cf3
Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
...
Amend:
More peer review comments
Restore PreferencesHandler
Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7
Former-commit-id: efd3d3735a
[formerly 064ef82d1e
] [formerly 1dbeb22893
[formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]
Former-commit-id: 1dbeb22893
Former-commit-id: 4222b24d09
2012-11-08 09:57:16 -06:00
David Gillingham
a82f811659
Issue #1310 : Fix automated tropical testing support code after Data Delivery and Unified Grid
...
baseline merges.
Change-Id: Ia134ecd68c1468b281e7dca6e56f5cbc20047583
Former-commit-id: 251f41414a
[formerly 0f13b5d0b1
] [formerly ec7a7c1373
[formerly 0c3a35f339819afc5ed79202c95215ed90890df8]]
Former-commit-id: ec7a7c1373
Former-commit-id: f998d419d9
2012-11-02 15:21:30 -05:00
Dustin Johnson
e7a0f96a9a
Issue #1302 Merge branch '5-Data_Delivery' into development
...
Conflicts:
edexOsgi/build.edex/deploy-common/external-rules.xml
edexOsgi/build.edex/deploy-common/plugin-methods.xml
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0
Former-commit-id: 8e69107b5a
[formerly 98d7beae50
] [formerly 31d7d09c10
[formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 31d7d09c10
Former-commit-id: bcf575966b
2012-11-01 13:36:06 -05:00
David Gillingham
dc354717be
Issue #1251 : Ensure DynamicSerializationManager encodes the registered type when using serialization adapters.
...
Change-Id: I2d66647f953ded122a328e71e27cad37091d35c3
Former-commit-id: 86480283e0
[formerly 11dbb6f90c
] [formerly 32a2b34efe
[formerly b1a6f7936f93f664ad8b9fe6a05328783a990ed2]]
Former-commit-id: 32a2b34efe
Former-commit-id: cdeb78c828
2012-10-08 17:09:54 -05:00
root
537dbadf64
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: 0987fc6b3d
[formerly cb46f57879
] [formerly 5a453ee984
[formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]
Former-commit-id: 5a453ee984
Former-commit-id: 8a66b2f209
2012-08-15 22:15:20 +00:00
Bryan Kowal
21e8618852
Merge branch '11-Collaboration' into development
...
Conflicts:
cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
Former-commit-id: 9361f3eb94
[formerly f528e10391
] [formerly f0e3b957e3
[formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]
Former-commit-id: f0e3b957e3
Former-commit-id: 1ee59eac71
2012-06-18 11:16:28 -05:00
Max Schenkelberg
2db836b296
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
...
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 06ee0bbf6f
[formerly 78e1bd2c62
] [formerly 1f5abc6e20
[formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]
Former-commit-id: 1f5abc6e20
Former-commit-id: 3ca8ca6f01
2012-05-09 15:02:30 -05:00
Steve Harris
53d2822329
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
...
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.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.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: d7f7c26582
[formerly 092efd6072
] [formerly 31b3e87ffa
[formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 98447412f8
2012-05-09 13:19:47 -05:00
Steve Harris
9c9e01dbda
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
...
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: 572e1bb476
[formerly 27bc369818
] [formerly 58037cb5d1
[formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]
Former-commit-id: 58037cb5d1
Former-commit-id: 63ea8599d7
2012-05-09 13:14:00 -05:00
Richard Peter
ae35c2f27c
Issue #538 : Fix Serialization Annotations and Serialization Issues
...
Change-Id: I436997106438ab283e987cb7e3055fcee009b608
Former-commit-id: c33a392a8c
[formerly 349adaeedd
] [formerly b11df888d3
[formerly 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0]]
Former-commit-id: b11df888d3
Former-commit-id: e3323febc5
2012-04-27 12:08:29 -05:00
Steve Harris
a2a6a18fae
12.4.1-4 baseline
...
Former-commit-id: 750b7543dd
[formerly 67a5a68300
] [formerly 2a216f333c
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
2012-04-18 15:18:16 -05:00
Max Schenkelberg
3e781ede4f
Issue #239 Added wireframe shape capability
...
Former-commit-id: 7900e78944
[formerly 12dcb4b044
] [formerly 5be2b4e745
[formerly f56dd661225103b08b1d51a9f0cb174bd73340eb]]
Former-commit-id: 5be2b4e745
Former-commit-id: f6a2f5e55c
2012-04-12 14:46:08 -05:00
Max Schenkelberg
3b9699d896
Issue #239 Start of remote target capabilities
...
Former-commit-id: ac1fc79f5b
[formerly 6c411ffb07
] [formerly d2d03e2c64
[formerly 30b76609cff9a737b8e4190bbfebb5a37a259fad]]
Former-commit-id: d2d03e2c64
Former-commit-id: 5d7e504e89
2012-04-03 15:11:20 -05:00
Nate Jensen
8d94771854
Issue #427 Share maps and editor
...
Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c
Former-commit-id: 37d4401747
[formerly 615962f5dd
] [formerly 0e214bcd7c
[formerly 7a58d8a17be53fc504cafe32d19de2f52121eeff]]
Former-commit-id: 0e214bcd7c
Former-commit-id: 2801c4fdfb
2012-03-22 09:39:59 -05:00
Matt Nash
82300ccdcf
Moving 12.1.1 into ss_sync
...
Former-commit-id: 580e2938d7
[formerly 66be3bec40
] [formerly c83e5ff474
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
2012-01-19 11:53:12 -06:00
root
8e80217e59
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: a02aeb236c
[formerly 9f19e3f712
] [formerly 06a8b51d6d
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
2012-01-06 08:55:05 -06:00