xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2226 commits 31 branches 40 tags 3.8 GiB
Commit graph

32 commits

Author SHA1 Message Date
Steve Harris
e2496455b2 Merge branch 'omaha_13.3.1' into development 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: 67b25fa95817acafd25818c825656236597b6e09
 2013-03-20 16:09:26 -05:00
Steve Harris
fa15f03e1b Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: c789962e3ddb094ca93415864e9f1b8ed0619ba4
 2013-03-20 16:06:20 -05:00
Steve Harris
073687d9a9 13.3.1-10 baseline 
Former-commit-id: b48761e6f964bc7448439c1b69f85d75593ef90d
 2013-03-20 15:53:01 -05:00
Steve Harris
b8f0635ad6 Merge branch 'omaha_13.3.1' into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40
 2013-03-18 16:52:00 -05:00
Steve Harris
1a999fee5a Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1 
Conflicts (just history comments):
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java


Former-commit-id: 5927ff20543395733d9302eba2e6772315730a80
 2013-03-18 16:43:22 -05:00
Steve Harris
f97d78994b 13.3.1-8 baseline 
Former-commit-id: 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6
 2013-03-18 15:43:32 -05:00
Dustin Johnson
ecb0d2c826 Issue #1794 Consolidate common filename filters into FilenameFilters class 
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36

Former-commit-id: 0e4c9f6ef22bf59f18ce3aab6539c52192539106
 2013-03-15 11:51:58 -05:00
Ben Steffensmeier
f46686a6e2 Issue #1532 Delete uf.common.image and clean up the mess it left behind. 
Former-commit-id: 7c24d10acae9dee7ec03edd471983e0b80d58092
 2013-02-28 17:00:56 -06:00
Max Schenkelberg
0f1112fb3e Issue #1638 Removed dependency of pointdata in edex.common and uf.common.spatial in uf.edex.database. 
Change-Id: I87419a6d70e1a4c58e985fffa54d1fd19471bc79

Former-commit-id: bd68a2e47f8c54d6e06e19ce3e29259c07926b8a
 2013-02-27 12:26:32 -06:00
Max Schenkelberg
4ed4ef8d71 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: 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b
 2013-02-27 11:50:38 -06:00
Ron Anderson
a2a89fb4e7 Issue #1608 Fixed group deletes in H5pyDataStore.py 
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a

Former-commit-id: dc9ac54903107224633b4e18d5caa345649d8266
 2013-02-15 09:03:41 -06:00
Steve Harris
83e9157df7 13.2.1-2 baseline 
Former-commit-id: bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf
 2013-01-23 11:18:44 -05:00
Bryan Kowal
e2a12845d3 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: ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30
 2013-01-15 14:56:01 -06:00
Steve Harris
c0c1d56f3a 13.1.2-2 baseline 
Former-commit-id: 221d0aaf0e19a054387134e72a76a278159bf4d0
 2013-01-06 14:32:24 -06:00
Dave Hladky
0b250b2483 Issue #1372 Make Ingest DAT log stats. 
Change-Id: Icf9914a53ea384fe51c28c995b8834dfa9071612

Former-commit-id: 38cd4be2fa86df03580dc87824e7270066de298a
 2012-11-30 16:03:10 -06:00
Ben Steffensmeier
7226decbe2 Issue #189 clean up unneeded references to grib. 
Former-commit-id: b25e86c8f369297b8e21efe7cdc0a9874c0cc470
 2012-11-19 13:33:02 -06:00
Benjamin Phillippe
5bf46d468d Issue #1335 Fixed EHCache warnings. Changes to necessary config files 
Change-Id: Ib6ad30965f32a046a1414bdfb534ec44ed875ce8

Former-commit-id: 6bb4fb29b5dd8e30a19ec63412fbd05348bd87a0
 2012-11-15 13:35:25 -06:00
Max Schenkelberg
dcde9e8951 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: 85a0b9bb03887b9ef50e67a1ae3a36afd24b3a58
 2012-11-14 16:19:37 -06:00
Dustin Johnson
7d9e7567bd Issue #1322 Common baseline changes to support BandwidthManager 
Amend:
  Revert EDEXLocalizationAdapter and duplicate getPath() in test version.

Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8

Former-commit-id: 07aeec469a83ce07286bc27ea3e6bda41909be8d
 2012-11-14 12:19:10 -06:00
Max Schenkelberg
2f90120248 Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration. 
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345

Former-commit-id: a9c7374d162296c170f7c1b80e1fb2978b854cfd
 2012-11-07 10:44:42 -06:00
Dustin Johnson
98d7beae50 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: 89583d97c8823818f87dc1a234078d85ba7bea4a
 2012-11-01 13:36:06 -05:00
Steven Harris
618aa3f316 12.11.1-1 baseline 
Former-commit-id: 765055b5332ddace3cec2d07e279652de869cfe4
 2012-09-27 15:57:45 -05:00
Max Schenkelberg
fffe220e05 Issue #1138 Added null check to base ProtectedFile object since will be null when called recursively first time when constructing the base object. Organized static functions together from member functions. 
Change-Id: I5dbef82932c9dc8623061361fad64fd0e8706546

Former-commit-id: edbff1f2b607d53e8247155a5526a7c21e40ac71
 2012-09-11 14:04:14 -05:00
Max Schenkelberg
80439b309b 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: 1d5b8912fe38bd21496c7b9f4ba385e27d7dedcd
 2012-09-10 10:45:37 -05:00
Steve Harris
2c0ff851ca 12.6.1-9 baseline 
Former-commit-id: 8f93efb93ec2d244fe599c16b3af5b33784c0232
 2012-07-10 07:53:49 -05:00
Steve Harris
b4b1f6975f Revert "12.6.1-10 baseline" 
This reverts commit ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1].


Former-commit-id: 8cdb21fda317373a0dc95e5048716d0e31412ab4
 2012-06-21 08:51:08 -05:00
Steve Harris
ddde63eee0 12.6.1-10 baseline 
Former-commit-id: 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1
 2012-06-21 08:38:48 -05:00
Steve Harris
c99afab05f 12.6.1-5 baseline 
Former-commit-id: 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb
 2012-06-11 16:23:47 -05:00
Steve Harris
67a5a68300 12.4.1-4 baseline 
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
 2012-04-18 15:18:16 -05:00
Ben Steffensmeier
100b4c4ba0 Issue #176 remove id from dataURI notifications 
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58

Former-commit-id: 32b8f723ebf64d97636705911c0b7b22a9cd2148
 2012-02-14 12:59:42 -06:00
Matt Nash
66be3bec40 Moving 12.1.1 into ss_sync 
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
 2012-01-19 11:53:12 -06:00
root
9f19e3f712 Initial revision of AWIPS2 11.9.0-7p5 
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
 2012-01-06 08:55:05 -06:00