David Friedman
4bdfeb8da8
Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1
...
Conflicts:
cave/build/static/linux/alertviz/alertviz.sh
cave/build/static/linux/cave/cave.sh
cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/AlertvizJob.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.xdat/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.shef/src/com/raytheon/uf/common/dataplugin/shef/tables/Riverstat.java
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/process_configuration
Change-Id: I9acfead0148ca1df35b8f69cd556b40d8189c226
Former-commit-id: 33053b2a6b55dacfecb24d5cde2cd3068e999f2f
2015-07-30 20:53:19 +00:00
Steve Harris
11d147911d
Merge tag 'OB_15.1.1-20' into omaha_16.1.1
...
15.1.1-20
Conflicts:
pythonPackages/pypies/pypies/impl/H5pyDataStore.py
Former-commit-id: d3fc25a0bc4136a28efcd024dd272373982b2c9d
2015-07-06 09:48:19 -05:00
steve.naples
8dce16d886
ASM #15002 Fixed issue with apps_dir token in set_hydro_env not being set at RFCs properly.
...
Change-Id: I28a96953acf2ae5e3355d933627309e06312ab9a
Former-commit-id: db5a86e09418f642b7e69382f51e4b4bb95ae6f1
2015-07-01 18:48:16 +00:00
Fay.Liang
e321770a07
Merge tag 'OB_14.4.1-53' into int_15.1.1
...
14.4.1-53
Former-commit-id: a86e1e2195be886ecac70299b0b0aebf3e519ab6
2015-06-23 21:28:09 -04:00
Shawn.Hooper
25f8ca9be0
ASM #17630 - Update with patched thrift libraries
...
Change-Id: Ibde2e2fb283f9b21360de4a013706409a7f941f1
Former-commit-id: ce6c9e536cd45d030b74d9cedf66b4a8cdb18bb3
2015-06-19 11:24:23 -04:00
Steve Harris
9b3d8a8443
Merge tag 'OB_15.1.1-12' into omaha_16.1.1
...
15.1.1-12
Conflicts:
build/deploy.edex.awips2/esb/bin/setup.env
cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py
Former-commit-id: 881df1ae809fb94151c7bddc8eeda305ac4317f7
2015-05-20 11:25:45 -05:00
Shawn.Hooper
003c528458
ASM #17024 - Merge up to 14.4.1-38 into 15.1.1-10
...
Change-Id: Id4091550082328ce8a682db5ddd1a133fb7a5d39
Former-commit-id: 721a43ed8a1c9fdd1e5c62827869a91a20bfb416
2015-05-12 11:30:23 -04:00
Fay.Liang
18d8746429
ASM #17476 - Add 64bit libthrift libraries
...
Change-Id: I8c7bb826c9688950ad09092bb22f27414cadfae2
Former-commit-id: 6131f8ff469989c607a61edd471c4129a23dca8a
2015-05-10 01:25:59 -04:00
Fay.Liang
95ab6a74b1
ASM #17476 - HWR: Certain marine observations missing from product
...
Change-Id: Ib289f53e3f8cb2f82df3ac512540917eae072a08
Former-commit-id: 272927b1a4e27e59ff82353ed12de68634efd7da
2015-05-10 00:07:16 -04:00
Nate Jensen
f072f3bbca
Omaha #4259 remove old jep from nativeLib
...
our jep changes have been merged into main jep
jep 3.3 will move into AWIPS2_build repo
JavaImporter is no longer necessary, uses jep/hook.py now
Change-Id: I0eb6714e90f21e2accadf5286d3f768fa5be3926
Former-commit-id: 852bc57217e03a11cb329b90f83d5be63e315920
2015-04-30 14:23:44 -05:00
Nate Jensen
15b501ce07
Omaha #4259 speed up get_jtype, ensure correct jep types are chosen
...
Change-Id: I11a7c072f8b460d2728cf2a4a018932159c0e1b0
Former-commit-id: c13284d74b6c561cd305cf714722e4904b4ab0bf
2015-04-30 12:39:54 -05:00
Nate Jensen
9c71fb1bee
Omaha #4259 improved class checking
...
when return type of Java method is Object, check for arrays
simplified get_jtype to actually make sense
Change-Id: Ibfc22699f3121a7980527e7bca8e578d85016699
Former-commit-id: 36954eaeb93f0d3e24aba0be8cea90f6d1a8deee
2015-04-29 16:45:36 -05:00
Nate Jensen
e4f1679510
Omaha #4259 cache frequent jclass usages for speedup
...
Change-Id: I8e27110c9c9b2a901560c547f8729870d3e992bf
Former-commit-id: e663c39f1e1e225c63109f24d294902e90afb621
2015-04-28 12:19:36 -05:00
Nate Jensen
d14c8c7e7a
Omaha #4259 tie IllegalArgumentException to ValueError
...
Change-Id: I742fbe53cba7356941bab3f88441e8d47507c3e8
Former-commit-id: 8716dde5c659c5afa80e9c57aad2120ae0e56bb5
2015-04-27 17:41:16 -05:00
Nate Jensen
5b25c39afd
Omaha #4259 even more advanced exception handling
...
Change-Id: Ib483fbc7d6eedc4ae087577edcc45c273c3f0ff5
Former-commit-id: c86279d50c1a75bba4d32291b028fe56ad2b7721
2015-04-27 15:33:49 -05:00
Nate Jensen
6318d1122d
Omaha #4259 implement hash() on pyjobject
...
Change-Id: I6298245a467a2f73caf8b4a2a03918790c409d80
Former-commit-id: 2719830ac6dc2e33c73f7d730892b8c496b555d1
2015-04-25 19:25:34 -05:00
Nate Jensen
944c2e0863
Omaha #4259 fix import of java classes
...
Change-Id: If27267eaa0e57ffe7e73500bbb9affc333b2f1bc
Former-commit-id: d80f1339af7eed3994ce2b274b3936649a631dc6
2015-04-22 17:14:32 -05:00
Nate Jensen
2ea379d4d8
Omaha #4259 clean up compiler warnings
...
Change-Id: I9cd7342519eb0d8f6da1cbf51be44e3ea309fcf2
Former-commit-id: c43051254a546f387c3e2b4589e6b0ab8371dd6f
2015-04-21 13:53:58 -05:00
Nate Jensen
b5dc8b814f
Omaha #4259 convenience constructor for NDArray
...
Change-Id: I0cc978a0f4086fff997fab6791980360e7e2389e
Former-commit-id: 8ef33c85e7c4ff7a933ca013e1abe61f1aea905d
2015-04-16 16:54:38 -05:00
Nate Jensen
e189166a34
Omaha #4259 fix missed compiler warning
...
Change-Id: Id63d86e74d2dee0e99c01e9c467855bd276a67df
Former-commit-id: 46d0a687a7a3e15320e4ea85f8f2bab0bbbd0320
2015-04-16 15:21:13 -05:00
Nate Jensen
a51643fe7d
Omaha #4259 clean up compiler warnings
...
Change-Id: I1592d1b527a5c36dcd58e32d2e8fb1561aab904d
Former-commit-id: a47e86c9683ee54ddf10542c43e1ef97124fe273
2015-04-16 14:49:08 -05:00
Nate Jensen
eabd52c620
Omaha #4259 fix jep unit test threading unsafety
...
Change-Id: I13f58d8dcf3e3d074c3586d2682ad3fa9809a3fe
Former-commit-id: 24922b47c679227489740da2979d10d9f81088bf
2015-04-15 17:47:57 -05:00
Nate Jensen
460f1a7429
Omaha #4259 fix compiler issues
...
Change-Id: I16fe1f201bc3676fcf6079743112d8cbaddb0892
Former-commit-id: 4741e21ae3f1b3e0904980b75d2c1dd82aace7ad
2015-04-15 12:00:20 -05:00
Nate Jensen
a6491bd9d8
Omaha #4259 more cleanup of jep
...
Change-Id: I84a44ea8219132033f60ed3534fe0f00d9b5bbca
Former-commit-id: 022055f57c46cafe125cd407c2e384c46a5a8ead
2015-04-14 11:06:51 -05:00
Nate Jensen
b1f34b0eab
Omaha #4259 cleanup based on code review comments and tests
...
Change-Id: I2be78c10ba89d43ba0fb498037764805e287b12e
Former-commit-id: 36c0b8679d6af895ff91b7dcfb4c4cef7f04ffe6
2015-04-13 16:21:43 -05:00
Nate Jensen
d320075a73
Merge "Omaha #4259 fixed uncovered issues, code review comments" into omaha_16.1.1
...
Former-commit-id: 33161fce6267d536c36557137351c8ff612652f3
2015-04-13 13:50:13 -05:00
Steve Harris
7ec7cdf232
Merge tag 'OB_15.1.1-4' into omaha_16.1.1
...
15.1.1-4
Former-commit-id: c9f9bc2c612dae6d355fb3c5de313aa7274adc8b
2015-04-13 12:22:22 -05:00
Nate Jensen
2cc9a82f54
Omaha #4259 fixed uncovered issues, code review comments
...
Change-Id: If6a253f157d131669e22915f440a8364ee62f19c
Former-commit-id: 1c3825d99fe792c45a78a1942cc30aa0d17e4716
2015-04-10 15:27:45 -05:00
Nate Jensen
bcba6c956b
Merge "Omaha #4259 merging most of the rest of JEP updates with our changes" into omaha_16.1.1
...
Former-commit-id: 0d309effe01d50a323e1a6799632c7cf3efb4b5e
2015-04-10 13:39:02 -05:00
Nate Jensen
cb64093e9d
Omaha #4259 last of the jep java merges
...
Change-Id: I3c82218dfc3cf5fc5d4bca13d3423123c5836b46
Former-commit-id: 8a14388a49813a9dfae394a8c14dfe4c4ca56a84
2015-04-09 20:17:54 -05:00
Nate Jensen
cc092f365a
Omaha #4259 merging most of the rest of JEP updates with our changes
...
Change-Id: I3d530e5ebf17d63d2bb61a2b8bfb818eaa2f80cb
Former-commit-id: 4ad70d2021420bff9b5060068c9f682b01c04757
2015-04-09 18:08:34 -05:00
Fay.Liang
7349df3d27
Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/export_configuration
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/proc_receive_config
Former-commit-id: 9742125df2b54fe54e1e06dba554de21db52f5a0
2015-04-08 12:22:27 -04:00
Nate Jensen
eb8d673675
Omaha #4259 non-hacky support for accessing inner classes
...
Change-Id: I5058ef5b5cda7bc59e1f50786ee277ae0637d9a1
Former-commit-id: 07886e9e1a91fb79d560d8f6f3c5224aab156968
2015-04-07 09:30:48 -05:00
Nate Jensen
418d41e200
Merge "Omaha #4259 fix when java method expects string arg and gets java.lang.String instead of Py_String" into omaha_16.1.1
...
Former-commit-id: 842dfb0fa6e7a3cda122f14148a18b5cb83b5eee
2015-04-01 21:34:47 -05:00
Steve Harris
f7af8ee606
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Former-commit-id: cf70a7888a39667c54b344274c76d5106927fa30
2015-04-01 17:22:45 -05:00
Fay.Liang
499a7c7e80
ASM #17024 - Check-in library.ohd.pproc.so after merge/build from 14.4.1-21 to 15.1.1
...
Former-commit-id: ef3c93c82e72b9c574c2bbba8536e568e2a078ac
2015-04-01 14:56:17 -04:00
Nate Jensen
487b1ff68a
Omaha #4259 fix when java method expects string arg and gets java.lang.String
...
instead of Py_String
Change-Id: Ic65c49fcf3b9ef051b0c36d12b00e02183eeba2f
Former-commit-id: 452379894eec349ba6d1b901073b1f2746c08e94
2015-04-01 12:09:15 -05:00
Fay.Liang
a204a6210e
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Former-commit-id: 5e481a056337b7f502921886725382258c6e29d1
2015-04-01 13:04:48 -04:00
Shawn.Hooper
714044cb9b
ASM #14920 - Revert "ASM #14920 - GFE: Smartinits not calculating 12hr PoP correctly"
...
This reverts commit 3c532660b0
2015-04-01 12:39:52 -04:00
Nate Jensen
4d59a38a3d
Omaha #4259 fix pyjlist slice assignment
...
Change-Id: Ida83669d57ee2f135d125071a57e3c5b004e31b1
Former-commit-id: e350bd0098041ef73ea0d9d2db0e1d39e3d24eb5
2015-04-01 10:53:58 -05:00
Nate Jensen
99b5d09d9d
Omaha #4259 native java.util.List support in JEP
...
Change-Id: If0706318fd409884933433a8edf279e1f6659621
Former-commit-id: 4921ee47a87af497fdc2be53f6bde67b857587b8
2015-03-31 10:44:18 -05:00
Fay.Liang
133a603566
Merge tag 'OB_14.4.1-20m' into master_15.1.1
...
14.4.1-20m
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
edexOsgi/build.edex/esb/conf/logback.xml
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 1d282a64da2998d91040a7c97f2e81beea0a8da4
2015-03-30 14:28:30 -04:00
Steve Harris
7375074ed8
Merge tag 'OB_15.1.1-2m' into omaha_15.1.1
...
15.1.1-2m
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 7cad81591e22bc1a46f54982f0cd0ca647208290
2015-03-30 11:07:52 -05:00
Nate Jensen
64a82afdc9
Merge "Omaha #4259 clean up pyjclass optimization for inclusion in jep" into omaha_16.1.1
...
Former-commit-id: 5d1b229924399e16617347162e97e3210608a8f8
2015-03-23 17:28:11 -05:00
Nate Jensen
1d87ce6e8b
Omaha #4259 clean up pyjclass optimization for inclusion in jep
...
Change-Id: I2f887276fcdaeb57b8c0193bcc92397328400954
Former-commit-id: aac3401e112bf8f7d85dc3a08788fc6a30afc91a
2015-03-23 15:12:01 -05:00
Nate Jensen
7c9754df2d
Omaha #4259 remove mistakes from 2009
...
Change-Id: I5d52789d72f0ed0a6fb46c9d1012615f34d39963
Former-commit-id: 55d47895ae2bb64601178b1aceabdbf2a655fb94
2015-03-23 15:10:08 -05:00
Fay.Liang
3546b8901d
Merge branch 'ohd_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
...
Former-commit-id: 366cd07d35f6e9f842ba72d1164a53fbb5fc6838
2015-03-19 12:42:35 -04:00
Fay.Liang
86a8041062
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/build.edex/edex/common.properties
Former-commit-id: ba576b948587ea7b1c077ebad7113bc4e7504c00
2015-03-19 12:35:31 -04:00
Steve Harris
c585001981
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Former-commit-id: 3e863af798cf64ae9bbde71649339aa99698e33b
2015-03-18 16:05:13 -05:00
Steve Harris
67b3a77c4f
Merge tag 'OB_14.4.1-18m' into omaha_15.1.1
...
14.4.1_18m
Conflicts:
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 41217304fa68101d17e003b2fa6992d0e15b083c
2015-03-18 09:29:01 -05:00
