Commit graph

14 commits

Author SHA1 Message Date
Bryan Kowal
620f4c17d0 Issue #2929 - the pure Python Override now recognizes REGION as a valid localization level
Amend: use baseline Redmine number

Change-Id: I765c1199e9d8b639e3c87afec41798459f0f92e4

Former-commit-id: e4d263daee [formerly e7c80e9bfd] [formerly 316f9b4747] [formerly e4d263daee [formerly e7c80e9bfd] [formerly 316f9b4747] [formerly 4e320a35a3 [formerly 316f9b4747 [formerly b48eb97e9d270ad49d93f2ca85ceae48da9b9269]]]]
Former-commit-id: 4e320a35a3
Former-commit-id: b1b31ffe43 [formerly e92a5230a3] [formerly 00b3d63df6c842c70fde8d100307033b01a01b1d [formerly 68c1654214]]
Former-commit-id: 6fb95f948116941355d6aeaf661c92bbcc6777ef [formerly f02a9f476a]
Former-commit-id: d189d82929
2014-03-19 14:07:03 -05:00
Bryan Kowal
347439ff96 Issue #2712 - Python Overrider can now determine whether or not it is running in Jep so that the main module can be used at all times now.
Amend: add a default value for localization site in the pure overrider.

Change-Id: I6056c274a10def96ba69786b58ba284146e49160

Former-commit-id: 8493f0581f [formerly bb3a067f93] [formerly f5afe830a7] [formerly 8493f0581f [formerly bb3a067f93] [formerly f5afe830a7] [formerly e0b0d88e46 [formerly f5afe830a7 [formerly 71c960bfc67fd78d3ffee8a14005d4391f4bc2aa]]]]
Former-commit-id: e0b0d88e46
Former-commit-id: dc3c609086 [formerly b5d4574294] [formerly 0fabd8efb5af94eb16e9f5943156b46b011fbfcc [formerly d4ce52459e]]
Former-commit-id: 1f4c4d080742176ec073740e722e466292bd26b6 [formerly f5e65b5e56]
Former-commit-id: 14488904e5
2014-02-17 14:41:10 -06:00
Bryan Kowal
38e0db898a Issue #2712 - improved class merging in Python Overrider. Created PythonOverriderInterface.
Amend: Wrap ModuleUtil in try..finally to ensure changes to the path are undone
Amend: Fixed formatting in PythonOverriderCore

Change-Id: I8c4d2702ef634d2b038ba20ccffc610db8a6c580

Former-commit-id: 87a367ab05 [formerly db00372029] [formerly c85b151210] [formerly 87a367ab05 [formerly db00372029] [formerly c85b151210] [formerly d2e40770dd [formerly c85b151210 [formerly b788b07aecdc4039ef0ce657d7d9a04ab88e0069]]]]
Former-commit-id: d2e40770dd
Former-commit-id: 23a43fa42e [formerly 5c5ccfc65d] [formerly c7afdc35878088f48892c5546a83a73128a9ff77 [formerly cf82007019]]
Former-commit-id: c979ede9026ddbdd6ecd96f6664ec6cae30a643e [formerly 29b48d3ef6]
Former-commit-id: 744084f871
2014-01-20 14:02:07 -06:00
Richard Peter
170aeb49af Merge branch 'development' into development_on_RHEL6
Former-commit-id: 9bebb21be8 [formerly 800effdc5a] [formerly 8fb79e7b73] [formerly 9bebb21be8 [formerly 800effdc5a] [formerly 8fb79e7b73] [formerly c42f931118 [formerly 8fb79e7b73 [formerly 13d284277bed2f0f731547ec443a262556df997c]]]]
Former-commit-id: c42f931118
Former-commit-id: b9da33bcea [formerly e5dc8e2027] [formerly d0ba6f0b34d98e888dee8eca0e8a59d14ff6436f [formerly 2b95bcfb31]]
Former-commit-id: 6bd09bf526063f854e453bf474886432548c3c50 [formerly e7d8e5e560]
Former-commit-id: 2025e073ef
2013-11-14 14:56:59 -06:00
Bryan Kowal
fde6569c34 Issue #2540 - pure python module merge implementation
Amend: remove dead LocalizationUtil.py file. Use os.path.join; catch Exception thrown by module merge
Amend: remove module merge exception catching

Change-Id: Idb9bc359d8b3dc1b6c4ccfd6247e02e2905bbea1

Former-commit-id: 7b9c8a6174 [formerly 48cc679bce] [formerly 2029c34f24] [formerly 7b9c8a6174 [formerly 48cc679bce] [formerly 2029c34f24] [formerly 7e35ea310f [formerly 2029c34f24 [formerly c0595b49cab0d0ef636427ed3b31ea805f8adb43]]]]
Former-commit-id: 7e35ea310f
Former-commit-id: 8a0b0667de [formerly 4759e48c5c] [formerly 90670353179a78bde76d7ccb60b47f097fef7acd [formerly a2261b9ff3]]
Former-commit-id: 5339245b650c517d8012d02401b6076bf3cd1ed8 [formerly 79045d620b]
Former-commit-id: ae5e6b3927
2013-11-14 11:57:11 -06:00
Richard Peter
ff729f46b5 Merge branch 'development' into development_on_RHEL6
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	rpms/awips2.core/Installer.httpd-pypies/component.spec
	rpms/build/i386/build.sh
	rpms/build/i386/build.sh-keep-10032013
	rpms/build/i386/build.sh-keep-11012013
	rpms/build/x86_64/build.sh
	rpms/build/x86_64/build.sh.orig

Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461

Former-commit-id: 061fa07147 [formerly 7ba466f5a6] [formerly 306bd6fae1] [formerly 061fa07147 [formerly 7ba466f5a6] [formerly 306bd6fae1] [formerly 460a7b8b5d [formerly 306bd6fae1 [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]]]
Former-commit-id: 460a7b8b5d
Former-commit-id: 112816a54c [formerly 3f68fc6eed] [formerly 617c9d2d122683ab3ac05ff74694962b33afa16d [formerly 59671c1e7d]]
Former-commit-id: 8b93a7813019963981a150f64ec44daf5d188cde [formerly c8ef435295]
Former-commit-id: ef23a8f65b
2013-11-12 11:11:36 -06:00
Bryan Kowal
25bbbb75b1 Issue #2540 - finish implementing the python override capability. The pure-python solution will be checked in later.
Amend: addressed review comments
Amend: update DR number

Change-Id: I5ae0c1140e0c90be002e3e3711fc4311ce1a05f0

Former-commit-id: d369a33bf0 [formerly 6b5f93117e] [formerly 8e1c0fb8eb] [formerly d369a33bf0 [formerly 6b5f93117e] [formerly 8e1c0fb8eb] [formerly 75e6914df1 [formerly 8e1c0fb8eb [formerly 315ca002de4045f0d7ae6b298012365a052a7430]]]]
Former-commit-id: 75e6914df1
Former-commit-id: 5bfc4d4dda [formerly 1a966d8ec2] [formerly 117ea92d58b5f7e0d20d3bd89d1f4e7c6c26b7f1 [formerly 5c38f0bfd6]]
Former-commit-id: 4274b56b364d7382bd0a540b4a1fb3f80b4ad82e [formerly 2565306c95]
Former-commit-id: adf5ac93ae
2013-11-11 17:00:17 -06:00
Bryan Kowal
6a0ddf11e4 Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/static/common/cave/etc/bundles/StationPlot.xml
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	nativeLib/ncep_grib2module/.cproject
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so

Former-commit-id: 5164a7c0b1 [formerly 38464427d3] [formerly feaacd9356] [formerly 5164a7c0b1 [formerly 38464427d3] [formerly feaacd9356] [formerly c8d7a32e2e [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: d3062ea58f [formerly f02d4b7a0b] [formerly fc14f5a833bc96ed1a9a8b8cb4ac6b0c2897f30f [formerly d366e70934]]
Former-commit-id: a385091a8de68d44ac589d69363d2af9bd0275a7 [formerly eaaa3d022c]
Former-commit-id: f5bb76a01e
2013-10-31 15:34:46 -05:00
Steve Harris
cbf859daf6 14.1.1-4 baseline
Former-commit-id: cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2039d101ef [formerly b60635cd70] [formerly 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e]]
Former-commit-id: 973d527ee973fdb4fc285ca2d02f0a43a03bb0fa [formerly 98ae84da42]
Former-commit-id: da4589ec2b
2013-10-28 10:55:16 -04:00
Matt Nash
b524edc07b Issue #2250 fix for Python PathManager not correctly closing
Change-Id: I3d600871ea09ec49ca83fdc5d898a4d9a0369d6f

Former-commit-id: e529f3b15a [formerly 143916d637] [formerly dc767d0491] [formerly e529f3b15a [formerly 143916d637] [formerly dc767d0491] [formerly 5e2e35e45b [formerly dc767d0491 [formerly a55d89df84db254372db340f22559ac17940ddaf]]]]
Former-commit-id: 5e2e35e45b
Former-commit-id: 3b51f4452d [formerly b7c24195e5] [formerly 691bd4461cb920e92327eb8fb0f67a38db45e94a [formerly 147008dfea]]
Former-commit-id: ffec4dffbf2f4a0115d34a87da1277a239024b60 [formerly e44c23a6fb]
Former-commit-id: 40913d7cc2
2013-09-25 17:18:54 -05:00
Steve Harris
97a4c59662 13.5.1-1 baseline
Former-commit-id: 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]]
Former-commit-id: fe872355a7
Former-commit-id: 43b7a9b410 [formerly 0aab285b8a] [formerly 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e]]
Former-commit-id: 83a711e54bdd8cabc147e6ca5222939082f46f9c [formerly 146c5e8940]
Former-commit-id: 859965fc9d
2013-06-10 15:17:17 -04:00
Matt Nash
e86a2bcf57 Issue #1870 add Python and XML Incremental Override, implemented for both Java
and Python

Change-Id: I293b6abcdffbd2cef35e9b986362113186583c55

Former-commit-id: a72e130f18 [formerly f544fdd9e1] [formerly 288bd3b02c] [formerly a72e130f18 [formerly f544fdd9e1] [formerly 288bd3b02c] [formerly 7943769110 [formerly 288bd3b02c [formerly 27f86d4c39ce8b8e708408511c820a5dd765e4cb]]]]
Former-commit-id: 7943769110
Former-commit-id: 25fac01538 [formerly 5b62180a2a] [formerly 09b0ecdb20cc917f603bc05f2a53cae1c74ee3ea [formerly ae21592cbf]]
Former-commit-id: 07822a8f4f1084499d7851ed610c106db7d9fd65 [formerly 40c3731f4a]
Former-commit-id: ccfcc23bee
2013-05-02 13:39:55 -05:00
Matt Nash
35f5d4167e Issue #1870 add package-info.java so that the empty src directory gets pushed to git
Change-Id: I75d97d6b54de65507288c1b43aaa02b143218840

Former-commit-id: 24711d9f2c [formerly 7ffb45758d] [formerly 0d12fb16bc] [formerly 24711d9f2c [formerly 7ffb45758d] [formerly 0d12fb16bc] [formerly 4b896002ac [formerly 0d12fb16bc [formerly df00846cfe22e318eafe40eaaa08a13b20fd5c58]]]]
Former-commit-id: 4b896002ac
Former-commit-id: c3b78dcb45 [formerly 317cbf0950] [formerly 3171c53715c04eee22a513fc63775f14cec341d2 [formerly 87af6d2809]]
Former-commit-id: 07f95159ba72d1a2635b6c0d391a0b4e90166b2a [formerly a2e421048c]
Former-commit-id: a8358a4b40
2013-04-15 14:53:07 -05:00
Matt Nash
0985877ac1 Issue #1870 implement PathManager interface in Python to allow Python code to
get files

Change-Id: I0192c996533b1539194aaeba0213074bef8a4717

Former-commit-id: 054c9afeed [formerly 68892951c5] [formerly bf01f50e17] [formerly 054c9afeed [formerly 68892951c5] [formerly bf01f50e17] [formerly 4b23ec7c0a [formerly bf01f50e17 [formerly e3df8efa51ad95c952318b59edca702157a59856]]]]
Former-commit-id: 4b23ec7c0a
Former-commit-id: 6f32d989c4 [formerly 123351e82b] [formerly 593118c2fd517ea4ccef855699786a9ac5386ea8 [formerly caf1f1fdf7]]
Former-commit-id: d7376844fc5a64a79ad485ae990bc811691e6589 [formerly d6feca69b4]
Former-commit-id: b6d567fd72
2013-04-12 07:55:56 -05:00