Mike Duff
eb613ad337
Issue #1550 - Add ability for MPE to preload maps on perspective open.
...
Former-commit-id: 1740e14fa9
[formerly 944c5a4732
] [formerly f9fec9668c
] [formerly 1740e14fa9
[formerly 944c5a4732
] [formerly f9fec9668c
] [formerly 5940423ac8
[formerly f9fec9668c
[formerly 779ff3238cd9aba2980f589721a0f5ccfff4a15e]]]]
Former-commit-id: 5940423ac8
Former-commit-id: ac13852b92
[formerly 2edb4f1117
] [formerly 199352144e883563c5a96c9514598f1ea31d4c67 [formerly b55adb3cce
]]
Former-commit-id: dfd19cb8e65ecd1d065187cd30ed6b36e2e0f926 [formerly e1c6fbc93d
]
Former-commit-id: 302b467d5e
2013-01-29 15:39:40 -06:00
Brad Gonzales
bea7374337
Issue #1274 Added Token control for java code and scripts started by RFC Crons.
...
Added tokens for app control to the Apps_Defaults configuration file.
Added AppsDefaults token checks to the cron java code and scripts.
Updated Executor.start() to load system properties from properties files
in a conf resources properties directory and also to load site specific
properties from a conf resources properties site directory.
Amend:
Removed tabs in MainMethod.java.
Updates from peer review.
Removed old commented out code in ohd cron properties file and commented-out code in MainMethod.execute().
Change-Id: I44e74791dadc9af09c99244d8d099cea581863cc
Former-commit-id: 0a60448e8f
[formerly 75e77feb58
] [formerly 68a3a98547
] [formerly 0a60448e8f
[formerly 75e77feb58
] [formerly 68a3a98547
] [formerly 44e9238fa9
[formerly 68a3a98547
[formerly 96bb97c32f664e015a29ac5c3187e6b27160a872]]]]
Former-commit-id: 44e9238fa9
Former-commit-id: 675a6f6b05
[formerly 7807eca270
] [formerly 62ae708ea7ab6aae87f7de0577fa4c1f706252c9 [formerly 253c19ae05
]]
Former-commit-id: a3c040aec25d5d8789173fbd8b8fe65a2a00c984 [formerly 6fae286ad2
]
Former-commit-id: 78fbf32245
2012-10-31 21:20:40 -05:00
Steve Harris
b54ad5af66
Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
...
Conflicts:
cots/org.jboss.cache/.project
edexOsgi/build.edex/esb/conf/spring/project.properties
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
javaUtilities/com.raytheon.wes2bridge.utility.product/.project
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
ncep/gov.noaa.nws.ncep.common.staticdata/.project
Former-commit-id: 975053c3dc
[formerly c7024992a3
] [formerly 37793c86b1
] [formerly 975053c3dc
[formerly c7024992a3
] [formerly 37793c86b1
] [formerly d325d496f5
[formerly 37793c86b1
[formerly a435e6464a78345b5036e3060430375dc53e4faf]]]]
Former-commit-id: d325d496f5
Former-commit-id: 5e0e2d2c48
[formerly 23c34c469a
] [formerly 788e16ce64aaeca91000aa565d43e89a27246362 [formerly cf3c768213
]]
Former-commit-id: bbdcec83196c1a64fd2e31c1e9abdcf46698ab0b [formerly 3dd5b84aa2
]
Former-commit-id: c01b096242
2012-06-11 15:24:03 -05:00
Steve Harris
46068c6716
12.5.1-15 baseline
...
Former-commit-id: 2f10c7a1e4
[formerly 8552902906
] [formerly b13cbb7e00
] [formerly 2f10c7a1e4
[formerly 8552902906
] [formerly b13cbb7e00
] [formerly 3904c4ccf5
[formerly b13cbb7e00
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3
[formerly 97c4db937e
] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f
]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c
]
Former-commit-id: 39ff9954f8
2012-06-08 13:39:48 -05:00
Steve Harris
2f6ae50479
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: fc70139990
[formerly d7f7c26582
] [formerly 092efd6072
] [formerly fc70139990
[formerly d7f7c26582
] [formerly 092efd6072
] [formerly 31b3e87ffa
[formerly 092efd6072
[formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: fe7ac96625
[formerly 53d2822329
] [formerly 606a1f5f70c4344a8a6b5b7da1c351cf7707cda2 [formerly 98447412f8
]]
Former-commit-id: 3940ab38fea505f445ec4019600081324e15e68d [formerly 7ee04eb560
]
Former-commit-id: d040b14742
2012-05-09 13:19:47 -05:00
Steve Harris
5b35d8a6e0
12.4.1-4 baseline
...
Former-commit-id: 4767b0e069
[formerly 750b7543dd
] [formerly 67a5a68300
] [formerly 4767b0e069
[formerly 750b7543dd
] [formerly 67a5a68300
] [formerly 2a216f333c
[formerly 67a5a68300
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188
[formerly a2a6a18fae
] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd
]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c
]
Former-commit-id: 74b66d9683
2012-04-18 15:18:16 -05:00
Mike Duff
cf4cf4038a
Issue #16 - Added subdirectory to token value and fixed IndexOutOfBounds
...
error
Change-Id: Ie0d670487a1768a53001209be0499c3cf5e9d4c7
Former-commit-id: f5613a0088
[formerly 504fdc8cf8
] [formerly 60de2210f5
] [formerly f5613a0088
[formerly 504fdc8cf8
] [formerly 60de2210f5
] [formerly d8d84fbe2e
[formerly 60de2210f5
[formerly 967c9d38fe967ab02cf620201c4fd9915f7ba3fc]]]]
Former-commit-id: d8d84fbe2e
Former-commit-id: 86b0c97761
[formerly 2300b2e6c7
] [formerly 8773dfd018bd59c5dd8b0cc6057c6b0f2a0291c2 [formerly 846110bac4
]]
Former-commit-id: 2f60aa660d5da4ac879e49cf31ee7a89c22d90cb [formerly 03d3f84246
]
Former-commit-id: 82b5a96b1d
2012-02-07 16:46:36 -06:00
Matt Nash
515196cb86
Moving 12.1.1 into ss_sync
...
Former-commit-id: d8da2252c3
[formerly 580e2938d7
] [formerly 66be3bec40
] [formerly d8da2252c3
[formerly 580e2938d7
] [formerly 66be3bec40
] [formerly c83e5ff474
[formerly 66be3bec40
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90
[formerly 82300ccdcf
] [formerly 21d2361f00
[formerly 1faae42484
]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
2012-01-19 11:53:12 -06:00
root
7dbd17a5aa
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 133dc97f67
[formerly a02aeb236c
] [formerly 9f19e3f712
] [formerly 133dc97f67
[formerly a02aeb236c
] [formerly 9f19e3f712
] [formerly 06a8b51d6d
[formerly 9f19e3f712
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf
[formerly 8e80217e59
] [formerly 377dcd10b9
[formerly 3360eb6c5f
]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
2012-01-06 08:55:05 -06:00