Merge "Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes." into development

Former-commit-id: a4b1eb9dff [formerly e717ae510b] [formerly 8f67035519] [formerly a4b1eb9dff [formerly e717ae510b] [formerly 8f67035519] [formerly d7db5d0219 [formerly 8f67035519 [formerly 3a704d8d903afc5629a13f478af585947954b5d2]]]]
Former-commit-id: d7db5d0219
Former-commit-id: 7dc72f9bba [formerly 3fec426da2] [formerly 68223945005706fda2640591654c8d7d4815f98e [formerly 6eae16a7dc]]
Former-commit-id: dc6e6aca3594aebe8bc757e3f6554467e5e116c1 [formerly 0eba27543b]
Former-commit-id: 2ee7444aa7

cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/VerticalSubsetTab.java

@@ -67,6 +67,7 @@ import com.raytheon.uf.viz.datadelivery.subscription.subset.xml.VerticalXML;
  * Dec 10, 2012 1259       bsteffen   Switch Data Delivery from LatLon to referenced envelopes.
  * Jan 10, 2013 1444       mpduff     Add updateSettings method.
  * Sept 30, 1797 1797      dhladky    separated time from gridded time
+ * Oct 09, 2013 2267       bgonzale   Fix Collection cast to List error.
  * 
  * </pre>
  * 
@@ -197,7 +198,8 @@ public class VerticalSubsetTab extends SubsetTab implements
         List<String> returnList = new ArrayList<String>();
 
         Levels levels = null;
-        for (Parameter p : (List<Parameter>)dataSet.getParameters().values()) {
+        for (Parameter p : (Collection<Parameter>) dataSet.getParameters()
+                .values()) {
             DataLevelType tempCheck = p.getDataLevelByType(levelType.getType());
 
             if (tempCheck != null) {

edexOsgi/build.edex/esb/conf/modes.xml

@@ -238,7 +238,6 @@
 	<mode name="registry">
         <!-- Registry production mode -->
         <include>ebxml.*\.xml</include>
-        <includeMode>statsTemplate</includeMode>
         <includeMode>dataDeliveryTemplate</includeMode>
         <exclude>.*datadelivery-ncf.*</exclude>
         <exclude>harvester-*</exclude>
@@ -247,7 +246,6 @@
     <mode name="centralRegistry">
         <!-- Central Registry production mode -->
         <include>ebxml.*\.xml</include>
-        <includeMode>statsTemplate</includeMode>
         <includeMode>dataDeliveryTemplate</includeMode>
         <exclude>.*datadelivery-wfo.*</exclude>
     </mode>
@@ -305,7 +303,6 @@
 		are for DEVELOPMENT purposes only -->
     <mode name="devRegistry">
         <include>ebxml.*\.xml</include>
-        <includeMode>statsTemplate</includeMode>
         <includeMode>dataDeliveryTemplate</includeMode>
         <exclude>.*datadelivery-ncf.*</exclude>
     </mode>

edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/handlers/DataSetHandler.java

@@ -19,6 +19,7 @@
  **/
 package com.raytheon.uf.common.datadelivery.registry.handlers;
 
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -56,6 +57,7 @@ import com.raytheon.uf.common.util.CollectionUtil;
  * Dec 10, 2012 1259      bsteffen     Switch Data Delivery from LatLon to referenced envelopes.
  * Jun 04, 2013  223      mpduff       Added datatype to the filter.
  * Jun 24, 2013 2106      djohnson     Now composes a registryHandler.
+ * Oct 09, 2013 2267      bgonzale     Fix Collection cast to List error.
  * 
  * </pre>
  * 
@@ -146,7 +148,8 @@ public class DataSetHandler extends
                 // referenced by
                 // their RegistryObject ids...
                 Map<String, Parameter> remap = new HashMap<String, Parameter>();
-                for (Parameter parm : (List<Parameter>) obj.getParameters().values()) {
+                for (Parameter parm : (Collection<Parameter>) obj
+                        .getParameters().values()) {
                     try {
                         remap.put(RegistryUtil.getRegistryObjectKey(parm), parm);
                     } catch (Throwable e1) {

edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/resources/com.raytheon.uf.edex.datadelivery.retrieval.properties

@@ -4,7 +4,7 @@ sbn.retrieval.transfer.wmo.header.dataProviderMap=NOMADS:A,MADIS:B,PDA:C
 sbn.retrieval.transfer.wmo.header.dataFormatMap=GRID:A,MADIS:B,NETCDF:C
 sbn.retrieval.transfer.wmo.header.dataSourceMap=MODEL:1,OBSERVATION:2,SATELLITE:3
 # WMO Header MessageFormat should be used for SBN retrievals
-sbn.retrieval.transfer.wmo.header=LZ{0}{1}9{2} KWBC {3,date,ddHH00}
+sbn.retrieval.transfer.wmo.header=LZ{0}{1}9{2} KWBC {3,date,ddHH00}\r\r\n
 # How often to check for retrievals to process
 # Valid units: [MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS]
 retrieval.task.frequency=1 MINUTES

edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/handlers/DataDeliveryRetrievalWmoHeaderApplier.java

@@ -69,6 +69,7 @@ import com.raytheon.uf.edex.core.props.PropertiesException;
  * Oct 01, 2013 2267       bgonzale     Pass request parameter instead of components of request.
  *                                      Fixed ordering of elements in maps and defaults when
  *                                      element keys are null.
+ * Oct 09, 2013 2267       bgonzale     Fix Wmo header cr and lf formatting.
  * 
  * </pre>
  * 
@@ -132,7 +133,7 @@ public class DataDeliveryRetrievalWmoHeaderApplier implements IWmoHeaderApplier
         final Object formatArgs = createMessageFormatArgs(dataProvider,
                 dataFormat, sourceType, date);
         final String formattedWmoHeader = wmoHeaderMessage.format(formatArgs);
-        return formattedWmoHeader + "\n" + data;
+        return formattedWmoHeader + data;
     }
 
     private Object createMessageFormatArgs(String dataProvider,

tests/unit/com/raytheon/uf/edex/datadelivery/retrieval/handlers/DataDeliveryRetrievalWmoHeaderApplierTest.java

@@ -45,6 +45,7 @@ import com.raytheon.uf.edex.wmo.message.WMOMessage;
  * ------------ ---------- ----------- --------------------------
  * Aug 08, 2013 1822       bgonzale    Initial creation
  * Oct 01, 2013 2267       bgonzale    Added test for null inputs.
+ * Oct 09, 2013 2267       bgonzale    Fix Wmo header cr and lf formatting testing.
  * 
  * </pre>
  * 
@@ -74,7 +75,7 @@ public class DataDeliveryRetrievalWmoHeaderApplierTest {
 
     private static DataDeliveryRetrievalWmoHeaderApplier createApplier()
             throws PropertiesException {
-        String wmoHeader = "LZ{0}{1}9{2} KWBC {3,date,ddHH00}";
+        String wmoHeader = "LZ{0}{1}9{2} KWBC {3,date,ddHH00}\r\r\n";
         String dataProviderMapping = "NOMADS:A,MADIS:B,PDA:C";
         String dataFormatMapping = "GRID:A,MADIS:B,NETCDF:C";
         String dataSourceMapping = "MODEL:1,OBSERVATION:2,SATELLITE:3";