Bryan Kowal
fc184536e0
Issue #2133 - qpid is now a wrapped java application; incremented qpid release
...
- Amend: wes2bridge compatibility updates
- Amend: running deploy.xml in the yajsw project will now deploy it to both its EDEX and QPID destination
- Amend: fixed monitoring in qpid wrapper.conf
- Amend: no longer restart qpid when >= 90% of the heap is used
- Amend: specify maximum memory directly in wrapper.conf
Change-Id: I2e3e6881f456535bac08f51f1e541e708be20f58
Former-commit-id: 93e2de52231932480e2bf6412117e193e2de52231932480e2bf6412117e138aa7723c6f6412117e138aa7723c63c0cb232c256c7afbc0f32190c884822c2eef5eef56e42195e
2013-07-03 15:55:53 -05:00
Bryan Kowal
be2e2452b3
Issue #2164 - fix 13.6.1 wes2bridge build
...
Former-commit-id: c087e22ce2f484a47d4363345a298bc087e22ce2f484a47d4363345a298b9f632d9e2d63345a298b9f632d9e2d4076dec94a588503289a4a492c0059d262771d1b1dff626fef
2013-07-03 15:35:12 -05:00
Ben Steffensmeier
5630ec9b85
Issue #2154 Ensure all resource groups get removed from the time matcher.
...
Former-commit-id: c95b7b3fb5808941ac45a7bfd8ee28c95b7b3fb5808941ac45a7bfd8ee28519d0f3ef8a7bfd8ee28519d0f3ef8ab4bea19cc1c678fb0244b9138dc0f17c7cd473486b0a0a2c3
2013-07-03 14:42:59 -05:00
Nate Jensen
3563e5ae4d
Merge "Issue #2145 Changes to RangeRingDialog so it doesn't double the movable range rings when a point is modified." into development
...
Former-commit-id: 22ee16a803d883392d05f13bd6391a22ee16a803d883392d05f13bd6391a6465fb58adf13bd6391a6465fb58adaa6f46efd60cb178f8356a9b54cd4e29f4bf22a33f990ebc8a
2013-07-03 13:32:49 -05:00
Greg Armendariz
de6e453ebd
Merge "Issue #2142 attempt to fix build" into development
...
Former-commit-id: 425f676b5a7f6ae6bca440d7855af0425f676b5a7f6ae6bca440d7855af027ba2d1d3c40d7855af027ba2d1d3cb727fab06da695123c7d3360d5f0b2a4a653221dc5473d9dca
2013-07-03 13:23:05 -05:00
Nate Jensen
7370ec316d
Merge "Issue #2159 Synchronize TimeCache access in D2DTimeMatcher. Change-Id: I9116ced28775294385ea9ea92a1e63bf2fefff55" into development
...
Former-commit-id: 3bb2890812b7ddbeed41d4261fcc453bb2890812b7ddbeed41d4261fcc456b93db235fd4261fcc456b93db235f671a9a81efb6880001758793ca3101f732b4ccbb5e7b468622
2013-07-03 13:10:39 -05:00
Nate Jensen
23a02c5519
Issue #2142 attempt to fix build
...
Change-Id: I465de277a20aa354731e45abbb685e108cdb4377
Former-commit-id: abb3ff9cecd5d5c5e6741fb11fbdf7abb3ff9cecd5d5c5e6741fb11fbdf747520c7b301fb11fbdf747520c7b30f7920f833c1bd4d15d7a577292d8d52286c25c5128ae926f33
2013-07-03 13:05:57 -05:00
Ben Steffensmeier
51559078de
Issue #2159 Synchronize TimeCache access in D2DTimeMatcher.
...
Change-Id: I9116ced28775294385ea9ea92a1e63bf2fefff55
Former-commit-id: af51ecc7c92d8e1e5e6ca868d3d0b5af51ecc7c92d8e1e5e6ca868d3d0b553d969d0dba868d3d0b553d969d0db679ef95297b18f4bbe89dde0846fc36804d5f9b3e7443b5ef6
2013-07-03 12:44:45 -05:00
Bryan Kowal
7826d2a96d
Issue #2164 - fix 13.6.1 build
...
Change-Id: I9f4e29f8f19abf7700baad125617054c8a561ff3
Former-commit-id: 970eaad44734efd01a4fc2b54d7c31970eaad44734efd01a4fc2b54d7c311c49dff18ec2b54d7c311c49dff18eb94334199ec9fa2750890787aca88b5c14f56265ca7f9097f6
2013-07-03 11:25:46 -05:00
Greg Armendariz
5e1549062b
13.5.1-5 baseline
...
Former-commit-id: ed9da994c782aabf1066492f92ef7bed9da994c782aabf1066492f92ef7bea7ac37930492f92ef7bea7ac37930d5bea0fc06d899faec3d869922cb82dc881f4ed813ac0b1062
2013-07-03 12:20:27 -04:00
Nate Jensen
95cd15b40b
Merge "Issue #2122 Committing Geostationary projection for GOES-R fixed grid as well as cleanup to SatResource code." into development
...
Former-commit-id: 7b6481ba36ae004c8c777bd12afa027b6481ba36ae004c8c777bd12afa02679bf314e07bd12afa02679bf314e0614cdb58a87bb4d66cbfc8d221b46c64a7f0d148d97721eda9
2013-07-03 09:37:05 -05:00
Roger Ferrel
25ebc33066
Issue #2145 Changes to RangeRingDialog so it doesn't double the movable range rings when a point is modified.
...
Change-Id: I229ce3e40769961c9c1b296c7c42d919a21cfd0b
Former-commit-id: 8cab528dc8ebb76daf14fab96d28f28cab528dc8ebb76daf14fab96d28f2752933c7fefab96d28f2752933c7fe2f5994b297477d8b03173c24739b720fb0ff7a5a9f8b831148
2013-07-02 17:27:22 -05:00
Bryan Kowal
36e343f8ab
Issue #2153 - 13.5.1 build update
...
Change-Id: Ia57fe9a6ae3f31826eec1eede1c2b46c5c4fae05
Former-commit-id: 4dfb37f2df2e467481566a6cdd7f6d4dfb37f2df2e467481566a6cdd7f6ddc177c90d16a6cdd7f6ddc177c90d1ba832ceb8a94ecc8119c6bbe51aca9a89ff261d0c0905c536e
2013-07-02 16:12:06 -05:00
Mike Duff
c14c159f24
Issue #2132 - review comments
...
Change-Id: I65b880b5f96471b6f8e0f5ae89ee3981a96a1094
Former-commit-id: 876960a2cb57d37e97614399429e74876960a2cb57d37e97614399429e742618c1a4e44399429e742618c1a4e4a48d17ef7e617abbd8f182d713083a3e20961fe0c1abe64b72
2013-07-02 16:08:37 -05:00
Max Schenkelberg
5bc6ca2784
Issue #2122 Committing Geostationary projection for GOES-R fixed grid as well as cleanup to SatResource code.
...
Amend: Fixed comment
Change-Id: I384a3fac3ad6e3ee8b4efd17246a26a1c4476c63
Former-commit-id: fa03e3f2efbc91a9f6de9709b0500afa03e3f2efbc91a9f6de9709b0500afef60565199709b0500afef6056519358ad2892763d69a5435dc78010e741e7b73c44e738d6bcae8
2013-07-02 15:22:31 -05:00
Mike Duff
1f44740b1a
Issue #2160 - Fix for MPE display 7x7 dialog, field changes
...
Change-Id: Ib428d1aab246863bfdbbb271d27a4687197a3ebe
Former-commit-id: d82c72b52bcc4ac57b22655d9eb928d82c72b52bcc4ac57b22655d9eb9285b676b122d655d9eb9285b676b122dd09183f6d770d25a48ddd87b4bceb5c07d8ef10dafedebecd4
2013-07-02 12:31:10 -05:00
Roger Ferrel
9eb3cffa65
Issue #1964 clean up of features and manifest.
...
Change-Id: Ie2fc8ce45853499d80863ab83ba6a60b76444548
Former-commit-id: 559a54ea8f3c31d8c2ac41c46e14c0559a54ea8f3c31d8c2ac41c46e14c07d3362d2b541c46e14c07d3362d2b556b1a0713cb3437266d7201e62a4adea00a52ebe1d3ee09895
2013-07-02 11:14:56 -05:00
Nate Jensen
42a50bee52
Merge "Issue #2139 Loaded maps at cave start up." into omaha_13.5.1
...
Former-commit-id: 4918ff844fc68cf47883e4955f094c4918ff844fc68cf47883e4955f094c01efa33cb9e4955f094c01efa33cb95784cf98aa058e47192a150203f5ccd288dded446c95177bdf
2013-07-02 11:07:59 -05:00
Jonathan Sanchez
596ffc3b12
Issue #2139 Loaded maps at cave start up.
...
Change-Id: If7d1e801190a2215c6043b81b4beb70e09ba9ee1
Former-commit-id: bbd2a9e5ab58fcc4c896a2328f0e06bbd2a9e5ab58fcc4c896a2328f0e06de24b8b431a2328f0e06de24b8b431767a7dd7d9ab2e2f9a174e1b0674e45431e5915d28849d2a53
2013-07-02 11:04:26 -05:00
Richard Peter
4423b133b1
Merge "Issue #2130 - Fix ordering of columns in Subsciption Manager Dialog" into development
...
Former-commit-id: 2764b2edf4f12b08401f37042f0b2a2764b2edf4f12b08401f37042f0b2aa3bd7b3e9c37042f0b2aa3bd7b3e9c45070c3a98aef289d2878e15d6aa0af916bba7ad06ed1bc66c
2013-07-02 10:30:51 -05:00
Roger Ferrel
d19356f2f7
Issue #1964 Changed com.raytheon.uf.viz.archive include files needed in the binary build.
...
Change-Id: Id5f135c25333d6906178f76782f2b370546863b9
Former-commit-id: 50d0a7430582b1712714c3ebc0cc1c50d0a7430582b1712714c3ebc0cc1c68be9bd65fc3ebc0cc1c68be9bd65f4983001f68ff84f293fd933009605a68c22b70735eee41410c
2013-07-01 15:45:14 -05:00
Nate Jensen
4f6c84f9bb
Issue #2142 initial cutover from log4j to SLF4J and logback
...
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895
Former-commit-id: 338b0ae310a4de603bcf316d6c09c6338b0ae310a4de603bcf316d6c09c6db6152e524316d6c09c6db6152e524cce5d8e8ff5a6b0f99cc6da64f329cefcf0c851986b096bc9b
2013-07-01 14:41:05 -05:00
Roger Ferrel
019989f5ee
Issue #2088 Made FcstPointGroupDlg, FloodReportDlg, HydroBaseDlg and StationFilterOptionsDlg non-blocking.
...
Change-Id: I44d41a5e3e4e00d924df190e253ae2568988d987
Former-commit-id: 289011dc921c3c9e461b1e7ae55676289011dc921c3c9e461b1e7ae55676220818df3a1e7ae55676220818df3a97d130d022ee5b1209293cabedbd45ac04c66be2d52ab020d1
2013-07-01 13:03:39 -05:00
Mike Duff
6a3af47bd8
Issue #2130 - Fix ordering of columns in Subsciption Manager Dialog
...
Change-Id: I97ce5323002d6c1ae230c446de9837e541e02c86
Former-commit-id: 44e60899d33fed839344cd511c1a0c44e60899d33fed839344cd511c1a0c5c7fd77f98cd511c1a0c5c7fd77f9893bbabda662250983ad8053082cb800f4b98626b9eb197d124
2013-07-01 11:53:07 -05:00
Nate Jensen
dbd11273bf
Merge "Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen."" into omaha_13.5.1
...
Former-commit-id: 5b1d7fe401b23dcab913f7e743f3885b1d7fe401b23dcab913f7e743f388001fba449ff7e743f388001fba449fc4edde79f547d34419300cb972655457d1375eed89f8162e2b
2013-07-01 11:29:47 -05:00
Bryan Kowal
0a131779fb
Issue #2153 - fix merge issue for build
...
Former-commit-id: eea749f828756fb4be59f052982f8eeea749f828756fb4be59f052982f8e9c1aaa2bf5f052982f8e9c1aaa2bf51862ecd1a408bb604ced37a5eb6c69e6516def2a29f21e56ee
2013-07-01 10:52:29 -05:00
Jonathan Sanchez
9ab3a75c3b
Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen."
...
This reverts commit b046ea220c79e69eec32fa15fca28a84b3cf419c [formerly e4c0188c142d4a32ca64ab8acf06e181aad09d062d4a32ca64ab8acf06e181aad09d06e4c0188c1481aad09d06772bf31dd070ab67c3e5c883b4e636772bf31dd070ab67c3e5c883b4e6367f74926bb4c883b4e6367f74926bb45794a0bc3ffa0887429d41e94abee3a08032627c23fe9db31b
2013-07-01 10:40:48 -05:00
Richard Peter
8396898d25
Merge branch 'omaha_13.5.1' (13.5.1-4) into development
...
Conflicts:
edexOsgi/build.edex/build.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
Former-commit-id: 2368697938edeb3e255b162261c3952368697938edeb3e255b162261c39576bc31aa77162261c39576bc31aa775bcfa6048df8213c16bdd3017ca60f3d6754337acca3d4c19b
2013-07-01 00:04:43 -05:00
Richard Peter
6434a4025d
Merge branch 'master_13.5.1' (13.5.1-4) into omaha_13.5.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive.feature/feature.xml
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveTableComp.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java
edexOsgi/com.raytheon.uf.common.archive/build.properties
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/CategoryConfig.java
edexOsgi/com.raytheon.uf.edex.archive/res/spring/archivepurger-spring.xml
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/purge/ArchivePurger.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
tests/unit/com/raytheon/uf/common/archive/ArchiveConfigManagerTest.java
Former-commit-id: 4ee66ab1f0da54766cc853258be7974ee66ab1f0da54766cc853258be797582f38bdd453258be797582f38bdd40da7509e6d69f88079631757da59ee7ceb1bb9abda3eb1e75c
2013-06-30 23:46:32 -05:00
Brad Gonzales
7c8f8a018c
Issue #1965 added edex archive to the build.edex build.xml.
...
Change-Id: I27973b5f824e03f9bdbe5f485e8c35291db3fd3b
Former-commit-id: f95cf443d52d1c6a0ec5ba661b9e39f95cf443d52d1c6a0ec5ba661b9e39add108398aba661b9e39add108398afb8caf6e22bc766efb7a5c9ce05ce3c4daf04c32245de9c408
2013-06-28 13:25:46 -05:00
Steve Harris
9f5469bc6e
13.5.1-4 baseline
...
Former-commit-id: 2487a8b435c56be8a33270e4ff30a62487a8b435c56be8a33270e4ff30a6e197f23ce370e4ff30a6e197f23ce343bb696901640b022e84f658320357c183e08922c05a6c8b50
2013-06-28 09:46:25 -04:00
Brad Gonzales
8e22010180
Issue #1965 Added null check for topLevelDirs in purgeExpiredFromArchive.
...
Amend: Added archive feature to the viz product build.
Added archive feature to the viz developer product.
Change-Id: I49a9e2245236a81e72d66b08cf9af251cadd1f07
Former-commit-id: aca148680165507d4424c28d1e5d4daca148680165507d4424c28d1e5d4df4bb78381cc28d1e5d4df4bb78381c1c6ca609196e99019a25d842d8d9d0f51c74e2d433dc495040
2013-06-27 17:40:07 -05:00
Brad Gonzales
d706ff2334
Issue #1965 added File filtering by file date extension in archive purge.
...
Amend: updated purge cron time to once every hour.
moved archive.purge.cron to cron.properties.
removed purge code from DataArchiver.
added back isHoursToKeep in DataArchiver.
updated CategoryFileDateHelper for CategoryConfig dirPattern lists.
updates from peer review.
updated test cases to work with Roger's refactoring.
fixes for ArchiveConfigManager createArchive.
clean up of ArchiveConfigManager purgeFile.
Change-Id: I096c2a103211caab7b7ec00f18111077cfe3e519
Former-commit-id: 90f363d72267b4a2e202137c66539e90f363d72267b4a2e202137c66539e276f05233f137c66539e276f05233fdf7670676bd6fb3150964f54596904d047e6a1379a5c3e259d
2013-06-27 11:46:44 -05:00
Dave Hladky
9d07cc7cbe
Issue #2096 First steps to getting CAVE to display MADIS data
...
Change-Id: I68925eef139c31e751bcb47f05f05cfd83b380b9
Former-commit-id: d5990cacc0083dff9e43f5d3a5f012d5990cacc0083dff9e43f5d3a5f012ee50b5c7bef5d3a5f012ee50b5c7be9637e9c42708a81cdaaf2b90920d8f2a57eea47f1b6421d4c3
2013-06-27 11:07:27 -05:00
Roger Ferrel
667104c43e
Issue #1966 Fix race conditiona and delay in populating GUIs combo/spinner entries also minor code clean up.
...
Change-Id: I4df5a5e4b1fb1e868ce9e8914116c2ae67c029c3
Former-commit-id: 713f39c4296f07f6f3bdee409c0819713f39c4296f07f6f3bdee409c0819f66681f62bee409c0819f66681f62b79c0bbb1405f35643c2d45dcfe3ad8bec6928ea96261e65829
2013-06-27 07:51:56 -05:00
Dave Hladky
f258e1e91d
Issue #2146 Deleted uneeded jars from crawl4j plugin
...
Change-Id: I52581c7c5ffb085f3cef1b05f7347dcf02bc2a01
Former-commit-id: 9f621ed6f62eded94be4d92e039e729f621ed6f62eded94be4d92e039e72d298749486d92e039e72d29874948607227d8a4de8ac45c21f00ed2353adecf284956611c6036301
2013-06-26 14:59:22 -05:00
Richard Peter
fa3b24f01c
Merge "Issue #1869 Fix plot sampling. Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b" into omaha_13.5.1
...
Former-commit-id: 45956fdcaae3886246fd3a3dc3d20845956fdcaae3886246fd3a3dc3d20867d052307c3a3dc3d20867d052307c59789a38851b00dd48ec208b01a167575405b14e2952f2b56d
2013-06-26 13:25:39 -05:00
Ben Steffensmeier
5c0ec55d70
Issue #1869 Fix plot sampling.
...
Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b
Former-commit-id: 9e23a71d84570da6f0d58c14a34f469e23a71d84570da6f0d58c14a34f466db28c32a58c14a34f466db28c32a59906f30ff02ce266f7e7f26a72afe90d2f5561446cb77b1793
2013-06-26 13:24:13 -05:00
Nate Jensen
108c9173d2
Merge "Issue #2139 Run async job for loading maps in warngen." into omaha_13.5.1
...
Former-commit-id: 9282a3be3b8cc7eefd84a60afe66409282a3be3b8cc7eefd84a60afe664010baafed63a60afe664010baafed63a56dc79f879374463bac214fd8689cb4c6a79741586cb967aa
2013-06-26 11:14:03 -05:00
Richard Peter
d78167643e
Merge "Issue #2144 Switched hibernate to Post GIS config" into development
...
Former-commit-id: 6bd546714cb616339f1d8a9feffa826bd546714cb616339f1d8a9feffa82ad91edf3de8a9feffa82ad91edf3de350804e7f48c968f2120dedc9ecda046ef5c884a18e49d732b
2013-06-25 18:22:09 -05:00
Jonathan Sanchez
bac226cd75
Issue #2139 Run async job for loading maps in warngen.
...
Change-Id: I9df6c9f2a730a4c7fe4e64fabac00be96a673e7a
Former-commit-id: 2d4a32ca64ab8acf06e181aad09d062d4a32ca64ab8acf06e181aad09d06e4c0188c1481aad09d06e4c0188c147ed0d5d135d1b63b5a2547505aa013c4ce4831c2acad56f72b
2013-06-25 15:29:08 -05:00
Roger Ferrel
2033689544
Issue #1966 Initial Base configuration files for Dale Morris to test.
...
Change-Id: I764b440aed1568e59cada95f0d6938c90bedc2f1
Former-commit-id: 89d4d0e00f1e5d68fa1b2cfff5c56389d4d0e00f1e5d68fa1b2cfff5c563c10f5c8d652cfff5c563c10f5c8d654b10182a2e318de198e5ee52f0281cb681d073463419cbaddd
2013-06-25 13:44:30 -05:00
Dave Hladky
a6a2bd029f
Issue #2144 Switched hibernate to Post GIS config
...
Change-Id: I9393b60fbc2a8880c588f707758a84cebf909725
Former-commit-id: 22c8646d12b4e41b137d5aee30a47322c8646d12b4e41b137d5aee30a473fe5cde7afd5aee30a473fe5cde7afd1c84be15f034400e34c7671b6ee566c038109d5d7dda985dd1
2013-06-25 13:31:37 -05:00
Dustin Johnson
c9b74d06a1
Issue #2106 Fix transactional semantics
...
- No longer continuously suspend/resume transactions caused by invoking static methods
- Mark registry top-level query/store classes as requiring existing transactions
- Invoke registry initialized listeners in their own transaction
- Data changes denoted by registry events are now visible when the transaction commits
Change-Id: Ic78cbf00afc93aa5fcf1357000ea6c8b5e32cea9
Former-commit-id: fe8c0b47d15bfef9bb45fac7d3a9d9fe8c0b47d15bfef9bb45fac7d3a9d969c09e530ffac7d3a9d969c09e530f84ecc6dec4da1ad3c8a0f67d02a394c2ed1495ad9b42432838
2013-06-25 08:33:55 -05:00
Richard Peter
f6e6c3c531
Merge branch 'omaha_13.5.1' (omaha_13.5.1-3) into development
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
Change-Id: Idbf62886d6dbb4a4feeedb6ac17e8978cad2d59c
Former-commit-id: cf29af8d65ad353c34f9d262c02612cf29af8d65ad353c34f9d262c02612b007d4a302d262c02612b007d4a302bf6e4c1f71e03283ad4aaf1099b3fb8f49eea08fed15c2edcc
2013-06-24 18:51:56 -05:00
Richard Peter
7ef16a186e
Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
rpms/build/i386/build.sh
Change-Id: Ibfe5a34eb60b655ffd8d5f0a7a794648f778eb24
Former-commit-id: f47f42e31e0fa3bf800d744eb64856f47f42e31e0fa3bf800d744eb6485637645245e5744eb6485637645245e546ee2f5dd7be094a1745a7594f8c934b582fef509acddf6eeb
2013-06-24 18:36:15 -05:00
Ron Anderson
9cfaeb51e2
Issue #2122 Fix the build
...
Change-Id: I28e57ea57e1dc70beaf538586d27f2f83b5cdf2a
Former-commit-id: 74750fa37bce42bdead7f75554f1f774750fa37bce42bdead7f75554f1f7f06a8baf2df75554f1f7f06a8baf2d384984d8a8eedb35faed6740c9e40f740542cd56d7d227a83a
2013-06-24 18:03:52 -05:00
Richard Peter
a39da3996e
Merge "Issue #2126 - updated for Java 7 compatibility; compatible with both Java 6 and Java 7" into development
...
Former-commit-id: 8aee8dc9b3a67d1906125f85aefff68aee8dc9b3a67d1906125f85aefff6a19a946a245f85aefff6a19a946a24331f7d8c7dfdad3e08b78481dd6bcef55e67c3ad65d1bed2a8
2013-06-24 17:20:10 -05:00
Max Schenkelberg
815ab796b9
Issue #2122 Refactored satellite to use tile set renderable. Deleted old code
...
Amend: Added fix for issue 2103
Amend: Added software history
Change-Id: I1e09bcbf28aaffbf602431a09af50da447e4cf2b
Former-commit-id: 78c0e1684eb4c0d1f71547b55981c878c0e1684eb4c0d1f71547b55981c82f03c38ca047b55981c82f03c38ca06b4982e8a3c912e8e6c5bc4ebb4f0820caab72f9539bbe2cb5
2013-06-24 15:48:37 -05:00
Bryan Kowal
bf4e603d16
Issue #2126 - updated for Java 7 compatibility; compatible with both Java 6 and Java 7
...
Former-commit-id: 03366c8be32b8984c4455b85217ca203366c8be32b8984c4455b85217ca2cd2af684ca5b85217ca2cd2af684cae74d5231f4a56679fa2a7ebee00dc96cff1f63bbc525056059
2013-06-24 14:08:47 -05:00
