diff --git a/edexOsgi/build.edex/esb/conf/res/analysis-barnes.xml b/edexOsgi/build.edex/esb/conf/res/analysis-barnes.xml deleted file mode 100755 index 4b0597aba2..0000000000 --- a/edexOsgi/build.edex/esb/conf/res/analysis-barnes.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - ANAL_BARNES - com.raytheon.edex.objanalysis.ObjAnalysisBarnes - diff --git a/edexOsgi/build.edex/esb/conf/res/base/attributeNames.xml b/edexOsgi/build.edex/esb/conf/res/base/attributeNames.xml deleted file mode 100644 index 6566c0bfd5..0000000000 --- a/edexOsgi/build.edex/esb/conf/res/base/attributeNames.xml +++ /dev/null @@ -1,242 +0,0 @@ - - - - - ATTRIBUTE_NAMES - - - - product_type - datatype - satellite - area_subtype - product - parameter - non_goes_satellite_product - source - creating_entity - locationkey - physical_element - projection - resolution - lambert_scanning_horiz - lambert_scanning_vert - lambert_scanning_axis - - mercator_scanning_horiz - - - mercator_scanning_vert - - - mercator_scanning_axis - - - mercator_intersect_lat - - - navigational_indicator - - projection_center - records - record_size - valid_time - Nx - Ny - Lat1 - Lon1 - Lov - Dx - Dy - Latin1 - image_resolution - data_compression - version_number - - navigational_indicator - - navigational_info - resolution - Lat2 - Lon2 - - longitudinal_increment - - latitudinal_increment - - mercator_intersection_lat - - image_resolution - number_octets - reserved - original_filename - key - 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> - diff --git a/edexOsgi/build.edex/esb/conf/res/base/environment.xml b/edexOsgi/build.edex/esb/conf/res/base/environment.xml deleted file mode 100644 index d86d21241a..0000000000 --- a/edexOsgi/build.edex/esb/conf/res/base/environment.xml +++ /dev/null @@ -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> - - diff --git a/edexOsgi/build.edex/esb/conf/res/config.xml b/edexOsgi/build.edex/esb/conf/res/config.xml deleted file mode 100644 index 6a054d604c..0000000000 --- a/edexOsgi/build.edex/esb/conf/res/config.xml +++ /dev/null @@ -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> - - diff --git a/edexOsgi/build.edex/esb/conf/res/gridImageSylesRules.xml b/edexOsgi/build.edex/esb/conf/res/gridImageSylesRules.xml deleted file mode 100755 index 2519f780cd..0000000000 --- a/edexOsgi/build.edex/esb/conf/res/gridImageSylesRules.xml +++ /dev/null @@ -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> - - diff --git a/edexOsgi/build.edex/esb/conf/res/response-ascii.xml b/edexOsgi/build.edex/esb/conf/res/response-ascii.xml deleted file mode 100755 index c8dd49e5fd..0000000000 --- a/edexOsgi/build.edex/esb/conf/res/response-ascii.xml +++ /dev/null @@ -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> diff --git a/edexOsgi/build.edex/esb/conf/res/response-inline.xml b/edexOsgi/build.edex/esb/conf/res/response-inline.xml deleted file mode 100755 index 83bd7ec5ab..0000000000 --- a/edexOsgi/build.edex/esb/conf/res/response-inline.xml +++ /dev/null @@ -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> \ No newline at end of file diff --git a/edexOsgi/build.edex/esb/conf/res/response-uri.xml b/edexOsgi/build.edex/esb/conf/res/response-uri.xml deleted file mode 100755 index fb289fcdc5..0000000000 --- a/edexOsgi/build.edex/esb/conf/res/response-uri.xml +++ /dev/null @@ -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> diff --git a/edexOsgi/build.edex/esb/conf/res/response-xml.xml b/edexOsgi/build.edex/esb/conf/res/response-xml.xml deleted file mode 100644 index c637692b0e..0000000000 --- a/edexOsgi/build.edex/esb/conf/res/response-xml.xml +++ /dev/null @@ -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> diff --git a/edexOsgi/build.edex/esb/conf/res/site/attributeNames.xml b/edexOsgi/build.edex/esb/conf/res/site/attributeNames.xml deleted file mode 100644 index ed6efd29be..0000000000 --- a/edexOsgi/build.edex/esb/conf/res/site/attributeNames.xml +++ /dev/null @@ -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> - diff --git a/edexOsgi/build.edex/esb/conf/res/site/environment.xml b/edexOsgi/build.edex/esb/conf/res/site/environment.xml deleted file mode 100644 index 78acd16974..0000000000 --- a/edexOsgi/build.edex/esb/conf/res/site/environment.xml +++ /dev/null @@ -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> - - diff --git a/edexOsgi/build.edex/esb/conf/res/subscription.xml b/edexOsgi/build.edex/esb/conf/res/subscription.xml deleted file mode 100644 index 281de87d66..0000000000 --- a/edexOsgi/build.edex/esb/conf/res/subscription.xml +++ /dev/null @@ -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> \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.notifysrv/src/com/raytheon/edex/services/NotifySrv.java b/edexOsgi/com.raytheon.edex.notifysrv/src/com/raytheon/edex/services/NotifySrv.java index 3562398fe2..f88e36ce70 100644 --- a/edexOsgi/com.raytheon.edex.notifysrv/src/com/raytheon/edex/services/NotifySrv.java +++ b/edexOsgi/com.raytheon.edex.notifysrv/src/com/raytheon/edex/services/NotifySrv.java @@ -23,7 +23,6 @@ package com.raytheon.edex.services; import java.util.ArrayList; import java.util.List; -import org.apache.commons.configuration.Configuration; import org.apache.commons.logging.Log; 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.util.StringUtil; 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 @@ -51,7 +49,7 @@ import com.raytheon.uf.edex.core.props.PropertiesFactory; * 06Feb2007 TO5 MW Fegan Removed JMX registration. * 27Apr2007 208 MW Fegan Pass only dataURI in message. * 26Nov2007 443 bphillip Modified to receive lists of PluginDataObjects - * + * Jul 10, 2014 2914 garmendariz Remove EnvProperties * </pre> * * @author mfegan @@ -105,21 +103,8 @@ public class NotifySrv { // messages = new ArrayList<String>(); logger.info("-subscription exists for " + StringUtil.printString(dataURI)); - Configuration properties = PropertiesFactory.getInstance() - .getConfiguration( - ISubscriptionManager.CONFIGURATION_NAME); Subscription subscription = subscriptionManager .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()) { if (script != null) { String key = script.getScriptid(); diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java index f2ed37dc94..4c5915a124 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java @@ -32,7 +32,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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.user.IUser; 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.resp.AuthorizationResponse; import com.raytheon.uf.edex.core.EDEXUtil; -import com.raytheon.uf.edex.core.props.PropertiesFactory; import com.raytheon.uf.edex.site.SiteAwareRegistry; /** @@ -66,6 +64,7 @@ import com.raytheon.uf.edex.site.SiteAwareRegistry; * method to retrieve list of svcbu * sites. * May 28, 2014 3211 njensen Use IAuthorizer instead of IRoleStorage + * Jul 10, 2014 2914 garmendariz Remove EnvProperties * * </pre> * @@ -119,10 +118,8 @@ public class SvcBackupUtil { private static String executeProcess(String... args) throws GfeException { RunProcess proc = RunProcess.getRunProcess(); ProcessBuilder pBuilder = new ProcessBuilder(); - pBuilder.environment().put( - "LOCALIZATION_PATH", - PropertiesFactory.getInstance().getEnvProperties() - .getEnvValue("UTILITYDIR")); + pBuilder.environment().put("LOCALIZATION_PATH", + EDEXUtil.getEdexUtility()); pBuilder.environment().put("AWIPS_HOME", "/awips2/"); pBuilder.redirectErrorStream(true); pBuilder.command(args); @@ -206,7 +203,7 @@ public class SvcBackupUtil { FileInputStream fis = null; try { fis = new FileInputStream( - EDEXUtil.EDEX_HOME + EDEXUtil.getEdexHome() + "/../GFESuite/ServiceBackup/configuration/svcbu.properties"); svcbuProperties.load(fis); } catch (Exception e) { @@ -278,7 +275,7 @@ public class SvcBackupUtil { public static Set<String> getPrimarySites() { Properties svcbuProps = SvcBackupUtil.getSvcBackupProperties(); - String siteList = SiteUtil.getSite(); + String siteList = EDEXUtil.getEdexSite(); if (svcbuProps != null) { String propVal = svcbuProps.getProperty("PRIMARY_SITES", "").trim(); if (!propVal.isEmpty()) { diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/res/conf/attributes.xml b/edexOsgi/com.raytheon.edex.plugin.radar/res/conf/attributes.xml deleted file mode 100644 index acdb8a50dc..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.radar/res/conf/attributes.xml +++ /dev/null @@ -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> \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/res/conf/plugin.xml b/edexOsgi/com.raytheon.edex.plugin.radar/res/conf/plugin.xml deleted file mode 100644 index c6435c180c..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.radar/res/conf/plugin.xml +++ /dev/null @@ -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> diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/res/conf/attributes.xml b/edexOsgi/com.raytheon.edex.plugin.shef/res/conf/attributes.xml deleted file mode 100644 index adc26ebc78..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.shef/res/conf/attributes.xml +++ /dev/null @@ -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> \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/res/conf/shef.xml b/edexOsgi/com.raytheon.edex.plugin.shef/res/conf/shef.xml deleted file mode 100644 index 108579092f..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.shef/res/conf/shef.xml +++ /dev/null @@ -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> \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.uengine/build.properties b/edexOsgi/com.raytheon.edex.uengine/build.properties index 5791d48d5f..ad8d78badb 100644 --- a/edexOsgi/com.raytheon.edex.uengine/build.properties +++ b/edexOsgi/com.raytheon.edex.uengine/build.properties @@ -2,4 +2,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ .,\ - res/ + res/,\ + resources/ diff --git a/edexOsgi/com.raytheon.edex.uengine/res/conf/microengine.xml b/edexOsgi/com.raytheon.edex.uengine/res/conf/microengine.xml deleted file mode 100644 index 14380dd30f..0000000000 --- a/edexOsgi/com.raytheon.edex.uengine/res/conf/microengine.xml +++ /dev/null @@ -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> \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.uengine/resources/com.raytheon.edex.uengine.properties b/edexOsgi/com.raytheon.edex.uengine/resources/com.raytheon.edex.uengine.properties new file mode 100644 index 0000000000..47fbd19726 --- /dev/null +++ b/edexOsgi/com.raytheon.edex.uengine/resources/com.raytheon.edex.uengine.properties @@ -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 \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/MicroEngineTaskManager.java b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/MicroEngineTaskManager.java index b97f91a472..f66804d8c2 100644 --- a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/MicroEngineTaskManager.java +++ b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/MicroEngineTaskManager.java @@ -35,8 +35,7 @@ import org.apache.commons.logging.LogFactory; import com.raytheon.edex.util.Util; import com.raytheon.uf.common.util.FileUtil; import com.raytheon.uf.common.util.JarUtil; -import com.raytheon.uf.edex.core.props.EnvProperties; -import com.raytheon.uf.edex.core.props.PropertiesFactory; +import com.raytheon.uf.edex.core.EDEXUtil; /** * 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 * ----------- ---------- ------------ -------------------------- * Apr 2, 2007 njensen Initial Creation + * Jul 10, 2014 2914 garmendariz Remove EnvProperties * </PRE> * */ @@ -88,7 +88,6 @@ public class MicroEngineTaskManager { Class<?> task = null; URLClassLoader uriLoader; ClassLoader loader = ClassLoader.getSystemClassLoader(); - EnvProperties envProperties; String jarPath = null; String jarName = null; @@ -106,8 +105,7 @@ public class MicroEngineTaskManager { /* * next, get a listing of plugin JARs and search for tasks. */ - envProperties = PropertiesFactory.getInstance().getEnvProperties(); - pluginPath = envProperties.getEnvValue("PLUGINDIR"); + pluginPath = EDEXUtil.getEdexPlugins(); pluginPath = FileUtil.convertFilePath(pluginPath); File[] files = JarUtil.getJarFiles(new File(pluginPath)); uriLoader = Util.getLibrariesClassLoader(files); @@ -155,8 +153,8 @@ public class MicroEngineTaskManager { if (!fullName.equals(taskName) && task.isAssignableFrom(temp)) { - packages.add(fullName.substring(0, fullName - .lastIndexOf("."))); + packages.add(fullName.substring(0, + fullName.lastIndexOf("."))); } } } diff --git a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/runners/MicroEngine.java b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/runners/MicroEngine.java index 54dda8bc58..8ebecc0fee 100644 --- a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/runners/MicroEngine.java +++ b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/runners/MicroEngine.java @@ -19,34 +19,35 @@ **/ package com.raytheon.edex.uengine.runners; -import org.apache.commons.configuration.Configuration; - 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. - * This class does not performing any logging. + * A factory class that creates and returns &mu;Engine script runners. This + * class does not performing any logging. * <P> * Basic usage: - * <pre><code> - * IMicroEngine runner = MicroEngine.getInstance(type); - * </code></pre> * * <pre> - * + * <code> + * IMicroEngine runner = MicroEngine.getInstance(type); + * </code> + * </pre> + * + * <pre> + * * SOFTWARE HISTORY - * + * * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * 17Nov2008 1709 MW Fegan Initial creation. + * Jul 10, 2014 2914 garmendariz Remove EnvProperties * * </pre> - * + * * @author mfegan * @version 1.0 * @see com.raytheon.edex.uengine.runners.AMicroEngine - * @see com.raytheon.edex.uengine.runners.IMicroEngine + * @see com.raytheon.edex.uengine.runners.IMicroEngine */ public final class MicroEngine { @@ -56,39 +57,40 @@ public final class MicroEngine { */ private MicroEngine() { } + /** * 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 * - * @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; Class<?> aClass = null; - Configuration config = null; - String configName = "micro_engine"; IMicroEngine retVal = null; 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 */ - className = config.getString(runner); + className = System.getProperty(runner); 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 */ try { aClass = Class.forName(className); - retVal = (IMicroEngine)aClass.newInstance(); + retVal = (IMicroEngine) aClass.newInstance(); } 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; } diff --git a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/tasks/output/FileOut.java b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/tasks/output/FileOut.java index ebb4593728..70e8b2ec97 100644 --- a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/tasks/output/FileOut.java +++ b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/tasks/output/FileOut.java @@ -29,8 +29,7 @@ import com.raytheon.edex.uengine.exception.MicroEngineException; import com.raytheon.edex.uengine.tasks.ScriptTask; import com.raytheon.uf.common.util.FileUtil; import com.raytheon.uf.common.util.StringUtil; -import com.raytheon.uf.edex.core.props.EnvProperties; -import com.raytheon.uf.edex.core.props.PropertiesFactory; +import com.raytheon.uf.edex.core.EDEXUtil; /** * 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 * ----------- ---------- ------------ -------------------------- * Mar 29, 2007 njensen Initial Creation + * Jul 10, 2014 2914 garmendariz Remove EnvProperties * </PRE> * */ @@ -79,24 +79,19 @@ public class FileOut extends ScriptTask { } 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 */ if (StringUtil.isEmptyString(destDir)) { // default to uengineOutDir - destDir = uengineOutDir; + destDir = EDEXUtil.getEdexData() + File.separator + "uEngine"; logger.debug("Defaulting destDir to: " + destDir); } else { // If the ignore default data dir flag is not true then // prepend the default data dir to the destination directory. if (!ignoreDefaultDataDir) { - destDir = defaultDataDir + destDir; + destDir = EDEXUtil.getEdexData() + File.separator + destDir; } } } diff --git a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/tasks/process/ReplayArchive.java b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/tasks/process/ReplayArchive.java deleted file mode 100644 index 8c26e0b10c..0000000000 --- a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/tasks/process/ReplayArchive.java +++ /dev/null @@ -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; - } - -} \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.qc/resources/com.raytheon.uf.common.dataplugin.qc.properties b/edexOsgi/com.raytheon.uf.common.dataplugin.qc/resources/com.raytheon.uf.common.dataplugin.qc.properties new file mode 100644 index 0000000000..b9b97f0ee2 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.qc/resources/com.raytheon.uf.common.dataplugin.qc.properties @@ -0,0 +1 @@ +HDF5_PATH=hdf5/QC \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.qc/src/com/raytheon/uf/common/dataplugin/qc/internal/QCPaths.java b/edexOsgi/com.raytheon.uf.common.dataplugin.qc/src/com/raytheon/uf/common/dataplugin/qc/internal/QCPaths.java index 91d3d85774..667d31cad6 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.qc/src/com/raytheon/uf/common/dataplugin/qc/internal/QCPaths.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.qc/src/com/raytheon/uf/common/dataplugin/qc/internal/QCPaths.java @@ -43,7 +43,7 @@ import com.raytheon.uf.common.serialization.SerializationException; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; 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. @@ -62,9 +62,9 @@ public class QCPaths { PYTHON_INCLUDE_PATH = PyUtil.buildJepIncludePath(pathMgr.getFile( pathMgr.getContext(LocalizationType.COMMON_STATIC, LocalizationLevel.BASE), "python").getAbsolutePath()); - QC_RAW_DIR = PropertiesFactory.getInstance().getEnvProperties() - .getEnvValue("HDF5DIR") - + "/QC/"; + QC_RAW_DIR = EDEXUtil.getEdexData() + File.separator + + System.getProperty("HDF5_PATH"); + } public static String getPythonScriptPath(String scriptFileName) { @@ -138,6 +138,11 @@ public class QCPaths { } } } + + if (jar != null) { + jar.close(); + } + return pdds; } catch (SerializationException e) { throw new RuntimeException( diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.ohd/META-INF/MANIFEST.MF index 040cd72056..5366333be5 100644 --- a/edexOsgi/com.raytheon.uf.edex.ohd/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.ohd/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Ohd Plug-in Bundle-SymbolicName: com.raytheon.uf.edex.ohd -Bundle-Version: 1.12.1174.qualifier +Bundle-Version: 1.14.0.qualifier Bundle-Vendor: RAYTHEON -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: com.raytheon.edex.util, com.raytheon.uf.common.dataplugin.binlightning, 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.wmo, com.raytheon.uf.edex.core, - com.raytheon.uf.edex.core.props, com.raytheon.uf.edex.dat.utils, com.raytheon.uf.edex.database, com.raytheon.uf.edex.database.dao, diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/MainMethod.java b/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/MainMethod.java index 3c6331a6f8..79db5528ab 100644 --- a/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/MainMethod.java +++ b/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/MainMethod.java @@ -30,7 +30,7 @@ import java.util.ArrayList; import com.raytheon.uf.common.ohd.AppsDefaults; import com.raytheon.uf.common.status.IUFStatusHandler; 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 @@ -51,6 +51,7 @@ import com.raytheon.uf.edex.core.props.PropertiesFactory; * Oct 28, 2008 jelkins Initial creation * Oct 19, 2012 #1274 bgonzale Set AppContext on the process builder in ctor. * Mar 28, 2014 2952 mpduff Changed to use UFStatus for logging. + * Jul 10, 2014 2914 garmendariz Remove EnvProperties * </pre> * * @author jelkins @@ -117,9 +118,8 @@ public class MainMethod extends Process { try { processBuilder.environment().put( "apps_dir", - new File(PropertiesFactory.getInstance().getEnvProperties() - .getEnvValue("SHAREDIR") - + File.separator + "hydroapps").getCanonicalPath()); + new File(EDEXUtil.getEdexShare() + File.separator + + "hydroapps").getCanonicalPath()); AppsDefaults.getInstance().setAppContext(processBuilder); } catch (IOException e) { log.error("Unable to get apps_dir", e); diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java index 071eaebb8b..33f633f730 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java @@ -33,6 +33,7 @@ import java.util.concurrent.Executor; import java.util.regex.Pattern; 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.URIGenerateMessage; 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.SourceBinList; 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.util.RadarsInUseUtil; 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.edex.core.EDEXUtil; 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.dat.utils.DatMenuUtil; 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 * Aug 30, 2013 2298 rjpeter Make getPluginName abstract * Apr 24, 2014 2940 dhladky Prevent storage of bad records. + * Jul 10, 2014 2914 garmendariz Remove EnvProperties * </pre> * * @author dhladky @@ -263,8 +263,7 @@ public class FFMPGenerator extends CompositeProductGenerator implements RadarStationDao dao = new RadarStationDao(); List<RadarStation> stations = null; try { - stations = dao.queryByWfo(PropertiesFactory.getInstance() - .getEnvProperties().getEnvValue("SITENAME")); + stations = dao.queryByWfo(SiteUtil.getSite()); } catch (DataAccessLayerException e) { statusHandler .handle(Priority.ERROR, @@ -698,7 +697,7 @@ public class FFMPGenerator extends CompositeProductGenerator implements FFMPProcessor ffmp = new FFMPProcessor(config, generator, ffmpRec, template); ffmpRec = ffmp.processFFMP(ffmpProduct); - + if (ffmpRec != null) { ffmpRec.constructDataURI(); @@ -1586,8 +1585,7 @@ public class FFMPGenerator extends CompositeProductGenerator implements } DatMenuUtil dmu = new DatMenuUtil(); - dmu.setDatSite(PropertiesFactory.getInstance().getEnvProperties() - .getEnvValue("SITENAME")); + dmu.setDatSite(SiteUtil.getSite()); dmu.setOverride(true); dmu.createMenus(); } diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPURIFilter.java b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPURIFilter.java index 17a6cc0a45..3d89cf3040 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPURIFilter.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPURIFilter.java @@ -28,6 +28,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Pattern; +import com.raytheon.edex.site.SiteUtil; import com.raytheon.edex.urifilter.URIFilter; import com.raytheon.edex.urifilter.URIGenerateMessage; 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.SourceXML; 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. * Feb 15, 2013 1638 mschenke Moved DataURINotificationMessage to uf.common.dataplugin + * Jul 10, 2014 2914 garmendariz Remove EnvProperties * * </pre> * @@ -252,8 +253,7 @@ public class FFMPURIFilter extends URIFilter { .getInstance(); FFMPRunConfigurationManager runConfig = FFMPRunConfigurationManager .getInstance(); - FFMPRunXML runner = runConfig.getRunner(PropertiesFactory.getInstance() - .getEnvProperties().getEnvValue("SITENAME")); + FFMPRunXML runner = runConfig.getRunner(SiteUtil.getSite()); for (SourceXML source : sourceConfig.getSources()) { @@ -273,21 +273,22 @@ public class FFMPURIFilter extends URIFilter { for (String dataKey : sicx.getDataKey()) { String matcher = null; - // RFC FFG, special matching criteria and override potentials - if (source.isRfc()) { - String pathReplace = source.getDataPath(dataKey); - if (pathReplace.equals(source.getDataPath())) { - matcher = replaceWildCard( - "FFG-" + dataKey.substring(1), - source.getDataPath(), - sicx.getUriSubLocation()); - } else { - matcher = pathReplace; - } - } - // All others use this pattern - else { - matcher = replaceWildCard(dataKey, + // RFC FFG, special matching criteria and override + // potentials + if (source.isRfc()) { + String pathReplace = source.getDataPath(dataKey); + if (pathReplace.equals(source.getDataPath())) { + matcher = replaceWildCard( + "FFG-" + dataKey.substring(1), + source.getDataPath(), + sicx.getUriSubLocation()); + } else { + matcher = pathReplace; + } + } + // All others use this pattern + else { + matcher = replaceWildCard(dataKey, source.getDataPath(dataKey), sicx.getUriSubLocation()); } diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.madis/src/com/raytheon/uf/edex/plugin/madis/MadisSeparator.java b/edexOsgi/com.raytheon.uf.edex.plugin.madis/src/com/raytheon/uf/edex/plugin/madis/MadisSeparator.java index ff7a93a954..4f55b1a230 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.madis/src/com/raytheon/uf/edex/plugin/madis/MadisSeparator.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.madis/src/com/raytheon/uf/edex/plugin/madis/MadisSeparator.java @@ -23,9 +23,10 @@ import com.raytheon.uf.edex.core.EDEXUtil; import com.raytheon.uf.edex.core.EdexException; /** - * Madis record separation. + * Madis record separation. + * * <pre> - * + * * SOFTWARE HISTORY * * Date Ticket# Engineer Description @@ -39,20 +40,19 @@ import com.raytheon.uf.edex.core.EdexException; * @version 1 */ - public class MadisSeparator { - + 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; private static final String pathSuffix = ".madis"; private String madisRoute; - + private int timeback; - + private static final IUFStatusHandler statusHandler = UFStatus .getHandler(MadisSeparator.class); @@ -69,15 +69,14 @@ public class MadisSeparator { } } - public void separate(byte[] inputData) - throws DecoderException { - + public void separate(byte[] inputData) throws DecoderException { + InputStream is = null; BufferedReader bfReader = null; long time = System.currentTimeMillis(); - + if (inputData != null) { - + is = new ByteArrayInputStream(inputData); bfReader = new BufferedReader(new InputStreamReader(is)); String line = null; @@ -85,13 +84,13 @@ public class MadisSeparator { MadisIngestObject mio = null; String headerLine = null; int i = 0; - + try { - + long time3 = 0l; int j = 1; - - while((line = bfReader.readLine()) != null) { + + while ((line = bfReader.readLine()) != null) { // Get the file type, D or F if (i == 0) { time3 = System.currentTimeMillis(); @@ -125,10 +124,10 @@ public class MadisSeparator { sendFile(mio); long time4 = System.currentTimeMillis(); statusHandler.handle(Priority.INFO, - "MADIS separated record wrote: "+j+" " + "MADIS separated record wrote: " + j + " " + (time4 - time3) + " ms"); } - + } catch (IOException e) { statusHandler.handle(Priority.ERROR, "Could not open MADIS CSV file!", e); @@ -137,17 +136,18 @@ public class MadisSeparator { try { bfReader.close(); } catch (IOException e) { - statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e); + statusHandler.handle(Priority.PROBLEM, + e.getLocalizedMessage(), e); } } } } - + long time2 = System.currentTimeMillis(); statusHandler.handle(Priority.INFO, "MADIS separation total: " + (time2 - time) + " ms"); } - + /** * Gets the correct MADIS header type * @@ -170,14 +170,16 @@ public class MadisSeparator { "Unknown format for MADIS CSV file! " + commaSepList); } } - + /** * Writes the object to the File System + * * @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; - + try { File file = new File(path); file.createNewFile(); @@ -187,57 +189,62 @@ public class MadisSeparator { statusHandler.handle(Priority.PROBLEM, "Couldn't create file", e); throw new Exception("Unable to write File, FileNotFound!", 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); } 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); } finally { if (fos != null) { try { fos.close(); } catch (IOException e) { - statusHandler.handle(Priority.PROBLEM, "Problem closing the stream!", e); + statusHandler.handle(Priority.PROBLEM, + "Problem closing the stream!", e); } } } } - + /** * Send the path to QPID + * * @param path * @param route */ private static void sendPath(String path, String route) throws Exception { try { - EDEXUtil.getMessageProducer().sendAsyncUri( - route, path); + EDEXUtil.getMessageProducer().sendAsyncUri(route, path); } catch (EdexException e) { - statusHandler.handle(Priority.PROBLEM, - e.getLocalizedMessage(), e); - throw new Exception("Unable to send Path message, EdexException!", e); - } + statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e); + throw new Exception("Unable to send Path message, EdexException!", + e); + } } - + /** * Get the file from the path + * * @param path * @param route */ public static MadisIngestObject getObject(String path) { - + FileInputStream fis = null; MadisIngestObject mio = null; - + try { fis = new FileInputStream(new File(path)); - mio = SerializationUtil.transformFromThrift(MadisIngestObject.class, fis); - + mio = SerializationUtil.transformFromThrift( + MadisIngestObject.class, fis); + } catch (FileNotFoundException e) { - statusHandler.handle(Priority.PROBLEM, - "Couldn't find the file", e); + statusHandler.handle(Priority.PROBLEM, "Couldn't find the file", 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 { if (fis != null) { try { @@ -248,18 +255,20 @@ public class MadisSeparator { } } } - + return mio; } - + /** * Gets the filePath and sends to queue and disk + * * @param mio */ private void sendFile(MadisIngestObject mio) { - + 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(); try { sendObject(mio, path); @@ -269,7 +278,7 @@ public class MadisSeparator { "Could not write file or place message on queue!", e); } } - + /** * Cleans up any orphaned files that might be hanging around */ diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/src/com/raytheon/uf/edex/plugin/manualIngest/MessageGenerator.java b/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/src/com/raytheon/uf/edex/plugin/manualIngest/MessageGenerator.java index e072174c02..27d4b26f64 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/src/com/raytheon/uf/edex/plugin/manualIngest/MessageGenerator.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/src/com/raytheon/uf/edex/plugin/manualIngest/MessageGenerator.java @@ -40,7 +40,6 @@ import com.raytheon.uf.common.time.SimulatedTime; import com.raytheon.uf.common.util.header.WMOHeaderFinder; import com.raytheon.uf.common.wmo.WMOTimeParser; import com.raytheon.uf.edex.core.EDEXUtil; -import com.raytheon.uf.edex.core.props.PropertiesFactory; 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. * Apr 17, 2014 2942 skorolev Updated throw exception in sendFileToIngest. * May 14, 2014 2536 bclement removed TimeTools usage + * Jul 10, 2014 2914 garmendariz Remove EnvProperties * * </pre> * @@ -69,8 +69,7 @@ public class MessageGenerator implements Processor { private static final transient IUFStatusHandler statusHandler = UFStatus .getHandler(MessageGenerator.class); - private static String DIR = PropertiesFactory.getInstance() - .getEnvProperties().getEnvValue("ARCHIVEDIR") + private static String DIR = System.getProperty("data.archive.root") + File.separator + "manual"; private static MessageGenerator instance = new MessageGenerator(); diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/ScanGenerator.java b/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/ScanGenerator.java index 5a01e82a7a..4c96e8699e 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/ScanGenerator.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/ScanGenerator.java @@ -26,6 +26,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import com.raytheon.edex.site.SiteUtil; import com.raytheon.edex.urifilter.URIFilter; import com.raytheon.edex.urifilter.URIGenerateMessage; 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.Priority; 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.dat.utils.DatMenuUtil; 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. * Aug 30, 2013 2298 rjpeter Make getPluginName abstract * May 12, 2014 3133 njensen Remove unused field + * Jul 10, 2014 2914 garmendariz Remove EnvProperties * * </pre> * @@ -298,11 +299,9 @@ public class ScanGenerator extends CompositeProductGenerator implements resetFilters(); DatMenuUtil dmu = new DatMenuUtil(); - dmu.setDatSite(PropertiesFactory.getInstance().getEnvProperties() - .getEnvValue("SITENAME")); + dmu.setDatSite(SiteUtil.getSite()); dmu.setOverride(true); dmu.createMenus(); } } - } diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.taf/res/conf/attributes.xml b/edexOsgi/com.raytheon.uf.edex.plugin.taf/res/conf/attributes.xml deleted file mode 100644 index 8d50a39b93..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.taf/res/conf/attributes.xml +++ /dev/null @@ -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> \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/res/conf/subscription.xml b/edexOsgi/com.raytheon.uf.edex.plugin.text/res/conf/subscription.xml deleted file mode 100644 index 281de87d66..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.text/res/conf/subscription.xml +++ /dev/null @@ -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> \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/resources/com.raytheon.edex.text.properties b/edexOsgi/com.raytheon.uf.edex.plugin.text/resources/com.raytheon.edex.text.properties index 918c9e8590..afe5ea233a 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.text/resources/com.raytheon.edex.text.properties +++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/resources/com.raytheon.edex.text.properties @@ -2,4 +2,7 @@ # inserted in the last minute. When purge runs if the hour is a multiple of # the interval it does a full version purge to catch any cases not handled by # the purge every minute. -text.fullVersionPurge.intervalhours=3 \ No newline at end of file +text.fullVersionPurge.intervalhours=3 + + +fxadebugsavedbadtextfile=false \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextDecoder.java index 9fcf2980a7..bb6789e115 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextDecoder.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextDecoder.java @@ -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.wmo.AFOSProductId; 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.plugin.text.dao.AfosToAwipsDao; 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 * Mar 14, 2014 2652 skorolev Changed logging for skipped headers. * May 12, 2014 2536 bclement added createTextRecord(), removed deprecated code + * Jul 10, 2014 2914 garmendariz Remove EnvProperties * </pre> * * @author @@ -93,12 +94,10 @@ public class TextDecoder extends AbstractDecoder { private static final long MSG_HDR_LOG_PERIOD = 10 * 60 * 1000; - private static boolean moveBadTxt = Boolean.parseBoolean(PropertiesFactory - .getInstance().getEnvProperties() - .getEnvValue("FXADEBUGSAVEBADTEXTFILES")); + private static boolean moveBadTxt = Boolean.parseBoolean(System + .getProperty("fxadebugsavedbadtextfiles")); - private static String badTxtDir = PropertiesFactory.getInstance() - .getEnvProperties().getEnvValue("DEFAULTDATADIR") + private static String badTxtDir = EDEXUtil.getEdexData() + File.separator + "badTxt"; private final Log logger = LogFactory.getLog(getClass()); diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/db/TextDB.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/db/TextDB.java index 3f0dbd1cad..5b2060af59 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/db/TextDB.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/db/TextDB.java @@ -28,6 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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.PracticeStdTextProduct; 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.WMOHeader; 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.StdTextProductDao; 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 15, 2014 2536 bclement moved asciiToHex() hexToAscii() and getProperty() to PropConverter * May 20, 2014 2536 bclement moved from edex.textdb to edex.plugin.text + * Jul 10, 2014 2914 garmendariz Remove EnvProperties * </pre> * * @author jkorman @@ -84,8 +85,7 @@ public class TextDB { private Log logger = LogFactory.getLog(getClass()); - private String siteName = PropertiesFactory.getInstance() - .getEnvProperties().getEnvValue("SITENAME"); + private String siteName = SiteUtil.getSite(); private boolean operationalMode = true; diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/TextSeparatorFactory.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/TextSeparatorFactory.java index c320efbda1..bd99f8310b 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/TextSeparatorFactory.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/TextSeparatorFactory.java @@ -25,8 +25,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import com.raytheon.edex.esb.Headers; +import com.raytheon.edex.site.SiteUtil; 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.impl.separator.StdCollectiveSeparator; 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. * Apr 01, 2014 2915 dgilling Support re-factored TextDBStaticData. * May 14, 2014 2536 bclement moved WMO Header to common + * Jul 10, 2014 2914 garmendariz Remove EnvProperties * * </pre> * @@ -63,8 +64,7 @@ public class TextSeparatorFactory { private static final Log logger = LogFactory .getLog(TextSeparatorFactory.class); - private static final String siteId = PropertiesFactory.getInstance() - .getEnvProperties().getEnvValue("SITENAME"); + private static final String siteId = SiteUtil.getSite(); private static Pattern TAF_PTRN = Pattern.compile("^TAF\\s*$"); diff --git a/edexOsgi/com.raytheon.uf.edex.python.decoder/src/com/raytheon/uf/edex/python/decoder/PythonDecoderFactory.java b/edexOsgi/com.raytheon.uf.edex.python.decoder/src/com/raytheon/uf/edex/python/decoder/PythonDecoderFactory.java index 56e04f50cf..fd8763dd59 100644 --- a/edexOsgi/com.raytheon.uf.edex.python.decoder/src/com/raytheon/uf/edex/python/decoder/PythonDecoderFactory.java +++ b/edexOsgi/com.raytheon.uf.edex.python.decoder/src/com/raytheon/uf/edex/python/decoder/PythonDecoderFactory.java @@ -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.PathManagerFactory; import com.raytheon.uf.common.python.PythonScript; -import com.raytheon.uf.edex.core.props.EnvProperties; -import com.raytheon.uf.edex.core.props.PropertiesFactory; +import com.raytheon.uf.edex.core.EDEXUtil; /** * Factory class for getting pooled Python decoder instances @@ -45,7 +44,8 @@ import com.raytheon.uf.edex.core.props.PropertiesFactory; * SOFTWARE HISTORY * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- - * Apr 2, 2009 njensen Initial creation + * Apr 2, 2009 njensen Initial creation + * Jul 10, 2014 2914 garmendariz Remove EnvProperties * * </pre> * @@ -80,8 +80,7 @@ public class PythonDecoderFactory { decoderInterface = pathMgr.getFile(commonCx, "python" + File.separator + "DecoderInterface.py").getPath(); includePath = pathMgr.getFile(commonCx, "python").getPath(); - EnvProperties env = PropertiesFactory.getInstance().getEnvProperties(); - pluginDir = env.getEnvValue("PLUGINDIR"); + pluginDir = EDEXUtil.getEdexPlugins(); } /** diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/DbInit.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/DbInit.java index 0a47ce8c58..4446d1268a 100644 --- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/DbInit.java +++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/DbInit.java @@ -36,7 +36,6 @@ import java.util.Map; import java.util.jar.JarEntry; import java.util.jar.JarFile; -import javax.persistence.Version; import javax.xml.bind.JAXBException; 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.util.ReflectionUtil; 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.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 * Dec 20, 2013 2636 mpduff Set initialized to true before postInitialized is called. * Dec 04, 2013 2584 dhladky Version based EbxmlJaxbManager + * Jul 10, 2014 2914 garmendariz Remove EnvProperties * </pre> * * @author bphillip @@ -209,8 +208,7 @@ public class DbInit extends com.raytheon.uf.edex.database.init.DbInit implements JarFile jar = null; try { - jar = new JarFile(PropertiesFactory.getInstance() - .getEnvProperties().getEnvValue("PLUGINDIR") + jar = new JarFile(EDEXUtil.getEdexPlugins() + File.separator + "com.raytheon.uf.edex.registry.ebxml.jar"); } catch (IOException e) { throw new EbxmlRegistryException("Unable to find registry jar!", e); diff --git a/edexOsgi/com.raytheon.uf.edex.site/src/com/raytheon/uf/edex/site/SiteAwareRegistry.java b/edexOsgi/com.raytheon.uf.edex.site/src/com/raytheon/uf/edex/site/SiteAwareRegistry.java index 4dc706b173..e67d48c74f 100644 --- a/edexOsgi/com.raytheon.uf.edex.site/src/com/raytheon/uf/edex/site/SiteAwareRegistry.java +++ b/edexOsgi/com.raytheon.uf.edex.site/src/com/raytheon/uf/edex/site/SiteAwareRegistry.java @@ -43,8 +43,6 @@ import com.raytheon.uf.common.status.UFStatus.Priority; import com.raytheon.uf.common.util.registry.RegistryException; import com.raytheon.uf.edex.core.EDEXUtil; 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; /** @@ -64,6 +62,7 @@ import com.raytheon.uf.edex.site.SiteActivationMessage.Action; * home site only if activated. * 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. + * Jul 10, 2014 2914 garmendariz Remove EnvProperties * * </pre> * @@ -93,8 +92,7 @@ public class SiteAwareRegistry { loadActiveSites(); // initialize default site - EnvProperties env = PropertiesFactory.getInstance().getEnvProperties(); - String defaultSite = env.getEnvValue("SITENAME"); + String defaultSite = EDEXUtil.getEdexSite(); if (!activeSites.contains(defaultSite)) { activeSites.add(defaultSite); } @@ -143,8 +141,7 @@ public class SiteAwareRegistry { public String[] getActiveSites() { // make a set of the strings for each listener site Set<String> tmp = new LinkedHashSet<String>(); - String mySite = PropertiesFactory.getInstance().getEnvProperties() - .getEnvValue("SITENAME"); + String mySite = EDEXUtil.getEdexSite(); for (ISiteActivationListener sa : activationListeners) { if (sa.getActiveSites().contains(mySite)) { tmp.add(mySite); diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/res/conf/plugin.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/res/conf/plugin.xml deleted file mode 100644 index 1d9349c12f..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/res/conf/plugin.xml +++ /dev/null @@ -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> diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/res/conf/plugin.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/res/conf/plugin.xml deleted file mode 100644 index 75e47e084e..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/res/conf/plugin.xml +++ /dev/null @@ -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> diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/conf/attributes.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/conf/attributes.xml deleted file mode 100644 index 73ad91cafb..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/conf/attributes.xml +++ /dev/null @@ -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> \ No newline at end of file diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/conf/plugin.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/conf/plugin.xml deleted file mode 100644 index 587c132531..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/conf/plugin.xml +++ /dev/null @@ -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> diff --git a/ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/output/GridOut.java b/ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/output/GridOut.java index 37bab0c2fc..3fc85bdfc7 100644 --- a/ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/output/GridOut.java +++ b/ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/output/GridOut.java @@ -10,8 +10,7 @@ import java.util.UUID; import com.raytheon.edex.uengine.exception.MicroEngineException; import com.raytheon.edex.uengine.tasks.ScriptTask; import com.raytheon.uf.common.util.StringUtil; -import com.raytheon.uf.edex.core.props.EnvProperties; -import com.raytheon.uf.edex.core.props.PropertiesFactory; +import com.raytheon.uf.edex.core.EDEXUtil; public class GridOut extends ScriptTask { @@ -56,24 +55,19 @@ public class GridOut extends ScriptTask { } 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 */ if (StringUtil.isEmptyString(destDir)) { // default to uengineOutDir - destDir = uengineOutDir; + destDir = EDEXUtil.getEdexData() + File.separator + "uEngine"; // logger.debug("Defaulting destDir to: " + destDir); } else { // If the ignore default data dir flag is not true then // prepend the default data dir to the destination directory. if (!ignoreDefaultDataDir) { - destDir = defaultDataDir + destDir; + destDir = EDEXUtil.getEdexData() + File.separator + destDir; } } }