Commit graph

366 commits

Author SHA1 Message Date
Bryan Kowal
646d61335d Issue #2356 - update httpd-collaboration configuration for new httpd version and RHEL6
Former-commit-id: 21ac850e9cf61f58a324f17ee687f50cda7c5804
2013-09-12 13:08:07 -05:00
Bryan Kowal
ca9597b66a Issue #2356 - pypies configuration updates and RHEL6 compatibility updates
Former-commit-id: 2f1617632a5d24748e915066a7209839bca3f68a
2013-09-11 17:34:19 -05:00
Bryan Kowal
9a370ca614 Issue #2343 - resolve AWIPS II httpd depenency issue
Former-commit-id: b5081a38c6d90f47a625fde975f717ff4f63215f
2013-09-10 17:04:35 -05:00
Bryan Kowal
101fd09211 Issue #2163 - disable Java 7 build
Former-commit-id: eb2bba4ac4a43eff894a23f714c8b71fba20419c
2013-09-09 09:46:09 -05:00
Bryan Kowal
79e88c19aa Issue #2163 - convert the few remaining python rpms for 14.1.1; remove 13.6 feature modifications
Former-commit-id: 4503735d3a05071878683f4a523d0dbd37e47ea3
2013-09-06 12:30:01 -05:00
Bryan Kowal
b88a13d3b5 Issue #2163 - fix Eclipse CDT metadata after merge
Former-commit-id: 7502d12a78c68f56e33a41bae7b3346d195ad79f
2013-09-04 14:49:47 -05:00
Bryan Kowal
03cadc5aa9 Issue #2163 - build dynamicserialize and ufpy with the redhat 6 build
Former-commit-id: 422e9b611535e9c20338041e0e1af62d38aab047
2013-09-04 13:48:08 -05:00
Bryan Kowal
326cae8be4 Issue #2163 - RHEL6 nativeLib changes required for compiler compatibility
- Amend: restore mpe changes
- Amend: attempt rebase

Change-Id: I7763e2b8b56cc9d2caae022f35e72c82a7f1da90

Conflicts:

	nativeLib/edex_com/.cproject
	nativeLib/edex_notify/.cproject


Former-commit-id: 5fb2f3ae5276385fb65c2102ad7619a855947632
2013-09-04 10:08:21 -05:00
Steve Harris
7fe19d898c Merge branch 'master_13.5.2' (13.5.2-2) into omaha_14.1.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
	nativeLib/edexBridge/.cproject
	nativeLib/edexBridge/edexBridge.cpp
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/ld.so.conf.d/awips2-ldm-i386.conf
	rpms/awips2.qpid/0.18/SOURCES/awips.patch
	rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec
	rpms/awips2.qpid/0.18/deploy.builder/build.sh
	rpms/build/common/rpms.sh

Former-commit-id: b2674e0f626c643f0f81f865ea56351af2531c6a
2013-09-03 16:05:44 -05:00
Bryan Kowal
ab3485a3ed Issue #2163 - RHEL6 14.1.1 build updates
Former-commit-id: b0e47f4548c235a7cbaefc12e97264ce4c782fce
2013-09-03 13:46:19 -05:00
Steve Harris
9e4bf0cf2e 13.5.2-2 baseline
Former-commit-id: 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9
2013-08-29 15:01:29 -04:00
Steve Harris
542b2c3d18 13.5.2-1 baseline
Former-commit-id: a362ca91ee5972a1501a2842191fbe2e23feac9c
2013-08-28 09:43:48 -04:00
Steve Harris
0a7acf96c7 13.5.1-18 baseline
Former-commit-id: f407ad6db2f621a5be95939aea88f49d874d1ab6
2013-08-22 09:12:43 -04:00
Steve Harris
b210c90245 13.5.1-17 baseline
Former-commit-id: c5d75a6473b2659b9ac1054a1160c921bd8c1c16
2013-08-19 16:34:24 -04:00
Bryan Kowal
7f8226d319 Issue #2163 - build the java and awips2-common-base rpms
Former-commit-id: dcd9e70f94deda8a26e8df00ee9bc8ffc13abe43
2013-08-15 15:40:18 -05:00
Bryan Kowal
382cb87fa3 Issue #2163 - copy additional httpd source to the rpm SOURCES directory
Former-commit-id: b22a36d559ba6db6d1bd3d3c6785984353449a92
2013-08-15 15:40:05 -05:00
Bryan Kowal
c0458d512d Issue #2163 - remaining RHEL6 RPM changes
- Amend: update build.sh to build the full set of rpms

Change-Id: I182f23ffc67f2dc84a0e5436b2830311e29f534f

Conflicts:
	rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0

Former-commit-id: 45adc2b64e9037273e1013631ba7a8fbef400c35
2013-08-15 15:39:37 -05:00
Bryan Kowal
8b51e353f1 Issue #2163 - fixed awips2-openfire and re-compiled nativeLib for RHEL6.
Conflicts:
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so

Former-commit-id: 0a735f5fe81d5329bc02a421ecc39a0974d48d37
2013-08-15 15:38:11 -05:00
Bryan Kowal
94eacfc460 Issue #2163 - remaining rpms that are not dependent on nativeLib and cleanup
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.uf.viz.feature.alertviz/feature.xml

Former-commit-id: 58a80b4b6d31d11b0ca722545bfd788a2feee488
2013-08-15 15:30:05 -05:00
Bryan Kowal
36eca9bbfb Issue #2163 - additional RHEL6 changes
- updated edexBridge to use the QPID 0.18 API
- awips2-ldm is now ready for RHEL 6
- the QPID 0.18 rpms now build for RHEL 6
- disabled the build of QPID 0.7
- awips2-qpid-lib (new to RHEL 6) is now ready


Former-commit-id: d0f73c3852e45ec7b2363b46c77a94d7b3a47143
2013-08-15 15:25:52 -05:00
Bryan Kowal
b1e4e77a13 Issue #2163 - pgadmin 3 updated for RHEL 6 compatibility
Former-commit-id: 417c6abe1a9d7f2df51ca38a8127d06e6a15dc7b
2013-08-15 15:25:43 -05:00
Bryan Kowal
c0614bc7d4 Issue #2163 - updates to PostgreSQL, psql, httpd-pypies, and httpd-collaboration rpms
- httpd has been updated for compatibility


Former-commit-id: 8298c43aba3850753b67ff002f71e02e70b12fb0
2013-08-15 15:25:02 -05:00
Bryan Kowal
e686f9bdda Issue #2163 - 64-bit RHEL6 rpm conversion
- converted ant and added ant source to the repository (will no longer need to be retrieved from awipscm)
- converted Java
- converted the hdf5 tools and lzf is now built from source in addition to the hdf5 tools
- fixed python h5py to correctly include the built libsz libraries


Former-commit-id: ffc8892888976ee4b9d9edeb315b74edc5bb375f
2013-08-15 15:24:48 -05:00
Bryan Kowal
be011d3b92 Issue #2163 - python rpm specification and awips2-notification compatibility with RedHat 6
Former-commit-id: f2497ff20afefdcf67b0b4bcc17f9ee358d2288d
2013-08-15 15:24:11 -05:00
Steve Harris
7ce0234d76 13.5.1-16 baseline
Former-commit-id: 2fcbcde58066c18ab423c94c37f446ab5e7f42da
2013-08-15 13:40:37 -04:00
Steve Harris
c6dc1817e7 13.5.1-15 baseline
Former-commit-id: dbf9107f9c775f9a1df759bc341c0722f5fc92f2
2013-08-14 10:24:26 -04:00
Steve Harris
80e5f7fbd4 13.5.1-14 baseline
Former-commit-id: fe7b1a704ee92b34684e4f9059bd61cfa28dd485
2013-08-14 10:07:41 -04:00
Greg Armendariz
5577e686c1 13.5.1-13 baseline
Former-commit-id: 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4
2013-08-08 17:00:36 -04:00
Greg Armendariz
fe51885ba7 13.5.1-12 baseline
Former-commit-id: eb9cd610891ce5830f4a169db036a49f32c1e63b
2013-08-08 15:34:01 -04:00
Greg Armendariz
4ec04083bd 13.5.1-11 baseline
Former-commit-id: 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f
2013-08-07 14:34:27 -04:00
Greg Armendariz
acf7ced37b 13.5.1-10 baseline
Former-commit-id: c2c6882c462c34ce9cb9ea3399071c2a121ba0f7
2013-08-07 14:14:46 -04:00
Steve Harris
6e60cd9a79 13.5.1-9 baseline
Former-commit-id: 06a1dd45adedbe259f9c30ebf93f2f90017fe945
2013-08-01 09:20:23 -04:00
Steve Harris
dfbf9a5afe 13.5.1-8 baseline
Former-commit-id: 37504305d70e6aaf6a7bdfad8267054af0612515
2013-07-26 09:02:34 -04:00
Steve Harris
86ce1248c2 13.5.1-7 baseline
Former-commit-id: 4310ff14ffe9c7975574bb8b40bef668a90649e4
2013-07-18 12:07:22 -04:00
Greg Armendariz
b9044b1195 13.5.1-6 baseline
Former-commit-id: 30b8d4c0ce425715ea44a394b4b4f143c64b416a
2013-07-10 10:04:22 -04:00
Greg Armendariz
ea7ac37930 13.5.1-5 baseline
Former-commit-id: e0157ab61ca5f2a62d78993a27893778fa119c4f
2013-07-03 12:20:27 -04:00
Steve Harris
e197f23ce3 13.5.1-4 baseline
Former-commit-id: d18b403b332dff67d1c85d4317bbceda337d1b41
2013-06-28 09:46:25 -04:00
Steve Harris
72d22a30c9 13.5.1-3 baseline
Former-commit-id: cc90f0c02410fef504ec9de389c07dfa41164247
2013-06-24 09:29:43 -04:00
Steve Harris
3386330894 13.5.1-2 baseline
Former-commit-id: 36f4554f8f80812a5ffa0d243fe1a4ad6e330192
2013-06-17 15:01:22 -04:00
Steve Harris
fe872355a7 13.5.1-1 baseline
Former-commit-id: 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3
2013-06-10 15:17:17 -04:00
Steve Harris
2fc7f80939 Merge branch 'master_13.4.1' into master_13.5.1
Conflicts (solved by taking all of 13.4.1-14):
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/build/i386/build.sh


Former-commit-id: 388fb201c6914d9ec7986a1017df57e5e2de0633
2013-06-10 15:07:59 -04:00
Steve Harris
18b90226a2 13.4.1-14 baseline
Former-commit-id: 0e4ca3ea4159ea0256e22f9814f0de85180a41fb
2013-06-06 15:15:27 -04:00
Steve Harris
de476791fb 13.4.1-13 baseline
Former-commit-id: f79327d3865cb0fa7812d5fba896c1a46013badf
2013-05-29 16:30:09 -04:00
Steve Harris
e53ada66b8 13.4.1-12 baseline
Former-commit-id: 398b25dee65cd6154c467b657ced5c9d2bada11a
2013-05-22 16:42:39 -04:00
Steve Harris
c0376ce9ed 13.4.1-11 baseline
Former-commit-id: e414ae01ab52b3940647e46e22bba3b89790c142
2013-05-21 09:19:25 -04:00
Steve Harris
92152778b9 13.4.1-10 baseline
Former-commit-id: bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4
2013-05-20 10:52:47 -04:00
Steve Harris
aff41713f9 13.4.1-9 baseline
Former-commit-id: 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375
2013-05-16 11:12:07 -04:00
Steve Harris
c59b52a266 13.4.1-8 baseline
Former-commit-id: d130c847d4f9d0b491f9326c8b5140fb59174927
2013-05-14 09:21:41 -04:00
Steve Harris
8347bed50e 13.4.1-7 baseline
Former-commit-id: dd6304e82206bb46b0c0442d15ab5d9312d9f19f
2013-05-13 12:58:10 -04:00
Steve Harris
16fe8cc5a2 13.4.1-6 baseline
Former-commit-id: f30c650b1c406889c38a5f82bbeda3605adbd9a5
2013-05-07 08:47:39 -04:00