Commit graph

14 commits

Author SHA1 Message Date
Bryan Kowal
e4d263daee 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: 4e320a35a3 [formerly 316f9b4747 [formerly b48eb97e9d270ad49d93f2ca85ceae48da9b9269]]
Former-commit-id: 316f9b4747
Former-commit-id: e7c80e9bfd
2014-03-19 14:07:03 -05:00
Bryan Kowal
8493f0581f 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: e0b0d88e46 [formerly f5afe830a7 [formerly 71c960bfc67fd78d3ffee8a14005d4391f4bc2aa]]
Former-commit-id: f5afe830a7
Former-commit-id: bb3a067f93
2014-02-17 14:41:10 -06:00
Bryan Kowal
87a367ab05 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: d2e40770dd [formerly c85b151210 [formerly b788b07aecdc4039ef0ce657d7d9a04ab88e0069]]
Former-commit-id: c85b151210
Former-commit-id: db00372029
2014-01-20 14:02:07 -06:00
Richard Peter
9bebb21be8 Merge branch 'development' into development_on_RHEL6
Former-commit-id: c42f931118 [formerly 8fb79e7b73 [formerly 13d284277bed2f0f731547ec443a262556df997c]]
Former-commit-id: 8fb79e7b73
Former-commit-id: 800effdc5a
2013-11-14 14:56:59 -06:00
Bryan Kowal
7b9c8a6174 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: 7e35ea310f [formerly 2029c34f24 [formerly c0595b49cab0d0ef636427ed3b31ea805f8adb43]]
Former-commit-id: 2029c34f24
Former-commit-id: 48cc679bce
2013-11-14 11:57:11 -06:00
Richard Peter
061fa07147 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: 460a7b8b5d [formerly 306bd6fae1 [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]
Former-commit-id: 306bd6fae1
Former-commit-id: 7ba466f5a6
2013-11-12 11:11:36 -06:00
Bryan Kowal
d369a33bf0 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: 75e6914df1 [formerly 8e1c0fb8eb [formerly 315ca002de4045f0d7ae6b298012365a052a7430]]
Former-commit-id: 8e1c0fb8eb
Former-commit-id: 6b5f93117e
2013-11-11 17:00:17 -06:00
Bryan Kowal
5164a7c0b1 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: c8d7a32e2e [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]
Former-commit-id: feaacd9356
Former-commit-id: 38464427d3
2013-10-31 15:34:46 -05:00
Steve Harris
cb3b53f205 14.1.1-4 baseline
Former-commit-id: 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]
Former-commit-id: bd95bb6a4e
Former-commit-id: 82dec19b6a
2013-10-28 10:55:16 -04:00
Matt Nash
e529f3b15a Issue #2250 fix for Python PathManager not correctly closing
Change-Id: I3d600871ea09ec49ca83fdc5d898a4d9a0369d6f

Former-commit-id: 5e2e35e45b [formerly dc767d0491 [formerly a55d89df84db254372db340f22559ac17940ddaf]]
Former-commit-id: dc767d0491
Former-commit-id: 143916d637
2013-09-25 17:18:54 -05:00
Steve Harris
5d99df9969 13.5.1-1 baseline
Former-commit-id: fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]
Former-commit-id: 998961612c
Former-commit-id: 6384018950
2013-06-10 15:17:17 -04:00
Matt Nash
a72e130f18 Issue #1870 add Python and XML Incremental Override, implemented for both Java
and Python

Change-Id: I293b6abcdffbd2cef35e9b986362113186583c55

Former-commit-id: 7943769110 [formerly 288bd3b02c [formerly 27f86d4c39ce8b8e708408511c820a5dd765e4cb]]
Former-commit-id: 288bd3b02c
Former-commit-id: f544fdd9e1
2013-05-02 13:39:55 -05:00
Matt Nash
24711d9f2c Issue #1870 add package-info.java so that the empty src directory gets pushed to git
Change-Id: I75d97d6b54de65507288c1b43aaa02b143218840

Former-commit-id: 4b896002ac [formerly 0d12fb16bc [formerly df00846cfe22e318eafe40eaaa08a13b20fd5c58]]
Former-commit-id: 0d12fb16bc
Former-commit-id: 7ffb45758d
2013-04-15 14:53:07 -05:00
Matt Nash
054c9afeed Issue #1870 implement PathManager interface in Python to allow Python code to
get files

Change-Id: I0192c996533b1539194aaeba0213074bef8a4717

Former-commit-id: 4b23ec7c0a [formerly bf01f50e17 [formerly e3df8efa51ad95c952318b59edca702157a59856]]
Former-commit-id: bf01f50e17
Former-commit-id: 68892951c5
2013-04-12 07:55:56 -05:00