xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Omaha #2914 - Remove calls to PropertiesFactory

Browse source 
Change-Id: I1dd1696b86411f8f9707deb7c54a75c6d669b3be

Former-commit-id: b59ebac85404fba5657e9041b6f2be7a1959fd9c
This commit is contained in:
Greg Armendariz 2014-07-15 15:12:53 -05:00
parent e4c85f7cd5
commit b34486973e
48 changed files with 178 additions and 1493 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
edexOsgi/build.edex/esb/conf/res/analysis-barnes.xml
View file

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<!-- properties for the objective analysis factory method -->
<!-- defines the class name for the Barnes scheme analysis -->
<properties>
<Name>ANAL_BARNES</Name>
<OBJECT>com.raytheon.edex.objanalysis.ObjAnalysisBarnes </OBJECT>
</properties>

242
edexOsgi/build.edex/esb/conf/res/base/attributeNames.xml
View file

@ -1,242 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<properties>
<Name>ATTRIBUTE_NAMES</Name>
<!-- The following list of values are lucene index names.
The tag names are used to reference those values in Parser and Decoder classes
-->
<PRODUCTTYPE>product_type</PRODUCTTYPE>
<DATATYPE>datatype</DATATYPE>
<SATELLITE>satellite</SATELLITE>
<AREASUBTYPE>area_subtype</AREASUBTYPE>
<PRODUCT>product</PRODUCT>
<GOES>parameter</GOES>
<NONGOES>non_goes_satellite_product</NONGOES>
<SOURCE>source</SOURCE>
<CREATINGENTITY>creating_entity</CREATINGENTITY>
<SECTORID>locationkey</SECTORID>
<PHYSICALELEMENT>physical_element</PHYSICALELEMENT>
<PROJECTION>projection</PROJECTION>
<RESOLUTION>resolution</RESOLUTION>
<LAMBERTSCANNINGMODE1>lambert_scanning_horiz</LAMBERTSCANNINGMODE1>
<LAMBERTSCANNINGMODE2>lambert_scanning_vert</LAMBERTSCANNINGMODE2>
<LAMBERTSCANNINGMODE3>lambert_scanning_axis</LAMBERTSCANNINGMODE3>
<MERCATORSCANNINGMODE1>
mercator_scanning_horiz
</MERCATORSCANNINGMODE1>
<MERCATORSCANNINGMODE2>
mercator_scanning_vert
</MERCATORSCANNINGMODE2>
<MERCATORSCANNINGMODE3>
mercator_scanning_axis
</MERCATORSCANNINGMODE3>
<MERCATORINTERSECTIONLAT>
mercator_intersect_lat
</MERCATORINTERSECTIONLAT>
<NAVIGATIONALINDICATOR>
navigational_indicator
</NAVIGATIONALINDICATOR>
<PROJECTIONCENTER>projection_center</PROJECTIONCENTER>
<RECORDS>records</RECORDS>
<RECORDSIZE>record_size</RECORDSIZE>
<VALIDTIME>valid_time</VALIDTIME>
<XPOINTS>Nx</XPOINTS>
<YPOINTS>Ny</YPOINTS>
<FIRSTPOINTLAT>Lat1</FIRSTPOINTLAT>
<FIRSTPOINTLON>Lon1</FIRSTPOINTLON>
<ORIENTATION>Lov</ORIENTATION>
<XINCREMENT>Dx</XINCREMENT>
<YINCREMENT>Dy</YINCREMENT>
<TANGENTLATITUDE>Latin1</TANGENTLATITUDE>
<IMAGERESOLUTION>image_resolution</IMAGERESOLUTION>
<DATACOMPRESSION>data_compression</DATACOMPRESSION>
<VERSIONNUMBER>version_number</VERSIONNUMBER>
<NAVIGATIONALINDICATOR>
navigational_indicator
</NAVIGATIONALINDICATOR>
<NAVIGATIONALINFO>navigational_info</NAVIGATIONALINFO>
<RESOLUTION>resolution</RESOLUTION>
<LASTPOINTLAT>Lat2</LASTPOINTLAT>
<LASTPOINTLON>Lon2</LASTPOINTLON>
<LONGITUDINALINCREMENT>
longitudinal_increment
</LONGITUDINALINCREMENT>
<LATITUDINALINCREMENT>latitudinal_increment</LATITUDINALINCREMENT>
<MERCATORINTERSECTINLAT>
mercator_intersection_lat
</MERCATORINTERSECTINLAT>
<IMAGERESOLUTION>image_resolution</IMAGERESOLUTION>
<NUMBEROCTETS>number_octets</NUMBEROCTETS>
<RESERVED>reserved</RESERVED>
<ORIGINALFILENAME>original_filename</ORIGINALFILENAME>
<KEY>key</KEY>
<PLAINTEXT>plainText</PLAINTEXT>
<DECODEMETHOD>decode_method</DECODEMETHOD>
<INDEXDIR>indexDir</INDEXDIR>
<INDEXTIME>index_time</INDEXTIME>
<PERSISTDIR>persistDir</PERSISTDIR>
<DECODER>Decoder</DECODER>
<PLUGIN>Plugin</PLUGIN>
<PLUGINDIR>pluginDirectory</PLUGINDIR>
<SERVICEDIR>servicesDirectory</SERVICEDIR>
<DEGRIBEXECPATH>degribExecPath</DEGRIBEXECPATH>
<HTTPPROXYSET>httpProxySet</HTTPPROXYSET>
<HTTPPROXYHOST>httpProxyHost</HTTPPROXYHOST>
<HTTPPROXYPORT>httpProxyPort</HTTPPROXYPORT>
<FILENAMEDECODER>FilenameDecoder</FILENAMEDECODER>
<WRITER>Writer</WRITER>
<UENGINEOUTDIR>uengineOutDir</UENGINEOUTDIR>
<DEFAULTDATADIR>defaultDataDir</DEFAULTDATADIR>
<GRIBJARS>gribJars</GRIBJARS>
<BMEXISTS>bms_exists</BMEXISTS>
<GDEXISTS>gds_exists</GDEXISTS>
<BASETIME>base_time</BASETIME>
<CENTERNAME>center_name</CENTERNAME>
<DECIMALSCALE>decimal_scale</DECIMALSCALE>
<DESCRIPTION>description</DESCRIPTION>
<FORECASTTIME>forecast_time</FORECASTTIME>
<GRIDID>grid_id</GRIDID>
<FIRSTFIXEDSURFACE>first_fixed_surface</FIRSTFIXEDSURFACE>
<FIRSTFIXEDVALUE>first_fixed_value</FIRSTFIXEDVALUE>
<FIRSTFIXEDSURFACEUNITS>
first_fixed_surface_units
</FIRSTFIXEDSURFACEUNITS>
<SECONDFIXEDSURFACE>second_fixed_surface</SECONDFIXEDSURFACE>
<SECONDFIXEDVALUE>second_fixed_value</SECONDFIXEDVALUE>
<SECONDFIXEDSURFACEUNITS>
second_fixed_surface_units
</SECONDFIXEDSURFACEUNITS>
<PROCESSID>process_id</PROCESSID>
<PRODUCDEFINITIONNAME>product_definition_name</PRODUCDEFINITIONNAME>
<REFERENCETIME>reference_time</REFERENCETIME>
<SUBCENTERNAME>subcenter_name</SUBCENTERNAME>
<TIMERANGE>time_range</TIMERANGE>
<TIMEUNITS>time_units</TIMEUNITS>
<PARAMETERTYPE>parameter_type</PARAMETERTYPE>
<PARAMETERUNITS>parameter_units</PARAMETERUNITS>
<ANALYSISGENPROCESS>analysis_gen_process</ANALYSISGENPROCESS>
<BACKGENPROCESS>back_gen_process</BACKGENPROCESS>
<COORDINATES>coordinates</COORDINATES>
<HOURSAFTER>hours_after</HOURSAFTER>
<MINUTESAFTER>minutes_after</MINUTESAFTER>
<PARAMETERCATEGORY>parameter_category</PARAMETERCATEGORY>
<PARAMETERNUMBER>parameter_number</PARAMETERNUMBER>
<PRODUCTDEFINITION>product_definition</PRODUCTDEFINITION>
<PRODUCTDEFINITIONNAME>
product_definition_name
</PRODUCTDEFINITIONNAME>
<GENPROCESS>gen_process</GENPROCESS>
<GRIBTYPE>grib_type</GRIBTYPE>
<PROJTYPE>projection</PROJTYPE>
<SPATIAL_DESCRIPTOR>spatial_descriptor</SPATIAL_DESCRIPTOR>
<RED>red</RED>
<BLUE>blue</BLUE>
<GREEN>green</GREEN>
<JSLIBRARY>jsLibraryDir</JSLIBRARY>
<LowLightVis>3</LowLightVis>
<IRDefault>7</IRDefault>
<WVAlternate>10</WVAlternate>
<Linear>57</Linear>
<WindModes>16</WindModes>
<WindSpeed>18</WindSpeed>
<Velocity>19</Velocity>
<Reflectivity>20</Reflectivity>
<LayerMaxRefl>21</LayerMaxRefl>
<VisDefault>25</VisDefault>
<GriddedData>29</GriddedData>
<LowrangeEnhanced>30</LowrangeEnhanced>
<MidrangeEnhanced>31</MidrangeEnhanced>
<HirangeEnhanced>32</HirangeEnhanced>
<WarmToCold>33</WarmToCold>
<CWBZReflectivity>34</CWBZReflectivity>
<StormClearReflectivity>35</StormClearReflectivity>
<IRWV>36</IRWV>
<IRFog>37</IRFog>
<SLCWV>38</SLCWV>
<Lvl8Vel>39</Lvl8Vel>
<Bit8Refl>40</Bit8Refl>
<VADWindProfile>41</VADWindProfile>
<VelocityAzimuthDisplay>42</VelocityAzimuthDisplay>
<Level16Reflectivity>43</Level16Reflectivity>
<Level8Reflectivity>44</Level8Reflectivity>
<Level256Reflectivity>72</Level256Reflectivity>
<Level16Velocity>45</Level16Velocity>
<Level8Velocity>46</Level8Velocity>
<Level256Velocity>73</Level256Velocity>
<Hr1_3PrecipAccumulation>47</Hr1_3PrecipAccumulation>
<SpectrumWidth>48</SpectrumWidth>
<Level16CompositeReflectivity>49</Level16CompositeReflectivity>
<Shear>50</Shear>
<StormClearRefl>74</StormClearRefl>
<SevereWxProb>51</SevereWxProb>
<EchoTops>52</EchoTops>
<CombinedShear>53</CombinedShear>
<VerticallyIntegratedLiquid>54</VerticallyIntegratedLiquid>
<SRMRadialVelocity>55</SRMRadialVelocity>
<ClutterFilterControl>56</ClutterFilterControl>
<GrayScaleWaterVapor>11</GrayScaleWaterVapor>
<CWAThreatIndex>58</CWAThreatIndex>
<LiftedIndex>60</LiftedIndex>
<PrecipWater>61</PrecipWater>
<SkinTemp>62</SkinTemp>
<CloudTopHeight>63</CloudTopHeight>
<QPFBestCategory>68</QPFBestCategory>
<LAMPGriddedData>69</LAMPGriddedData>
<Bit8Vel>70</Bit8Vel>
<km10RadarCodedMessage>71</km10RadarCodedMessage>
<Hr0_3RadarBasedProbabilities>75</Hr0_3RadarBasedProbabilities>
<Hr0_3RadarBasedCategorical>76</Hr0_3RadarBasedCategorical>
<DigitalVIL>77</DigitalVIL>
<OSFDigitalVIL>78</OSFDigitalVIL>
<EnhancedEchoTops>79</EnhancedEchoTops>
<StormTotalPrecip>80</StormTotalPrecip>
<OSFStormTotalPrecip>81</OSFStormTotalPrecip>
<CUSTOM_LIB>customLib</CUSTOM_LIB>
<DATAURI>dataURI</DATAURI>
<OBJECT>OBJECT</OBJECT>
<METADATA>METADATA</METADATA>
<SEPARATOR>SEPARATOR</SEPARATOR>
<RECORD>Record</RECORD>
<ADAPTERSRVQUE>adapterServiceQueue</ADAPTERSRVQUE>
<RESFOLDER>resFolder</RESFOLDER>
<HDF5DIR>hdf5Dir</HDF5DIR>
<SHAREDIR>shareDir</SHAREDIR>
<SCRIPTFOLDER>pluginScriptFolder</SCRIPTFOLDER>
<BINDADDR>bindAddr</BINDADDR>
<UTILITYDIR>utilityDir</UTILITYDIR>
<STATICDIR>staticDir</STATICDIR>
<SITENAME>sitename</SITENAME>
<LOGDIR>logDir</LOGDIR>
<FXADEBUGSAVEBADTEXTFILES>fxaDebugSaveBadTextFiles</FXADEBUGSAVEBADTEXTFILES>
<ARCHIVEDIR>archiveDir</ARCHIVEDIR>
<SVCBACKUP>svcBackupDir</SVCBACKUP>
<MHS_DATA>mhsData</MHS_DATA>
</properties>

56
edexOsgi/build.edex/esb/conf/res/base/environment.xml
View file

@ -1,56 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<properties>
<Name>ENVIRONMENT</Name>
<logDir>${env:edex.home}/logs</logDir>
<pluginDirectory>${env:edex.home}/lib/plugins/</pluginDirectory>
<servicesDirectory>${env:edex.home}/lib/services/</servicesDirectory>
<pluginResDirectory>res/</pluginResDirectory>
<httpProxySet>true</httpProxySet>
<httpProxyHost>proxy.ext.ray.com</httpProxyHost>
<httpProxyPort>80</httpProxyPort>
<gribJars>${env:edex.home}/lib</gribJars>
<uengineOutDir>${env:edex.home}/data/uEngine</uengineOutDir>
<defaultDataDir>${env:edex.home}/data/</defaultDataDir>
<archiveDir>${env:data.archive.root}</archiveDir>
<jsLibraryDir>${env:edex.home}/esb/js/</jsLibraryDir>
<customLib>${env:edex.home}/lib/</customLib>
<bindAddr>bindaddr</bindAddr>
<adapterServiceQueue>edex.AdapterSrv</adapterServiceQueue>
<resFolder>../conf/res</resFolder>
<pluginScriptFolder>${env:edex.home}/conf/db/commonScripts/</pluginScriptFolder>
<!--
hdf5Dir now refers only to the local hdf5 directory; pypies keeps track
of its own hdf5 directory. The local hdf5 directory will only be used
by plugins that do not store / retrieve their data through pypies
(ex: QC).
-->
<hdf5Dir>${env:edex.home}/data/hdf5</hdf5Dir>
<shareDir>${env:edex.home}/data/share</shareDir>
<utilityDir>${env:edex.home}/data/utility</utilityDir>
<staticDir>${env:edex.home}/data/static</staticDir>
<fxaDebugSaveBadTextFiles>false</fxaDebugSaveBadTextFiles>
<svcBackupDir>${env:edex.home}/../GFESuite/</svcBackupDir>
<mhsData>/data/fxa/mhs</mhsData>
</properties>

43
edexOsgi/build.edex/esb/conf/res/config.xml
View file

@ -1,43 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<configuration>
<header>
<result>
<nodeCombiner config-class="org.apache.commons.configuration.tree.OverrideCombiner"/>
</result>
</header>
<!-- Localized Environmental Properties -->
<override>
<xml fileName="site/environment.xml" encoding="UTF-8" validating="false" />
<xml fileName="base/environment.xml" encoding="UTF-8" validating="false" />
</override>
<!-- Localized Attribute Names -->
<override>
<xml fileName="site/attributeNames.xml" encoding="UTF-8" validating="false" />
<xml fileName="base/attributeNames.xml" encoding="UTF-8" validating="false" />
</override>
</configuration>

27
edexOsgi/build.edex/esb/conf/res/gridImageSylesRules.xml
View file

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<properties>
<Name>GRID_IMAGERY</Name>
</properties>

28
edexOsgi/build.edex/esb/conf/res/response-ascii.xml
View file

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<!-- properties for the response message factory method -->
<!-- defines the class name for the response message ASCII -->
<properties>
<Name>RESP_ASCII</Name>
<OBJECT>com.raytheon.edex.uengine.tasks.response.MakeResponseASCII</OBJECT>
</properties>

28
edexOsgi/build.edex/esb/conf/res/response-inline.xml
View file

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<!-- properties for the response message factory method -->
<!-- defines the class name for the response message INLINE -->
<properties>
<Name>RESP_INLINE</Name>
<OBJECT>com.raytheon.edex.uengine.tasks.response.MakeResponseInline</OBJECT>
</properties>

28
edexOsgi/build.edex/esb/conf/res/response-uri.xml
View file

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<!-- properties for the response message factory method -->
<!-- defines the class name for the response message URI -->
<properties>
<Name>RESP_URI</Name>
<OBJECT>com.raytheon.edex.uengine.tasks.response.MakeResponseURI</OBJECT>
</properties>

28
edexOsgi/build.edex/esb/conf/res/response-xml.xml
View file

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<!-- properties for the response message factory method -->
<!-- defines the class name for the response message XML -->
<properties>
<Name>RESP_XML</Name>
<OBJECT>com.raytheon.edex.uengine.tasks.response.MakeResponseXML</OBJECT>
</properties>

25
edexOsgi/build.edex/esb/conf/res/site/attributeNames.xml
View file

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<properties>
<Name>ATTRIBUTE_NAMES</Name>
</properties>

29
edexOsgi/build.edex/esb/conf/res/site/environment.xml
View file

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<properties>
<Name>ENVIRONMENT</Name>
<clustered>false</clustered>
<sitename>${env:aw.site.identifier}</sitename>
<!-- httpServer and jmsServer moved to setup.env -->
</properties>

32
edexOsgi/build.edex/esb/conf/res/subscription.xml
View file

@ -1,32 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<!-- properties for the subscription service. -->
<!-- defines values for subscription handling -->
<properties>
<Name>SUBSCRIPTION_SERVICE</Name>
<KEY_FIELD>datauri</KEY_FIELD>
<HIB_CLASS>Subscription</HIB_CLASS>
<PGS_TABLE>subscription</PGS_TABLE>
<SUBSCRIPTION_QUERY_VAR>subscriptionDataQueryId</SUBSCRIPTION_QUERY_VAR>
<SUBSCRIPTION_QUERY_FIELD>subscriptionDataFieldId</SUBSCRIPTION_QUERY_FIELD>
</properties>

17
edexOsgi/com.raytheon.edex.notifysrv/src/com/raytheon/edex/services/NotifySrv.java
View file

@ -23,7 +23,6 @@ package com.raytheon.edex.services;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -34,7 +33,6 @@ import com.raytheon.edex.subscription.SubscriptionManager;
import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.util.StringUtil; import com.raytheon.uf.common.util.StringUtil;
import com.raytheon.uf.edex.core.EdexException; import com.raytheon.uf.edex.core.EdexException;
import com.raytheon.uf.edex.core.props.PropertiesFactory;
/** /**
* Processes incoming data events to determine if the data matches an existing * Processes incoming data events to determine if the data matches an existing
@ -51,7 +49,7 @@ import com.raytheon.uf.edex.core.props.PropertiesFactory;
* 06Feb2007 TO5 MW Fegan Removed JMX registration. * 06Feb2007 TO5 MW Fegan Removed JMX registration.
* 27Apr2007 208 MW Fegan Pass only dataURI in message. * 27Apr2007 208 MW Fegan Pass only dataURI in message.
* 26Nov2007 443 bphillip Modified to receive lists of PluginDataObjects * 26Nov2007 443 bphillip Modified to receive lists of PluginDataObjects
* * Jul 10, 2014 2914 garmendariz Remove EnvProperties
* </pre> * </pre>
* *
* @author mfegan * @author mfegan
@ -105,21 +103,8 @@ public class NotifySrv {
// messages = new ArrayList<String>(); // messages = new ArrayList<String>();
logger.info("-subscription exists for " logger.info("-subscription exists for "
+ StringUtil.printString(dataURI)); + StringUtil.printString(dataURI));
Configuration properties = PropertiesFactory.getInstance()
.getConfiguration(
ISubscriptionManager.CONFIGURATION_NAME);
Subscription subscription = subscriptionManager Subscription subscription = subscriptionManager
.getSubscription(subscriptionKey); .getSubscription(subscriptionKey);
// logger.info(this.traceID + "-Subscription is "
// + Util.printString(subscription));
// this.message.setStringProperty("dataURI", dataURI);
// this.message.setStringProperty("subscriptKey",
// subscriptionKey);
// this.message
// .setProperty(
// properties
// .getString(ISubscriptionManager.SUBSCRIPTION_QUERY_VAR),
// dataURI);
for (Script script : subscription.getScripts()) { for (Script script : subscription.getScripts()) {
if (script != null) { if (script != null) {
String key = script.getScriptid(); String key = script.getScriptid();

13
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
View file

@ -32,7 +32,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.raytheon.edex.site.SiteUtil;
import com.raytheon.uf.common.auth.exception.AuthorizationException; import com.raytheon.uf.common.auth.exception.AuthorizationException;
import com.raytheon.uf.common.auth.user.IUser; import com.raytheon.uf.common.auth.user.IUser;
import com.raytheon.uf.common.dataplugin.gfe.exception.GfeException; import com.raytheon.uf.common.dataplugin.gfe.exception.GfeException;
@ -46,7 +45,6 @@ import com.raytheon.uf.edex.auth.AuthManagerFactory;
import com.raytheon.uf.edex.auth.authorization.IAuthorizer; import com.raytheon.uf.edex.auth.authorization.IAuthorizer;
import com.raytheon.uf.edex.auth.resp.AuthorizationResponse; import com.raytheon.uf.edex.auth.resp.AuthorizationResponse;
import com.raytheon.uf.edex.core.EDEXUtil; import com.raytheon.uf.edex.core.EDEXUtil;
import com.raytheon.uf.edex.core.props.PropertiesFactory;
import com.raytheon.uf.edex.site.SiteAwareRegistry; import com.raytheon.uf.edex.site.SiteAwareRegistry;
/** /**
@ -66,6 +64,7 @@ import com.raytheon.uf.edex.site.SiteAwareRegistry;
* method to retrieve list of svcbu * method to retrieve list of svcbu
* sites. * sites.
* May 28, 2014 3211 njensen Use IAuthorizer instead of IRoleStorage * May 28, 2014 3211 njensen Use IAuthorizer instead of IRoleStorage
* Jul 10, 2014 2914 garmendariz Remove EnvProperties
* *
* </pre> * </pre>
* *
@ -119,10 +118,8 @@ public class SvcBackupUtil {
private static String executeProcess(String... args) throws GfeException { private static String executeProcess(String... args) throws GfeException {
RunProcess proc = RunProcess.getRunProcess(); RunProcess proc = RunProcess.getRunProcess();
ProcessBuilder pBuilder = new ProcessBuilder(); ProcessBuilder pBuilder = new ProcessBuilder();
pBuilder.environment().put( pBuilder.environment().put("LOCALIZATION_PATH",
"LOCALIZATION_PATH", EDEXUtil.getEdexUtility());
PropertiesFactory.getInstance().getEnvProperties()
.getEnvValue("UTILITYDIR"));
pBuilder.environment().put("AWIPS_HOME", "/awips2/"); pBuilder.environment().put("AWIPS_HOME", "/awips2/");
pBuilder.redirectErrorStream(true); pBuilder.redirectErrorStream(true);
pBuilder.command(args); pBuilder.command(args);
@ -206,7 +203,7 @@ public class SvcBackupUtil {
FileInputStream fis = null; FileInputStream fis = null;
try { try {
fis = new FileInputStream( fis = new FileInputStream(
EDEXUtil.EDEX_HOME EDEXUtil.getEdexHome()
+ "/../GFESuite/ServiceBackup/configuration/svcbu.properties"); + "/../GFESuite/ServiceBackup/configuration/svcbu.properties");
svcbuProperties.load(fis); svcbuProperties.load(fis);
} catch (Exception e) { } catch (Exception e) {
@ -278,7 +275,7 @@ public class SvcBackupUtil {
public static Set<String> getPrimarySites() { public static Set<String> getPrimarySites() {
Properties svcbuProps = SvcBackupUtil.getSvcBackupProperties(); Properties svcbuProps = SvcBackupUtil.getSvcBackupProperties();
String siteList = SiteUtil.getSite(); String siteList = EDEXUtil.getEdexSite();
if (svcbuProps != null) { if (svcbuProps != null) {
String propVal = svcbuProps.getProperty("PRIMARY_SITES", "").trim(); String propVal = svcbuProps.getProperty("PRIMARY_SITES", "").trim();
if (!propVal.isEmpty()) { if (!propVal.isEmpty()) {

40
edexOsgi/com.raytheon.edex.plugin.radar/res/conf/attributes.xml
View file

@ -1,40 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<properties>
<Name>ATTRIBUTE_NAMES</Name>
<!-- Radar values -->
<DESTINATION_ID>destination_id</DESTINATION_ID>
<HEIGHT>height</HEIGHT>
<MESSAGE_CODE>message_code</MESSAGE_CODE>
<OPERATIONAL_MODE>operational_mode</OPERATIONAL_MODE>
<PRODUCT_CODE>productCode</PRODUCT_CODE>
<SEQ_NUMBER>seq_number</SEQ_NUMBER>
<SOURCE_ID>source_id</SOURCE_ID>
<VOL_SCAN_NUMBER>vol_scan_number</VOL_SCAN_NUMBER>
<VOL_SCAN_PATTERN>vol_scan_pattern</VOL_SCAN_PATTERN>
<RADIAL_LATITUDE>radial_latitude</RADIAL_LATITUDE>
<TIME_STAMP>time_stamp</TIME_STAMP>
<RADIAL_LONGITUDE>radial_longitude</RADIAL_LONGITUDE>
<PRODUCT_GEN_TIME>product_gen_time</PRODUCT_GEN_TIME>
<VOL_SCAN_TIME>vol_scan_time</VOL_SCAN_TIME>
<ICAO>icao</ICAO>
</properties>

30
edexOsgi/com.raytheon.edex.plugin.radar/res/conf/plugin.xml
View file

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<properties>
<Name>RADAR</Name>
<PacketList>com.raytheon.uf.common.dataplugin.radar.level3.RadialPacket,
com.raytheon.uf.common.dataplugin.radar.level3.RadialPacket8bit,
com.raytheon.uf.common.dataplugin.radar.level3.RasterPacket,
com.raytheon.uf.common.dataplugin.radar.level3.TextSymbolPacket,
com.raytheon.uf.common.dataplugin.radar.level3.UnlinkedVectorPacket,
com.raytheon.uf.common.dataplugin.radar.level3.LinkedVectorPacket
</PacketList>
</properties>

28
edexOsgi/com.raytheon.edex.plugin.shef/res/conf/attributes.xml
View file

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<properties>
<Name>ATTRIBUTE_NAMES</Name>
<!-- Valuse used for indexing SHEF products -->
<SR>SHEF</SR>
</properties>

31
edexOsgi/com.raytheon.edex.plugin.shef/res/conf/shef.xml
View file

@ -1,31 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<!-- Properties for SHEF ASCII record type -->
<properties>
<Name>SHEF</Name>
<decode_method>lazy</decode_method>
<OBJECT>com.raytheon.edex.plugin.shef.ShefRecord</OBJECT>
<SEPARATOR>com.raytheon.edex.plugin.shef.ShefSeparator</SEPARATOR>
<METADATA>type obs_station report_time</METADATA>
</properties>

3
edexOsgi/com.raytheon.edex.uengine/build.properties
View file

@ -2,4 +2,5 @@ source.. = src/
output.. = bin/ output.. = bin/
bin.includes = META-INF/,\ bin.includes = META-INF/,\
.,\ .,\
res/ res/,\
resources/

31
edexOsgi/com.raytheon.edex.uengine/res/conf/microengine.xml
View file

@ -1,31 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<!-- properties for the response message factory method -->
<!-- defines the class name for the response message ASCII -->
<properties>
<Name>MICRO_ENGINE</Name>
<python_runner>com.raytheon.edex.uengine.runners.PyMicroEngine</python_runner>
<jscript_runner>com.raytheon.edex.uengine.runners.JsMicroEngine</jscript_runner>
<system_runner>com.raytheon.edex.uengine.runners.SysMicroEngine</system_runner>
<pil_runner>com.raytheon.edex.uengine.runners.LdadMicroEngine</pil_runner>
<ldad_runner>com.raytheon.edex.uengine.runners.LdadMicroEngine</ldad_runner>
</properties>

4
edexOsgi/com.raytheon.edex.uengine/resources/com.raytheon.edex.uengine.properties Normal file
View file

@ -0,0 +1,4 @@
python_runner=com.raytheon.edex.uengine.runners.PyMicroEngine
system_runner=com.raytheon.edex.uengine.runners.SysMicroEngine
pil_runner=com.raytheon.edex.uengine.runners.LdadMicroEngine
ldad_runner=com.raytheon.edex.uengine.runners.LdadMicroEngine

12
edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/MicroEngineTaskManager.java
View file

@ -35,8 +35,7 @@ import org.apache.commons.logging.LogFactory;
import com.raytheon.edex.util.Util; import com.raytheon.edex.util.Util;
import com.raytheon.uf.common.util.FileUtil; import com.raytheon.uf.common.util.FileUtil;
import com.raytheon.uf.common.util.JarUtil; import com.raytheon.uf.common.util.JarUtil;
import com.raytheon.uf.edex.core.props.EnvProperties; import com.raytheon.uf.edex.core.EDEXUtil;
import com.raytheon.uf.edex.core.props.PropertiesFactory;
/** /**
* Determines the classes that extend ScriptTask. Derived from original * Determines the classes that extend ScriptTask. Derived from original
@ -47,6 +46,7 @@ import com.raytheon.uf.edex.core.props.PropertiesFactory;
* Date PR# Engineer Description * Date PR# Engineer Description
* ----------- ---------- ------------ -------------------------- * ----------- ---------- ------------ --------------------------
* Apr 2, 2007 njensen Initial Creation * Apr 2, 2007 njensen Initial Creation
* Jul 10, 2014 2914 garmendariz Remove EnvProperties
* </PRE> * </PRE>
* *
*/ */
@ -88,7 +88,6 @@ public class MicroEngineTaskManager {
Class<?> task = null; Class<?> task = null;
URLClassLoader uriLoader; URLClassLoader uriLoader;
ClassLoader loader = ClassLoader.getSystemClassLoader(); ClassLoader loader = ClassLoader.getSystemClassLoader();
EnvProperties envProperties;
String jarPath = null; String jarPath = null;
String jarName = null; String jarName = null;
@ -106,8 +105,7 @@ public class MicroEngineTaskManager {
/* /*
* next, get a listing of plugin JARs and search for tasks. * next, get a listing of plugin JARs and search for tasks.
*/ */
envProperties = PropertiesFactory.getInstance().getEnvProperties(); pluginPath = EDEXUtil.getEdexPlugins();
pluginPath = envProperties.getEnvValue("PLUGINDIR");
pluginPath = FileUtil.convertFilePath(pluginPath); pluginPath = FileUtil.convertFilePath(pluginPath);
File[] files = JarUtil.getJarFiles(new File(pluginPath)); File[] files = JarUtil.getJarFiles(new File(pluginPath));
uriLoader = Util.getLibrariesClassLoader(files); uriLoader = Util.getLibrariesClassLoader(files);
@ -155,8 +153,8 @@ public class MicroEngineTaskManager {
if (!fullName.equals(taskName) && if (!fullName.equals(taskName) &&
task.isAssignableFrom(temp)) { task.isAssignableFrom(temp)) {
packages.add(fullName.substring(0, fullName packages.add(fullName.substring(0,
.lastIndexOf("."))); fullName.lastIndexOf(".")));
} }
} }
} }

46
edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/runners/MicroEngine.java
View file

@ -19,19 +19,19 @@
**/ **/
package com.raytheon.edex.uengine.runners; package com.raytheon.edex.uengine.runners;
import org.apache.commons.configuration.Configuration;
import com.raytheon.edex.uengine.exception.MicroEngineException; import com.raytheon.edex.uengine.exception.MicroEngineException;
import com.raytheon.uf.edex.core.props.PropertiesFactory;
/** /**
* A factory class that creates and returns &mu;Engine script runners. * A factory class that creates and returns &mu;Engine script runners. This
* This class does not performing any logging. * class does not performing any logging.
* <P> * <P>
* Basic usage: * Basic usage:
* <pre><code> *
* <pre>
* <code>
* IMicroEngine runner = MicroEngine.getInstance(type); * IMicroEngine runner = MicroEngine.getInstance(type);
* </code></pre> * </code>
* </pre>
* *
* <pre> * <pre>
* *
@ -40,6 +40,7 @@ import com.raytheon.uf.edex.core.props.PropertiesFactory;
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* 17Nov2008 1709 MW Fegan Initial creation. * 17Nov2008 1709 MW Fegan Initial creation.
* Jul 10, 2014 2914 garmendariz Remove EnvProperties
* *
* </pre> * </pre>
* *
@ -56,39 +57,40 @@ public final class MicroEngine {
*/ */
private MicroEngine() { private MicroEngine() {
} }
/** /**
* Creates a &mu;Engine script runner of the specified type. * Creates a &mu;Engine script runner of the specified type.
* *
* @param type the type of script runner to create * @param type
* the type of script runner to create
* *
* @return the script runner * @return the script runner
* *
* @throws MicroEngineException if unable to create the script runner * @throws MicroEngineException
* if unable to create the script runner
*/ */
public static IMicroEngine getInstance(String type) throws MicroEngineException { public static IMicroEngine getInstance(String type)
throws MicroEngineException {
String className = null; String className = null;
Class<?> aClass = null; Class<?> aClass = null;
Configuration config = null;
String configName = "micro_engine";
IMicroEngine retVal = null; IMicroEngine retVal = null;
String runner = type.toLowerCase() + "_runner"; String runner = type.toLowerCase() + "_runner";
/* get the configuration for uEngine */
try {
config = PropertiesFactory.getInstance().getConfiguration(configName);
} catch (Exception e) {
throw new MicroEngineException("Unable to load properties for MicroEngine, type = " + type,e);
}
/* get the class name for the uEngine script runner */ /* get the class name for the uEngine script runner */
className = config.getString(runner); className = System.getProperty(runner);
if (className == null) { if (className == null) {
throw new MicroEngineException("Unable to find class name for MicroEngine, type = " + type); throw new MicroEngineException(
"Unable to find class name for MicroEngine, type = " + type);
} }
/* attempt to create the script runner class */ /* attempt to create the script runner class */
try { try {
aClass = Class.forName(className); aClass = Class.forName(className);
retVal = (IMicroEngine)aClass.newInstance(); retVal = (IMicroEngine) aClass.newInstance();
} catch (Exception e) { } catch (Exception e) {
throw new MicroEngineException("Unable to create MicroEngine script runner, type = " + type,e); throw new MicroEngineException(
"Unable to create MicroEngine script runner, type = "
+ type, e);
} }
return retVal; return retVal;
} }

13
edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/tasks/output/FileOut.java
View file

@ -29,8 +29,7 @@ import com.raytheon.edex.uengine.exception.MicroEngineException;
import com.raytheon.edex.uengine.tasks.ScriptTask; import com.raytheon.edex.uengine.tasks.ScriptTask;
import com.raytheon.uf.common.util.FileUtil; import com.raytheon.uf.common.util.FileUtil;
import com.raytheon.uf.common.util.StringUtil; import com.raytheon.uf.common.util.StringUtil;
import com.raytheon.uf.edex.core.props.EnvProperties; import com.raytheon.uf.edex.core.EDEXUtil;
import com.raytheon.uf.edex.core.props.PropertiesFactory;
/** /**
* FileOut task derived from original FileOut uEngine task. Writes the data out * FileOut task derived from original FileOut uEngine task. Writes the data out
@ -41,6 +40,7 @@ import com.raytheon.uf.edex.core.props.PropertiesFactory;
* Date PR# Engineer Description * Date PR# Engineer Description
* ----------- ---------- ------------ -------------------------- * ----------- ---------- ------------ --------------------------
* Mar 29, 2007 njensen Initial Creation * Mar 29, 2007 njensen Initial Creation
* Jul 10, 2014 2914 garmendariz Remove EnvProperties
* </PRE> * </PRE>
* *
*/ */
@ -79,24 +79,19 @@ public class FileOut extends ScriptTask {
} }
private void init() { private void init() {
EnvProperties envProperties = PropertiesFactory.getInstance()
.getEnvProperties();
String uengineOutDir = envProperties.getEnvValue("UENGINEOUTDIR");
String defaultDataDir = envProperties.getEnvValue("DEFAULTDATADIR");
/* /*
* make sure there is an output directory defined * make sure there is an output directory defined
*/ */
if (StringUtil.isEmptyString(destDir)) { if (StringUtil.isEmptyString(destDir)) {
// default to uengineOutDir // default to uengineOutDir
destDir = uengineOutDir; destDir = EDEXUtil.getEdexData() + File.separator + "uEngine";
logger.debug("Defaulting destDir to: " + destDir); logger.debug("Defaulting destDir to: " + destDir);
} else { } else {
// If the ignore default data dir flag is not true then // If the ignore default data dir flag is not true then
// prepend the default data dir to the destination directory. // prepend the default data dir to the destination directory.
if (!ignoreDefaultDataDir) { if (!ignoreDefaultDataDir) {
destDir = defaultDataDir + destDir; destDir = EDEXUtil.getEdexData() + File.separator + destDir;
} }
} }
} }

397
edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/tasks/process/ReplayArchive.java
View file

@ -1,397 +0,0 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.edex.uengine.tasks.process;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.GregorianCalendar;
import java.util.Iterator;
import java.util.List;
import java.util.TreeSet;
import org.apache.commons.lang.StringUtils;
import com.raytheon.edex.uengine.tasks.ScriptTask;
import com.raytheon.uf.common.message.response.ResponseMessageGeneric;
import com.raytheon.uf.edex.core.props.EnvProperties;
import com.raytheon.uf.edex.core.props.PropertiesFactory;
/**
* This script task will start replaying the files located in the sbnDir.
* While keeping the delays between each file.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 12/12/2007 561 dfitch Initial Creation
* 18Sep2008 SP#12 ebabin update to not block caller.
*
* </pre>
*
* @author dfitch
* @version 1
*/
public class ReplayArchive extends ScriptTask
{
private static File sbnDir = null;
static {
EnvProperties env = PropertiesFactory.getInstance().getEnvProperties();
String defaultDataDir = env.getEnvValue("DEFAULTDATADIR") + File.separatorChar + "sbn";
sbnDir = new File(defaultDataDir);
}
private List<String> lstArchiveDirectories;
private TreeSet<FileWithTime> sortedSet;
public ReplayArchive()
{
super();
lstArchiveDirectories = new ArrayList<String>();
sortedSet = new TreeSet<FileWithTime>();
}
/**
* @param lstFilesAndTimes
*/
private void dumpFileTimes(List<FileWithTime> lstFilesAndTimes)
{
loginfo("*********************");
for (int i = 0; i < lstFilesAndTimes.size(); ++i)
{
FileWithTime fwt = lstFilesAndTimes.get(i);
loginfo("Mod Time: " + timeStr(fwt.getModifiedTime()) + "\t"
+ "File: " + fwt.getFile());
}
loginfo("*********************");
}
/**
* @param fwt --
* the file with time stamp info from the archive. The file is
* copied to a temporary file, the time stamp is set, and then
*/
private boolean play(FileWithTime fwt)
{
File file = fwt.getFile();
File tempFile = copyFileToTmp(file);
tempFile.setLastModified(fwt.getModifiedTime());
// important to look at the full path to determine where to put it
// in the target sbn directory tree....
String parts[] = StringUtils.split(file.toString(), File.separatorChar);
String dataType = parts[parts.length - 2];
loginfo("dataType=" + dataType);
String newPath = sbnDir + "/" + dataType + "/" + file.getName();
File newFile = new File(newPath);
return tempFile.renameTo(newFile);
}
/**
* @param file
*/
private File copyFileToTmp(File file)
{
File temp = null;
try
{
temp = File.createTempFile("tmp", ".tmp");
OutputStream out = new FileOutputStream(temp);
InputStream is = new FileInputStream(file);
byte[] bytes = new byte[8 * 1024];
// Read in the bytes
int numRead = 0;
while (0 <= (numRead = is.read(bytes)))
{
out.write(bytes, 0, numRead);
}
// Close the input stream and return bytes
is.close();
out.close();
}
catch (IOException e)
{
e.printStackTrace();
logwarn("Problem copying file " + file + " to " + temp, e);
}
return temp;
}
/**
* @param modifiedTime
* @return
*/
static String timeStr(long modifiedTime)
{
String result = null;
GregorianCalendar local = new GregorianCalendar();
local.setTimeInMillis(modifiedTime);
result = "" + local.getTime();
return result;
}
// Process only files under dir
private void visitAllFiles(File dir)
{
if (dir.isDirectory())
{
String[] children = dir.list();
for (int i = 0; i < children.length; i++)
{
visitAllFiles(new File(dir, children[i]));
}
}
else
{
processFile(dir);
}
}
/**
* @param dir
*/
private void processFile(File file)
{
loginfo(file.toString());
long modifiedTime = file.lastModified();
sortedSet.add(new FileWithTime(file, modifiedTime));
}
/**
* @param dir
*/
private void loginfo(String msg)
{
logger.info(msg);
}
/**
* @param string
*/
private void logwarn(String msg)
{
logger.warn(msg);
}
/**
* @param string
* @param e
*/
private void logwarn(String msg, IOException e)
{
logger.warn(msg, e);
}
/**
* @param string
*/
public void addArchiveDirectory(String directoryName)
{
lstArchiveDirectories.add(directoryName);
}
/**
* @param fn
*/
public void setSbnDir(String fn)
{
sbnDir = new File(fn);
}
/**
* Replay the archive returning an XML string of some information about what
* happened...
*
* TODO: MGP this still needs to be tested some more...
* TODO: MGP write a junit test for this!
*/
@Override
public Object execute()
{
// Form a string about what will be done.
ResponseMessageGeneric msg = new ResponseMessageGeneric();
String result = "Received ReplayArchive request, starting to replay the archive: "
+sbnDir + " please check log for results.";
msg.setContents(result);
Replayer player = new Replayer();
Thread myThread = new Thread(player);
myThread.start();
return msg;
}
class Replayer extends Thread {
public Replayer() {
super("Runner");
}
@Override
public void run() {
for (Iterator<String> it = lstArchiveDirectories.iterator(); it.hasNext();)
{
String dirName = it.next();
visitAllFiles(new File(dirName));
}
// Now sortedSet is filled with FileWithTime objects and we simply need
// to
// dequeue them in time order....
List<FileWithTime> lstFilesAndTimes = new ArrayList<FileWithTime>();
lstFilesAndTimes.addAll(sortedSet);
// Handle the special cases....
int size = lstFilesAndTimes.size();
FileWithTime fwt = lstFilesAndTimes.get(0);
if (1 == size)
{
play(fwt);
}
else
{
dumpFileTimes(lstFilesAndTimes);
FileWithTime fwtNext = lstFilesAndTimes.get(1);
long sleepTime = fwtNext.getModifiedTime() - fwt.getModifiedTime();
try {
Thread.sleep(sleepTime);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
for (int i = 1; i < lstFilesAndTimes.size() - 1; ++i)
{
fwt = lstFilesAndTimes.get(i);
loginfo("Mod Time: " + timeStr(fwt.getModifiedTime()) + "\t"
+ "File: " + fwt.getFile());
// Calculate the sleep time....
play(lstFilesAndTimes.get(i));
fwtNext = lstFilesAndTimes.get(i + 1);
sleepTime = fwtNext.getModifiedTime() - fwt.getModifiedTime();
try {
Thread.sleep(sleepTime);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
// Calculate the last sleep time....
play(lstFilesAndTimes
.get(lstFilesAndTimes.size() - 1));
}
}
}
}
class FileWithTime implements Comparable<FileWithTime>
{
private File file;
private long modifiedTime;
/**
* @param file
* @param modifiedTime
*/
public FileWithTime(File file, long modifiedTime)
{
super();
this.file = file;
this.modifiedTime = modifiedTime;
}
public String toString()
{
return ReplayArchive.timeStr(modifiedTime) + "\t" + file;
}
public int compareTo(FileWithTime o)
{
int result = 0;
FileWithTime other = (FileWithTime) o;
if (other.modifiedTime < this.modifiedTime)
{
result = 1;
}
else if (other.modifiedTime > this.modifiedTime)
{
result = -1;
}
else
{
result = 0;
}
return result;
}
/**
* @return the file
*/
public File getFile()
{
return file;
}
/**
* @param file
* the file to set
*/
public void setFile(File file)
{
this.file = file;
}
/**
* @return the modifiedTime
*/
public long getModifiedTime()
{
return modifiedTime;
}
/**
* @param modifiedTime
* the modifiedTime to set
*/
public void setModifiedTime(long modifiedTime)
{
this.modifiedTime = modifiedTime;
}
}

1
edexOsgi/com.raytheon.uf.common.dataplugin.qc/resources/com.raytheon.uf.common.dataplugin.qc.properties Normal file
View file

@ -0,0 +1 @@
HDF5_PATH=hdf5/QC

13
edexOsgi/com.raytheon.uf.common.dataplugin.qc/src/com/raytheon/uf/common/dataplugin/qc/internal/QCPaths.java
View file

@ -43,7 +43,7 @@ import com.raytheon.uf.common.serialization.SerializationException;
import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority; import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.edex.core.props.PropertiesFactory; import com.raytheon.uf.edex.core.EDEXUtil;
/** /**
* This class should only be used by the QC plug-ins. * This class should only be used by the QC plug-ins.
@ -62,9 +62,9 @@ public class QCPaths {
PYTHON_INCLUDE_PATH = PyUtil.buildJepIncludePath(pathMgr.getFile( PYTHON_INCLUDE_PATH = PyUtil.buildJepIncludePath(pathMgr.getFile(
pathMgr.getContext(LocalizationType.COMMON_STATIC, pathMgr.getContext(LocalizationType.COMMON_STATIC,
LocalizationLevel.BASE), "python").getAbsolutePath()); LocalizationLevel.BASE), "python").getAbsolutePath());
QC_RAW_DIR = PropertiesFactory.getInstance().getEnvProperties() QC_RAW_DIR = EDEXUtil.getEdexData() + File.separator
.getEnvValue("HDF5DIR") + System.getProperty("HDF5_PATH");
+ "/QC/";
} }
public static String getPythonScriptPath(String scriptFileName) { public static String getPythonScriptPath(String scriptFileName) {
@ -138,6 +138,11 @@ public class QCPaths {
} }
} }
} }
if (jar != null) {
jar.close();
}
return pdds; return pdds;
} catch (SerializationException e) { } catch (SerializationException e) {
throw new RuntimeException( throw new RuntimeException(

5
edexOsgi/com.raytheon.uf.edex.ohd/META-INF/MANIFEST.MF
View file

@ -2,9 +2,9 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: Ohd Plug-in Bundle-Name: Ohd Plug-in
Bundle-SymbolicName: com.raytheon.uf.edex.ohd Bundle-SymbolicName: com.raytheon.uf.edex.ohd
Bundle-Version: 1.12.1174.qualifier Bundle-Version: 1.14.0.qualifier
Bundle-Vendor: RAYTHEON Bundle-Vendor: RAYTHEON
Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: com.raytheon.edex.util, Import-Package: com.raytheon.edex.util,
com.raytheon.uf.common.dataplugin.binlightning, com.raytheon.uf.common.dataplugin.binlightning,
com.raytheon.uf.common.dataplugin.grid, com.raytheon.uf.common.dataplugin.grid,
@ -13,7 +13,6 @@ Import-Package: com.raytheon.edex.util,
com.raytheon.uf.common.serialization.comm, com.raytheon.uf.common.serialization.comm,
com.raytheon.uf.common.wmo, com.raytheon.uf.common.wmo,
com.raytheon.uf.edex.core, com.raytheon.uf.edex.core,
com.raytheon.uf.edex.core.props,
com.raytheon.uf.edex.dat.utils, com.raytheon.uf.edex.dat.utils,
com.raytheon.uf.edex.database, com.raytheon.uf.edex.database,
com.raytheon.uf.edex.database.dao, com.raytheon.uf.edex.database.dao,

8
edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/MainMethod.java
View file

@ -30,7 +30,7 @@ import java.util.ArrayList;
import com.raytheon.uf.common.ohd.AppsDefaults; import com.raytheon.uf.common.ohd.AppsDefaults;
import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.edex.core.props.PropertiesFactory; import com.raytheon.uf.edex.core.EDEXUtil;
/** /**
* Abstract Main method class provides supporting functions for the main methods * Abstract Main method class provides supporting functions for the main methods
@ -51,6 +51,7 @@ import com.raytheon.uf.edex.core.props.PropertiesFactory;
* Oct 28, 2008 jelkins Initial creation * Oct 28, 2008 jelkins Initial creation
* Oct 19, 2012 #1274 bgonzale Set AppContext on the process builder in ctor. * Oct 19, 2012 #1274 bgonzale Set AppContext on the process builder in ctor.
* Mar 28, 2014 2952 mpduff Changed to use UFStatus for logging. * Mar 28, 2014 2952 mpduff Changed to use UFStatus for logging.
* Jul 10, 2014 2914 garmendariz Remove EnvProperties
* </pre> * </pre>
* *
* @author jelkins * @author jelkins
@ -117,9 +118,8 @@ public class MainMethod extends Process {
try { try {
processBuilder.environment().put( processBuilder.environment().put(
"apps_dir", "apps_dir",
new File(PropertiesFactory.getInstance().getEnvProperties() new File(EDEXUtil.getEdexShare() + File.separator
.getEnvValue("SHAREDIR") + "hydroapps").getCanonicalPath());
+ File.separator + "hydroapps").getCanonicalPath());
AppsDefaults.getInstance().setAppContext(processBuilder); AppsDefaults.getInstance().setAppContext(processBuilder);
} catch (IOException e) { } catch (IOException e) {
log.error("Unable to get apps_dir", e); log.error("Unable to get apps_dir", e);

10
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
View file

@ -33,6 +33,7 @@ import java.util.concurrent.Executor;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import com.raytheon.edex.plugin.radar.dao.RadarStationDao; import com.raytheon.edex.plugin.radar.dao.RadarStationDao;
import com.raytheon.edex.site.SiteUtil;
import com.raytheon.edex.urifilter.URIFilter; import com.raytheon.edex.urifilter.URIFilter;
import com.raytheon.edex.urifilter.URIGenerateMessage; import com.raytheon.edex.urifilter.URIGenerateMessage;
import com.raytheon.uf.common.dataplugin.PluginException; import com.raytheon.uf.common.dataplugin.PluginException;
@ -47,7 +48,6 @@ import com.raytheon.uf.common.dataplugin.ffmp.FFMPTemplates.MODE;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPUtils; import com.raytheon.uf.common.dataplugin.ffmp.FFMPUtils;
import com.raytheon.uf.common.dataplugin.ffmp.SourceBinList; import com.raytheon.uf.common.dataplugin.ffmp.SourceBinList;
import com.raytheon.uf.common.dataplugin.message.DataURINotificationMessage; import com.raytheon.uf.common.dataplugin.message.DataURINotificationMessage;
import com.raytheon.uf.common.dataplugin.message.DataURINotificationMessage;
import com.raytheon.uf.common.dataplugin.radar.RadarStation; import com.raytheon.uf.common.dataplugin.radar.RadarStation;
import com.raytheon.uf.common.dataplugin.radar.util.RadarsInUseUtil; import com.raytheon.uf.common.dataplugin.radar.util.RadarsInUseUtil;
import com.raytheon.uf.common.datastorage.DataStoreFactory; import com.raytheon.uf.common.datastorage.DataStoreFactory;
@ -91,7 +91,6 @@ import com.raytheon.uf.common.time.util.TimeUtil;
import com.raytheon.uf.common.util.FileUtil; import com.raytheon.uf.common.util.FileUtil;
import com.raytheon.uf.edex.core.EDEXUtil; import com.raytheon.uf.edex.core.EDEXUtil;
import com.raytheon.uf.edex.core.dataplugin.PluginRegistry; import com.raytheon.uf.edex.core.dataplugin.PluginRegistry;
import com.raytheon.uf.edex.core.props.PropertiesFactory;
import com.raytheon.uf.edex.cpgsrv.CompositeProductGenerator; import com.raytheon.uf.edex.cpgsrv.CompositeProductGenerator;
import com.raytheon.uf.edex.dat.utils.DatMenuUtil; import com.raytheon.uf.edex.dat.utils.DatMenuUtil;
import com.raytheon.uf.edex.database.DataAccessLayerException; import com.raytheon.uf.edex.database.DataAccessLayerException;
@ -137,6 +136,7 @@ import com.raytheon.uf.edex.plugin.ffmp.common.FFTIRatioDiff;
* Jul 15, 2013 2184 dhladky Remove all HUC's for storage except ALL * Jul 15, 2013 2184 dhladky Remove all HUC's for storage except ALL
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract * Aug 30, 2013 2298 rjpeter Make getPluginName abstract
* Apr 24, 2014 2940 dhladky Prevent storage of bad records. * Apr 24, 2014 2940 dhladky Prevent storage of bad records.
* Jul 10, 2014 2914 garmendariz Remove EnvProperties
* </pre> * </pre>
* *
* @author dhladky * @author dhladky
@ -263,8 +263,7 @@ public class FFMPGenerator extends CompositeProductGenerator implements
RadarStationDao dao = new RadarStationDao(); RadarStationDao dao = new RadarStationDao();
List<RadarStation> stations = null; List<RadarStation> stations = null;
try { try {
stations = dao.queryByWfo(PropertiesFactory.getInstance() stations = dao.queryByWfo(SiteUtil.getSite());
.getEnvProperties().getEnvValue("SITENAME"));
} catch (DataAccessLayerException e) { } catch (DataAccessLayerException e) {
statusHandler statusHandler
.handle(Priority.ERROR, .handle(Priority.ERROR,
@ -1586,8 +1585,7 @@ public class FFMPGenerator extends CompositeProductGenerator implements
} }
DatMenuUtil dmu = new DatMenuUtil(); DatMenuUtil dmu = new DatMenuUtil();
dmu.setDatSite(PropertiesFactory.getInstance().getEnvProperties() dmu.setDatSite(SiteUtil.getSite());
.getEnvValue("SITENAME"));
dmu.setOverride(true); dmu.setOverride(true);
dmu.createMenus(); dmu.createMenus();
} }

37
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPURIFilter.java
View file

@ -28,6 +28,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import com.raytheon.edex.site.SiteUtil;
import com.raytheon.edex.urifilter.URIFilter; import com.raytheon.edex.urifilter.URIFilter;
import com.raytheon.edex.urifilter.URIGenerateMessage; import com.raytheon.edex.urifilter.URIGenerateMessage;
import com.raytheon.uf.common.dataplugin.message.DataURINotificationMessage; import com.raytheon.uf.common.dataplugin.message.DataURINotificationMessage;
@ -37,7 +38,6 @@ import com.raytheon.uf.common.monitor.xml.FFMPRunXML;
import com.raytheon.uf.common.monitor.xml.SourceIngestConfigXML; import com.raytheon.uf.common.monitor.xml.SourceIngestConfigXML;
import com.raytheon.uf.common.monitor.xml.SourceXML; import com.raytheon.uf.common.monitor.xml.SourceXML;
import com.raytheon.uf.common.ohd.AppsDefaults; import com.raytheon.uf.common.ohd.AppsDefaults;
import com.raytheon.uf.edex.core.props.PropertiesFactory;
/** /**
* *
@ -49,6 +49,7 @@ import com.raytheon.uf.edex.core.props.PropertiesFactory;
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* 06/21/2009 2521 dhladky Initial Creation. * 06/21/2009 2521 dhladky Initial Creation.
* Feb 15, 2013 1638 mschenke Moved DataURINotificationMessage to uf.common.dataplugin * Feb 15, 2013 1638 mschenke Moved DataURINotificationMessage to uf.common.dataplugin
* Jul 10, 2014 2914 garmendariz Remove EnvProperties
* *
* </pre> * </pre>
* *
@ -252,8 +253,7 @@ public class FFMPURIFilter extends URIFilter {
.getInstance(); .getInstance();
FFMPRunConfigurationManager runConfig = FFMPRunConfigurationManager FFMPRunConfigurationManager runConfig = FFMPRunConfigurationManager
.getInstance(); .getInstance();
FFMPRunXML runner = runConfig.getRunner(PropertiesFactory.getInstance() FFMPRunXML runner = runConfig.getRunner(SiteUtil.getSite());
.getEnvProperties().getEnvValue("SITENAME"));
for (SourceXML source : sourceConfig.getSources()) { for (SourceXML source : sourceConfig.getSources()) {
@ -273,21 +273,22 @@ public class FFMPURIFilter extends URIFilter {
for (String dataKey : sicx.getDataKey()) { for (String dataKey : sicx.getDataKey()) {
String matcher = null; String matcher = null;
// RFC FFG, special matching criteria and override potentials // RFC FFG, special matching criteria and override
if (source.isRfc()) { // potentials
String pathReplace = source.getDataPath(dataKey); if (source.isRfc()) {
if (pathReplace.equals(source.getDataPath())) { String pathReplace = source.getDataPath(dataKey);
matcher = replaceWildCard( if (pathReplace.equals(source.getDataPath())) {
"FFG-" + dataKey.substring(1), matcher = replaceWildCard(
source.getDataPath(), "FFG-" + dataKey.substring(1),
sicx.getUriSubLocation()); source.getDataPath(),
} else { sicx.getUriSubLocation());
matcher = pathReplace; } else {
} matcher = pathReplace;
} }
// All others use this pattern }
else { // All others use this pattern
matcher = replaceWildCard(dataKey, else {
matcher = replaceWildCard(dataKey,
source.getDataPath(dataKey), source.getDataPath(dataKey),
sicx.getUriSubLocation()); sicx.getUriSubLocation());
} }

51
edexOsgi/com.raytheon.uf.edex.plugin.madis/src/com/raytheon/uf/edex/plugin/madis/MadisSeparator.java
View file

@ -24,6 +24,7 @@ import com.raytheon.uf.edex.core.EdexException;
/** /**
* Madis record separation. * Madis record separation.
*
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
@ -39,12 +40,11 @@ import com.raytheon.uf.edex.core.EdexException;
* @version 1 * @version 1
*/ */
public class MadisSeparator { public class MadisSeparator {
private static final Pattern regex = Pattern.compile(","); private static final Pattern regex = Pattern.compile(",");
public static final String pathPrefix = EDEXUtil.EDEX_HOME + File.separatorChar + "data" public static final String pathPrefix = EDEXUtil.getEdexData()
+ File.separatorChar + "madis" + File.separatorChar; + File.separatorChar + "madis" + File.separatorChar;
private static final String pathSuffix = ".madis"; private static final String pathSuffix = ".madis";
@ -69,8 +69,7 @@ public class MadisSeparator {
} }
} }
public void separate(byte[] inputData) public void separate(byte[] inputData) throws DecoderException {
throws DecoderException {
InputStream is = null; InputStream is = null;
BufferedReader bfReader = null; BufferedReader bfReader = null;
@ -91,7 +90,7 @@ public class MadisSeparator {
long time3 = 0l; long time3 = 0l;
int j = 1; int j = 1;
while((line = bfReader.readLine()) != null) { while ((line = bfReader.readLine()) != null) {
// Get the file type, D or F // Get the file type, D or F
if (i == 0) { if (i == 0) {
time3 = System.currentTimeMillis(); time3 = System.currentTimeMillis();
@ -125,7 +124,7 @@ public class MadisSeparator {
sendFile(mio); sendFile(mio);
long time4 = System.currentTimeMillis(); long time4 = System.currentTimeMillis();
statusHandler.handle(Priority.INFO, statusHandler.handle(Priority.INFO,
"MADIS separated record wrote: "+j+" " "MADIS separated record wrote: " + j + " "
+ (time4 - time3) + " ms"); + (time4 - time3) + " ms");
} }
@ -137,7 +136,8 @@ public class MadisSeparator {
try { try {
bfReader.close(); bfReader.close();
} catch (IOException e) { } catch (IOException e) {
statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e); statusHandler.handle(Priority.PROBLEM,
e.getLocalizedMessage(), e);
} }
} }
} }
@ -173,9 +173,11 @@ public class MadisSeparator {
/** /**
* Writes the object to the File System * Writes the object to the File System
*
* @param mio * @param mio
*/ */
private static void sendObject(MadisIngestObject mio, String path) throws Exception { private static void sendObject(MadisIngestObject mio, String path)
throws Exception {
FileOutputStream fos = null; FileOutputStream fos = null;
try { try {
@ -187,17 +189,20 @@ public class MadisSeparator {
statusHandler.handle(Priority.PROBLEM, "Couldn't create file", e); statusHandler.handle(Priority.PROBLEM, "Couldn't create file", e);
throw new Exception("Unable to write File, FileNotFound!", e); throw new Exception("Unable to write File, FileNotFound!", e);
} catch (SerializationException e) { } catch (SerializationException e) {
statusHandler.handle(Priority.PROBLEM, "Serialization exception writing file", e); statusHandler.handle(Priority.PROBLEM,
"Serialization exception writing file", e);
throw new Exception("Unable to write File, Serialization!", e); throw new Exception("Unable to write File, Serialization!", e);
} catch (IOException e) { } catch (IOException e) {
statusHandler.handle(Priority.PROBLEM, "IO Exception creating file", e); statusHandler.handle(Priority.PROBLEM,
"IO Exception creating file", e);
throw new Exception("Unable to write File, IO!", e); throw new Exception("Unable to write File, IO!", e);
} finally { } finally {
if (fos != null) { if (fos != null) {
try { try {
fos.close(); fos.close();
} catch (IOException e) { } catch (IOException e) {
statusHandler.handle(Priority.PROBLEM, "Problem closing the stream!", e); statusHandler.handle(Priority.PROBLEM,
"Problem closing the stream!", e);
} }
} }
} }
@ -205,22 +210,23 @@ public class MadisSeparator {
/** /**
* Send the path to QPID * Send the path to QPID
*
* @param path * @param path
* @param route * @param route
*/ */
private static void sendPath(String path, String route) throws Exception { private static void sendPath(String path, String route) throws Exception {
try { try {
EDEXUtil.getMessageProducer().sendAsyncUri( EDEXUtil.getMessageProducer().sendAsyncUri(route, path);
route, path);
} catch (EdexException e) { } catch (EdexException e) {
statusHandler.handle(Priority.PROBLEM, statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
e.getLocalizedMessage(), e); throw new Exception("Unable to send Path message, EdexException!",
throw new Exception("Unable to send Path message, EdexException!", e); e);
} }
} }
/** /**
* Get the file from the path * Get the file from the path
*
* @param path * @param path
* @param route * @param route
*/ */
@ -231,13 +237,14 @@ public class MadisSeparator {
try { try {
fis = new FileInputStream(new File(path)); fis = new FileInputStream(new File(path));
mio = SerializationUtil.transformFromThrift(MadisIngestObject.class, fis); mio = SerializationUtil.transformFromThrift(
MadisIngestObject.class, fis);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
statusHandler.handle(Priority.PROBLEM, statusHandler.handle(Priority.PROBLEM, "Couldn't find the file", e);
"Couldn't find the file", e);
} catch (SerializationException e) { } catch (SerializationException e) {
statusHandler.handle(Priority.PROBLEM, "Couldn't de-serialize the file", e); statusHandler.handle(Priority.PROBLEM,
"Couldn't de-serialize the file", e);
} finally { } finally {
if (fis != null) { if (fis != null) {
try { try {
@ -254,12 +261,14 @@ public class MadisSeparator {
/** /**
* Gets the filePath and sends to queue and disk * Gets the filePath and sends to queue and disk
*
* @param mio * @param mio
*/ */
private void sendFile(MadisIngestObject mio) { private void sendFile(MadisIngestObject mio) {
StringBuilder filePath = new StringBuilder(); StringBuilder filePath = new StringBuilder();
filePath.append(pathPrefix).append(UUID.randomUUID().toString()).append(pathSuffix); filePath.append(pathPrefix).append(UUID.randomUUID().toString())
.append(pathSuffix);
String path = filePath.toString(); String path = filePath.toString();
try { try {
sendObject(mio, path); sendObject(mio, path);

5
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/src/com/raytheon/uf/edex/plugin/manualIngest/MessageGenerator.java
View file

@ -40,7 +40,6 @@ import com.raytheon.uf.common.time.SimulatedTime;
import com.raytheon.uf.common.util.header.WMOHeaderFinder; import com.raytheon.uf.common.util.header.WMOHeaderFinder;
import com.raytheon.uf.common.wmo.WMOTimeParser; import com.raytheon.uf.common.wmo.WMOTimeParser;
import com.raytheon.uf.edex.core.EDEXUtil; import com.raytheon.uf.edex.core.EDEXUtil;
import com.raytheon.uf.edex.core.props.PropertiesFactory;
import com.raytheon.uf.edex.distribution.DistributionPatterns; import com.raytheon.uf.edex.distribution.DistributionPatterns;
/** /**
@ -58,6 +57,7 @@ import com.raytheon.uf.edex.distribution.DistributionPatterns;
* Sep 03, 2013 2327 rjpeter Added directory routing by plugin and date of product. * Sep 03, 2013 2327 rjpeter Added directory routing by plugin and date of product.
* Apr 17, 2014 2942 skorolev Updated throw exception in sendFileToIngest. * Apr 17, 2014 2942 skorolev Updated throw exception in sendFileToIngest.
* May 14, 2014 2536 bclement removed TimeTools usage * May 14, 2014 2536 bclement removed TimeTools usage
* Jul 10, 2014 2914 garmendariz Remove EnvProperties
* *
* </pre> * </pre>
* *
@ -69,8 +69,7 @@ public class MessageGenerator implements Processor {
private static final transient IUFStatusHandler statusHandler = UFStatus private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(MessageGenerator.class); .getHandler(MessageGenerator.class);
private static String DIR = PropertiesFactory.getInstance() private static String DIR = System.getProperty("data.archive.root")
.getEnvProperties().getEnvValue("ARCHIVEDIR")
+ File.separator + "manual"; + File.separator + "manual";
private static MessageGenerator instance = new MessageGenerator(); private static MessageGenerator instance = new MessageGenerator();

7
edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/ScanGenerator.java
View file

@ -26,6 +26,7 @@ import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;
import com.raytheon.edex.site.SiteUtil;
import com.raytheon.edex.urifilter.URIFilter; import com.raytheon.edex.urifilter.URIFilter;
import com.raytheon.edex.urifilter.URIGenerateMessage; import com.raytheon.edex.urifilter.URIGenerateMessage;
import com.raytheon.uf.common.dataplugin.message.DataURINotificationMessage; import com.raytheon.uf.common.dataplugin.message.DataURINotificationMessage;
@ -40,7 +41,6 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority; import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.DataTime; import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.edex.core.props.PropertiesFactory;
import com.raytheon.uf.edex.cpgsrv.CompositeProductGenerator; import com.raytheon.uf.edex.cpgsrv.CompositeProductGenerator;
import com.raytheon.uf.edex.dat.utils.DatMenuUtil; import com.raytheon.uf.edex.dat.utils.DatMenuUtil;
import com.raytheon.uf.edex.dat.utils.ScanDataCache; import com.raytheon.uf.edex.dat.utils.ScanDataCache;
@ -57,6 +57,7 @@ import com.raytheon.uf.edex.dat.utils.ScanDataCache;
* Feb 25, 2013 1660 D. Hladky Fixed SCAN configuration bug. * Feb 25, 2013 1660 D. Hladky Fixed SCAN configuration bug.
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract * Aug 30, 2013 2298 rjpeter Make getPluginName abstract
* May 12, 2014 3133 njensen Remove unused field * May 12, 2014 3133 njensen Remove unused field
* Jul 10, 2014 2914 garmendariz Remove EnvProperties
* *
* </pre> * </pre>
* *
@ -298,11 +299,9 @@ public class ScanGenerator extends CompositeProductGenerator implements
resetFilters(); resetFilters();
DatMenuUtil dmu = new DatMenuUtil(); DatMenuUtil dmu = new DatMenuUtil();
dmu.setDatSite(PropertiesFactory.getInstance().getEnvProperties() dmu.setDatSite(SiteUtil.getSite());
.getEnvValue("SITENAME"));
dmu.setOverride(true); dmu.setOverride(true);
dmu.createMenus(); dmu.createMenus();
} }
} }
} }

29
edexOsgi/com.raytheon.uf.edex.plugin.taf/res/conf/attributes.xml
View file

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<properties>
<Name>ATTRIBUTE_NAMES</Name>
<!-- Valuse used for indexing TAF products -->
<FT>TAF</FT>
<FC>TAF</FC>
</properties>

32
edexOsgi/com.raytheon.uf.edex.plugin.text/res/conf/subscription.xml
View file

@ -1,32 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<!-- properties for the subscription service. -->
<!-- defines values for subscription handling -->
<properties>
<Name>SUBSCRIPTION_SERVICE</Name>
<KEY_FIELD>datauri</KEY_FIELD>
<HIB_CLASS>Subscription</HIB_CLASS>
<PGS_TABLE>subscription</PGS_TABLE>
<SUBSCRIPTION_QUERY_VAR>subscriptionDataQueryId</SUBSCRIPTION_QUERY_VAR>
<SUBSCRIPTION_QUERY_FIELD>subscriptionDataFieldId</SUBSCRIPTION_QUERY_FIELD>
</properties>

3
edexOsgi/com.raytheon.uf.edex.plugin.text/resources/com.raytheon.edex.text.properties
View file

@ -3,3 +3,6 @@
# the interval it does a full version purge to catch any cases not handled by # the interval it does a full version purge to catch any cases not handled by
# the purge every minute. # the purge every minute.
text.fullVersionPurge.intervalhours=3 text.fullVersionPurge.intervalhours=3
fxadebugsavedbadtextfile=false

11
edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextDecoder.java
View file

@ -50,7 +50,7 @@ import com.raytheon.uf.common.dataplugin.text.db.StdTextProduct;
import com.raytheon.uf.common.time.DataTime; import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.common.wmo.AFOSProductId; import com.raytheon.uf.common.wmo.AFOSProductId;
import com.raytheon.uf.common.wmo.WMOHeader; import com.raytheon.uf.common.wmo.WMOHeader;
import com.raytheon.uf.edex.core.props.PropertiesFactory; import com.raytheon.uf.edex.core.EDEXUtil;
import com.raytheon.uf.edex.database.DataAccessLayerException; import com.raytheon.uf.edex.database.DataAccessLayerException;
import com.raytheon.uf.edex.plugin.text.dao.AfosToAwipsDao; import com.raytheon.uf.edex.plugin.text.dao.AfosToAwipsDao;
import com.raytheon.uf.edex.plugin.text.db.TextDB; import com.raytheon.uf.edex.plugin.text.db.TextDB;
@ -80,6 +80,7 @@ import com.raytheon.uf.edex.plugin.text.impl.separator.WMOMessageSeparator;
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract * Aug 30, 2013 2298 rjpeter Make getPluginName abstract
* Mar 14, 2014 2652 skorolev Changed logging for skipped headers. * Mar 14, 2014 2652 skorolev Changed logging for skipped headers.
* May 12, 2014 2536 bclement added createTextRecord(), removed deprecated code * May 12, 2014 2536 bclement added createTextRecord(), removed deprecated code
* Jul 10, 2014 2914 garmendariz Remove EnvProperties
* </pre> * </pre>
* *
* @author * @author
@ -93,12 +94,10 @@ public class TextDecoder extends AbstractDecoder {
private static final long MSG_HDR_LOG_PERIOD = 10 * 60 * 1000; private static final long MSG_HDR_LOG_PERIOD = 10 * 60 * 1000;
private static boolean moveBadTxt = Boolean.parseBoolean(PropertiesFactory private static boolean moveBadTxt = Boolean.parseBoolean(System
.getInstance().getEnvProperties() .getProperty("fxadebugsavedbadtextfiles"));
.getEnvValue("FXADEBUGSAVEBADTEXTFILES"));
private static String badTxtDir = PropertiesFactory.getInstance() private static String badTxtDir = EDEXUtil.getEdexData() + File.separator
.getEnvProperties().getEnvValue("DEFAULTDATADIR")
+ "badTxt"; + "badTxt";
private final Log logger = LogFactory.getLog(getClass()); private final Log logger = LogFactory.getLog(getClass());

6
edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/db/TextDB.java
View file

@ -28,6 +28,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.raytheon.edex.esb.Headers; import com.raytheon.edex.esb.Headers;
import com.raytheon.edex.site.SiteUtil;
import com.raytheon.uf.common.dataplugin.text.db.OperationalStdTextProduct; import com.raytheon.uf.common.dataplugin.text.db.OperationalStdTextProduct;
import com.raytheon.uf.common.dataplugin.text.db.PracticeStdTextProduct; import com.raytheon.uf.common.dataplugin.text.db.PracticeStdTextProduct;
import com.raytheon.uf.common.dataplugin.text.db.StateMatch; import com.raytheon.uf.common.dataplugin.text.db.StateMatch;
@ -39,7 +40,6 @@ import com.raytheon.uf.common.site.SiteMap;
import com.raytheon.uf.common.wmo.AFOSProductId; import com.raytheon.uf.common.wmo.AFOSProductId;
import com.raytheon.uf.common.wmo.WMOHeader; import com.raytheon.uf.common.wmo.WMOHeader;
import com.raytheon.uf.common.wmo.WMOTimeParser; import com.raytheon.uf.common.wmo.WMOTimeParser;
import com.raytheon.uf.edex.core.props.PropertiesFactory;
import com.raytheon.uf.edex.plugin.text.dao.StateMatchDao; import com.raytheon.uf.edex.plugin.text.dao.StateMatchDao;
import com.raytheon.uf.edex.plugin.text.dao.StdTextProductDao; import com.raytheon.uf.edex.plugin.text.dao.StdTextProductDao;
import com.raytheon.uf.edex.plugin.text.dao.TextProductInfoDao; import com.raytheon.uf.edex.plugin.text.dao.TextProductInfoDao;
@ -74,6 +74,7 @@ import com.raytheon.uf.edex.plugin.text.impl.WMOReportData;
* May 14, 2014 2536 bclement moved WMO Header to common, removed TimeTools usage * May 14, 2014 2536 bclement moved WMO Header to common, removed TimeTools usage
* May 15, 2014 2536 bclement moved asciiToHex() hexToAscii() and getProperty() to PropConverter * May 15, 2014 2536 bclement moved asciiToHex() hexToAscii() and getProperty() to PropConverter
* May 20, 2014 2536 bclement moved from edex.textdb to edex.plugin.text * May 20, 2014 2536 bclement moved from edex.textdb to edex.plugin.text
* Jul 10, 2014 2914 garmendariz Remove EnvProperties
* </pre> * </pre>
* *
* @author jkorman * @author jkorman
@ -84,8 +85,7 @@ public class TextDB {
private Log logger = LogFactory.getLog(getClass()); private Log logger = LogFactory.getLog(getClass());
private String siteName = PropertiesFactory.getInstance() private String siteName = SiteUtil.getSite();
.getEnvProperties().getEnvValue("SITENAME");
private boolean operationalMode = true; private boolean operationalMode = true;

6
edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/TextSeparatorFactory.java
View file

@ -25,8 +25,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.raytheon.edex.esb.Headers; import com.raytheon.edex.esb.Headers;
import com.raytheon.edex.site.SiteUtil;
import com.raytheon.uf.common.wmo.WMOHeader; import com.raytheon.uf.common.wmo.WMOHeader;
import com.raytheon.uf.edex.core.props.PropertiesFactory;
import com.raytheon.uf.edex.plugin.text.db.TextDB; import com.raytheon.uf.edex.plugin.text.db.TextDB;
import com.raytheon.uf.edex.plugin.text.impl.separator.StdCollectiveSeparator; import com.raytheon.uf.edex.plugin.text.impl.separator.StdCollectiveSeparator;
import com.raytheon.uf.edex.plugin.text.impl.separator.StdTextSeparator; import com.raytheon.uf.edex.plugin.text.impl.separator.StdTextSeparator;
@ -51,6 +51,7 @@ import com.raytheon.uf.edex.plugin.text.impl.separator.WMOMessageSeparator;
* for input data. * for input data.
* Apr 01, 2014 2915 dgilling Support re-factored TextDBStaticData. * Apr 01, 2014 2915 dgilling Support re-factored TextDBStaticData.
* May 14, 2014 2536 bclement moved WMO Header to common * May 14, 2014 2536 bclement moved WMO Header to common
* Jul 10, 2014 2914 garmendariz Remove EnvProperties
* *
* </pre> * </pre>
* *
@ -63,8 +64,7 @@ public class TextSeparatorFactory {
private static final Log logger = LogFactory private static final Log logger = LogFactory
.getLog(TextSeparatorFactory.class); .getLog(TextSeparatorFactory.class);
private static final String siteId = PropertiesFactory.getInstance() private static final String siteId = SiteUtil.getSite();
.getEnvProperties().getEnvValue("SITENAME");
private static Pattern TAF_PTRN = Pattern.compile("^TAF\\s*$"); private static Pattern TAF_PTRN = Pattern.compile("^TAF\\s*$");

9
edexOsgi/com.raytheon.uf.edex.python.decoder/src/com/raytheon/uf/edex/python/decoder/PythonDecoderFactory.java
View file

@ -34,8 +34,7 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType; import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
import com.raytheon.uf.common.localization.PathManagerFactory; import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.uf.common.python.PythonScript; import com.raytheon.uf.common.python.PythonScript;
import com.raytheon.uf.edex.core.props.EnvProperties; import com.raytheon.uf.edex.core.EDEXUtil;
import com.raytheon.uf.edex.core.props.PropertiesFactory;
/** /**
* Factory class for getting pooled Python decoder instances * Factory class for getting pooled Python decoder instances
@ -45,7 +44,8 @@ import com.raytheon.uf.edex.core.props.PropertiesFactory;
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Apr 2, 2009 njensen Initial creation * Apr 2, 2009 njensen Initial creation
* Jul 10, 2014 2914 garmendariz Remove EnvProperties
* *
* </pre> * </pre>
* *
@ -80,8 +80,7 @@ public class PythonDecoderFactory {
decoderInterface = pathMgr.getFile(commonCx, decoderInterface = pathMgr.getFile(commonCx,
"python" + File.separator + "DecoderInterface.py").getPath(); "python" + File.separator + "DecoderInterface.py").getPath();
includePath = pathMgr.getFile(commonCx, "python").getPath(); includePath = pathMgr.getFile(commonCx, "python").getPath();
EnvProperties env = PropertiesFactory.getInstance().getEnvProperties(); pluginDir = EDEXUtil.getEdexPlugins();
pluginDir = env.getEnvValue("PLUGINDIR");
} }
/** /**

6
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/DbInit.java
View file

@ -36,7 +36,6 @@ import java.util.Map;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
import java.util.jar.JarFile; import java.util.jar.JarFile;
import javax.persistence.Version;
import javax.xml.bind.JAXBException; import javax.xml.bind.JAXBException;
import oasis.names.tc.ebxml.regrep.wsdl.registry.services.v4.LifecycleManager; import oasis.names.tc.ebxml.regrep.wsdl.registry.services.v4.LifecycleManager;
@ -66,7 +65,6 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.util.ReflectionUtil; import com.raytheon.uf.common.util.ReflectionUtil;
import com.raytheon.uf.edex.core.EDEXUtil; import com.raytheon.uf.edex.core.EDEXUtil;
import com.raytheon.uf.edex.core.props.PropertiesFactory;
import com.raytheon.uf.edex.registry.ebxml.exception.EbxmlRegistryException; import com.raytheon.uf.edex.registry.ebxml.exception.EbxmlRegistryException;
import com.raytheon.uf.edex.registry.ebxml.init.RegistryInitializedListener; import com.raytheon.uf.edex.registry.ebxml.init.RegistryInitializedListener;
@ -93,6 +91,7 @@ import com.raytheon.uf.edex.registry.ebxml.init.RegistryInitializedListener;
* Nov 14, 2013 2552 bkowal EbxmlJaxbManager is now accessed via getInstance * Nov 14, 2013 2552 bkowal EbxmlJaxbManager is now accessed via getInstance
* Dec 20, 2013 2636 mpduff Set initialized to true before postInitialized is called. * Dec 20, 2013 2636 mpduff Set initialized to true before postInitialized is called.
* Dec 04, 2013 2584 dhladky Version based EbxmlJaxbManager * Dec 04, 2013 2584 dhladky Version based EbxmlJaxbManager
* Jul 10, 2014 2914 garmendariz Remove EnvProperties
* </pre> * </pre>
* *
* @author bphillip * @author bphillip
@ -209,8 +208,7 @@ public class DbInit extends com.raytheon.uf.edex.database.init.DbInit implements
JarFile jar = null; JarFile jar = null;
try { try {
jar = new JarFile(PropertiesFactory.getInstance() jar = new JarFile(EDEXUtil.getEdexPlugins() + File.separator
.getEnvProperties().getEnvValue("PLUGINDIR")
+ "com.raytheon.uf.edex.registry.ebxml.jar"); + "com.raytheon.uf.edex.registry.ebxml.jar");
} catch (IOException e) { } catch (IOException e) {
throw new EbxmlRegistryException("Unable to find registry jar!", e); throw new EbxmlRegistryException("Unable to find registry jar!", e);

9
edexOsgi/com.raytheon.uf.edex.site/src/com/raytheon/uf/edex/site/SiteAwareRegistry.java
View file

@ -43,8 +43,6 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.util.registry.RegistryException; import com.raytheon.uf.common.util.registry.RegistryException;
import com.raytheon.uf.edex.core.EDEXUtil; import com.raytheon.uf.edex.core.EDEXUtil;
import com.raytheon.uf.edex.core.EdexException; import com.raytheon.uf.edex.core.EdexException;
import com.raytheon.uf.edex.core.props.EnvProperties;
import com.raytheon.uf.edex.core.props.PropertiesFactory;
import com.raytheon.uf.edex.site.SiteActivationMessage.Action; import com.raytheon.uf.edex.site.SiteActivationMessage.Action;
/** /**
@ -64,6 +62,7 @@ import com.raytheon.uf.edex.site.SiteActivationMessage.Action;
* home site only if activated. * home site only if activated.
* Dec 11, 2012 14360 ryu No printing stack trace on activation exception * Dec 11, 2012 14360 ryu No printing stack trace on activation exception
* Mar 10, 2014 2721 randerso Fix error when activeSites.txt contains blank lines. * Mar 10, 2014 2721 randerso Fix error when activeSites.txt contains blank lines.
* Jul 10, 2014 2914 garmendariz Remove EnvProperties
* *
* </pre> * </pre>
* *
@ -93,8 +92,7 @@ public class SiteAwareRegistry {
loadActiveSites(); loadActiveSites();
// initialize default site // initialize default site
EnvProperties env = PropertiesFactory.getInstance().getEnvProperties(); String defaultSite = EDEXUtil.getEdexSite();
String defaultSite = env.getEnvValue("SITENAME");
if (!activeSites.contains(defaultSite)) { if (!activeSites.contains(defaultSite)) {
activeSites.add(defaultSite); activeSites.add(defaultSite);
} }
@ -143,8 +141,7 @@ public class SiteAwareRegistry {
public String[] getActiveSites() { public String[] getActiveSites() {
// make a set of the strings for each listener site // make a set of the strings for each listener site
Set<String> tmp = new LinkedHashSet<String>(); Set<String> tmp = new LinkedHashSet<String>();
String mySite = PropertiesFactory.getInstance().getEnvProperties() String mySite = EDEXUtil.getEdexSite();
.getEnvValue("SITENAME");
for (ISiteActivationListener sa : activationListeners) { for (ISiteActivationListener sa : activationListeners) {
if (sa.getActiveSites().contains(mySite)) { if (sa.getActiveSites().contains(mySite)) {
tmp.add(mySite); tmp.add(mySite);

16
ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/res/conf/plugin.xml
View file

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!-- ==================================================================== -->
<!-- Declares McIDAS ingest properties -->
<!-- -->
<!-- File History: -->
<!-- Date: Ticket Engineer Description -->
<!-- ========= ========= ============ ============================== -->
<!-- 08/09 144 T. Lee Initial Creation -->
<!-- ==================================================================== -->
<properties>
<Name>MCIDAS</Name>
<Plugin>true</Plugin>
<Database>metadata</Database>
<Record>gov.noaa.nws.ncep.common.dataplugin.mcidas.McidasRecord</Record>
<Decoder>gov.noaa.nws.ncep.edex.plugin.mcidas.decoder.McidasDecoder</Decoder>
</properties>

23
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/res/conf/plugin.xml
View file

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- ==================================================================== -->
<!-- Declares mosaic ingest properties -->
<!-- -->
<!-- File History: -->
<!-- Date: Ticket Engineer Description -->
<!-- ========= ========= ============ ============================== -->
<!-- 20090817 143 L. Lin Initial Creation -->
<!-- ==================================================================== -->
<properties>
<Name>MOSAIC</Name>
<Plugin>true</Plugin>
<Database>metadata</Database>
<Record>gov.noaa.nws.ncep.edex.plugin.mosaic.MosaicRecord</Record>
<Decoder>gov.noaa.nws.ncep.edex.plugin.mosaic.MosaicDecoder</Decoder>
<PacketList>gov.noaa.nws.ncep.edex.plugin.mosaic.level3.RadialPacket,
gov.noaa.nws.ncep.edex.plugin.mosaic.level3.RadialPacket8bit,
gov.noaa.nws.ncep.edex.plugin.mosaic.level3.RasterPacket,
gov.noaa.nws.ncep.edex.plugin.mosaic.level3.TextSymbolPacket,
gov.noaa.nws.ncep.edex.plugin.mosaic.level3.UnlinkedVectorPacket,
gov.noaa.nws.ncep.edex.plugin.mosaic.level3.LinkedVectorPacket
</PacketList>
</properties>

29
ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/conf/attributes.xml
View file

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<properties>
<Name>ATTRIBUTE_NAMES</Name>
<!-- Valuse used for indexing TAF products -->
<FT>NCTAF</FT>
<FC>NCTAF</FC>
</properties>

18
ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/conf/plugin.xml
View file

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- ==================================================================== -->
<!-- Declares nctaf ingest properties -->
<!-- -->
<!-- File History: -->
<!-- Date: Ticket Engineer Description -->
<!-- ========= ========= ============ ============================== -->
<!-- 09/12/2011 458 S. Gurung Initial Creation -->
<!-- ==================================================================== -->
<properties>
<Name>nctaf</Name>
<Plugin>true</Plugin>
<Database>metadata</Database>
<Record>gov.noaa.nws.ncep.common.dataplugin.nctaf.NcTafRecord</Record>
<Decoder>gov.noaa.nws.ncep.edex.plugin.nctaf.NcTafDecoder</Decoder>
<SEPARATOR>gov.noaa.nws.ncep.edex.plugin.nctaf.decoder.NcTafSeparator</SEPARATOR>
<Purger>com.raytheon.edex.db.purge.DefaultPurgerImpl</Purger>
</properties>

12
ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/output/GridOut.java
View file

@ -10,8 +10,7 @@ import java.util.UUID;
import com.raytheon.edex.uengine.exception.MicroEngineException; import com.raytheon.edex.uengine.exception.MicroEngineException;
import com.raytheon.edex.uengine.tasks.ScriptTask; import com.raytheon.edex.uengine.tasks.ScriptTask;
import com.raytheon.uf.common.util.StringUtil; import com.raytheon.uf.common.util.StringUtil;
import com.raytheon.uf.edex.core.props.EnvProperties; import com.raytheon.uf.edex.core.EDEXUtil;
import com.raytheon.uf.edex.core.props.PropertiesFactory;
public class GridOut extends ScriptTask { public class GridOut extends ScriptTask {
@ -56,24 +55,19 @@ public class GridOut extends ScriptTask {
} }
private void init() { private void init() {
EnvProperties envProperties = PropertiesFactory.getInstance()
.getEnvProperties();
String uengineOutDir = envProperties.getEnvValue("UENGINEOUTDIR");
String defaultDataDir = envProperties.getEnvValue("DEFAULTDATADIR");
/* /*
* make sure there is an output directory defined * make sure there is an output directory defined
*/ */
if (StringUtil.isEmptyString(destDir)) { if (StringUtil.isEmptyString(destDir)) {
// default to uengineOutDir // default to uengineOutDir
destDir = uengineOutDir; destDir = EDEXUtil.getEdexData() + File.separator + "uEngine";
// logger.debug("Defaulting destDir to: " + destDir); // logger.debug("Defaulting destDir to: " + destDir);
} else { } else {
// If the ignore default data dir flag is not true then // If the ignore default data dir flag is not true then
// prepend the default data dir to the destination directory. // prepend the default data dir to the destination directory.
if (!ignoreDefaultDataDir) { if (!ignoreDefaultDataDir) {
destDir = defaultDataDir + destDir; destDir = EDEXUtil.getEdexData() + File.separator + destDir;
} }
} }
} }