Changeset 22793 in main


Ignore:
Timestamp:
04/02/21 19:09:18 (11 days ago)
Author:
GarthBraithwaite_STG
Message:

view, admin, java - Updated base and request paths and assoc docs.

Location:
trunk
Files:
19 edited

Legend:

Unmodified
Added
Removed
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/config/SiteSpecific.properties

    r19848 r22793  
    11#------------------------------------------------------------------------------
    2 # Site Specific Property Overrides for the IBIS-PH Admin app/system.  These values
    3 # are applied to the Spring context configuration bean definitions.  The form is:
    4 # beanID.propertyName = value
     2# Site Specific Property Overrides for the IBIS-PH Admin app/system.  These
     3# values are applied to the Spring context configuration bean definitions.
     4# The form is: beanID.propertyName = value
    55#
    66# IMPORTANT: For these values to be used, they must be referenced.  This is
     
    1818# All paths shall have a trailing "/".  Sub paths should never have a leading "/"
    1919# but will always have the trailing "/".  Base paths can have a leading "/" as
    20 # this represents the root of the file system.
     20# this represents the root of the file system. 
     21#
     22# "BasePaths" define a path prefix that is used in conjunction with a specific
     23# filename (example an indicator name).  In some cases base paths are also
     24# combined with sub paths then an actual name.  BasePath are of the form of any
     25# legal URI value.  In most cases these values are used for retrieving files
     26# either via HTTP (as long as supported and configured correctly) or FILE access. 
     27# In some cases these base paths are used for saving local XML files.  When
     28# saving files only local URI file paths are legal (IBIS apps do not provide 
     29# support to handle remote file saves).
     30#
     31# "Requset" type paths are also URI/URL values and are more specificially named
     32# with "Request" to help convey usage i.e. implies ability to make an HTTP get
     33# request for a remote resource or to make a remote single request (preview).
    2134#------------------------------------------------------------------------------
    2235
     
    2740
    2841
    29 #--- Adopters split their XML content out from under the ibisph-view webapp into
    30 #        a peer directory typically named ibisph-content.  The publishing controllers
    31 #    use this base XML directory for the standard XML files.  The published IP
    32 #        files are typically below the main XML directory.  Likewise the preview XML
    33 #        files are also under the main XML directory.
     42#--- commonContentBasePath specifies the base file location where the admin app
     43#        writes its xml files to (all publish and the default for preview).  The
     44#        default value is "" which means to write all files within the admin app's
     45#        container.  Adopters are highly encouraged to store both published and
     46#        static content within it's own webapp type container (ie seperate from the
     47#        ibisph-view and ibisph-admin webapps).  This value is used in conjection
     48#        view app path settings and request urls. 
     49#
     50#    IMPORTANT: This value MUST be a local path where the app has write privs.
     51#        This path is used for creating files via publishing.  As such it
     52#    can NOT be HTTP based unless there is a backend process to handle that
     53#    request (which IBIS does not provide). 
     54#
    3455#    For non relative paths, need to use a URI/URL.  See: https://en.wikipedia.org/wiki/File_URI_scheme
    35 #
    36 #    IMPORTANT: This path is used for creating files via publishing.  As such it
    37 #    can NOT be HTTP based unless there is a backend process to handle that
    38 #    request (which IBIS does not have). 
    3956#
    4057#RELATIVE:                =../ibisph-content/
    4158#ABSOLUTE FILE PATH/URL:  =file:///d:/ibis/webapps/ibisph-content/
    42 #commonContentBasePath.string =../ibisph-content/
    43 commonContentBasePath.string =file:///d:/ibis/trunk/ibisph-view/src/content/
    44 #commonContentBasePath.string =file:///d:/ibis/trunk/ibisph-view/src/nmibis-content/
     59#Typical Example: commonContentBasePath.string =../ibisph-content/
    4560
    46 #--- Mid path segment to save IP and IPV XML files to for Preview requests. 
    47 #        The actual path is the commonContentBasePath + this path + actual IP + ".xml".
    48 indicatorPreviewFilePath.string =xml/preview/indicator/profile/
     61
     62#--- Full base path to save IP and IPV XML files to for Preview requests. 
     63#    The default value is: {commonContentBasePath}xml/preview/indicator/profile/
     64#        This value can be any path that have write privs.  However, it is best to
     65#        have this value be under the main content XML directory.
     66#indicatorPreviewXMLBasePath.string =file:///d:/xml/preview/indicator/profile/
     67
    4968
    5069#--- View app's base Preview request urls.  Value is sans the IP or IPV name
    51 #        which the controller adds.  This URL is from the end user's browser
    52 #    perspective.  So in a local dev enviro "localhost" works.  In a production
    53 #    or test server enviro the URL be set to the server's external view app URL.
    54 indicatorPreviewRequestPath.string =http://localhost/ibisph-view/indicator/preview/
    55 indicatorViewPreviewRequestPath.string =http://localhost/ibisph-view/indicator/view/preview/
     70#        which the controller adds.  These values MUST be a request URL that is from
     71#    the end user's browser perspective.  The app context and requested resource
     72#        paths MUST match the values specified in the url to controller mapping as
     73#        such it is recommended to not touch those values i.e. only change the first
     74#        portion of these request URLs.  For example change:
     75#               http://localhost/ibisph-view/ 
     76#               to
     77#               https://ibis.health.state.zz/zzibis-view/
     78#        and keep the rest of the request the same.  Full Example:
     79#               https://ibis.health.state.zz/zzibis-view/indicator/view/preview/
     80#    To be clear, in a production or test server enviro the first portion of the
     81#        URL should be set to the server's external view app URL (context URL). 
     82#
     83#        Below are the default values:
     84#indicatorPreviewRequestBasePath.string     =http://localhost/ibisph-view/indicator/preview/
     85#indicatorViewPreviewRequestBasePath.string =http://localhost/ibisph-view/indicator/view/preview/
    5686
    57 #securityAuthorityAdmin.string =admin
     87
     88#--- Example of setting the spring security admin priv value.  Default is: admin
     89#securityAuthorityAdmin.string =SuperAdminAppUser
    5890#----------------------------------- END OF FILE -----------------------------
    5991
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/config/spring/dispatcher_servlet.xml

    r20835 r22793  
    5858                        <map>
    5959                                <!-- A N C I L L A R Y   V A L U E -->
    60                                 <entry key="edit/ancillary_value/list/**"   value-ref="ancillaryValueEditListController"/>
    61                                 <entry key="edit/ancillary_value/detail/**" value-ref="ancillaryValueEditDetailController"/>
    62                                 <entry key="save/ancillary_value/list/**"   value-ref="ancillaryValueSaveListController"/>
    63                                 <entry key="save/ancillary_value/detail/**" value-ref="ancillaryValueSaveDetailController"/>
    64                                 <entry key="publish/ancillary_values"       value-ref="publishAncillaryValuesController"/>
     60                                <entry key="/edit/ancillary_value/list/**"   value-ref="ancillaryValueEditListController"/>
     61                                <entry key="/edit/ancillary_value/detail/**" value-ref="ancillaryValueEditDetailController"/>
     62                                <entry key="/save/ancillary_value/list/**"   value-ref="ancillaryValueSaveListController"/>
     63                                <entry key="/save/ancillary_value/detail/**" value-ref="ancillaryValueSaveDetailController"/>
     64                                <entry key="/publish/ancillary_values"       value-ref="publishAncillaryValuesController"/>
    6565
    6666
    6767                                <!-- A U T H O R I T Y -->
    68                                 <entry key="edit/authority/list/**"     value-ref="authorityEditListController"/>
    69                                 <entry key="edit/authority/detail/**"   value-ref="authorityEditDetailController"/>
    70                                 <entry key="save/authority/list/**"     value-ref="authoritySaveListController"/>
    71                                 <entry key="save/authority/detail/**"   value-ref="authoritySaveDetailController"/>
     68                                <entry key="/edit/authority/list/**"     value-ref="authorityEditListController"/>
     69                                <entry key="/edit/authority/detail/**"   value-ref="authorityEditDetailController"/>
     70                                <entry key="/save/authority/list/**"     value-ref="authoritySaveListController"/>
     71                                <entry key="/save/authority/detail/**"   value-ref="authoritySaveDetailController"/>
    7272
    7373
    7474                                <!-- C H A R T -->
    75                                 <entry key="edit/chart/list/**"         value-ref="chartEditListController"/>
    76                                 <entry key="edit/chart/detail/**"       value-ref="chartEditDetailController"/>
    77                                 <entry key="save/chart/list/**"         value-ref="chartSaveListController"/>
    78                                 <entry key="save/chart/detail/**"       value-ref="chartSaveDetailController"/>
    79                                 <entry key="publish/charts"             value-ref="publishChartsController"/>
     75                                <entry key="/edit/chart/list/**"         value-ref="chartEditListController"/>
     76                                <entry key="/edit/chart/detail/**"       value-ref="chartEditDetailController"/>
     77                                <entry key="/save/chart/list/**"         value-ref="chartSaveListController"/>
     78                                <entry key="/save/chart/detail/**"       value-ref="chartSaveDetailController"/>
     79                                <entry key="/publish/charts"             value-ref="publishChartsController"/>
    8080
    8181
    8282                                <!-- D A T A   S O U R C E -->
    83                                 <entry key="edit/data_source/list/**"   value-ref="dataSourceEditListController"/>
    84                                 <entry key="edit/data_source/detail/**" value-ref="dataSourceEditDetailController"/>
    85                                 <entry key="edit/data_source/period/**" value-ref="dataSourceEditIndicatorViewPeriodController"/>
    86                                 <entry key="save/data_source/list/**"   value-ref="dataSourceSaveListController"/>
    87                                 <entry key="save/data_source/detail/**" value-ref="dataSourceSaveDetailController"/>
    88                                 <entry key="save/data_source/period/**" value-ref="dataSourceSaveIndicatorViewPeriodController"/>
    89                                 <entry key="publish/data_sources"       value-ref="publishDataSourcesController"/>
     83                                <entry key="/edit/data_source/list/**"   value-ref="dataSourceEditListController"/>
     84                                <entry key="/edit/data_source/detail/**" value-ref="dataSourceEditDetailController"/>
     85                                <entry key="/edit/data_source/period/**" value-ref="dataSourceEditIndicatorViewPeriodController"/>
     86                                <entry key="/save/data_source/list/**"   value-ref="dataSourceSaveListController"/>
     87                                <entry key="/save/data_source/detail/**" value-ref="dataSourceSaveDetailController"/>
     88                                <entry key="/save/data_source/period/**" value-ref="dataSourceSaveIndicatorViewPeriodController"/>
     89                                <entry key="/publish/data_sources"       value-ref="publishDataSourcesController"/>
    9090
    9191
    9292                                <!-- D I M E N S I O N -->
    93                                 <entry key="edit/dimension/list/**"         value-ref="dimensionEditListController"/>
    94                                 <entry key="edit/dimension/detail/**"       value-ref="dimensionEditDetailController"/>
    95                                 <entry key="edit/dimension/value/list/**"   value-ref="dimensionValueEditListController"/>
    96                                 <entry key="edit/dimension/value/detail/**" value-ref="dimensionValueEditDetailController"/>
    97                                 <entry key="save/dimension/list/**"         value-ref="dimensionSaveListController"/>
    98                                 <entry key="save/dimension/detail/**"       value-ref="dimensionSaveDetailController"/>
    99                                 <entry key="save/dimension/value/list/**"   value-ref="dimensionValueSaveListController"/>
    100                                 <entry key="save/dimension/value/detail/**" value-ref="dimensionValueSaveDetailController"/>
    101                                 <entry key="publish/dimensions"             value-ref="publishDimensionsController"/>
     93                                <entry key="/edit/dimension/list/**"         value-ref="dimensionEditListController"/>
     94                                <entry key="/edit/dimension/detail/**"       value-ref="dimensionEditDetailController"/>
     95                                <entry key="/edit/dimension/value/list/**"   value-ref="dimensionValueEditListController"/>
     96                                <entry key="/edit/dimension/value/detail/**" value-ref="dimensionValueEditDetailController"/>
     97                                <entry key="/save/dimension/list/**"         value-ref="dimensionSaveListController"/>
     98                                <entry key="/save/dimension/detail/**"       value-ref="dimensionSaveDetailController"/>
     99                                <entry key="/save/dimension/value/list/**"   value-ref="dimensionValueSaveListController"/>
     100                                <entry key="/save/dimension/value/detail/**" value-ref="dimensionValueSaveDetailController"/>
     101                                <entry key="/publish/dimensions"             value-ref="publishDimensionsController"/>
    102102
    103103
    104104                                <!-- I N I T I A T I V E  /  O B J E C T I V E S -->
    105                                 <entry key="edit/initiative/list/**"         value-ref="initiativeEditListController"/>
    106                                 <entry key="edit/initiative/detail/**"       value-ref="initiativeEditDetailController"/>
    107                                 <entry key="edit/initiative/topic/list/**"   value-ref="initiativeTopicEditListController"/>
    108                                 <entry key="edit/initiative/topic/detail/**" value-ref="initiativeTopicEditDetailController"/>
    109                                 <entry key="edit/initiative/topic/objective/list/**"   value-ref="initiativeTopicObjectiveEditListController"/>
    110                                 <entry key="edit/initiative/topic/objective/detail/**" value-ref="initiativeTopicObjectiveEditDetailController"/>
    111 
    112                                 <entry key="save/initiative/list/**"         value-ref="initiativeSaveListController"/>
    113                                 <entry key="save/initiative/detail/**"       value-ref="initiativeSaveDetailController"/>
    114                                 <entry key="save/initiative/topic/list/**"   value-ref="initiativeTopicSaveListController"/>
    115                                 <entry key="save/initiative/topic/detail/**" value-ref="initiativeTopicSaveDetailController"/>
    116                                 <entry key="save/initiative/topic/objective/list/**"   value-ref="initiativeTopicObjectiveSaveListController"/>
    117                                 <entry key="save/initiative/topic/objective/detail/**" value-ref="initiativeTopicObjectiveSaveDetailController"/>
    118                                 <entry key="publish/initiatives"             value-ref="publishInitiativesController"/>
     105                                <entry key="/edit/initiative/list/**"         value-ref="initiativeEditListController"/>
     106                                <entry key="/edit/initiative/detail/**"       value-ref="initiativeEditDetailController"/>
     107                                <entry key="/edit/initiative/topic/list/**"   value-ref="initiativeTopicEditListController"/>
     108                                <entry key="/edit/initiative/topic/detail/**" value-ref="initiativeTopicEditDetailController"/>
     109                                <entry key="/edit/initiative/topic/objective/list/**"   value-ref="initiativeTopicObjectiveEditListController"/>
     110                                <entry key="/edit/initiative/topic/objective/detail/**" value-ref="initiativeTopicObjectiveEditDetailController"/>
     111
     112                                <entry key="/save/initiative/list/**"         value-ref="initiativeSaveListController"/>
     113                                <entry key="/save/initiative/detail/**"       value-ref="initiativeSaveDetailController"/>
     114                                <entry key="/save/initiative/topic/list/**"   value-ref="initiativeTopicSaveListController"/>
     115                                <entry key="/save/initiative/topic/detail/**" value-ref="initiativeTopicSaveDetailController"/>
     116                                <entry key="/save/initiative/topic/objective/list/**"   value-ref="initiativeTopicObjectiveSaveListController"/>
     117                                <entry key="/save/initiative/topic/objective/detail/**" value-ref="initiativeTopicObjectiveSaveDetailController"/>
     118                                <entry key="/publish/initiatives"             value-ref="publishInitiativesController"/>
    119119
    120120
    121121                                <!-- I N D I C A T O R -->
    122                                 <entry key="edit/indicator/list/**"               value-ref="indicatorEditListController"/>
    123                                 <entry key="edit/indicator/detail/**"             value-ref="indicatorEditDetailController"/>
    124 
    125                                 <entry key="edit/indicator/topics/**"             value-ref="indicatorEditTopicsController"/>
    126                                 <entry key="edit/indicator/initiatives/**"        value-ref="indicatorEditInitiativesController"/>
    127                                 <entry key="edit/indicator/related_indicators/**" value-ref="indicatorEditRelatedIndicatorsController"/>
    128                                 <entry key="edit/indicator/available_services/**" value-ref="indicatorEditAvailableServicesController"/>
    129                                 <entry key="edit/indicator/more_resources/**"     value-ref="indicatorEditMoreResourcesController"/>
    130                                 <entry key="edit/indicator/links/**"              value-ref="indicatorEditLinksController"/>
    131                                 <entry key="edit/indicator/owner/**"              value-ref="indicatorEditOwnerController"/>
    132                                 <entry key="edit/indicator/editors/**"            value-ref="indicatorEditEditorsController"/>
    133 
    134                                 <entry key="save/indicator/list/**"               value-ref="indicatorSaveListController"/>
    135                                 <entry key="save/indicator/detail/**"             value-ref="indicatorSaveDetailController"/>
    136                                 <entry key="save/indicator/status/**"             value-ref="indicatorSaveStatusController"/>
    137                                 <entry key="save/indicator/relation/**"           value-ref="indicatorSaveIndicatorRelationController"/>
    138                                 <entry key="save/indicator/related_indicators/**" value-ref="indicatorSaveRelatedIndicatorsController"/>
    139                                 <entry key="save/indicator/topics/**"             value-ref="indicatorSaveTopicsController"/>
    140                                 <entry key="save/indicator/initiatives/**"        value-ref="indicatorSaveInitiativesController"/>
    141                                 <entry key="save/indicator/available_services/**" value-ref="indicatorSaveAvailableServicesController"/>
    142                                 <entry key="save/indicator/more_resources/**"     value-ref="indicatorSaveMoreResourcesController"/>
    143                                 <entry key="save/indicator/links/**"              value-ref="indicatorSaveLinksController"/>
    144                                 <entry key="save/indicator/owner/**"              value-ref="indicatorSaveOwnerController"/>
    145                                 <entry key="save/indicator/editors/**"            value-ref="indicatorSaveEditorsController"/>
    146 
    147                                 <entry key="publish/indicators"                   value-ref="publishIndicatorAllApprovedController"/>
    148                                 <entry key="publish/indicator/**"                 value-ref="publishIndicatorController"/>
    149 
    150                                 <entry key="preview/indicator/**"                 value-ref="indicatorPreviewController"/>
    151                                 <entry key="preview/indicator/view/**"            value-ref="indicatorViewPreviewController"/>
     122                                <entry key="/edit/indicator/list/**"               value-ref="indicatorEditListController"/>
     123                                <entry key="/edit/indicator/detail/**"             value-ref="indicatorEditDetailController"/>
     124
     125                                <entry key="/edit/indicator/topics/**"             value-ref="indicatorEditTopicsController"/>
     126                                <entry key="/edit/indicator/initiatives/**"        value-ref="indicatorEditInitiativesController"/>
     127                                <entry key="/edit/indicator/related_indicators/**" value-ref="indicatorEditRelatedIndicatorsController"/>
     128                                <entry key="/edit/indicator/available_services/**" value-ref="indicatorEditAvailableServicesController"/>
     129                                <entry key="/edit/indicator/more_resources/**"     value-ref="indicatorEditMoreResourcesController"/>
     130                                <entry key="/edit/indicator/links/**"              value-ref="indicatorEditLinksController"/>
     131                                <entry key="/edit/indicator/owner/**"              value-ref="indicatorEditOwnerController"/>
     132                                <entry key="/edit/indicator/editors/**"            value-ref="indicatorEditEditorsController"/>
     133
     134                                <entry key="/save/indicator/list/**"               value-ref="indicatorSaveListController"/>
     135                                <entry key="/save/indicator/detail/**"             value-ref="indicatorSaveDetailController"/>
     136                                <entry key="/save/indicator/status/**"             value-ref="indicatorSaveStatusController"/>
     137                                <entry key="/save/indicator/relation/**"           value-ref="indicatorSaveIndicatorRelationController"/>
     138                                <entry key="/save/indicator/related_indicators/**" value-ref="indicatorSaveRelatedIndicatorsController"/>
     139                                <entry key="/save/indicator/topics/**"             value-ref="indicatorSaveTopicsController"/>
     140                                <entry key="/save/indicator/initiatives/**"        value-ref="indicatorSaveInitiativesController"/>
     141                                <entry key="/save/indicator/available_services/**" value-ref="indicatorSaveAvailableServicesController"/>
     142                                <entry key="/save/indicator/more_resources/**"     value-ref="indicatorSaveMoreResourcesController"/>
     143                                <entry key="/save/indicator/links/**"              value-ref="indicatorSaveLinksController"/>
     144                                <entry key="/save/indicator/owner/**"              value-ref="indicatorSaveOwnerController"/>
     145                                <entry key="/save/indicator/editors/**"            value-ref="indicatorSaveEditorsController"/>
     146
     147                                <entry key="/publish/indicators"                   value-ref="publishIndicatorAllApprovedController"/>
     148                                <entry key="/publish/indicator/**"                 value-ref="publishIndicatorController"/>
     149
     150                                <entry key="/preview/indicator/**"                 value-ref="indicatorPreviewController"/>
     151                                <entry key="/preview/indicator/view/**"            value-ref="indicatorViewPreviewController"/>
    152152
    153153
    154154                                <!-- I N D I C A T O R   D A T A S E T -->
    155                                 <entry key="edit/indicator/dataset/list/**"              value-ref="indicatorDatasetEditListController"/>
    156                                 <entry key="edit/indicator/dataset/detail/**"            value-ref="indicatorDatasetEditDetailController"/>
    157                                 <entry key="edit/indicator/dataset/data_sources/**"      value-ref="indicatorDatasetEditDataSourcesController"/>
    158                                 <entry key="edit/indicator/dataset/ancillary_values/**"  value-ref="indicatorDatasetEditAncillaryValuesController"/>
    159                                 <entry key="edit/indicator/dataset/dimensions/**"        value-ref="indicatorDatasetEditDimensionsController"/>
    160                                 <entry key="edit/indicator/dataset/records/**"           value-ref="indicatorDatasetEditRecordsController"/>
    161 
    162                                 <entry key="save/indicator/dataset/list/**"              value-ref="indicatorDatasetSaveListController"/>
    163                                 <entry key="save/indicator/dataset/detail/**"            value-ref="indicatorDatasetSaveDetailController"/>
    164                                 <entry key="save/indicator/dataset/data_sources/**"      value-ref="indicatorDatasetSaveDataSourcesController"/>
    165                                 <entry key="save/indicator/dataset/ancillary_values/**"  value-ref="indicatorDatasetSaveAncillaryValuesController"/>
    166                                 <entry key="save/indicator/dataset/dimensions/**"        value-ref="indicatorDatasetSaveDimensionsController"/>
    167                                 <entry key="save/indicator/dataset/records/**"           value-ref="indicatorDatasetSaveRecordsController"/>
     155                                <entry key="/edit/indicator/dataset/list/**"              value-ref="indicatorDatasetEditListController"/>
     156                                <entry key="/edit/indicator/dataset/detail/**"            value-ref="indicatorDatasetEditDetailController"/>
     157                                <entry key="/edit/indicator/dataset/data_sources/**"      value-ref="indicatorDatasetEditDataSourcesController"/>
     158                                <entry key="/edit/indicator/dataset/ancillary_values/**"  value-ref="indicatorDatasetEditAncillaryValuesController"/>
     159                                <entry key="/edit/indicator/dataset/dimensions/**"        value-ref="indicatorDatasetEditDimensionsController"/>
     160                                <entry key="/edit/indicator/dataset/records/**"           value-ref="indicatorDatasetEditRecordsController"/>
     161
     162                                <entry key="/save/indicator/dataset/list/**"              value-ref="indicatorDatasetSaveListController"/>
     163                                <entry key="/save/indicator/dataset/detail/**"            value-ref="indicatorDatasetSaveDetailController"/>
     164                                <entry key="/save/indicator/dataset/data_sources/**"      value-ref="indicatorDatasetSaveDataSourcesController"/>
     165                                <entry key="/save/indicator/dataset/ancillary_values/**"  value-ref="indicatorDatasetSaveAncillaryValuesController"/>
     166                                <entry key="/save/indicator/dataset/dimensions/**"        value-ref="indicatorDatasetSaveDimensionsController"/>
     167                                <entry key="/save/indicator/dataset/records/**"           value-ref="indicatorDatasetSaveRecordsController"/>
    168168
    169169
    170170                                <!-- I N D I C A T O R   V I E W -->
    171                                 <entry key="edit/indicator/view/list/**"              value-ref="indicatorViewEditListController"/>
    172                                 <entry key="edit/indicator/view/detail/**"            value-ref="indicatorViewEditDetailController"/>
    173 
    174                                 <entry key="edit/indicator/view/dataset/list/**"      value-ref="indicatorViewEditDatasetListController"/>
    175 
    176                                 <entry key="edit/indicator/view/datasets/**"          value-ref="indicatorViewEditDatasetsController"/>
    177                                 <entry key="edit/indicator/view/dimensions/**"        value-ref="indicatorViewEditDimensionsController"/>
    178                                 <entry key="edit/indicator/view/dimension/values/**"  value-ref="indicatorViewEditDimensionValuesController"/>
    179                                 <entry key="edit/indicator/view/records/**"           value-ref="indicatorViewEditRecordsController"/>
    180 
    181                                 <entry key="save/indicator/view/list/**"              value-ref="indicatorViewSaveListController"/>
    182                                 <entry key="save/indicator/view/detail/**"            value-ref="indicatorViewSaveDetailController"/>
    183                                 <entry key="save/indicator/view/datasets/**"          value-ref="indicatorViewSaveDatasetsController"/>
    184                                 <entry key="save/indicator/view/dimensions/**"        value-ref="indicatorViewSaveDimensionsController"/>
    185                                 <entry key="save/indicator/view/dimension/values/**"  value-ref="indicatorViewSaveDimensionsValuesController"/>
    186                                 <entry key="save/indicator/view/records/**"           value-ref="indicatorViewSaveRecordsController"/>
     171                                <entry key="/edit/indicator/view/list/**"              value-ref="indicatorViewEditListController"/>
     172                                <entry key="/edit/indicator/view/detail/**"            value-ref="indicatorViewEditDetailController"/>
     173
     174                                <entry key="/edit/indicator/view/dataset/list/**"      value-ref="indicatorViewEditDatasetListController"/>
     175
     176                                <entry key="/edit/indicator/view/datasets/**"          value-ref="indicatorViewEditDatasetsController"/>
     177                                <entry key="/edit/indicator/view/dimensions/**"        value-ref="indicatorViewEditDimensionsController"/>
     178                                <entry key="/edit/indicator/view/dimension/values/**"  value-ref="indicatorViewEditDimensionValuesController"/>
     179                                <entry key="/edit/indicator/view/records/**"           value-ref="indicatorViewEditRecordsController"/>
     180
     181                                <entry key="/save/indicator/view/list/**"              value-ref="indicatorViewSaveListController"/>
     182                                <entry key="/save/indicator/view/detail/**"            value-ref="indicatorViewSaveDetailController"/>
     183                                <entry key="/save/indicator/view/datasets/**"          value-ref="indicatorViewSaveDatasetsController"/>
     184                                <entry key="/save/indicator/view/dimensions/**"        value-ref="indicatorViewSaveDimensionsController"/>
     185                                <entry key="/save/indicator/view/dimension/values/**"  value-ref="indicatorViewSaveDimensionsValuesController"/>
     186                                <entry key="/save/indicator/view/records/**"           value-ref="indicatorViewSaveRecordsController"/>
    187187<!--
    188                                 <entry key="delete/indicator/view/list/**" value-ref="indicatorViewDeleteListController"/>
     188                                <entry key="/delete/indicator/view/list/**" value-ref="indicatorViewDeleteListController"/>
    189189-->
    190190
    191191                                <!-- V I E W   T E M P L A T E -->
    192                                 <entry key="edit/view_template/list/**"       value-ref="viewTemplateEditListController"/>
    193                                 <entry key="edit/view_template/detail/**"     value-ref="viewTemplateEditDetailController"/>
    194                                 <entry key="save/view_template/list/**"       value-ref="viewTemplateSaveListController"/>
    195                                 <entry key="save/view_template/detail/**"     value-ref="viewTemplateSaveDetailController"/>
     192                                <entry key="/edit/view_template/list/**"       value-ref="viewTemplateEditListController"/>
     193                                <entry key="/edit/view_template/detail/**"     value-ref="viewTemplateEditDetailController"/>
     194                                <entry key="/save/view_template/list/**"       value-ref="viewTemplateSaveListController"/>
     195                                <entry key="/save/view_template/detail/**"     value-ref="viewTemplateSaveDetailController"/>
    196196
    197197
    198198                                <!-- I N D I C A T O R   S E T -->
    199                                 <entry key="edit/indicator_set/list/**"       value-ref="indicatorSetEditListController"/>
    200                                 <entry key="edit/indicator_set/detail/**"     value-ref="indicatorSetEditDetailController"/>
    201                                 <entry key="edit/indicator_set/indicators/**" value-ref="indicatorSetEditIndicatorsController"/>
    202                                 <entry key="save/indicator_set/list/**"       value-ref="indicatorSetSaveListController"/>
    203                                 <entry key="save/indicator_set/detail/**"     value-ref="indicatorSetSaveDetailController"/>
    204                                 <entry key="save/indicator_set/indicators/**" value-ref="indicatorSetSaveIndicatorsController"/>
    205                                 <entry key="publish/indicator_sets/**"        value-ref="publishIndicatorSetsController"/>
     199                                <entry key="/edit/indicator_set/list/**"       value-ref="indicatorSetEditListController"/>
     200                                <entry key="/edit/indicator_set/detail/**"     value-ref="indicatorSetEditDetailController"/>
     201                                <entry key="/edit/indicator_set/indicators/**" value-ref="indicatorSetEditIndicatorsController"/>
     202                                <entry key="/save/indicator_set/list/**"       value-ref="indicatorSetSaveListController"/>
     203                                <entry key="/save/indicator_set/detail/**"     value-ref="indicatorSetSaveDetailController"/>
     204                                <entry key="/save/indicator_set/indicators/**" value-ref="indicatorSetSaveIndicatorsController"/>
     205                                <entry key="/publish/indicator_sets/**"        value-ref="publishIndicatorSetsController"/>
    206206
    207207
    208208                                <!-- M A P -->
    209                                 <entry key="edit/map/list/**"          value-ref="mapEditListController"/>
    210                                 <entry key="edit/map/detail/**"        value-ref="mapEditDetailController"/>
    211                                 <entry key="save/map/list/**"          value-ref="mapSaveListController"/>
    212                                 <entry key="save/map/detail/**"        value-ref="mapSaveDetailController"/>
    213                                 <entry key="publish/maps"              value-ref="publishMapsController"/>
     209                                <entry key="/edit/map/list/**"          value-ref="mapEditListController"/>
     210                                <entry key="/edit/map/detail/**"        value-ref="mapEditDetailController"/>
     211                                <entry key="/save/map/list/**"          value-ref="mapSaveListController"/>
     212                                <entry key="/save/map/detail/**"        value-ref="mapSaveDetailController"/>
     213                                <entry key="/publish/maps"              value-ref="publishMapsController"/>
    214214
    215215
    216216                                <!-- M E A S U R E -->
    217                                 <entry key="edit/measure/list/**"      value-ref="measureEditListController"/>
    218                                 <entry key="edit/measure/detail/**"    value-ref="measureEditDetailController"/>
    219                                 <entry key="save/measure/list/**"      value-ref="measureSaveListController"/>
    220                                 <entry key="save/measure/detail/**"    value-ref="measureSaveDetailController"/>
    221                                 <entry key="publish/measures"          value-ref="publishMeasuresController"/>
     217                                <entry key="/edit/measure/list/**"      value-ref="measureEditListController"/>
     218                                <entry key="/edit/measure/detail/**"    value-ref="measureEditDetailController"/>
     219                                <entry key="/save/measure/list/**"      value-ref="measureSaveListController"/>
     220                                <entry key="/save/measure/detail/**"    value-ref="measureSaveDetailController"/>
     221                                <entry key="/publish/measures"          value-ref="publishMeasuresController"/>
    222222
    223223
    224224                                <!-- O R G   U N I T -->
    225                                 <entry key="edit/org_unit/list/**"     value-ref="orgUnitEditListController"/>
    226                                 <entry key="edit/org_unit/detail/**"   value-ref="orgUnitEditDetailController"/>
    227                                 <entry key="save/org_unit/list/**"     value-ref="orgUnitSaveListController"/>
    228                                 <entry key="save/org_unit/detail/**"   value-ref="orgUnitSaveDetailController"/>
    229                                 <entry key="publish/org_units"         value-ref="publishOrgUnitsController"/>
     225                                <entry key="/edit/org_unit/list/**"     value-ref="orgUnitEditListController"/>
     226                                <entry key="/edit/org_unit/detail/**"   value-ref="orgUnitEditDetailController"/>
     227                                <entry key="/save/org_unit/list/**"     value-ref="orgUnitSaveListController"/>
     228                                <entry key="/save/org_unit/detail/**"   value-ref="orgUnitSaveDetailController"/>
     229                                <entry key="/publish/org_units"         value-ref="publishOrgUnitsController"/>
    230230
    231231
    232232                                <!-- T O P I C -->
    233                                 <entry key="edit/topic/list/**"        value-ref="topicEditListController"/>
    234                                 <entry key="edit/topic/detail/**"      value-ref="topicEditDetailController"/>
    235                                 <entry key="save/topic/list/**"        value-ref="topicSaveListController"/>
    236                                 <entry key="save/topic/detail/**"      value-ref="topicSaveDetailController"/>
    237                                 <entry key="publish/topics"            value-ref="publishTopicsController"/>
     233                                <entry key="/edit/topic/list/**"        value-ref="topicEditListController"/>
     234                                <entry key="/edit/topic/detail/**"      value-ref="topicEditDetailController"/>
     235                                <entry key="/save/topic/list/**"        value-ref="topicSaveListController"/>
     236                                <entry key="/save/topic/detail/**"      value-ref="topicSaveDetailController"/>
     237                                <entry key="/publish/topics"            value-ref="publishTopicsController"/>
    238238
    239239
    240240                                <!-- U S E R -->
    241                                 <entry key="edit/user/list/**"         value-ref="userEditListController"/>
    242                                 <entry key="edit/user/detail/**"       value-ref="userEditDetailController"/>
    243                                 <entry key="edit/user/authorities/**"  value-ref="userEditAuthoritiesController"/>
    244                                 <entry key="edit/user/roles/**"        value-ref="userEditRolesController"/>
    245                                 <entry key="save/user/detail/**"       value-ref="userSaveDetailController"/>
    246                                 <entry key="save/user/authorities/**"  value-ref="userSaveAuthoritiesController"/>
    247                                 <entry key="save/user/roles/**"        value-ref="userSaveRolesController"/>
     241                                <entry key="/edit/user/list/**"         value-ref="userEditListController"/>
     242                                <entry key="/edit/user/detail/**"       value-ref="userEditDetailController"/>
     243                                <entry key="/edit/user/authorities/**"  value-ref="userEditAuthoritiesController"/>
     244                                <entry key="/edit/user/roles/**"        value-ref="userEditRolesController"/>
     245                                <entry key="/save/user/detail/**"       value-ref="userSaveDetailController"/>
     246                                <entry key="/save/user/authorities/**"  value-ref="userSaveAuthoritiesController"/>
     247                                <entry key="/save/user/roles/**"        value-ref="userSaveRolesController"/>
    248248
    249249
    250250                                <!-- V A L U E   A T T R I B U T E -->
    251                                 <entry key="edit/value_attribute/list/**"   value-ref="valueAttributeEditListController"/>
    252                                 <entry key="edit/value_attribute/detail/**" value-ref="valueAttributeEditDetailController"/>
    253                                 <entry key="save/value_attribute/list/**"   value-ref="valueAttributeSaveListController"/>
    254                                 <entry key="save/value_attribute/detail/**" value-ref="valueAttributeSaveDetailController"/>
    255                                 <entry key="publish/value_attributes"       value-ref="publishValueAttributesController"/>
     251                                <entry key="/edit/value_attribute/list/**"   value-ref="valueAttributeEditListController"/>
     252                                <entry key="/edit/value_attribute/detail/**" value-ref="valueAttributeEditDetailController"/>
     253                                <entry key="/save/value_attribute/list/**"   value-ref="valueAttributeSaveListController"/>
     254                                <entry key="/save/value_attribute/detail/**" value-ref="valueAttributeSaveDetailController"/>
     255                                <entry key="/publish/value_attributes"       value-ref="publishValueAttributesController"/>
    256256
    257257
    258258                                <!-- V A L U E   T Y P E -->
    259                                 <entry key="edit/value_type/list/**"   value-ref="valueTypeEditListController"/>
    260                                 <entry key="edit/value_type/detail/**" value-ref="valueTypeEditDetailController"/>
    261                                 <entry key="save/value_type/list/**"   value-ref="valueTypeSaveListController"/>
    262                                 <entry key="save/value_type/detail/**" value-ref="valueTypeSaveDetailController"/>
    263                                 <entry key="publish/value_types"       value-ref="publishValueTypesController"/>
     259                                <entry key="/edit/value_type/list/**"   value-ref="valueTypeEditListController"/>
     260                                <entry key="/edit/value_type/detail/**" value-ref="valueTypeEditDetailController"/>
     261                                <entry key="/save/value_type/list/**"   value-ref="valueTypeSaveListController"/>
     262                                <entry key="/save/value_type/detail/**" value-ref="valueTypeSaveDetailController"/>
     263                                <entry key="/publish/value_types"       value-ref="publishValueTypesController"/>
    264264
    265265
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/config/spring/indicator.xml

    r18693 r22793  
    4040        </bean>
    4141
    42         <bean id="indicatorRelationDataBeanCollection" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
    43                 <property name="targetObject" ref="commonDataBeanDAOService"/>
    44                 <property name="targetMethod" value="getCollection"/>
    45                 <property name="arguments"><list><value>org.ibisph.indicatorprofile.databean.Relation</value></list></property>
    46         </bean>
    47 
    48         <bean id="indicatorPreviewFilePath" class="org.ibisph.model.StringHolder">
     42        <bean id="indicatorPreviewXMLBasePath" class="org.ibisph.model.StringHolder">
    4943                <description>
    5044                        Base XML file path used by the preview related controllers to save
     
    5347                        filename. 
    5448                </description>
    55                 <constructor-arg value="xml/preview/indicator/profile/"/>
    56         </bean>
    57         <bean id="indicatorPreviewRequestPath" class="org.ibisph.model.StringHolder">
     49                <constructor-arg value="#{commonContentBasePath}xml/preview/indicator/profile/"/>
     50        </bean>
     51        <bean id="indicatorPreviewRequestBasePath" class="org.ibisph.model.StringHolder">
    5852                <description>
    5953                         View app's base Preview request url.  Value is sans the IP or IPV
     
    6155                </description>
    6256                <constructor-arg value="http://localhost/ibisph-view/indicator/preview/"/>
     57        </bean>
     58
     59        <bean id="indicatorRelationDataBeanCollection" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     60                <property name="targetObject" ref="commonDataBeanDAOService"/>
     61                <property name="targetMethod" value="getCollection"/>
     62                <property name="arguments"><list><value>org.ibisph.indicatorprofile.databean.Relation</value></list></property>
    6363        </bean>
    6464
     
    169169        </bean>
    170170
    171 
    172171        <bean id="indicatorSaveListController" parent="indicatorSaveControllerProperties"
    173172                class="org.ibisph.databean.springmvc.SaveController"
     
    408407                <property name="indicatorDataBeanToXMLService"     ref="indicatorDataBeanToXMLService"/>
    409408                <property name="indicatorViewDataBeanToXMLService" ref="indicatorViewDataBeanToXMLService"/>
    410                 <property name="filePath"                          value="#{indicatorPreviewFilePath.string}"/>
    411                 <property name="viewAppPreviewRequestPath"         value="#{indicatorPreviewRequestPath.string}"/>
    412409                <property name="documentDAOService">
    413410                        <bean class="org.ibisph.xml.service.FileStoredDocumentDAO">
    414411                                <description>
    415                                         Main file service used to persist IP xml files.  This differs
    416                                         from the standard XML output simply in pretty printing and
    417                                         escaping.
     412                                        Main file service used to save the IP xml file(s) needed
     413                                        for previewing.
    418414                                </description>
    419                                 <property name="basePath"     ref="commonContentBasePathURL"/>
     415                                <property name="basePath"     value="#{indicatorPreviewXMLBasePath}"/>
    420416                                <property name="outputFormat" ref="commonWikiXMLOutputFormat"/>
    421417                                <property name="dateFormat"   ref="commonDateFormat"/>
     
    423419                        </bean>
    424420                </property>
     421                <property name="viewAppPreviewRequestBasePath" value="#{indicatorPreviewRequestBasePath.string}"/>
    425422        </bean>
    426423
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/config/spring/indicator_view.xml

    r20669 r22793  
    1919        </bean>
    2020
    21         <bean id="indicatorViewPreviewRequestPath" class="org.ibisph.model.StringHolder">
     21        <bean id="indicatorViewPreviewRequestBasePath" class="org.ibisph.model.StringHolder">
    2222                <description>
    2323                         View app's base View Preview request url.  Value is sans the IP or IPV
     
    232232        <!--  P R E V I W   C O N T R O L L E R  -->
    233233        <bean id="indicatorViewPreviewController" parent="indicatorPreviewController">
    234                 <property name="viewAppPreviewRequestPath" value="#{indicatorViewPreviewRequestPath.string}"/>
     234                <property name="viewAppPreviewRequestBasePath" value="#{indicatorViewPreviewRequestBasePath.string}"/>
    235235        </bean>
    236236
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/config/spring/view.xml

    r18245 r22793  
    4545                <property name="pathPrefixToRemove" value="#{viewGetFileRequestPathPrefixToRemove.string}"/>
    4646                <property name="basePath" ref="commonContentBasePathURL"/>
    47 
    48 <!--
    49                 <property name="HTTPResponseHeaders">
    50                         <bean class="org.springframework.beans.factory.config.PropertiesFactoryBean">
    51                                 <property name="properties">
    52                                         <props>
    53                                                 <prop key="Content-Disposition">inline</prop>
    54                                         </props>
    55                                 </property>
    56                         </bean>
    57                 </property>
    58 -->
    5947        </bean>
    6048
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/web.xml

    r21972 r22793  
    372372                <url-pattern>/publish/*</url-pattern>
    373373                <url-pattern>/preview/*</url-pattern>
    374                 <url-pattern>/view/**</url-pattern>
    375374        </filter-mapping>
    376375
  • trunk/ibisph-view/src/main/webapp/WEB-INF/config/SiteSpecific.properties

    r22738 r22793  
    2020#
    2121# PATH CONVENTION:
    22 # Paths shall have a trailing "/".  Sub paths should never have a leading "/"
     22# All paths shall have a trailing "/".  Sub paths should never have a leading "/"
    2323# but will always have the trailing "/".  Base paths can have a leading "/" as
    24 # this represents the root of the file system.
     24# this represents the root of the file system. 
     25#
     26# "BasePaths" define a path prefix that is used in conjunction with a specific
     27# filename (example an indicator name).  In some cases base paths are also
     28# combined with sub paths then an actual name.  BasePath are of the form of any
     29# legal URI value.  In most cases these values are used for retrieving files
     30# either via HTTP (as long as supported and configured correctly) or FILE access. 
     31# In some cases these base paths are used for saving local XML files.  When
     32# saving files only local URI file paths are legal (IBIS apps do not provide 
     33# support to handle remote file saves).
     34#
     35# "Requset" type paths are also URI/URL values and are more specificially named
     36# with "Request" to help convey usage i.e. implies ability to make an HTTP get
     37# request for a remote resource or to make a remote single request (preview).
    2538#------------------------------------------------------------------------------
    2639
     
    4356
    4457#--- Content Paths.  Adopters should be splitting their content from the
    45 #       ibisph-view webapp.  This allows the ibis webapp to be seperate from the
    46 #       content which allows the content to be managed without having to touch the
    47 #       deployed webapp.
     58#       ibisph-view and published ibisph-admin webapps.  This allows the ibis webapp
     59#       to be seperate from the static and published content which allows the content
     60#       to be managed independently of the deployed webapps.
    4861#
    49 #       There are three types of content published XML, static content (xml, pdf,
    50 #       images, etc), and saved XML content (saved query, self registered users). 
     62#       There are four types of content that the view app uses: 1) published XML,
     63#       2) static content (xml,  pdf, images, etc), 3) saved XML content (saved
     64#       query, self registered users), and dynamically queried SAS dataset results.
    5165#       - Published XML is the ibisph-admin app's published content data (org units,
    5266#       topics, measures, published indicators etc.).  These files should always be
    53 #       referenced and never versionsed as they are dynamic content.  These files
    54 #       will live on the same server (or fileserver) as the ibisph-admin app. 
     67#       referenced and never versionsed as they are generated content.  These files
     68#       MUST live on the same server (or fileserver) as the ibisph-admin app. 
    5569#       - Static content include images, json, pdfs, HTML_CONTENT XML files, query
    5670#       module XML files, SELECTION XML files and any content that is maintained by
     
    6579#       files) or for those adopters who deploy as an .ear or .war and choose to keep
    6680#       the file zipped instead of expanding it. 
     81#       - IBISQ data are dynamically requested and are not part of this type of content.
    6782#
    6883#       It is possible for all three published, static, and saved files to live on
    69 #       the same app server and in the same directory structure.  It is also very
    70 #       likely that all live on their own server.
     84#       the same app server and in the same directory structure.  It is also possible
     85#       to have all types live on sep servers.
    7186#
    72 #commonContentBasePath.string =../../ibisph-content/
    73 #commonContentBasePath.string =file:/d:/tomcat7/webapps/ibisph-content/
    74 #commonContentBasePath.string =http://localhost/ibisph-content/
    75 commonContentBasePath.string =../../ibisph-content/
     87# commonContentBasePath is the base for all static content and defaults to ""
     88# which means the content will be located within the view webapp container.
     89#RELATIVE PATH EXAMPLE: commonContentBasePath.string =../../ibisph-content/
     90#FILE EXAMPLE: commonContentBasePath.string =file:/d:/tomcat7/webapps/ibisph-content/
     91#REMOTE URL REQUEST EXAMPLE: commonContentBasePath.string =http://localhost/ibisph-content/
     92commonContentBasePath.string =../ibisph-content/
    7693
    77 #--- Example of published XML on different server. 
    78 #       The core code defaults to the published XML path being the same as the
    79 #       content's XML path which in both cases is the base path with an "xml/" suffix.
    80 #       If the published XML is in a different location then both paths should be
    81 #       specified.
     94#--- Example of specifying the published XML on different server. 
     95#       The core code defaults to the {commonContentBasePath}/xml path.  This default
     96#       setting results in the published XML path being the same as the content's
     97#       XML.  If the published XML is not contained within the commonContentBasePath in
     98#       then this value must be specified.  This value can be relative, file, or an
     99#       HTTP request URL.
    82100#commonPublishedXMLBasePath.string =http://admin.ibis.org/ibisph-admin-published-content/xml
    83101
     
    91109
    92110#--- Base admin app preview related XML file path.  Just like the content base
    93 #        path above, this can be a relataive, explicit file path or request URL.
     111#       paths above, this can be a relataive, explicit file path, or request URL.
     112#       This value specifies where the view app should get it's IP XML file(s) from
     113#       when it recieves a "preview" request.
    94114#
    95 #    IMPORTANT SECURITY NOTE: It is recommended to go through the admin app
    96 #        (e.g. URL request based) for XML IP file requests so that the admin app can
    97 #        handle file privs/security.  This is needed for those adopters that have
    98 #        sensitive, non public IP files and is a good practice in general.
    99 #        Default value: "http://localhost/ibisph-admim/xml/preview/indicator/profile/"
    100 indicatorPreviewFilePath.string =http://localhost/ibisph-admin/view/xml/preview/indicator/profile/
     115#   IMPORTANT SECURITY NOTE: It is recommended to go through the admin app
     116#       (e.g. URL request based) for XML IP file requests so that the admin app can
     117#       handle file privs/security.  This is needed for those adopters that have
     118#       sensitive, non public IP files and is a good practice in general.
     119#       Default: "http://localhost/ibisph-admin/view/xml/preview/indicator/profile/"
     120#indicatorPreviewXMLBasePath.string =file:///d:/xml/preview/indicator/profile/
    101121
    102122
  • trunk/ibisph-view/src/main/webapp/WEB-INF/config/spring/SiteSpecific.xml

    r22738 r22793  
    299299                        <list>
    300300                                <value>WEB-INF/config/SiteSpecific.properties</value>
    301                                 <value>file:../ibisph-view_core.properties</value>
    302                                 <value>file:${user.home}/ibisph-view_core.properties</value>
     301                                <value>file:../ibisph-view.properties</value>
     302                                <value>file:${user.home}/ibisph-view.properties</value>
    303303                        </list>
    304304                </property>
  • trunk/ibisph-view/src/main/webapp/WEB-INF/config/spring/indicator.xml

    r22683 r22793  
    5555        </bean>
    5656
    57         <bean id="indicatorPreviewFilePath" class="org.ibisph.model.StringHolder">
     57        <bean id="indicatorPreviewXMLBasePath" class="org.ibisph.model.StringHolder">
    5858                <description>
    5959                        Base admin app XML preview path that an xml service uses to build/
    6060                        locate the indicator XML file(s).   
    6161                </description>
    62                 <constructor-arg value="http://localhost/ibisph-admim/xml/preview/indicator/profile/"/>
     62                <constructor-arg value="http://localhost/ibisph-admin/view/xml/preview/indicator/profile/"/>
    6363        </bean>
    6464
     
    348348                                                                        <property name="targetObject" ref="commonContextAndPathService"/>
    349349                                                                        <property name="targetMethod" value="getPathURL"/>
    350                                                                         <property name="arguments"><list><value>#{indicatorPreviewFilePath.string}</value></list></property>
     350                                                                        <property name="arguments"><list><value>#{indicatorPreviewXMLBasePath.string}</value></list></property>
    351351                                                                </bean>
    352352                                                        </property>
  • trunk/ibisph-view/src/main/webapp/xslt/html/community/facts/SiteSpecific.xslt

    r20582 r22793  
    2323                </SELECTION>
    2424                <SELECTION>
    25                         <TITLE>Quick Facts</TITLE>
    26                         <URL><xsl:value-of select="concat($Page.communityBaseRequestPath, 'facts/', $Page.dimensionName, '/', $Page.dimensionValue, '.html')"/></URL>
     25                        <CONTENT>Quick Facts</CONTENT>
    2726                </SELECTION>
    2827        </xsl:param>
  • trunk/ibisph-view/src/main/webapp/xslt/html/community/indicator/SiteSpecific.xslt

    r21374 r22793  
    3030                <SELECTION>
    3131                        <TITLE>indicators</TITLE>
    32                         <URL><xsl:value-of select="concat($Page.communityBaseRequestPath, 'indicators/', $Page.indicatorSetName, '/', $Page.dimensionName, '/', $Page.dimensionValue, '.html')"/></URL>
     32                        <LOCAL_URL><xsl:value-of select="concat('indicators/', $Page.indicatorSetName, '/', $Page.dimensionName, '/', $Page.dimensionValue, '.html')"/></LOCAL_URL>
    3333                </SELECTION>
    3434                <SELECTION>
    3535                        <TITLE>Indicator</TITLE>
    36                         <URL><xsl:value-of select="concat($Page.communityBaseRequestPath, 'indicator/', $Page.indicatorName, '/', $Page.dimensionName, '/', $Page.dimensionValue, '.html')"/></URL>
     36                        <LOCAL_URL><xsl:value-of select="concat('indicator/', $Page.indicatorName, '/', $Page.dimensionName, '/', $Page.dimensionValue, '.html')"/></LOCAL_URL>
    3737                </SELECTION>
    3838        </xsl:param>
  • trunk/ibisph-view/src/main/webapp/xslt/html/community/indicators/SiteSpecific.xslt

    r20582 r22793  
    2323                </SELECTION>
    2424                <SELECTION>
    25                         <TITLE>Health Profile</TITLE>
    26                         <URL><xsl:value-of select="concat($Page.communityBaseRequestPath, 'indicators/', $Page.indicatorSetName, '/', $Page.dimensionName, '/', $Page.dimensionValue, '.html')"/></URL>
     25                        <CONTENT>Health Profile</CONTENT>
    2726                </SELECTION>
    2827        </xsl:param>
  • trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/Page.xslt

    r22256 r22793  
    161161                                                </option>
    162162                                        </xsl:if>
     163<!--
    163164                                                <option value="{$indicatorBaseRequsetPath}resources/{$indicator/NAME}.html">
    164165                                                        <xsl:if test="'resources' = $pageType">
     
    167168                                                        Resources &amp; Links
    168169                                                </option>
     170-->
    169171                                        </select>
    170172                                </div>
  • trunk/ibisph-view/src/main/webapp/xslt/html/query/module/result/SiteSpecific.xslt

    r20565 r22793  
    2828                </SELECTION>
    2929                <SELECTION>
    30                         <TITLE>Builder</TITLE>
    31                         <URL><xsl:value-of select="$Page.builderURL"/></URL>
     30                        <CONTENT>Builder</CONTENT>
    3231                        <DESCRIPTION>Not seeing what you want? Click this to go to the query builder page.</DESCRIPTION>
    3332                </SELECTION>
  • trunk/ibisph-view/src/main/webapp/xslt/html/secure/query/module/result/SiteSpecific.xslt

    r20565 r22793  
    3535                </SELECTION>
    3636                <SELECTION>
    37                         <TITLE>Definition</TITLE>
    38                         <URL><xsl:value-of select="$Page.builderURL"/></URL>
    39                         <DESCRIPTION>Not seeing what you want? Click this to go to the query builder page.</DESCRIPTION>
     37                        <CONTENT>Definition</CONTENT>
    4038                </SELECTION>
    4139        </xsl:param>
  • trunk/ibisph/src/main/java/org/ibisph/indicatorprofile/service/IndicatorDataBeanToXML.java

    r18000 r22793  
    2424  protected DatasetDataBeanToXML    datasetDataBeanToXMLService    = null;
    2525  protected InitiativeDataBeanToXML initiativeDataBeanToXMLService = null;
    26   protected Collection<Relation> relationDataBeanCollection  = null;
     26  protected Collection<Relation>    relationDataBeanCollection     = null;
    2727
    2828  protected boolean includeDependentXML = false;
  • trunk/ibisph/src/main/java/org/ibisph/indicatorprofile/springmvc/databean/PreviewIndicatorController.java

    r19295 r22793  
    2828  protected DocumentDAO        documentDAOService;
    2929
    30   protected String filePath = "";
    31   protected String viewAppPreviewRequestPath = "http://localhost/ibisph-view/indicator/preview";
     30  protected String viewAppPreviewRequestBasePath = "http://localhost/ibisph-view/indicator/preview";
    3231
    3332  /**
     
    4948
    5049  /**
    51    * Sets the sub XML file path directory that is used to build a filename and
    52    * path that is sent to the Document Service to save files to.  Note that the
    53    * XML Document Service is path based with the service typically having some
    54    * base path that the actual file is stored to (or in the case of a db type
    55    * service it simply uses the supplied path).
    56    * @param filePath directory path to save the XML files to.
    57    */
    58   public void setFilePath(String filePath) {
    59     this.filePath = filePath;
    60   } //-------------------------- End of Method ------------------------------
    61 
    62   /**
    6350   * Sets the preview request path/URL to be used for sending a preview request
    6451   * to the view app.
    65    * @param viewAppPreviewRequestPath complete base URL to the view app to
     52   * @param viewAppPreviewRequestBasePath complete base URL to the view app to
    6653   *   handle preview requests.
    6754   */
    68   public void setViewAppPreviewRequestPath(String viewAppPreviewRequestPath) {
    69     this.viewAppPreviewRequestPath = viewAppPreviewRequestPath;
     55  public void setViewAppPreviewRequestBasePath(String viewAppPreviewRequestBasePath) {
     56    this.viewAppPreviewRequestBasePath = viewAppPreviewRequestBasePath;
    7057  } //-------------------------- End of Method ------------------------------
    7158
     
    10188
    10289    // Save the IP xml file needed for the preview.
    103     String xmlFilePathAndName = IOPath.concat(this.filePath, indicatorName + ".xml", "/");
     90    String xmlFileName = indicatorName + ".xml";
    10491    Node indicatorDocument = this.indicatorDataBeanToXMLService.getDocument(indicator);
    105     this.documentDAOService.save(indicatorDocument, xmlFilePathAndName);
     92    this.documentDAOService.save(indicatorDocument, xmlFileName);
    10693
    10794    // Loop and save all the IPs view xml files.
     
    114101      indicatorView = (IndicatorView)db;
    115102      indicatorViewDocument = this.indicatorViewDataBeanToXMLService.getDocument(indicatorView);
    116       xmlFilePathAndName = IOPath.concat(this.filePath, indicatorView.getName() + ".xml", "/");
    117       this.documentDAOService.save(indicatorViewDocument, xmlFilePathAndName);
     103      xmlFileName = indicatorView.getName() + ".xml";
     104      this.documentDAOService.save(indicatorViewDocument, xmlFileName);
    118105    }
    119106
    120107    // Finally now that the XML files exist, redirect to view app's preview.
    121     String url = IOPath.concat(this.viewAppPreviewRequestPath, requestedName + ".html", "/");
     108    String url = IOPath.concat(this.viewAppPreviewRequestBasePath, requestedName + ".html", "/");
    122109    return( new org.springframework.web.servlet.ModelAndView(new org.springframework.web.servlet.view.RedirectView(url)) );
    123110  } //-------------------------- End of Method ------------------------------
Note: See TracChangeset for help on using the changeset viewer.