Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration

Conflicts:
	edexOsgi/build.edex/deploy-install.xml

Seems to have solved itself or was not actually a conflict


Former-commit-id: dcadf7baa4 [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]
Former-commit-id: 86e586befe
This commit is contained in:
Steve Harris 2012-02-23 12:38:55 -06:00
commit 938dc5b21c
3966 changed files with 593744 additions and 221243 deletions

View file

@ -5,6 +5,7 @@
12/26/2011 Xiaochuan DR14236 (trac 11710) request to fix SCAN Alert Visualization BASE
configuring file. Changed true or false setting on popup, text,
blink and color items followed the A1 configuring master.gcf file.
01/31/2012 dyninaj DR14427 added category NDFD
-->
<alertConfiguration name="DEFAULT">
<globalConfiguration height="37" width="-1" yPosition="-1" xPosition="-1" logLength="10" audioDuration="30" blinkDuration="5" expandedPopup="false" categoryShown="false" sourceKeyShown="false" priorityShown="false" mode="H2"/>
@ -18,6 +19,7 @@
<category textBox="1" categoryName="MISC" longName="Miscellaneous" locked="true"/>
<category textBox="1" categoryName="MODEL" longName="Model Related" locked="true"/>
<category textBox="1" categoryName="MONITOR" longName="Used only by Monitor applications." locked="true"/>
<category textBox="1" categoryName="NDFD" longName="AWIPS NDFD messages" locked="true"/>
<category textBox="1" categoryName="NWSADMIN" longName="NWS Administrative messages" locked="true"/>
<category textBox="1" categoryName="OBS_SFC" longName="Surface Observations" locked="true"/>
<category textBox="1" categoryName="OBS_UPPR" longName="Upper Observations" locked="true"/>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<AttributeSetGroup xmlns:ns2="http://www.example.org/productType" xmlns:ns3="group">
<resource>GFS_ENS</resource>
<attrSetGroupName>standard</attrSetGroupName>
<attrSetNames>500mb_avg_hght,500mb_avg_tmpc</attrSetNames>
</AttributeSetGroup>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<AttributeSetGroup xmlns:ns2="http://www.example.org/productType" xmlns:ns3="group">
<resource>NAM_00</resource>
<attrSetGroupName>standard</attrSetGroupName>
<attrSetNames>500mb_avg_hght,500mb_avg_tmpc</attrSetNames>
</AttributeSetGroup>

View file

@ -1,5 +1,4 @@
colorMapName=osf_ref16
colorBar=@dfltRadarColorBar.xml
productCode=19
prodName=BREF
elevationNumber=1

View file

@ -0,0 +1,4 @@
colorMapName=osf_ref16
colorBar=@dfltRadarColorBar.xml
productCode=20
elevationNumber=1

View file

@ -1,5 +1,4 @@
colorMapName=osf_ref16
colorBar=@dfltRadarColorBar.xml
productCode=19
prodName=BREF
elevationNumber=2

View file

@ -0,0 +1,4 @@
colorMapName=osf_ref16
colorBar=@dfltRadarColorBar.xml
productCode=20
elevationNumber=2

View file

@ -1,5 +1,4 @@
colorMapName=osf_ref16
colorBar=@dfltRadarColorBar.xml
productCode=19
prodName=BREF
elevationNumber=3

View file

@ -0,0 +1,4 @@
colorMapName=osf_ref16
colorBar=@dfltRadarColorBar.xml
productCode=20
elevationNumber=3

View file

@ -1,5 +1,4 @@
colorMapName=osf_ref16
colorBar=@dfltRadarColorBar.xml
productCode=19
prodName=BREF
elevationNumber=4

View file

@ -0,0 +1,4 @@
colorMapName=osf_ref16
colorBar=@dfltRadarColorBar.xml
productCode=20
elevationNumber=4

View file

@ -1,5 +1,4 @@
colorMapName=osf_ref16
colorBar=@dfltRadarColorBar.xml
productCode=19
prodName=BREF
elevationNumber=5

View file

@ -1,5 +1,4 @@
colorMapName=osf_ref16
colorBar=@dfltRadarColorBar.xml
productCode=19
prodName=BREF
elevationNumber=6

View file

@ -0,0 +1,6 @@
colorMapName=rad_scref
colorBar=@dfltRadarColorBar.xml
! 4km CREF
productCode=38
! check elevation
elevationNumber=0

View file

@ -0,0 +1,6 @@
colorMapName=rad_scref
colorBar=@dfltRadarColorBar.xml
! 1km COMP REFL
productCode=37
! check elevation
elevationNumber=0

View file

@ -0,0 +1,6 @@
colorMapName=rad_scref
colorBar=@dfltRadarColorBar.xml
! 4km COMP REFL
productCode=36
! check elevation
elevationNumber=0

View file

@ -0,0 +1,6 @@
! ?what is correct colormap?
colorMapName=lingray
colorBar=@dfltRadarColorBar.xml
! 1km Digital Hybrid Scan Refl.
productCode=32
elevationNumber=0

View file

@ -0,0 +1,5 @@
colorMapName=rad_eetops
colorBar=@dfltRadarColorBar.xml
! 1km Enhanced Echo Tops
productCode=135
elevationNumber=0

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<AttributeSetGroup xmlns:ns2="group" xmlns:ns3="http://www.example.org/productType">
<resource>LocalRadar</resource>
<attrSetGroupName>.25km</attrSetGroupName>
<attrSetNames>VEL3_.25.00,VEL4_.25.00,VEL2_.25.00</attrSetNames>
</AttributeSetGroup>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<AttributeSetGroup xmlns:ns2="group" xmlns:ns3="http://www.example.org/productType">
<resource>LocalRadar</resource>
<attrSetGroupName>1km</attrSetGroupName>
<attrSetNames>VEL3_1.00,VEL5_1.00,BREF6_1.00,SRVEL2_1.00,TOPS_1.00,EETOPS_1.00,CREF_1.00,BREF4_1.00,DIGSCAN_1.00,VEL6_1.00,SRVEL6_1.00,BREF1_1.00,BREF5_1.00,SRVEL3_1.00,VEL2_1.00,BREF3_1.00,VIL_1.00,VEL4_1.00,VEL1_1.00,SRVEL5_1.00,SRVEL4_1.00,BREF2_1.00,SRVEL1_1.00</attrSetNames>
</AttributeSetGroup>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<AttributeSetGroup xmlns:ns2="group" xmlns:ns3="http://www.example.org/productType">
<resource>LocalRadar</resource>
<attrSetGroupName>2km</attrSetGroupName>
<attrSetNames>PRCP1_2.00,PRCP3_2.00,BREF3_2.00,PRCPC_2.00,BREF4_2.00,BREF1_2.00,BREF2_2.00</attrSetNames>
</AttributeSetGroup>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<AttributeSetGroup xmlns:ns2="group" xmlns:ns3="http://www.example.org/productType">
<resource>LocalRadar</resource>
<attrSetGroupName>4km</attrSetGroupName>
<attrSetNames>VIL_4.00,CREF_4.00,CREFP_4.00</attrSetNames>
</AttributeSetGroup>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<AttributeSetGroup xmlns:ns2="group" xmlns:ns3="http://www.example.org/productType">
<resource>LocalRadar</resource>
<attrSetGroupName>AllProducts</attrSetGroupName>
<attrSetNames>VIL_4.00,PRCP1_2.00,PRCP3_2.00,CREF_1.00,BREF3_2.00,DIGSCAN_1.00,EETOPS_1.00,VEL3_.25.00,CREF_4.00,VEL4_.25.00,PRCPC_2.00,VEL1_.25.00,BREF4_2.00,BREF1_2.00,VEL2_.25.00,BREF2_2.00,BREF1_1.00,BREF2_1.00,BREF3_1.00,BREF4_1.00,BREF5_1.00,BREF6_1.00,CREFP_4.00,RCM_0.00,SRVEL1_1.00,SRVEL2_1.00,SRVEL3_1.00,SRVEL4_1.00,SRVEL5_1.00,SRVEL6_1.00,STRAC_1.00,TOPS_1.00,VEL1_1.00,VEL2_1.00,VEL3_1.00,VEL4_1.00,VEL5_1.00,VEL6_1.00,VIL_1.00</attrSetNames>
</AttributeSetGroup>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<AttributeSetGroup xmlns:ns2="group" xmlns:ns3="http://www.example.org/productType">
<resource>LocalRadar</resource>
<attrSetGroupName>BaseReflectivity</attrSetGroupName>
<attrSetNames>BREF6_1.00,BREF4_1.00,BREF2_2.00,BREF2_1.00,BREF3_2.00,BREF1_1.00,BREF5_1.00,BREF4_2.00,BREF3_1.00,BREF1_2.00</attrSetNames>
</AttributeSetGroup>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<AttributeSetGroup xmlns:ns2="group" xmlns:ns3="http://www.example.org/productType">
<resource>LocalRadar</resource>
<attrSetGroupName>CompReflectivity</attrSetGroupName>
<attrSetNames>CREF_1.00,CREF_4.00,CREFP_4.00</attrSetNames>
</AttributeSetGroup>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<AttributeSetGroup xmlns:ns2="group" xmlns:ns3="http://www.example.org/productType">
<resource>LocalRadar</resource>
<attrSetGroupName>EchoTops</attrSetGroupName>
<attrSetNames>TOPS_1.00,EETOPS_1.00</attrSetNames>
</AttributeSetGroup>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<AttributeSetGroup xmlns:ns2="group" xmlns:ns3="http://www.example.org/productType">
<resource>LocalRadar</resource>
<attrSetGroupName>Elevation1</attrSetGroupName>
<attrSetNames>PRCP1_2.00,VEL1_.25.00,BREF1_2.00,BREF1_1.00,SRVEL1_1.00,VEL1_1.00</attrSetNames>
</AttributeSetGroup>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<AttributeSetGroup xmlns:ns2="group" xmlns:ns3="http://www.example.org/productType">
<resource>LocalRadar</resource>
<attrSetGroupName>Elevation2</attrSetGroupName>
<attrSetNames>SRVEL2_1.00,VEL2_1.00,VEL2_.25.00,BREF2_1.00,BREF2_2.00</attrSetNames>
</AttributeSetGroup>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<AttributeSetGroup xmlns:ns2="group" xmlns:ns3="http://www.example.org/productType">
<resource>LocalRadar</resource>
<attrSetGroupName>Elevation3</attrSetGroupName>
<attrSetNames>VEL3_1.00,BREF3_2.00,VEL3_.25.00,SRVEL3_1.00,BREF3_1.00</attrSetNames>
</AttributeSetGroup>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<AttributeSetGroup xmlns:ns2="group" xmlns:ns3="http://www.example.org/productType">
<resource>LocalRadar</resource>
<attrSetGroupName>Elevation4</attrSetGroupName>
<attrSetNames>VEL4_1.00,BREF4_2.00,VEL4_.25.00,SRVEL4_1.00,BREF4_1.00</attrSetNames>
</AttributeSetGroup>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<AttributeSetGroup xmlns:ns2="group" xmlns:ns3="http://www.example.org/productType">
<resource>LocalRadar</resource>
<attrSetGroupName>Misc</attrSetGroupName>
<attrSetNames>DIGSCAN_1.00,RCM_0.00,STRAC_1.00</attrSetNames>
</AttributeSetGroup>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<AttributeSetGroup xmlns:ns2="group" xmlns:ns3="http://www.example.org/productType">
<resource>LocalRadar</resource>
<attrSetGroupName>Precip</attrSetGroupName>
<attrSetNames>PRCP1_2.00,PRCP3_2.00,PRCPC_2.00</attrSetNames>
</AttributeSetGroup>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<AttributeSetGroup xmlns:ns2="group" xmlns:ns3="http://www.example.org/productType">
<resource>LocalRadar</resource>
<attrSetGroupName>VIL</attrSetGroupName>
<attrSetNames>VIL_4.00,VIL_1.00</attrSetNames>
</AttributeSetGroup>

View file

@ -0,0 +1,5 @@
colorMapName=nids_pre
colorBar=@dfltRadarColorBar.xml
! 2km 1 hr precip
productCode=78
elevationNumber=0

View file

@ -0,0 +1,5 @@
colorMapName=nids_pre
colorBar=@dfltRadarColorBar.xml
! 2km total precip
productCode=80
elevationNumber=0

View file

@ -0,0 +1,5 @@
colorMapName=nids_pre
colorBar=@dfltRadarColorBar.xml
productCode=101
prodName=PRCPC
elevationNumber=0

View file

@ -0,0 +1,5 @@
colorMapName=osf_ref16
colorBar=@dfltRadarColorBar.xml
! Radar Coded Message
productCode=74
elevationNumber=0

View file

@ -0,0 +1,5 @@
colorMapName=rad_srmvel
colorBar=@dfltRadarColorBar.xml
! 1km Storm Relative Motion
productCode=56
elevationNumber=1

View file

@ -0,0 +1,5 @@
colorMapName=rad_srmvel
colorBar=@dfltRadarColorBar.xml
! 1km Storm Relative Motion
productCode=56
elevationNumber=2

View file

@ -0,0 +1,5 @@
colorMapName=rad_srmvel
colorBar=@dfltRadarColorBar.xml
! 1km Storm Relative Motion
productCode=56
elevationNumber=3

View file

@ -0,0 +1,5 @@
colorMapName=rad_srmvel
colorBar=@dfltRadarColorBar.xml
! 1km Storm Relative Motion
productCode=56
elevationNumber=4

View file

@ -0,0 +1,5 @@
colorMapName=rad_srmvel
colorBar=@dfltRadarColorBar.xml
! 1km Storm Relative Motion
productCode=56
elevationNumber=5

View file

@ -0,0 +1,5 @@
colorMapName=rad_srmvel
colorBar=@dfltRadarColorBar.xml
! 1km Storm Relative Motion
productCode=56
elevationNumber=6

View file

@ -0,0 +1,5 @@
colorMapName=osf_ref16
colorBar=@dfltRadarColorBar.xml
! Storm Track Information (Graphic)
productCode=58
elevationNumber=0

View file

@ -0,0 +1,6 @@
colorMapName=osf_etops
colorBar=@dfltRadarColorBar.xml
! 1km Echo Tops
productCode=41
! check elevation
elevationNumber=0

View file

@ -0,0 +1,5 @@
colorMapName=nids_vel16
colorBar=@dfltRadarColorBar.xml
! .25km Radial Velocity
productCode=99
elevationNumber=1

View file

@ -0,0 +1,4 @@
colorMapName=nids_vel16
colorBar=@dfltRadarColorBar.xml
productCode=27
elevationNumber=1

View file

@ -0,0 +1,5 @@
colorMapName=nids_vel16
colorBar=@dfltRadarColorBar.xml
! .25km Radial Velocity
productCode=99
elevationNumber=2

View file

@ -0,0 +1,4 @@
colorMapName=nids_vel16
colorBar=@dfltRadarColorBar.xml
productCode=27
elevationNumber=2

View file

@ -0,0 +1,5 @@
colorMapName=nids_vel16
colorBar=@dfltRadarColorBar.xml
! .25km Radial Velocity
productCode=99
elevationNumber=3

View file

@ -0,0 +1,4 @@
colorMapName=nids_vel16
colorBar=@dfltRadarColorBar.xml
productCode=27
elevationNumber=3

View file

@ -0,0 +1,5 @@
colorMapName=nids_vel16
colorBar=@dfltRadarColorBar.xml
! .25km Radial Velocity
productCode=99
elevationNumber=4

View file

@ -0,0 +1,4 @@
colorMapName=nids_vel16
colorBar=@dfltRadarColorBar.xml
productCode=27
elevationNumber=4

View file

@ -0,0 +1,4 @@
colorMapName=nids_vel16
colorBar=@dfltRadarColorBar.xml
productCode=27
elevationNumber=5

View file

@ -0,0 +1,4 @@
colorMapName=nids_vel16
colorBar=@dfltRadarColorBar.xml
productCode=27
elevationNumber=6

View file

@ -0,0 +1,5 @@
colorMapName=nids_vil
colorBar=@dfltRadarColorBar.xml
! 1km DIGITAL VIL
productCode=134
elevationNumber=0

View file

@ -0,0 +1,4 @@
colorMapName=osf_ref16
colorBar=@dfltRadarColorBar.xml
productCode=57
elevationNumber=0

Some files were not shown because too many files have changed in this diff Show more