Ignore:
Timestamp:
03/01/20 23:07:45 (2 years ago)
Author:
GarthBraithwaite_STG
Message:

db, view - fixed prev other topic name. Implemented topic ip list. Cleaned up and moved _commity.css to Community. XML services and model map cleanup and better descrips. Removed extra "/" from dynamic IP paths when building filename. Renamed IP page.options to page.contentOptions to be consist.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ibisph-view/src/main/webapp/WEB-INF/config/spring/indicator.xml

    r19867 r19916  
    1414>
    1515
    16         <!--  M O D E L S   /   C O N T R O L L E R   R E S O R U C E S -->
     16        <!--  M O D E L   /   C O N T R O L L E R   R E S O R U C E S -->
    1717        <bean id="indicatorXMLBasePath" class="org.ibisph.model.StringHolder">
    1818                <description>
    19                         Base IP file path.  This defaults to the common value but is split
    20                         out so that adopters can access production IP files from outside
    21                         by overriding this basePath string value.
     19                        Base IP XML file path.  This defaults to the common base XML value
     20                        but is split out so that developers/test enviros can access production
     21                        IP files from their enviro (so they don't have to copy or repub IPs).
    2222                </description>
    2323                <constructor-arg value="#{commonContentBasePath.string}xml/indicator/"/>
    2424        </bean>
    25 
    26         <bean id="indicatorCategorziedIndexFilePathAndName" class="org.ibisph.model.StringHolder">
    27                 <constructor-arg value="CategorizedSelection.xml"/>
    28         </bean>
    29         <bean id="indicatorPublishedIndicatorsFilePathAndName" class="org.ibisph.model.StringHolder">
    30                 <constructor-arg value="published_indicators.xml"/>
    31         </bean>
    32         <bean id="indicatorProfileFilePath" class="org.ibisph.model.StringHolder">
    33                 <description>
    34                         Path that the xml service uses to build/locate the actual real file's
    35                         path.  Note that this is a relative path.  See "Real" path below
    36                         for a value that can be injected as a model map parameter for XSLT
    37                         code to be able to lookup IP files. 
    38                 </description>
    39                 <constructor-arg value="profile/"/>
    40         </bean>
    41         <bean id="indicatorPreviewFilePath" class="org.ibisph.model.StringHolder">
    42                 <description>
    43                         Base admin app XML preview Path that an xml service uses to build/
    44                         locate the complete file path. 
    45                 </description>
    46                 <constructor-arg value="http://localhost/ibisph-admim/xml/preview/indicator/profile/"/>
    47         </bean>
    48 
    49 
    50         <!-- F I L E   S E R V I C E S -->
    5125        <bean id="indicatorXMLBasePathURL" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     26                <description>
     27                        Primary XML URL model for the XSLT processing.  Used for IP requests.
     28                </description>
    5229                <property name="targetObject" ref="commonContextAndPathService"/>
    5330                <property name="targetMethod" value="getPathURL"/>
    5431                <property name="arguments"><list><value>#{indicatorXMLBasePath.string}</value></list></property>
    5532        </bean>
     33
     34        <bean id="indicatorProfileFilePath" class="org.ibisph.model.StringHolder">
     35                <description>
     36                        Sub path that localizes the profiles portion of the IP path.  The xml
     37                        service uses this along with the base path to build/locate the actual
     38                        real file's path. 
     39                </description>
     40                <constructor-arg value="profile/"/>
     41        </bean>
     42        <bean id="indicatorPublishedIndicatorsFilePathAndName" class="org.ibisph.model.StringHolder">
     43                <constructor-arg value="published_indicators.xml"/>
     44        </bean>
     45        <bean id="indicatorIndicatorSetsFilePathAndName" class="org.ibisph.model.StringHolder">
     46                <constructor-arg value="indicator_sets.xml"/>
     47        </bean>
     48        <bean id="indicatorCategorziedIndexFilePathAndName" class="org.ibisph.model.StringHolder">
     49                <constructor-arg value="CategorizedSelection.xml"/>
     50        </bean>
     51
     52        <bean id="indicatorPreviewFilePath" class="org.ibisph.model.StringHolder">
     53                <description>
     54                        Base admin app XML preview Path that an xml service uses to build/
     55                        locate the complete file path. 
     56                </description>
     57                <constructor-arg value="http://localhost/ibisph-admim/xml/preview/indicator/profile/"/>
     58        </bean>
     59
     60
     61        <!-- F I L E   S E R V I C E S -->
    5662        <bean id="indicatorXMLFilePathModelService" class="org.ibisph.model.URLPathGetModelService">
    5763                <description>
    58                         Provides access to IP only files.  This is implemented so that adopters
    59                         can have a local dev enviro that access production IP XML files. 
     64                        Service that builds the actual, fully specified, explicit URL path.
     65                        The base path can be a string or URL which in this case is the IP
     66                        base path URL.  The model map then specifies an actual filename to
     67                        which is the appended to the base path to provide the full file path
     68                        URL.  Common was used but implemented an IP specific version so adopters
     69                        can have a local dev enviro access production IP XML files. 
    6070                </description>
    6171                <property name="basePath" ref="indicatorXMLBasePathURL"/>
    6272        </bean>
    63         <bean id="indicatorXMLServiceModelMapProperties" parent="commonXMLServiceModelMapProperties" abstract="true">
     73        <bean id="indicatorXMLServiceModelMapProperties" abstract="true">
     74                <description>
     75                        XML model map properties used by the IP XML requests.
     76                </description>
     77                <property name="modelMapKey" value="#{commonXMLModelMapKey.string}"/>
    6478                <property name="getModelService" ref="indicatorXMLFilePathModelService"/>
    6579        </bean>
    6680
    67         <bean id="indicatorPublishedIndicatorsFilePathModelMap" class="org.ibisph.modelmap.ModelFromFilePathAndNameService">
    68                 <description>xsl param value that allows the XSLT pages to access IP XMLs</description>
    69                 <property name="getModelService" ref="indicatorXMLFilePathModelService"/>
    70                 <property name="modelMapKey"     value="PublishedIndicatorsXMLFilePath"/>
    71                 <property name="filePathAndName" value="#{indicatorPublishedIndicatorsFilePathAndName.string}"/>
    72         </bean>
    73         <bean id="indicatorIndicatorProfileFilePathModelMap" class="org.ibisph.modelmap.ModelFromFilePathAndNameService">
    74                 <description>xsl param value that allows the XSLT pages to access IP XMLs</description>
    75                 <property name="getModelService" ref="indicatorXMLFilePathModelService"/>
    76                 <property name="modelMapKey"     value="IndicatorProfileXMLFilePath"/>
    77                 <property name="filePathAndName" value="#{indicatorProfileFilePath.string}"/>
    78         </bean>
    79         <bean id="indicatorIndicatorSetsModelMap" class="org.ibisph.modelmap.ModelFromFilePathAndNameService">
    80                 <description>
    81                         Document version of the indicator sets IPs XML.  Not used directly in
    82                         this config file but is defined here as it relates to IPs.
    83                 </description>
    84                 <property name="modelMapKey"     value="IndicatorSets"/>
    85                 <property name="getModelService" ref="commonDocumentDAOService"/>
    86                 <property name="filePathAndName" value="indicator/indicator_sets.xml"/>
    87         </bean>
    88 
     81        <bean id="indicatorDocumentDAOService" class="org.ibisph.xml.service.FileStoredDocumentDAO">
     82                <description>
     83                        Provides an IP specific base path XML document loader that is used
     84                        to load an XML document that is then put into model map.  This is
     85                        needed when an XML doc is needed but is not the primary XML e.g. is
     86                        a secondary XML passed as a parameter.  Typical use is the published
     87                        IPs for topic pages etc.
     88                </description>
     89                <property name="basePath"     ref="indicatorXMLBasePathURL"/>
     90                <property name="escapeTextWhenSaving" value="true"/>
     91                <property name="dateFormat"   ref="commonDateFormat"/>
     92                <property name="outputFormat" ref="commonXMLOutputFormat"/>
     93        </bean>
     94
     95
     96        <!--  M O D E L   M A P S -->
    8997        <bean id="indicatorProfileFilePathAndNameModelMap"
    9098                class="org.ibisph.web.modelmap.ModelFromHTTPRequestPathLastSegment"
    9199                parent="indicatorXMLServiceModelMapProperties"
    92100        >
     101                <description>
     102                        Main IP path and filename URL model map used for all IP XML requests
     103                        that specifies the actual IP XML file as the last segment in the
     104                        request path.  This model map uses the indicatorXMLFilePathModelService
     105                        which has it's base using the indicatorXMLBasePathURL.  The path value
     106                        is simply a sub path to the profiles" directory which is underneath
     107                        the IP XML dir.  This model map then uses the request's filename to
     108                        finish determining which IP XML file to use as the primary XML file
     109                        for XSLT/XML trans.
     110                </description>
    93111                <property name="filePath" value="#{indicatorProfileFilePath.string}"/>
    94112        </bean>
     
    96114        <bean id="indicatorSelectedRelationNameModelMap" class="org.ibisph.indicatorprofile.modelmap.RelationNameFromHTTPRequest">
    97115                <property name="modelMapKey" value="RelationName"/>
     116        </bean>
     117
     118        <bean id="indicatorPublishedIndicatorsURLModelMap" class="org.ibisph.modelmap.ModelFromFilePathAndNameService"
     119                parent="indicatorXMLServiceModelMapProperties"
     120        >
     121                <description>
     122                        Published IPs path and filename URL model map used for all index
     123                        type requests where the primary XML is the published IPs file.  This
     124                        model map uses the indicatorXMLFilePathModelService which has it's
     125                        base using the indicatorXMLBasePathURL.  The path value is simply a
     126                        the published ips filename which is typically at the root of the IP
     127                        XML dir. 
     128                        NOTE: there's a document version of the published IPs that is used
     129                        when published IPs are needed but where they are not the primary XML.
     130                </description>
     131                <property name="filePathAndName" value="#{indicatorPublishedIndicatorsFilePathAndName.string}"/>
     132        </bean>
     133        <bean id="indicatorPublishedIndicatorsModelMap" class="org.ibisph.modelmap.ModelFromFilePathAndNameService">
     134                <description>Document version of the published IPs XML typically used for Topics.</description>
     135                <property name="modelMapKey"     value="PublishedIndicators"/>
     136                <property name="getModelService" ref="indicatorDocumentDAOService"/>
     137                <property name="filePathAndName" value="#{indicatorPublishedIndicatorsFilePathAndName.string}"/>
     138        </bean>
     139
     140        <bean id="indicatorIndicatorProfileFilePathModelMap" class="org.ibisph.modelmap.ModelFromFilePathAndNameService">
     141                <description>
     142                        IP filepath that is passed as an XSLT param value that allows the XSLT
     143                        pages to dynamically access a bunch of IP XMLs.  Used for community
     144                        IPs and QFs demographic table.
     145                </description>
     146                <property name="getModelService" ref="indicatorXMLFilePathModelService"/>
     147                <property name="modelMapKey"     value="IndicatorProfileXMLFilePath"/>
     148                <property name="filePathAndName" value="#{indicatorProfileFilePath.string}"/>
     149        </bean>
     150        <bean id="indicatorIndicatorSetsModelMap" class="org.ibisph.modelmap.ModelFromFilePathAndNameService">
     151                <description>
     152                        Document version of the indicator sets IPs XML which is a 2ndary
     153                        IP set XML.  This is typically used for all community controllers to
     154                        allow show/change alternative IP sets.
     155                </description>
     156                <property name="modelMapKey"     value="IndicatorSets"/>
     157                <property name="getModelService" ref="indicatorDocumentDAOService"/>
     158                <property name="filePathAndName" value="#{indicatorIndicatorSetsFilePathAndName.string}"/>
    98159        </bean>
    99160
     
    116177                <property name="view" ref="indicatorOrgUnitIndexView"/>
    117178        </bean>
     179        <bean id="indicatorDataSourceIndexController" parent="indicatorAlphabeticalIndexController">
     180                <property name="view" ref="indicatorDataSourceIndexView"/>
     181        </bean>
     182        <bean id="indicatorTableIndexController" parent="indicatorAlphabeticalIndexController">
     183                <property name="view" ref="indicatorTableIndexView"/>
     184        </bean>
    118185
    119186        <bean id="indicatorIndicatorSetIndexController" parent="commonModelMapListController">
     
    131198        </bean>
    132199
    133         <bean id="indicatorDataSourceIndexController" parent="indicatorAlphabeticalIndexController">
     200        <bean id="indicatorCategorizedIndexController" parent="commonModelMapListController">
    134201                <property name="modelMapList">
    135202                        <list>
    136203                                <bean class="org.ibisph.modelmap.ModelFromFilePathAndNameService"
    137                                         parent="indicatorXMLServiceModelMapProperties"
     204                                        parent="commonXMLServiceModelMapProperties"
    138205                                >
    139                                         <property name="filePathAndName" value="#{indicatorPublishedIndicatorsFilePathAndName.string}"/>
    140                                 </bean>
    141                                 <ref bean="commonDataSourcesModelMap"/>
    142                         </list>
    143                 </property>
    144                 <property name="view" ref="indicatorDataSourceIndexView"/>
    145         </bean>
    146         <bean id="indicatorTableIndexController" parent="indicatorDataSourceIndexController">
    147                 <property name="view" ref="indicatorTableIndexView"/>
    148         </bean>
    149 
    150         <bean id="indicatorCategorizedIndexController" parent="commonModelMapListController">
    151                 <property name="modelMapList">
    152                         <list>
    153                                 <bean class="org.ibisph.modelmap.ModelFromFilePathAndNameService"
    154                                         parent="indicatorXMLServiceModelMapProperties"
    155                                 >
     206                                        <property name="getModelService" ref="indicatorXMLFilePathModelService"/>
    156207                                        <property name="filePathAndName" value="#{indicatorCategorziedIndexFilePathAndName.string}"/>
    157208                                </bean>
     
    166217        </bean>
    167218
    168 
    169219        <bean id="indicatorProfileControllerProperties" abstract="true" parent="commonModelMapListController">
    170220                <property name="modelMapList">
    171221                        <list>
    172                                 <ref bean="indicatorProfileFilePathAndNameModelMap"/>
    173222                                <ref bean="commonAncillaryValuesModelMap"/>
    174223                                <ref bean="commonDataSourcesModelMap"/>
     
    177226                                <ref bean="commonValueTypesModelMap"/>
    178227                                <ref bean="commonValueAttributesModelMap"/>
    179                         </list>
    180                 </property>
    181         </bean>
    182 
     228                                <ref bean="indicatorProfileFilePathAndNameModelMap"/>
     229                        </list>
     230                </property>
     231        </bean>
     232        <bean id="indicatorImportantFactsController" parent="indicatorProfileControllerProperties">
     233                <property name="view" ref="indicatorImportantFactsView"/>
     234        </bean>
     235        <bean id="indicatorServicesController" parent="indicatorProfileControllerProperties">
     236                <property name="view" ref="indicatorServicesView"/>
     237        </bean>
     238        <bean id="indicatorResourcesController" parent="indicatorProfileControllerProperties">
     239                <property name="view" ref="indicatorResourcesView"/>
     240        </bean>
     241
     242        <bean id="indicatorSummaryViewController" parent="indicatorProfileControllerProperties">
     243                <property name="view" ref="indicatorSummaryView"/>
     244        </bean>
     245
     246        <bean id="indicatorCompleteViewController" parent="indicatorProfileControllerProperties">
     247                <property name="view" ref="indicatorCompleteView"/>
     248        </bean>
     249<!--
     250        <bean id="indicatorDefaultViewController" parent="indicatorProfileControllerProperties">
     251                <property name="view" ref="indicatorDefaultView"/>
     252        </bean>
     253-->
    183254
    184255        <bean id="indicatorViewController" parent="commonModelMapListController">
     
    201272        </bean>
    202273
    203 
    204         <bean id="indicatorImportantFactsController" parent="indicatorProfileControllerProperties">
    205                 <property name="view" ref="indicatorImportantFactsView"/>
    206         </bean>
    207 
    208274        <bean id="indicatorRelatedIndicatorsController" parent="commonModelMapListController">
    209275                <property name="modelMapList">
     
    215281                <property name="view" ref="indicatorRelatedIndicatorsView"/>
    216282        </bean>
    217 
    218         <bean id="indicatorServicesController" parent="indicatorProfileControllerProperties">
    219                 <property name="view" ref="indicatorServicesView"/>
    220         </bean>
    221         <bean id="indicatorResourcesController" parent="indicatorProfileControllerProperties">
    222                 <property name="view" ref="indicatorResourcesView"/>
    223         </bean>
    224 
    225         <bean id="indicatorSummaryViewController" parent="indicatorProfileControllerProperties">
    226                 <property name="view" ref="indicatorSummaryView"/>
    227         </bean>
    228 
    229         <bean id="indicatorCompleteViewController" parent="indicatorProfileControllerProperties">
    230                 <property name="view" ref="indicatorCompleteView"/>
    231         </bean>
    232 <!--
    233         <bean id="indicatorDefaultViewController" parent="indicatorProfileControllerProperties">
    234                 <property name="view" ref="indicatorDefaultView"/>
    235         </bean>
    236 -->
    237283
    238284        <bean id="indicatorPreviewController" parent="commonModelMapListController">
Note: See TracChangeset for help on using the changeset viewer.