Bryan Kowal
105951f556
Issue #1739 - remove reference to non-existent junit version
...
Change-Id: If4f8825df05442173cbc537cdedb519dd382cf78
Former-commit-id: 29e157d94e
[formerly 5138fe5537
] [formerly 29e157d94e
[formerly 5138fe5537
] [formerly 44215e65e9
[formerly f4249d163f057560504b5cbc3745b7ae4b36f28c]]]
Former-commit-id: 44215e65e9
Former-commit-id: 0be2bc1f80
[formerly a2e3556f7e
]
Former-commit-id: e61e84fd6b
2013-03-01 10:26:25 -06:00
Max Schenkelberg
727602f011
Issue #1638 Removed dependency of pointdata in edex.common and uf.common.spatial in uf.edex.database.
...
Change-Id: I87419a6d70e1a4c58e985fffa54d1fd19471bc79
Former-commit-id: c8a5f1a007
[formerly 0f1112fb3e
] [formerly c8a5f1a007
[formerly 0f1112fb3e
] [formerly 38bba3705f
[formerly bd68a2e47f8c54d6e06e19ce3e29259c07926b8a]]]
Former-commit-id: 38bba3705f
Former-commit-id: 41706c42f2
[formerly 6ebc058df4
]
Former-commit-id: 22a18ffe01
2013-02-27 12:26:32 -06:00
Steve Harris
9db68d0585
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 0a4564eb97
[formerly 67f090638f
] [formerly 0a4564eb97
[formerly 67f090638f
] [formerly 6ec9e73035
[formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]]
Former-commit-id: 6ec9e73035
Former-commit-id: e46625f8f2
[formerly 0051276ad1
]
Former-commit-id: 140ae3191c
2013-02-25 15:58:48 -06:00
Steve Harris
b5d9e75b95
Merge branch 'development' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
Former-commit-id: 64744fdb19
[formerly a0573644c4
] [formerly 64744fdb19
[formerly a0573644c4
] [formerly 2641d578e2
[formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4f155a183a
[formerly 33dd2589f1
]
Former-commit-id: f3c3191a1c
2013-02-21 15:41:39 -06:00
Bryan Kowal
b88a24574b
Issue #1634 - replaced tanuki java service wrapper with yet another java service wrapper
...
- disabled the startup of the admin web application in the jetty container
- removed configuration and libraries specific to the tanuki java service wrapper
- updated the rpm build and developer deployment
- added jetty-util-6.1.26.jar to resolve a dependency on org.mortbay.log...
Former-commit-id: 519ce2c0fb
[formerly a8fb04f41c
] [formerly 519ce2c0fb
[formerly a8fb04f41c
] [formerly 803397c7c7
[formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]]
Former-commit-id: 803397c7c7
Former-commit-id: b2a0a7c148
[formerly 450e8e7a4c
]
Former-commit-id: 2a21f2624b
2013-02-21 13:55:28 -06:00
Steve Harris
8c828dbd75
13.3.1-1 baseline
...
Former-commit-id: 8ae397085e
[formerly 71e8990021
] [formerly 8ae397085e
[formerly 71e8990021
] [formerly d2a654625f
[formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: e4435815c9
[formerly 46d28be4a4
]
Former-commit-id: b3b56830b0
2013-02-20 16:19:40 -06:00
Ron Anderson
80df624bb3
Issue #1608 Fixed group deletes in H5pyDataStore.py
...
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a
Former-commit-id: dc7c9edb87
[formerly a2a89fb4e7
] [formerly dc7c9edb87
[formerly a2a89fb4e7
] [formerly 7c0a5d74bf
[formerly dc9ac54903107224633b4e18d5caa345649d8266]]]
Former-commit-id: 7c0a5d74bf
Former-commit-id: d69d628450
[formerly e952a4f179
]
Former-commit-id: 45627edcc7
2013-02-15 09:03:41 -06:00
Dustin Johnson
691e6d788e
Issue #1543 Clean up test files after changing to Spring transactions
...
Change-Id: I83199fd60f0e84c4b6e7b9b400d9f7cafbc2c680
Former-commit-id: 651c6d55c1
[formerly 4bcd75c091
] [formerly 651c6d55c1
[formerly 4bcd75c091
] [formerly 19fd95d2c8
[formerly e7e146c79b11d33ad6755acdeb11f58fa789b4c6]]]
Former-commit-id: 19fd95d2c8
Former-commit-id: 4a10957512
[formerly b4367903b0
]
Former-commit-id: 084f5b7fdf
2013-02-12 11:59:45 -06:00
Dustin Johnson
35b13ba973
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 0d548bd66f
[formerly 8307af022c
] [formerly ef32853dc1
[formerly bb9ab0ceb479a8c6a727b9764433edb70eec31f1]]]
Former-commit-id: ef32853dc1
Former-commit-id: 73a5667256
[formerly e504a474f9
]
Former-commit-id: e48bf48821
2013-02-11 14:21:57 -06:00
Steve Harris
dc55ef579a
13.2.1-6 baseline
...
Former-commit-id: d66ad2f77b
[formerly d0752de66c
] [formerly d66ad2f77b
[formerly d0752de66c
] [formerly a46e33f06e
[formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]
Former-commit-id: a46e33f06e
Former-commit-id: bbe92e6824
[formerly 30d38334cc
]
Former-commit-id: 0c128dd8f0
2013-02-07 16:00:39 -06:00
Dustin Johnson
547362b6bb
Issue #1543 Add ability to save/read dods files back to net.dods
...
Change-Id: Icca189f4c3716d4045798d88a6e6ce7d27d46fcf
Former-commit-id: efe1bcc4b5
[formerly cd381cb819
] [formerly efe1bcc4b5
[formerly cd381cb819
] [formerly febe492056
[formerly d93464273e905ecbb834d7aeaccf477b42e495a3]]]
Former-commit-id: febe492056
Former-commit-id: c81cb3d60b
[formerly fffbb32775
]
Former-commit-id: 999f3cbcd5
2013-02-05 14:07:30 -06:00
Steve Harris
2779f5c6d9
13.2.1-2 baseline
...
Former-commit-id: 33bc5fd816
[formerly 83e9157df7
] [formerly 33bc5fd816
[formerly 83e9157df7
] [formerly 328c6dccad
[formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: d9be4dce21
[formerly 47cc08ac79
]
Former-commit-id: 547c1dedd1
2013-01-23 11:18:44 -05:00
Dustin Johnson
7da688f138
Issue #1441 Create new datadelivery services plugin
...
Add GroupDefinition service.
Update subscriptions to not have a group name when their group is deleted.
Amend:
Rebase to HEAD of 13.2.1.
Change-Id: I817ca1912f76ccf347907ddb12e3f6fd8de7e5aa
Former-commit-id: 3ec05a5a9c
[formerly 557de162b0
] [formerly 3ec05a5a9c
[formerly 557de162b0
] [formerly 15c2c55ff9
[formerly 464b46dd4f4af60dbeb917f65c18c876d712e4ad]]]
Former-commit-id: 15c2c55ff9
Former-commit-id: 756080321e
[formerly a3c99f86bb
]
Former-commit-id: 2168713505
2013-01-22 11:45:18 -06:00
Dustin Johnson
24d1f60c83
Issue #1441 Break net.dods dependency on AWIPS code
...
Change-Id: I13289bff3f3ea80317a858f8a32cc280b1ac0480
Former-commit-id: 3ebe0cf1ca
[formerly ddcc816bba
] [formerly 3ebe0cf1ca
[formerly ddcc816bba
] [formerly c00f5f394a
[formerly 010eabebb27f6a2571ffb2a09e1715cb84c57ce9]]]
Former-commit-id: c00f5f394a
Former-commit-id: 59a209e77d
[formerly c29d2e2e71
]
Former-commit-id: 4aa7257146
2013-01-10 12:06:39 -06:00
Richard Peter
398b47967d
Issue #1408 : Merge 13.1.2-6 into development
...
Former-commit-id: d0a6ba23e5
[formerly 029ebaa63a
] [formerly d0a6ba23e5
[formerly 029ebaa63a
] [formerly 328be6ac2b
[formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 80bf1d7a28
[formerly 6a5a0d7d09
]
Former-commit-id: 709af3b25e
2013-01-09 17:55:05 -06:00
Bryan Kowal
1996f92f7e
Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
...
Former-commit-id: ab8b346489
[formerly c8a43edd9e
] [formerly ab8b346489
[formerly c8a43edd9e
] [formerly d6b4cb65f4
[formerly b535a90fb25287945485c10b3c85749c11285171]]]
Former-commit-id: d6b4cb65f4
Former-commit-id: 6d7f57c62a
[formerly 146c43a606
]
Former-commit-id: 0136f9d5a3
2013-01-07 12:16:01 -06:00
Steve Harris
b7f180d9d3
13.1.2-6 baseline
...
Former-commit-id: efd3392abe
[formerly 8e5f9e0e6c
] [formerly efd3392abe
[formerly 8e5f9e0e6c
] [formerly 59969775ad
[formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: 82a1ed77a4
[formerly dbcae57f57
]
Former-commit-id: 05bdc0ecd2
2013-01-06 14:55:11 -06:00
Steve Harris
f52ec0b0a0
13.1.2-2 baseline
...
Former-commit-id: 51208e5515
[formerly c0c1d56f3a
] [formerly 51208e5515
[formerly c0c1d56f3a
] [formerly 4ba416aeb3
[formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c
[formerly 941337c553
]
Former-commit-id: b6fa9b4858
2013-01-06 14:32:24 -06:00
Ron Anderson
c341ac0f55
Issue #1395 Updated SetOpacityDialog. Added source jars for geoapi. Removed legacy shapefile import menu item.
...
Change-Id: I495db377f77485fd9bd896f02dba9c640b9ad3b1
Former-commit-id: 3e4aeeab8b
[formerly 753fa0487b
] [formerly 3e4aeeab8b
[formerly 753fa0487b
] [formerly 639b5abbd9
[formerly a7657cf6b42a3d7a0f5fd64468820d1547ad1e9d]]]
Former-commit-id: 639b5abbd9
Former-commit-id: 8b81f0bfb4
[formerly 995f28220a
]
Former-commit-id: 676819adfa
2012-12-13 15:25:24 -06:00
Ron Anderson
04dc7bc022
Issue #1393 Add additional jars to org.geotools
...
Change-Id: I10aaef928d2eb7333d3d65c3871b633d5760e14f
Former-commit-id: 30c396680c
[formerly 95696f6396
] [formerly 30c396680c
[formerly 95696f6396
] [formerly 7cd3b46dfd
[formerly 910af88ea60686f094bb3de17f5412cb9656111f]]]
Former-commit-id: 7cd3b46dfd
Former-commit-id: 87f3e0f015
[formerly a96fa17142
]
Former-commit-id: 010c54b239
2012-12-06 14:17:35 -06:00
Matt Nash
2a207511e4
Issue #1369 fix geotiff import in CAVE
...
Change-Id: Iccc051478064e5746c80be5cf8edad7eb8e89f50
Former-commit-id: cb9cd97d1f
[formerly fc4d7daab4
] [formerly cb9cd97d1f
[formerly fc4d7daab4
] [formerly 10d399aafe
[formerly ab5775f5187c2b0a2180dfeebc32774c3a1adb16]]]
Former-commit-id: 10d399aafe
Former-commit-id: 01dc19b06d
[formerly c9372636d9
]
Former-commit-id: dc7355a3e4
2012-12-06 12:02:11 -06:00
Nate Jensen
cabeee008a
Merge "Issue #1325 add missing sourcepath for jts" into development
...
Former-commit-id: 397c71cb00
[formerly 19d74235d9
] [formerly 397c71cb00
[formerly 19d74235d9
] [formerly c4e1d26056
[formerly ecff6dc0484b6dc65e2c043be4a2b6a7fbb3a503]]]
Former-commit-id: c4e1d26056
Former-commit-id: 72a741c6a3
[formerly 84e98e2364
]
Former-commit-id: e76a412fb4
2012-11-15 11:02:35 -06:00
Ron Anderson
7a9826a27f
Issue #1325 add missing sourcepath for jts
...
Change-Id: I776bcb3cbb2accd0cf6c41b2a91c12102b9a9653
Former-commit-id: 0984f201b2
[formerly 94ec6eaeaf
] [formerly 0984f201b2
[formerly 94ec6eaeaf
] [formerly 457d55ecdf
[formerly bf8dd91d2e2cb79548cc852c82446cb914e63991]]]
Former-commit-id: 457d55ecdf
Former-commit-id: 9d832ad8be
[formerly 1157e5a55e
]
Former-commit-id: c55588f57c
2012-11-15 11:00:02 -06:00
Dustin Johnson
0c5a52f3b1
Issue #1322 Common baseline changes to support BandwidthManager
...
Amend:
Revert EDEXLocalizationAdapter and duplicate getPath() in test version.
Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8
Former-commit-id: afd9a767ea
[formerly 7d9e7567bd
] [formerly afd9a767ea
[formerly 7d9e7567bd
] [formerly 7c59f9ea41
[formerly 07aeec469a83ce07286bc27ea3e6bda41909be8d]]]
Former-commit-id: 7c59f9ea41
Former-commit-id: 5d410ff934
[formerly c0c60c2488
]
Former-commit-id: 3129d3bd3a
2012-11-14 12:19:10 -06:00
Ron Anderson
6bf06bf78f
Issue #1325 Update geotools source path entries per code review.
...
Change-Id: Ib9a682df979cd1b20510880b594f5c2e496094b0
Former-commit-id: 1bb7258935
[formerly 8a5a2dc532
] [formerly 1bb7258935
[formerly 8a5a2dc532
] [formerly 795dfdc9dd
[formerly fc0837f4b3219eaa7ae4a99dee6db1da9a80c3ba]]]
Former-commit-id: 795dfdc9dd
Former-commit-id: d6a33fb39f
[formerly bad09a9c0d
]
Former-commit-id: dc6b83dccc
2012-11-13 12:06:54 -06:00
Ron Anderson
46bedc0009
Issue #1325 Update GeoTools for WA4.7
...
Change-Id: Ic4a5b2ba0e6567d39c7faf19ed4a5d5b5445fb94
Former-commit-id: 7aaf4db2dc
[formerly f709ab812a
] [formerly 7aaf4db2dc
[formerly f709ab812a
] [formerly 303994ff1b
[formerly 5700f31e4620e1f7b819386aa8762927ec94c2d7]]]
Former-commit-id: 303994ff1b
Former-commit-id: 3ae270a65d
[formerly 7bf1316e8c
]
Former-commit-id: 80a6ade49c
2012-11-12 15:02:08 -06:00
Dustin Johnson
f9c6566ba7
Issue #1302 Restore jdom.jar, delete net.jcip/.project
...
Amend:
Also change the manifest and .classpath for ohd common
Change-Id: I26b4e88d36da6c38da393f2428b79735c881a23b
Former-commit-id: db4d728eb7
[formerly 595c421e47
] [formerly db4d728eb7
[formerly 595c421e47
] [formerly 2b6e98954e
[formerly 49b999039c470a5df095a202b5a67bf036a5b71c]]]
Former-commit-id: 2b6e98954e
Former-commit-id: eac5bc8197
[formerly 0806be04dd
]
Former-commit-id: 1317e0b3ef
2012-11-08 14:47:17 -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
Max Schenkelberg
2345861756
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: f069f34a96
[formerly 2f90120248
] [formerly f069f34a96
[formerly 2f90120248
] [formerly ca4177dd08
[formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]]
Former-commit-id: ca4177dd08
Former-commit-id: 5a5bd522a1
[formerly 747ab974e9
]
Former-commit-id: 50625b0453
2012-11-07 10:44:42 -06:00
Dustin Johnson
7843e33544
Issue #1302 Fixes for data delivery merge with development branch.
...
Change-Id: Ibff04f82290ff0b417b3fd8d1892925241aec753
Former-commit-id: 8d5c86f31e
[formerly 2f28e19bf6
] [formerly 8d5c86f31e
[formerly 2f28e19bf6
] [formerly a8f9c4f90a
[formerly 87641d4b41b10f66e12c8d839548b8012e900438]]]
Former-commit-id: a8f9c4f90a
Former-commit-id: 7b4967b5bb
[formerly 7f994472ae
]
Former-commit-id: e0c68bde6d
2012-11-01 16:31:14 -05: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
Steve Harris
35e34308c5
12.11.1-4 baseline
...
Former-commit-id: 98171b5de9
[formerly d3497e47eb
] [formerly 98171b5de9
[formerly d3497e47eb
] [formerly 6958b861f0
[formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: 2c82d9cb07
[formerly cbbdb231ce
]
Former-commit-id: 560f0d9cc3
2012-10-16 13:27:07 -05:00
Steven Harris
2f855322f6
12.11.1-1 baseline
...
Former-commit-id: 0e86bfd1d3
[formerly 618aa3f316
] [formerly 0e86bfd1d3
[formerly 618aa3f316
] [formerly feec28f274
[formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: f5e63d5f93
[formerly 8843ffd022
]
Former-commit-id: a544be6d83
2012-09-27 15:57:45 -05:00
Steve Harris
5030894212
12.10.1-3 baseline
...
Former-commit-id: de1639aea2
[formerly 21f430062b
] [formerly de1639aea2
[formerly 21f430062b
] [formerly 969e7e6dfd
[formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: f376a4b4db
[formerly 438d139fdd
]
Former-commit-id: faadb51529
2012-09-11 16:00:38 -05:00
Steve Harris
ede38c4b3f
12.9.1-10 baseline
...
Former-commit-id: bdb45cdfae
[formerly 3adc50a783
] [formerly bdb45cdfae
[formerly 3adc50a783
] [formerly cb9b80f3a0
[formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: f43a5af47f
[formerly dc08c5a71a
]
Former-commit-id: 5bb474d33c
2012-08-30 14:28:27 -05:00
Steve Harris
2d928d328e
12.9.1-5 baseline
...
Former-commit-id: a1d931fd44
[formerly 61f269f54c
] [formerly a1d931fd44
[formerly 61f269f54c
] [formerly f2fac39428
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 7fb0b17bd5
[formerly 72824561cb
]
Former-commit-id: 9b5c2094ed
2012-08-21 15:27:03 -05:00
Steve Harris
37f2b6e138
12.6.1-9 baseline
...
Former-commit-id: 7c064b6868
[formerly 2c0ff851ca
] [formerly 7c064b6868
[formerly 2c0ff851ca
] [formerly 27afa60345
[formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: dc50bc8443
[formerly 4f7bb90bb0
]
Former-commit-id: d5fa61041b
2012-07-10 07:53:49 -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
0c25458510
12.4.1-10 baseline
...
Former-commit-id: 4bfbdad17d
[formerly 9f8cb727a5
] [formerly 4bfbdad17d
[formerly 9f8cb727a5
] [formerly 8485b90ff8
[formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 33a67cdd82
[formerly a28d70b5c5
]
Former-commit-id: e5543a0e86
2012-05-01 18:06:13 -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
Steve Harris
034270857e
Merge branch 'ss_sync' into 4-Thin_Client
...
Former-commit-id: 608a0c17a0
[formerly f9baa1c98c
] [formerly 608a0c17a0
[formerly f9baa1c98c
] [formerly 46e1499e43
[formerly 2059372e90437312cf12f06de6c84d0824fb586c]]]
Former-commit-id: 46e1499e43
Former-commit-id: 63764220c4
[formerly 096ba6eb30
]
Former-commit-id: 1328771113
2012-02-23 13:16:35 -06:00
Steve Harris
3433a1e31c
removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
...
Former-commit-id: 07ac42866c
[formerly c502603907
] [formerly 07ac42866c
[formerly c502603907
] [formerly ecb38ba165
[formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]]]
Former-commit-id: ecb38ba165
Former-commit-id: d83100c3df
[formerly a9b900821a
]
Former-commit-id: 32fa2a28c5
2012-02-23 12:45:50 -06:00
Steve Harris
3aef320ffd
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: 92084b3f20
[formerly d0bbbfefcc
] [formerly 92084b3f20
[formerly d0bbbfefcc
] [formerly 7a10ca9766
[formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 92b7072b82
[formerly 3d511fe719
]
Former-commit-id: ae9c52b012
2012-02-23 10:06:18 -06:00
Roger Ferrel
80b5a2049b
Issue #181
...
Changes from January ncep_cave
Former-commit-id: ae0981ac0f
[formerly 7427aeaf29
] [formerly ae0981ac0f
[formerly 7427aeaf29
] [formerly fa42f2dc60
[formerly 6a878c3c5f400c53d39d7920c0619362aaafb946]]]
Former-commit-id: fa42f2dc60
Former-commit-id: 9475b22c54
[formerly 376f6868b6
]
Former-commit-id: 0d2ef82d19
2012-01-26 09:26:07 -06:00
Bryan Kowal
f0cdfeb9a8
Issue #24 - merging jep changes into git thinclient branch.
...
Former-commit-id: be0b6a87eb
[formerly 5039d66b12
] [formerly be0b6a87eb
[formerly 5039d66b12
] [formerly cf4d56d0a0
[formerly 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac]]]
Former-commit-id: cf4d56d0a0
Former-commit-id: f6b08149ad
[formerly 90c33ef882
]
Former-commit-id: a5a50ccfe0
2012-01-23 13:25:11 -06:00
Bryan Kowal
7afea63245
Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
...
Former-commit-id: 971bf802ac
[formerly 2142afe3f1
] [formerly 971bf802ac
[formerly 2142afe3f1
] [formerly 2b5ee4b940
[formerly 296d2915b17f0086d93e200d4780663bff34edbb]]]
Former-commit-id: 2b5ee4b940
Former-commit-id: a1dbdff475
[formerly 2a7b92ec91
]
Former-commit-id: 3bcecdfe66
2012-01-20 11:37:38 -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