Steve Harris
7063a0c8d2
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: cbffccc58e
[formerly 1718a19f2d
] [formerly cbffccc58e
[formerly 1718a19f2d
] [formerly 9b6cc68601
[formerly 382363c3418b73ecd4f0ead96315a50fe859f779]]]
Former-commit-id: 9b6cc68601
Former-commit-id: 764efdb8b8
[formerly c7148da94d
]
Former-commit-id: 6964c16be7
2013-01-22 21:47:09 -06:00
Max Schenkelberg
babef87edb
Issue #1485 fixed bug in CAVE localization where a save() operation would appear to work when it actually failed due to user not being authorized.
...
Change-Id: Ib37e5be2163d750ac24827c2868162b06c290390
Former-commit-id: 8058260830
[formerly 5c51083f35
] [formerly 8058260830
[formerly 5c51083f35
] [formerly 6fd6b2e42d
[formerly 3b5af8689a2fc2a7ee783d896c624fbc5581b58a]]]
Former-commit-id: 6fd6b2e42d
Former-commit-id: 3d459dd57c
[formerly 2c05f3c179
]
Former-commit-id: 75135bf8f6
2013-01-21 14:58:16 -06:00
Bryan Kowal
89cc2bdf57
Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict.
...
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3
Former-commit-id: fba28ea69b
[formerly e2a12845d3
] [formerly fba28ea69b
[formerly e2a12845d3
] [formerly 4db9c6c321
[formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]]
Former-commit-id: 4db9c6c321
Former-commit-id: 38480e46b1
[formerly c1330e8121
]
Former-commit-id: 290167ac16
2013-01-15 14:56:01 -06:00
Max Schenkelberg
dc4876fa33
Issue #1243 Revert locking in UtilityManager.getFileChecksum to avoid lock timing out until FileLocker can be fixed
...
Change-Id: I25ab9832d725647c17aea505514334a7c0026ae7
Former-commit-id: 34c4ec44c3
[formerly 0daa22064b
] [formerly 34c4ec44c3
[formerly 0daa22064b
] [formerly 71367ef5bb
[formerly a7386c6570455fe6f9175eaeae1225923124cce8]]]
Former-commit-id: 71367ef5bb
Former-commit-id: afc4de9a1a
[formerly 102c2dbaa1
]
Former-commit-id: 755c64bfdc
2012-11-16 14:12:27 -06:00
Max Schenkelberg
eec401909b
Issue #1243 Made localization lock more intelligently to avoid files getting out of sync and causing errors.
...
Amend: Fixed LocalizationFileOutputStream so it has option to close and save file and made LocalizationFile.write so it is more clear as to
what it is doing. Made CloudHeightData and AdaptivePlotResourceData not create FileUpdateMessages.
Amend: Rebased
Change-Id: I5aff6402004f4b4d3040c8c71f5ee16dfeb33567
Former-commit-id: fe11e31bfb
[formerly dcde9e8951
] [formerly fe11e31bfb
[formerly dcde9e8951
] [formerly 28e61c8285
[formerly 85a0b9bb03887b9ef50e67a1ae3a36afd24b3a58]]]
Former-commit-id: 28e61c8285
Former-commit-id: 5aa26e4f13
[formerly 2e20c3e799
]
Former-commit-id: 429ddc7312
2012-11-14 16:19:37 -06:00
Dustin Johnson
b4a13190ad
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 efd3d3735a
[formerly 064ef82d1e
] [formerly 1dbeb22893
[formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]
Former-commit-id: 1dbeb22893
Former-commit-id: 2d1e886cf3
[formerly 4222b24d09
]
Former-commit-id: 6613c51d3b
2012-11-08 09:57:16 -06:00
Dustin Johnson
931d94d1de
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 8e69107b5a
[formerly 98d7beae50
] [formerly 31d7d09c10
[formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]
Former-commit-id: 31d7d09c10
Former-commit-id: e7a0f96a9a
[formerly bcf575966b
]
Former-commit-id: 4d9c945388
2012-11-01 13:36:06 -05:00
Max Schenkelberg
29ab00a4cb
Issue #1138 Changed LocalizationFile.protectedFile from boolean to LocalizationLevel so the protected level is specified if the file is protected. That way the file browser knows what level the file can be copied or moved to. Made speed improvements to perspective when refreshing files and consolidated different ways of doing same thing. Made all localization actions check protected level when setting if enabled or not. Added tool tip to protected files to show they are protected in view.
...
Change-Id: Id6862f29f431dd79758e39282659a670fe3a1536
Former-commit-id: 6d78afd423
[formerly 80439b309b
] [formerly 6d78afd423
[formerly 80439b309b
] [formerly 84658dd03a
[formerly 1d5b8912fe38bd21496c7b9f4ba385e27d7dedcd]]]
Former-commit-id: 84658dd03a
Former-commit-id: d2d74fac20
[formerly 20f5d966db
]
Former-commit-id: 264bc403d6
2012-09-10 10:45:37 -05:00
Bryan Kowal
96e82f60e5
Issue #708 - ensure that spring and other resources are packaged in the edex jars created by the pde build. Updated the edex pde build to handle foss dependencies correctly.
...
Former-commit-id: cb16805e7e
[formerly 95a5887b06
] [formerly cb16805e7e
[formerly 95a5887b06
] [formerly 25e20ad89c
[formerly 1afabfa6e3621f0cfda1084e95c0e5a91a313812]]]
Former-commit-id: 25e20ad89c
Former-commit-id: 5db24885ba
[formerly fd8be91fed
]
Former-commit-id: f390151c0b
2012-06-19 13:15:53 -05:00
Steve Harris
39ff9954f8
12.5.1-15 baseline
...
Former-commit-id: 8552902906
[formerly b13cbb7e00
] [formerly 8552902906
[formerly b13cbb7e00
] [formerly 3904c4ccf5
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 97c4db937e
[formerly 676ea3192f
]
Former-commit-id: 9054c5ab6c
2012-06-08 13:39:48 -05:00
Steve Harris
74b66d9683
12.4.1-4 baseline
...
Former-commit-id: 750b7543dd
[formerly 67a5a68300
] [formerly 750b7543dd
[formerly 67a5a68300
] [formerly 2a216f333c
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae
[formerly a4e519f3cd
]
Former-commit-id: 8cd5974f4c
2012-04-18 15:18:16 -05:00
Ben Steffensmeier
da7275d80b
Issue #353 add logic to syncronize times for thin client data updates..
...
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1
Former-commit-id: 56d97c95d5
[formerly 5c303ed189
] [formerly 56d97c95d5
[formerly 5c303ed189
] [formerly c61e40c426
[formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]]]
Former-commit-id: c61e40c426
Former-commit-id: 390700efb0
[formerly 84e6c9beb8
]
Former-commit-id: 588432f980
2012-02-29 15:49:47 -06:00
Matt Nash
bcc32c10bc
Moving 12.1.1 into ss_sync
...
Former-commit-id: 580e2938d7
[formerly 66be3bec40
] [formerly 580e2938d7
[formerly 66be3bec40
] [formerly c83e5ff474
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 82300ccdcf
[formerly 1faae42484
]
Former-commit-id: 21d2361f00
2012-01-19 11:53:12 -06:00
root
e2ecdcfe33
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: a02aeb236c
[formerly 9f19e3f712
] [formerly a02aeb236c
[formerly 9f19e3f712
] [formerly 06a8b51d6d
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59
[formerly 3360eb6c5f
]
Former-commit-id: 377dcd10b9
2012-01-06 08:55:05 -06:00