Commit graph

135 commits

Author SHA1 Message Date
Max Schenkelberg
f58795f460 Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index

Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5

Former-commit-id: 16046a4dde [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]
Former-commit-id: cc2080449c
2014-01-06 17:03:45 -06:00
Brian Clements
4015dc23ee Issue #2562 moved session data from chat to packet extension
delegated compression to smack
added timeout for http config
fixed getting all joined venues
fixed room invitation from non-cave client
create session checks for session name already used


Former-commit-id: 80650337ce [formerly 3781483ef6dd1889aa0ecd6ccc83bfb2461713b5]
Former-commit-id: ce0a34b53c
2013-12-19 12:08:21 -06:00
Brian Clements
92f1087bcf Issue #2562 fixed smack buid properties
removed src folder


Former-commit-id: fdb5504f33 [formerly e844d36335795a022a6d2180c0a38bfea6f3eac4]
Former-commit-id: f4c657de4d
2013-12-17 10:55:28 -06:00
Brian Clements
b8df043202 Issue #2561 removed ECF from collaboration
added smack 3.3.1 to cots
collaboration now uses smack directly for XMPP
moderate code cleanup on collaboration.comm
added double click to start chat in participant list


Former-commit-id: 8ece30944a [formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]
Former-commit-id: e6c4b39aca
2013-12-06 17:07:16 -06:00
Steve Harris
94a60728ca Issue #2214 - restoring the libjep.so files I clobbered in the omaha_14.1.1 -> development merge
Former-commit-id: c37908caa8 [formerly f0792ba7de783225b4c13970dff87bb7b17f4f94]
Former-commit-id: 39ab54c912
2013-11-19 10:08:45 -06:00
Steve Harris
869b505f80 Merge branch 'omaha_14.1.1' (14.1.1-9) into development
Conflicts:
	cots/org.jep.linux32/libjep.so
	cots/org.jep.linux64/libjep.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
      (took all the omaha_14.1.1 versions)

Former-commit-id: 0a36987a01 [formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]
Former-commit-id: 6d9efac6ef
2013-11-15 13:15:25 -06:00
Steve Harris
8c136f202d 14.1.1-9 baseline
Former-commit-id: f8f995b697 [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]
Former-commit-id: 5a0a40e67c
2013-11-15 12:47:49 -05:00
Bryan Kowal
01735ca0c4 Merge branch 'development' into development_on_RHEL6
Conflicts:
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 86dd200844 [formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]
Former-commit-id: 0544b66f4e
2013-11-13 13:16:55 -06:00
Dave Hladky
53866e481a Issue #2542 Jetty upgraded
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3

Former-commit-id: 643a150777 [formerly 8de606bc467ba4d567bc2825f2aa10211774ff7d]
Former-commit-id: e3a259182c
2013-11-12 14:55:41 -06:00
Richard Peter
59671c1e7d 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: 306bd6fae1 [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]
Former-commit-id: 460a7b8b5d
2013-11-12 11:11:36 -06:00
Brian Clements
a5b61b6d22 Issue #2515 upgraded camel from 2.11.0 to 2.11.2
removed log showBody workaround


Former-commit-id: 4f374688c8 [formerly afee27c0b6b574b7d664f47ca0f9369f2b920426]
Former-commit-id: ea6b162369
2013-11-07 16:56:25 -06:00
Steve Harris
48df058653 14.1.1-7 baseline
Former-commit-id: 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]
Former-commit-id: 4fff87723f
2013-11-06 14:16:14 -05:00
Steve Harris
6d20cd89ff Merge branch 'development' into development_on_RHEL6
Former-commit-id: 2e0db025f3 [formerly 1e8e1f73bdbb02ee2f8c91d4a2128ea0d77cf084]
Former-commit-id: a956fd7f4d
2013-11-04 20:29:07 -06:00
Dave Hladky
47b946fc3b Issue #2472 Replacing lost commit
Former-commit-id: 1f1469fe82 [formerly 7c1f7ad737361b55e85bdf48dad24c7a60b36e99]
Former-commit-id: 9c6a430d40
2013-11-04 16:24:14 -06:00
Bryan Kowal
7e94e4cd78 Issue #2476 - re-compile jep for RHEL6 64-bit
Former-commit-id: 5b99b99d3c [formerly 39a2c09fe71d3fbafa1a10dc08e7348f7710579c]
Former-commit-id: d034d82744
2013-10-31 15:56:34 -05:00
Bryan Kowal
adb62df96a Merge branch 'development' into development_on_RHEL6
Conflicts:
	cots/org.jep.linux64/libjep.so

Former-commit-id: 49422aea62 [formerly ecb1c0da101c986ef21bb8514660605926303a71]
Former-commit-id: d08a652e23
2013-10-31 15:43:29 -05:00
Bryan Kowal
d366e70934 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: feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]
Former-commit-id: c8d7a32e2e
2013-10-31 15:34:46 -05:00
Bryan Kowal
d08a1af457 Issue #2476 - recompile jep for RHEL5 32-bit, RHEL5 64-bit, and Windows 32-bit
Former-commit-id: c74123f5a8 [formerly be179f2809180da7812a9f4b53b48870b13191ae]
Former-commit-id: e9b76cf185
2013-10-31 14:53:27 -05:00
Greg Armendariz
4fb0e0bd2f Merge branch 'development' into development_on_RHEL6
Former-commit-id: f6d98d6317 [formerly e1969dc2abafe372c0e9a874f464fc5336efd119]
Former-commit-id: 64dd62005b
2013-10-30 14:52:16 -05:00
Nate Jensen
f2751f017e Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code
Former-commit-id: f3143ba7b4 [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]
Former-commit-id: 6880a18f1a
2013-10-29 14:33:53 -05:00
Steve Harris
eced243e6a Merge branch 'development' into development_on_RHEL6
Former-commit-id: 560b0075cd [formerly 44ca28a7f980977bec5834069cdaf6e18fc224e8]
Former-commit-id: 6ea4ac62ed
2013-10-28 15:58:12 -05:00
Steve Harris
7590a56e0e 14.1.1-4 baseline
Former-commit-id: bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]
Former-commit-id: 99e3707c5b
2013-10-28 10:55:16 -04:00
Steve Harris
4a6a209aea 14.1.1-3 baseline
Former-commit-id: 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]
Former-commit-id: 5739b4f832
2013-10-28 10:46:02 -04:00
Nate Jensen
cf63b37257 Merge "Issue #2491 Use reflections to build Procedure JAXB context. Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b" into development
Former-commit-id: 002005139f [formerly 16f9a9ece5743e0e1f2cd71b23287defb277e915]
Former-commit-id: 5a99163569
2013-10-24 20:02:18 -05:00
Ben Steffensmeier
d927e6b2d7 Issue #2491 Use reflections to build Procedure JAXB context.
Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b

Former-commit-id: bfc3faf08f [formerly 220f77069726f3652ca5cd1f7c100e01cf38547a]
Former-commit-id: fa0a0619bc
2013-10-24 11:28:06 -05:00
Bryan Kowal
4bb993d6c3 Issue #2476 - re-compile 64-bit jep for RHEL6
Former-commit-id: 4c3cdbb28e [formerly f4fc8fb61073ffd0ed88e9ac5520d9b538481516]
Former-commit-id: 8036733372
2013-10-23 17:12:02 -05:00
Richard Peter
6ecb80e892 Merge branch 'development' into development_on_RHEL6
Conflicts:
	cots/org.jep.linux64/libjep.so

Change-Id: Ib01663f1b3be2671b90a35af2fcfc73cc6b0635d

Former-commit-id: cb33f5ada7 [formerly 81a1af882e3fa8703e3b4b6bb687a1ab9710b386]
Former-commit-id: 14d5b8656e
2013-10-23 15:50:25 -05:00
Bryan Kowal
1737a11d53 Issue #2476 - recompiled Jep for Windows
Former-commit-id: 0e1c5b51ba [formerly 408bf5a265f558f22d86295e2c541166868d8d1b]
Former-commit-id: 79f2f2694f
2013-10-23 15:12:42 -05:00
Bryan Kowal
46f5db6284 Issue #2476 - recompiled jep for Linux
Former-commit-id: a3cfae3510 [formerly b33a29abbb89d392b7bba2862db4b3d06b2c24a5]
Former-commit-id: 9fe5429068
2013-10-23 15:12:42 -05:00
Bryan Kowal
0a06af1fdd Merge branch 'development' into development_on_RHEL6
Former-commit-id: a929dec887 [formerly b3e74019d1a8550c1c7cbebe219dee3ba7e603b3]
Former-commit-id: c13018301e
2013-10-14 17:58:22 -05:00
Nate Jensen
9e4100b0e1 Issue #2361 replace hibernatables being detected by SerializableManager with detection from open source reflections
Change-Id: I33ddc5eb2acb909d79f6d1121747dc2aa7489c2e

Former-commit-id: b49a2ceb2f [formerly 16205ab7302195e99c8af69f9d24b41bca869ce3]
Former-commit-id: 40847d0edf
2013-10-14 15:30:09 -05:00
Bryan Kowal
ef789bf912 Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/alertviz/customTargets.xml
	cave/build/p2-build.xml
	edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
	edexOsgi/meteolib.jni.linux64/libmeteoLib.so
	javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/ncep_grib2module/.cproject
	nativeLib/rary.meteorological/.cproject
	nativeLib/rary.meteorological/src/dcapeFunc.c
	rpms/awips2.cave/Installer.cave-etc/component.spec
	rpms/awips2.cave/Installer.cave-feature/component.spec
	rpms/awips2.core/Installer.aviation/component.spec
	rpms/awips2.qpid/0.18/deploy.builder/build.sh
	rpms/python.site-packages/Installer.qpid/component.spec

Former-commit-id: c125b5b053 [formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]
Former-commit-id: 9829477ced
2013-09-30 18:00:31 -05:00
Dave Hladky
41ba230de0 Issue #2388 Multiple code jars in path, Nate's logger finds.
Former-commit-id: 8e5d3d9742 [formerly ad02f4640d747328257f9b7a3f2ca2300fcc7bba]
Former-commit-id: f184d2ba9c
2013-09-19 10:59:07 -05:00
Dave Hladky
1694178dcd Issue #2340 Update path for xmlschema jar
Former-commit-id: f83ed6037c [formerly 2336dbc99ba0effc1571672f5ab29fbde4f47863]
Former-commit-id: 687bd183ee
2013-09-06 09:03:19 -05:00
Dave Hladky
6a71524ce4 Issue #2323 Update xmlschema packages to correct naming convention
Former-commit-id: 074f08c4cb [formerly 884684895e7f7f671e5efe4ea62222bfa3192900]
Former-commit-id: ccff3e3a54
2013-09-04 12:56:10 -05:00
Benjamin Phillippe
283326197a Issue #1538 Federated registry fixes/modifications
Change-Id: Iedc048fe42687bec17385f0aacf0af0141df2146

Former-commit-id: a96764e900 [formerly 05e0a84c1ef3d04256884b81219f643e8f38187d]
Former-commit-id: b10ecfa19c
2013-08-28 11:41:06 -05:00
Richard Peter
f9a1a40bc2 Merge "Issue #2097 Initial update for OGC services Change-Id: I1bc8fc8a4c125bc79057c4af929c0495f0e5eb99" into development
Former-commit-id: 7883b7642f [formerly 96d335d72286bba82f9054b525f47450854797d1]
Former-commit-id: 34a6082255
2013-08-28 08:26:51 -05:00
Dave Hladky
37062aac21 Issue #2097 Initial update for OGC services
Change-Id: I1bc8fc8a4c125bc79057c4af929c0495f0e5eb99

Former-commit-id: 83dba7b655 [formerly 875006e24de0755cdd0dedc7b0afcf221bcbad49]
Former-commit-id: bef4b3cdbd
2013-08-28 08:24:45 -05:00
Roger Ferrel
9025cd3e30 Issue #2225 Changes for make tar compressed files.
Change-Id: I154683fec10b57d548944dd9037d4ca61cbe1b1b

Former-commit-id: d4eeceb020 [formerly 3456f395e845457b1add41ca8d736a65b6fbb1c7]
Former-commit-id: 477719a069
2013-08-27 16:51:06 -05:00
Bryan Kowal
5dffc9321c 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: 0b4961e9b0 [formerly 0a735f5fe81d5329bc02a421ecc39a0974d48d37]
Former-commit-id: 8b51e353f1
2013-08-15 15:38:11 -05:00
Nate Jensen
b0f3d536e4 Issue #2027 upgrade version of derby
Change-Id: Ic84bcde6b411283ce07a4d6d5005e596d4f392c4

Former-commit-id: ec01e6e872 [formerly fe74cd780a74814665121c4ed334829f4a42a0ef]
Former-commit-id: be9315642b
2013-08-07 16:44:30 -05:00
Benjamin Phillippe
33f601b72e Issue #1693 Modified Submit objects to conform to 4.0 spec. Added remote object references and some cleanup
Change-Id: I0f4eafb3fa68f2d1eeade4f047c95d714502cf56

Former-commit-id: 73fd5ac852 [formerly 2aa7bdc1a8a942eaa0589527e8987b6fc518479f]
Former-commit-id: 5bd0d92363
2013-08-06 11:13:01 -05:00
Nate Jensen
a3fd5fa3ee Issue #2207 removing custom org.junit
Change-Id: I6b65719c0b48a3430b9318aa6dbbf4718f98df7b

Former-commit-id: 185296c67d [formerly ae869b69c5a648205d4d0cd7275b4a6c1e82054d]
Former-commit-id: 4ccfc5be82
2013-07-25 16:48:18 -05:00
Nate Jensen
1feaa09ccf Issue #2215 finish removing old facebook thrift
Change-Id: I32423b0f7d0b59cb439fcefcc9b5482947a8a4b1

Former-commit-id: d6efde8ce2 [formerly 66924bc597e0e6da2e5f28b10a40fca10d697fbd]
Former-commit-id: a859d20865
2013-07-23 14:03:03 -05:00
Nate Jensen
375ad89ac8 Issue #2215 upgrade thrift to version 0.9.0
Change-Id: I9cf910a75c25f1d97a711a9088c3b496ceb2be70

Former-commit-id: 7b4938a999 [formerly ab2e3f3e8910043b117887712258fc689f2e9445]
Former-commit-id: 8898a6d2ba
2013-07-23 12:28:07 -05:00
Nate Jensen
65dbc62b59 Issue #2142 clean up dependencies and dead code
Change-Id: I30f94c9afb01cdd1b7bef98c6ba40f79c3acea59

Former-commit-id: a636846295 [formerly 593073cade120a95899f4f4d2c5a652c6ac3389a]
Former-commit-id: f28420dac4
2013-07-17 16:30:08 -05:00
Ben Steffensmeier
466b24a577 Issue #2181 Convert geometry types to use hibernate-spatial
Former-commit-id: a655380bad [formerly ded324e06f81fc63e6567a535cfa8a843a39902d]
Former-commit-id: 0bc5aca64b
2013-07-16 15:50:14 -05:00
Max Schenkelberg
1610826d2e Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]
Former-commit-id: 50825200a1
2013-07-15 14:26:15 -05:00
Nate Jensen
6da64f329c Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895

Former-commit-id: 316d6c09c6 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]
Former-commit-id: db6152e524
2013-07-01 14:41:05 -05:00
Steve Harris
f658320357 13.5.1-4 baseline
Former-commit-id: 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]
Former-commit-id: e197f23ce3
2013-06-28 09:46:25 -04:00