root
|
73466bae44
|
Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: bb7b5341dd [formerly 0987fc6b3d ] [formerly cb46f57879 ] [formerly bb7b5341dd [formerly 0987fc6b3d ] [formerly cb46f57879 ] [formerly 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]]
Former-commit-id: 5a453ee984
Former-commit-id: 791f3f5b85 [formerly 537dbadf64 ] [formerly 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26 [formerly 8a66b2f209 ]]
Former-commit-id: 167e4e289205b778c1de6873be7610daf3a39f5f [formerly 1792158ef8 ]
Former-commit-id: 0eb9520e15
|
2012-08-15 22:15:20 +00:00 |
|
Bryan Kowal
|
6706056477
|
Issue #708 - fix cave dependency issue when building due to ecf. The baseline p2-build.xml script will no longer attempt to build the collaboration feature.
Former-commit-id: a6814ec7fb [formerly fa84e5df3e ] [formerly 207bbd3087 ] [formerly a6814ec7fb [formerly fa84e5df3e ] [formerly 207bbd3087 ] [formerly 25addabe64 [formerly 207bbd3087 [formerly 048ea55e064e0581cf32ca286c67f611ee4e0c3b]]]]
Former-commit-id: 25addabe64
Former-commit-id: f064abd37a [formerly 21a02e1510 ] [formerly 17ed68aef27593eee306fe2fb3bb631e5e2624fc [formerly 94e4af6d47 ]]
Former-commit-id: 26b9b80270ee9967c245bdeb19a771d7cfaad8d6 [formerly 85507d67dd ]
Former-commit-id: b69b1e9509
|
2012-06-19 15:03:57 -05:00 |
|
Steve Harris
|
ec9204fa94
|
Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
Conflicts:
cave/build/p2-build.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java
Former-commit-id: 03383359f3 [formerly af6c0529ad ] [formerly 2f20a86a30 ] [formerly 03383359f3 [formerly af6c0529ad ] [formerly 2f20a86a30 ] [formerly 48860df690 [formerly 2f20a86a30 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]]
Former-commit-id: 48860df690
Former-commit-id: 6c0d8be39e [formerly d7a4853091 ] [formerly 2439ad1c1bff354f69594e31d7a2a27f4fc21bc4 [formerly 27b50c57bd ]]
Former-commit-id: e4fb4019cc599080c632d3e4becfebc21fb21929 [formerly 2838ca117f ]
Former-commit-id: 70a928d039
|
2012-06-12 14:37:12 -05:00 |
|
Steve Harris
|
46068c6716
|
12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906 ] [formerly b13cbb7e00 ] [formerly 2f10c7a1e4 [formerly 8552902906 ] [formerly b13cbb7e00 ] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3 [formerly 97c4db937e ] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f ]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c ]
Former-commit-id: 39ff9954f8
|
2012-06-08 13:39:48 -05:00 |
|
Bryan Kowal
|
22218f31bd
|
Issue #450 - the pde build will now build a p2 repository for collaboration. Removed org.jivesoftware.smack from the collaboration feature because it is already in the cots feature which is included in the collaboration feature. Had to remove and re-add log4j to the alertviz and cots features.
Former-commit-id: db3f60b23a [formerly b1a5abc6b3 ] [formerly 6ddeef48fa ] [formerly db3f60b23a [formerly b1a5abc6b3 ] [formerly 6ddeef48fa ] [formerly ce99417a2a [formerly 6ddeef48fa [formerly b6c8b811ad911f13503859f7af09b916eb16a1d4]]]]
Former-commit-id: ce99417a2a
Former-commit-id: 8b08c8308e [formerly 541fe8fbbb ] [formerly 2de12493f2b8810fd8a4d81ec071b4416735a9af [formerly 10a291afa1 ]]
Former-commit-id: ffb83e28c6229d71093fafcfa99acc4e62dc25af [formerly 47c7cba3f5 ]
Former-commit-id: 07e4ddc1b9
|
2012-04-10 16:42:36 -05:00 |
|
root
|
7dbd17a5aa
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c ] [formerly 9f19e3f712 ] [formerly 133dc97f67 [formerly a02aeb236c ] [formerly 9f19e3f712 ] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59 ] [formerly 377dcd10b9 [formerly 3360eb6c5f ]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
|
2012-01-06 08:55:05 -06:00 |
|