Changeset 17645 in main


Ignore:
Timestamp:
12/18/18 18:37:03 (3 months ago)
Author:
GarthBraithwaite_STG
Message:

db, admin, view, java - db script to get proper IPV titles. More base path type name standardization/cleanup. Simplified IP preview to use paths and controllers and not to rely on the generic XSLT/XML view. Removed unused preview mappings and requests. Removed inherit font from the bold/italic/etc view general.css. Updated IP view and QM builder titles. Updating Java 9+ deprecated warnings.

Location:
trunk
Files:
1 added
2 deleted
54 edited

Legend:

Unmodified
Added
Removed
  • trunk/db/src/main/scripts/mysql/data-cleanup.sql

    r17596 r17645  
    132132
    133133/* SUB_TITLE is now TITLE.  Remove trailing "," */
    134 update INDICATOR_VIEW set TITLE = substring(TITLE, 1, length(TITLE) - 1)
    135 where TITLE like '% '
    136 ;
    137 update INDICATOR_VIEW set TITLE = substring(TITLE, 1, length(TITLE) - 1)
    138 where TITLE like '%,'
     134update INDICATOR_VIEW set TITLE = substring(SUB_TITLE, 1, length(SUB_TITLE) - 1)
     135where SUB_TITLE like '% '
     136;
     137update INDICATOR_VIEW set TITLE = substring(SUB_TITLE, 1, length(SUB_TITLE) - 1)
     138where SUB_TITLE like '%,'
    139139;
    140140
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/config/SiteSpecific.properties

    r14637 r17645  
    2222
    2323
    24 #--- Some adopters split their XML content out from the ibisph-view webapp. 
    25 #    This has several advantages like shared data and not having to put any
    26 #    content files in the deployment package.  Below are examples of how to
    27 #    specify the base file path used for direct publishing.  The default is:
    28 #    ../ibisph-view/xml - which is the assumed peer core view webapp.
     24#--- Adopters split their XML content out from under the ibisph-view webapp into
     25#        a peer directory typically named ibisph-content.  The publishing controllers
     26#    use this base XML directory for the standard XML files.  The published IP
     27#        files are typically below the main XML directory.  Likewise the preview XML
     28#        files are also under the main XML directory.
    2929#    For non relative paths, need to use a URI/URL.  See: https://en.wikipedia.org/wiki/File_URI_scheme
    30 #RELATIVE: publishXMLBasePath.string =../ibisph-content/xml
    31 #ABSOLUTE/URL: publishXMLBasePath.string =file:///d:/ibis/webapps
    32 publishXMLBasePath.string =../ibisph-content/xml
     30#RELATIVE: =../ibisph-content
     31#ABSOLUTE/URL:  =file:///d:/ibis/webapps/ibisph-content
     32commonContentBasePath.string =../ibisph-content
    3333
    34 #--- Example of preview urls if using 8080.
    35 #indicatorPreviewProfileController.previewURL=http://localhost:8080/ibisph-view/view.html?xslt=html/indicator/profile/complete_profile/CompleteProfilePage.xslt&xmlURL=http://localhost:8080/ibisph-admin/indicator/########.xml
    36 #indicatorPreviewImportantFactsController.previewURL=http://localhost:8080/ibisph-view/view.html?xslt=html/indicator/profile/important_facts/ImportantFactsPage.xslt&xmlURL=http://localhost:8080/ibisph-admin/indicator/########.xml
    37 # do similar config for all preview urls: indicatorPreviewRelatedController,
    38 #    indicatorPreviewAvailableServicesController, indicatorViewPreviewChartController,
    39 #    indicatorViewPreviewNumbersController.
    40 indicatorViewPreviewChartController.previewURL=http://localhost/ibisph-view/view.html?xslt=html/indicator/profile/view/ViewPage.xslt&xmlURL=http://localhost/ibisph-admin/indicator/########.xml
     34#--- Mid path segment to save IP and IPV XML files to for Preview requests. 
     35#        The actual path is the commonContentBaseXMLPath + this path + actual IP
     36#        name followed by .xml.
     37indicatorPreviewFilePath.string =xml/preview/indicator/profile
     38
     39#--- View app's base Preview request url.  Value is sans the IP or IPV name
     40#        which the controller adds.
     41indicatorPreviewBaseRequestURL.string =http://localhost/ibisph-view/indicator/preview
    4142
    4243#securityAuthorityAdmin.string =admin
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/config/spring/SiteSpecific.xml

    r17143 r17645  
    103103
    104104        <import resource="publish.xml"/>
     105        <import resource="view.xml"/>
    105106
    106107        <bean id="siteSpecificPropertyOverrides" class="org.springframework.beans.factory.config.PropertyOverrideConfigurer">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/config/spring/common.xml

    r16500 r17645  
    3333        </bean>
    3434
    35         <bean id="commonPreviewURLNameSignature" class="org.ibisph.model.StringHolder">
    36                 <description>
    37                         The "Signature" is a string used for searching for and replacing
    38                         with the appropriate indicator name and should be included as part
    39                         of the preview URLs.
    40                 </description>
    41                 <constructor-arg value="########"/>
    42         </bean>
    43 
    4435
    4536        <!--  C O N T E X T S   A N D   P A T H S -->
    4637        <bean id="commonContextAndPathService" class="org.ibisph.web.ContextAndPathService"/>
     38        <bean id="commonContentBasePath" class="org.ibisph.model.StringHolder">
     39                <description>
     40                        Base "Content" file path used by publish and preview.
     41                </description>
     42                <constructor-arg value=""/>
     43        </bean>
     44        <bean id="commonBasePathURL" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     45                <property name="targetObject" ref="commonContextAndPathService"/>
     46                <property name="targetMethod" value="getPathURL"/>
     47                <property name="arguments"><list><value>#{commonContentBasePath.string}</value></list></property>
     48        </bean>
    4749
    4850
     
    109111        </bean>
    110112
    111         <!-- This is the default string value displayed in the required fields when
    112                 adding a new indicator.  Previous values were like: [Required Value].
    113                 It is probably best to leave blank as the UI will prompt the user to
    114                 fill in the values.  Currently this property is only injected into the
    115                 EditIndicatorNew controller but is defined here for future usages for
    116                 all UI pages that have required values.
    117         -->
    118         <bean id="commonDefaultRequiredValue" class="org.ibisph.model.StringHolder">
    119                 <constructor-arg value=""/>
     113        <bean id="commonXMLEncodingScheme" class="org.ibisph.model.StringHolder">
     114                <description>
     115                        XML encoding scheme used when creating an XML files.  Both of these
     116                        should work: "UTF-8", "ISO-8859-1", however, UTF-8 had some problems
     117                        with some data.  ISO-8859-1 is an 8 bit subset of the 16 bit unicode
     118                        UTF-8 character set and is used for western english characters.
     119                </description>
     120                <constructor-arg value="ISO-8859-1"/>
     121        </bean>
     122        <bean id="commonWikiXMLOutputFormat" class="org.dom4j.io.OutputFormat">
     123                <description>
     124                        Output format used for publishing content that has wiki and CR formatting
     125                        that needs to be preseved.
     126                </description>
     127                <property name="encoding"      value="#{commonXMLEncodingScheme.string}"/>
     128                <property name="indentSize"    value="1"/>     <!-- count of indents -->
     129                <property name="indent"        value="&#09;"/> <!-- tab value: &#09; = horizontal tab or spaces etc -->
     130                <property name="newlines"      value="true"/>  <!-- if true puts next element on new line -->
     131                <property name="padText"       value="false"/> <!-- if true just adds extra blank line inbetween... -->
     132                <property name="trimText"      value="false"/>  <!-- must be false for embedded data CRs -->
    120133        </bean>
    121134
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/config/spring/dispatcher_servlet.xml

    r17155 r17645  
    8989                                <entry key="publish/data_sources"       value-ref="publishDataSourcesController"/>
    9090
     91
    9192                                <!-- D I M E N S I O N -->
    9293                                <entry key="edit/dimension/list/**"         value-ref="dimensionEditListController"/>
     
    143144                                <entry key="save/indicator/editors/**"            value-ref="indicatorSaveEditorsController"/>
    144145
    145                                 <entry key="preview/indicator/profile/**"            value-ref="indicatorPreviewProfileController"/>
    146                                 <entry key="preview/indicator/related/**"            value-ref="indicatorPreviewRelatedController"/>
    147                                 <entry key="preview/indicator/available_services/**" value-ref="indicatorPreviewAvailableServicesController"/>
    148                                 <entry key="preview/indicator/more_resources/**"     value-ref="indicatorPreviewMoreResourcesController"/>
    149 
    150                                 <entry key="indicator/*.xml" value-ref="indicatorXMLController"/>
     146                                <entry key="publish/indicators"                   value-ref="publishIndicatorAllApprovedController"/>
     147                                <entry key="publish/indicator/**"                 value-ref="publishIndicatorController"/>
     148
     149                                <entry key="preview/indicator/**"                 value-ref="indicatorPreviewController"/>
    151150
    152151
     
    187186                                <entry key="delete/indicator/view/list/**" value-ref="indicatorViewDeleteListController"/>
    188187-->
    189                                 <entry key="preview/indicator/view/numbers/**"       value-ref="indicatorViewPreviewNumbersController"/>
    190                                 <entry key="preview/indicator/view/**"               value-ref="indicatorViewPreviewChartController"/>
    191 
    192                                 <!-- This request is not made any longer as the indicator get XML
    193                                         handler is now coded to supply IPs and IPVs.  This made the
    194                                         XSLT preview URL much simplier e.g. don't need to do URL
    195                                         manipulation to add/remove the "/view/" to/from the path.
    196                                         This request is left in simply as an option...
    197                                 -->
    198                                 <entry key="indicator/view/*.xml"     value-ref="indicatorViewXMLController"/>
    199                                 <entry key="publish/indicators"       value-ref="publishIndicatorAllApprovedController"/>
    200                                 <entry key="publish/indicator/**"     value-ref="publishIndicatorController"/>
    201 
    202188
    203189                                <!-- I N D I C A T O R   S E T -->
     
    208194                                <entry key="save/indicator_set/detail/**"     value-ref="indicatorSetSaveDetailController"/>
    209195                                <entry key="save/indicator_set/indicators/**" value-ref="indicatorSetSaveIndicatorsController"/>
    210 
    211                                 <entry key="indicator_sets.xml"               value-ref="indicatorSetViewXMLController"/>
    212196                                <entry key="publish/indicator_sets/**"        value-ref="publishIndicatorSetsController"/>
    213197
     
    234218                                <entry key="save/org_unit/list/**"     value-ref="orgUnitSaveListController"/>
    235219                                <entry key="save/org_unit/detail/**"   value-ref="orgUnitSaveDetailController"/>
    236                                 <entry key="org_units.xml"             value-ref="orgUnitViewXMLController"/>
    237220                                <entry key="publish/org_units"         value-ref="publishOrgUnitsController"/>
    238221
     
    270253                                <entry key="save/value_type/detail/**" value-ref="valueTypeSaveDetailController"/>
    271254                                <entry key="publish/value_types"       value-ref="publishValueTypesController"/>
     255
     256
     257                                <!-- F I L E   C O N T E N T   S T R E A M E R -->
     258                                <entry key="/view/xml/**" value-ref="viewGetXMLFileController"/>
     259                                <entry key="/view/**"     value-ref="viewAccessDeniedController"/>
    272260
    273261
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/config/spring/indicator.xml

    r17155 r17645  
    2828        </bean>
    2929
    30 
    3130        <bean id="indicatorIndicatorViewModelName" class="org.ibisph.model.StringHolder">
    3231                <constructor-arg value="indicatorView"/>
     
    4241        </bean>
    4342
     43        <bean id="indicatorPreviewFilePath" class="org.ibisph.model.StringHolder">
     44                <description>
     45                        Base XML file path used by the preview related controllers to save
     46                        the associated IP and IPV XML files to.  The controller adds the 
     47                        actual filename and ext to this value for the final complete
     48                        filename. 
     49                </description>
     50                <constructor-arg value="xml/preview/indicator/profile"/>
     51        </bean>
     52        <bean id="indicatorPreviewBaseRequestURL" class="org.ibisph.model.StringHolder">
     53                <description>
     54                         View app's base Preview request url.  Value is sans the IP or IPV
     55                         name which the controller adds.
     56                </description>
     57                <constructor-arg value="http://localhost/ibisph-view/indicator/preview"/>
     58        </bean>
    4459
    4560
    4661        <!--  S E R V I C E S  -->
     62        <bean id="indicatorDatasetDataBeanToXMLService" class="org.ibisph.indicatorprofile.service.DatasetDataBeanToXML">
     63                <property name="dataBeanDAOService"         ref="commonDataBeanDAOService"/>
     64                <property name="dateFormat"                 ref="commonDateFormat"/>
     65                <property name="stringCleaner"              ref="commonMSWordStringCleaner"/>
     66        </bean>
    4767        <bean id="indicatorDataBeanToXMLService" class="org.ibisph.indicatorprofile.service.IndicatorDataBeanToXML">
    4868                <property name="dataBeanDAOService"          ref="commonDataBeanDAOService"/>
     
    376396
    377397
    378 
    379         <!--  P R E V I W   C O N T R O L L E R S  -->
    380         <bean id="indicatorPreviewProfileController" class="org.ibisph.web.springmvc.PreviewRedirectController">
    381                 <property name="previewURL"                    value="http://localhost/ibisph-view/view.html?xslt=html/indicator/profile/view/ViewPage.xslt&amp;xmlURL=http://localhost/ibisph-admin/indicator/########.xml"/>
    382                 <property name="previewURLNameSearchSignature" value="#{commonPreviewURLNameSignature.string}"/>
    383         </bean>
    384         <bean id="indicatorPreviewRelatedController" class="org.ibisph.indicatorprofile.springmvc.databean.PreviewRelatedIndicatorsRedirectController">
    385                 <property name="previewURL"                       value="http://localhost/ibisph-view/view.html?xslt=html/indicator/profile/related_indicators/RelatedIndicatorsPage.xslt&amp;xmlURL=http://localhost/ibisph-admin/indicator/########.xml&amp;RelationName=@@@@@@@@"/>
    386                 <property name="previewURLNameSearchSignature"    value="#{commonPreviewURLNameSignature.string}"/>
    387                 <property name="relationNameHTTPRequestParameterName" value="RelationName"/>
    388                 <property name="relationNameURLSearchSignature"   value="@@@@@@@@"/>
    389         </bean>
    390         <bean id="indicatorPreviewAvailableServicesController" class="org.ibisph.web.springmvc.PreviewRedirectController">
    391                 <property name="previewURL"                    value="http://localhost/ibisph-view/view.html?xslt=html/indicator/profile/available_services/AvailableServicesPage.xslt&amp;xmlURL=http://localhost/ibisph-admin/indicator/########.xml"/>
    392                 <property name="previewURLNameSearchSignature" value="#{commonPreviewURLNameSignature.string}"/>
    393         </bean>
    394         <bean id="indicatorPreviewMoreResourcesController" class="org.ibisph.web.springmvc.PreviewRedirectController">
    395                 <property name="previewURL"                    value="http://localhost/ibisph-view/view.html?xslt=html/indicator/profile/more_resources/MoreResourcesPage.xslt&amp;xmlURL=http://localhost/ibisph-admin/indicator/########.xml"/>
    396                 <property name="previewURLNameSearchSignature" value="#{commonPreviewURLNameSignature.string}"/>
    397         </bean>
    398 
    399 
    400         <!--  X M L   C O N T R O L L E R S  -->
    401         <!-- Note that this controller handles both "indicator/view/*.xml" and
    402                 "indicator/*.xml" requests. 
    403         -->
    404         <bean id="indicatorXMLController" class="org.ibisph.indicatorprofile.springmvc.databean.GetIndicatorXMLController">
     398        <!--  P R E V I W   C O N T R O L L E R  -->
     399        <bean id="indicatorPreviewController" class="org.ibisph.indicatorprofile.springmvc.databean.PreviewIndicatorController">
     400                <property name="dataBeanDAOService"                ref="commonDataBeanDAOService"/>
    405401                <property name="indicatorDataBeanToXMLService"     ref="indicatorDataBeanToXMLService"/>
    406402                <property name="indicatorViewDataBeanToXMLService" ref="indicatorViewDataBeanToXMLService"/>
     403                <property name="filePath"                          value="#{indicatorPreviewFilePath.string}"/>
     404                <property name="viewAppBasePreviewURL"             value="http://localhost/ibisph-view/indicator/preview"/>
     405                <property name="documentDAOService">
     406                        <bean class="org.ibisph.xml.service.FileStoredDocumentDAO">
     407                                <description>
     408                                        Main file service used to persist IP xml files.  This differs
     409                                        from the standard XML output simply in pretty printing and
     410                                        escaping.
     411                                </description>
     412                                <property name="basePath"     ref="commonBasePathURL"/>
     413                                <property name="outputFormat" ref="commonWikiXMLOutputFormat"/>
     414                                <property name="dateFormat"   ref="commonDateFormat"/>
     415                                <property name="escapeTextWhenSaving" value="true"/>
     416                        </bean>
     417                </property>
    407418        </bean>
    408419
    409420</beans>
    410 
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/config/spring/indicator_dataset.xml

    r16975 r17645  
    2020        <bean id="indicatorDatasetSelectedIndicatorDatasetNameSessionName" class="org.ibisph.model.StringHolder">
    2121                <constructor-arg value="selectedDatasetName"/>
    22         </bean>
    23 
    24 
    25         <!--  S E R V I C E S  -->
    26         <bean id="indicatorDatasetDataBeanToXMLService" class="org.ibisph.indicatorprofile.service.DatasetDataBeanToXML">
    27                 <property name="dataBeanDAOService"         ref="commonDataBeanDAOService"/>
    28                 <property name="dateFormat"                 ref="commonDateFormat"/>
    29                 <property name="stringCleaner"              ref="commonMSWordStringCleaner"/>
    3022        </bean>
    3123
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/config/spring/indicator_set.xml

    r16294 r17645  
    9595                <property name="modifiedDescriptionMessage" value="indicator set modified"/>
    9696        </bean>
    97        
    98 
    99         <bean id="indicatorSetViewXMLController" class="org.ibisph.databean.springmvc.GetCollectionXMLController">
    100                 <property name="dataBeanClassName" value="org.ibisph.indicatorprofile.databean.IndicatorSet"/>
    101                 <property name="containerXMLElementName" value="INDICATOR_SETS"/>
    102                 <property name="dataBeanDAOService"   ref="commonDataBeanDAOService"/>
    103                 <property name="dataBeanToXMLService" ref="commonDataBeanToXMLService"/>
    104         </bean>
    10597
    10698</beans>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/config/spring/indicator_view.xml

    r16461 r17645  
    217217        </bean>
    218218
    219 
    220         <!-- optional "indicator/view/*.xml" handler.  This is not really needed as
    221                 the indicator xml handles views as well.  Left in since it is coded and
    222                 works.
    223         -->
    224         <bean id="indicatorViewXMLController" class="org.ibisph.indicatorprofile.springmvc.databean.GetIndicatorViewXMLController">
    225                 <property name="indicatorViewDataBeanToXMLService" ref="indicatorViewDataBeanToXMLService"/>
    226         </bean>
    227 
    228 
    229         <bean id="indicatorViewPreviewChartController"   class="org.ibisph.web.springmvc.PreviewRedirectController">
    230                 <property name="previewURL"                    value="http://localhost/ibisph-view/view.html?xslt=html/indicator/profile/view/ViewPage.xslt&amp;xmlURL=http://localhost/ibisph-admin/indicator/########.xml"/>
    231                 <property name="previewURLNameSearchSignature" value="#{commonPreviewURLNameSignature.string}"/>
    232         </bean>
    233         <bean id="indicatorViewPreviewNumbersController" class="org.ibisph.web.springmvc.PreviewRedirectController">
    234                 <property name="previewURL"                    value="http://localhost/ibisph-view/view.html?xslt=html/indicator/profile/view_numbers/ViewNumbersPage.xslt&amp;xmlURL=http://localhost/ibisph-admin/indicator/########.xml"/>
    235                 <property name="previewURLNameSearchSignature" value="#{commonPreviewURLNameSignature.string}"/>
    236         </bean>
    237 
    238219</beans>
    239220
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/config/spring/org_unit.xml

    r16294 r17645  
    7171        </bean>
    7272
    73         <bean id="orgUnitViewXMLController" class="org.ibisph.databean.springmvc.GetCollectionXMLController">
    74                 <property name="dataBeanClassName" value="org.ibisph.indicatorprofile.databean.OrgUnit"/>
    75                 <property name="containerXMLElementName" value="ORG_UNITS"/>
    76                 <property name="dataBeanDAOService"   ref="commonDataBeanDAOService"/>
    77                 <property name="dataBeanToXMLService" ref="commonDataBeanToXMLService"/>
    78         </bean>
    79 
    8073</beans>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/config/spring/publish.xml

    r17155 r17645  
    4040
    4141        <!--  R E S O U R C E S  -->
    42         <!-- Used when app wired for publishing IPs directly to dir.  This bean
    43           provides published_indicators.xml file management.
    44         -->
    45         <bean id="publishXMLEncodingScheme" class="org.ibisph.model.StringHolder">
    46                 <description>
    47                         XML encoding scheme used when creating an XML file and Request character
    48                         encoding.  Both of these should work: "UTF-8", "ISO-8859-1", however, UTF-8
    49                         had some problems with some data.  ISO-8859-1 is an 8 bit subset of the 16
    50                         bit unicode UTF-8 character set and is used for western english characters.
    51                 </description>
    52                 <constructor-arg value="ISO-8859-1"/>
    53         </bean>
    54 
    55         <bean id="publishXMLBasePath" class="org.ibisph.model.StringHolder">
    56                 <description>
    57                         XML base file path used by most XML path type bean configurations. 
    58                         This provides a mechanism to easily locate files to a directory
    59                         outside of the webapp.  If the value is set relative to this app
    60                         e.g. "xml" then the view app will need to be configured to get the
    61                         IP XML from this app's "xml" dir.  The default is to use a relative
    62                         path to the assumed ibisph-view/xml directory.  This value is easily
    63                         overridden via the ss.props or ss.xml config mechanisms and can be
    64                         a complete file path or relative to this admin webapp's context.
    65                 </description>
    66                 <constructor-arg value="../ibisph-view/xml"/>
    67         </bean>
    68         <bean id="publishBaseXMLPathURL" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     42        <bean id="publishAncillaryValuesFilePathAndName" class="org.ibisph.model.StringHolder">
     43                <constructor-arg value="ancillary_values.xml"/>
     44        </bean>
     45        <bean id="publishChartsFilePathAndName" class="org.ibisph.model.StringHolder"> 
     46                <constructor-arg value="charts.xml"/>
     47        </bean>
     48        <bean id="publishDataSourcesFilePathAndName" class="org.ibisph.model.StringHolder">     
     49                <constructor-arg value="data_sources.xml"/>
     50        </bean>
     51        <bean id="publishDimensionsFilePathAndName" class="org.ibisph.model.StringHolder">     
     52                <constructor-arg value="dimensions.xml"/>
     53        </bean>
     54        <bean id="publishIndicatorSetsFilePathAndName" class="org.ibisph.model.StringHolder">   
     55                <constructor-arg value="indicator/indicator_sets.xml"/>
     56        </bean>
     57        <bean id="publishMapsFilePathAndName" class="org.ibisph.model.StringHolder">   
     58                <constructor-arg value="maps.xml"/>
     59        </bean>
     60        <bean id="publishMeasuresFilePathAndName" class="org.ibisph.model.StringHolder">       
     61                <constructor-arg value="measures.xml"/>
     62        </bean>
     63        <bean id="publishOrgUnitsFilePathAndName" class="org.ibisph.model.StringHolder">       
     64                <constructor-arg value="org_units.xml"/>
     65        </bean>
     66        <bean id="publishTopicsFilePathAndName" class="org.ibisph.model.StringHolder"> 
     67                <constructor-arg value="topics.xml"/>
     68        </bean>
     69        <bean id="publishValueAttributesFilePathAndName" class="org.ibisph.model.StringHolder">
     70                <constructor-arg value="value_attributes.xml"/>
     71        </bean>
     72        <bean id="publishValueTypesFilePathAndName" class="org.ibisph.model.StringHolder">     
     73                <constructor-arg value="value_types.xml"/>
     74        </bean>
     75
     76        <bean id="publishPublishedIndicatorsFilePathAndName" class="org.ibisph.model.StringHolder">
     77                <description>used by indicator indexes</description>
     78                <constructor-arg value="indicator/published_indicators.xml"/>
     79        </bean>
     80        <bean id="publishIndicatorProfileFilePath" class="org.ibisph.model.StringHolder">
     81                <constructor-arg value="xml/indicator/profile"/>
     82        </bean>
     83
     84        <bean id="publishIndicatorProfileXMLBasePathURL" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
    6985                <property name="targetObject" ref="commonContextAndPathService"/>
    7086                <property name="targetMethod" value="getPathURL"/>
    71                 <property name="arguments"><list><value>#{publishXMLBasePath.string}</value></list></property>
    72         </bean>
    73 
    74         <bean id="publishAncillaryValuesXMLFilePathAndName" class="org.ibisph.model.StringHolder">     
    75                 <constructor-arg value="ancillary_values.xml"/>
    76         </bean>
    77         <bean id="publishChartsXMLFilePathAndName" class="org.ibisph.model.StringHolder">       
    78                 <constructor-arg value="charts.xml"/>
    79         </bean>
    80         <bean id="publishDataSourcesXMLFilePathAndName" class="org.ibisph.model.StringHolder"> 
    81                 <constructor-arg value="data_sources.xml"/>
    82         </bean>
    83         <bean id="publishDimensionsXMLFilePathAndName" class="org.ibisph.model.StringHolder">   
    84                 <constructor-arg value="dimensions.xml"/>
    85         </bean>
    86         <bean id="publishIndicatorSetsXMLFilePathAndName" class="org.ibisph.model.StringHolder">       
    87                 <constructor-arg value="indicator/indicator_sets.xml"/>
    88         </bean>
    89         <bean id="publishMapsXMLFilePathAndName" class="org.ibisph.model.StringHolder">
    90                 <constructor-arg value="maps.xml"/>
    91         </bean>
    92         <bean id="publishMeasuresXMLFilePathAndName" class="org.ibisph.model.StringHolder">     
    93                 <constructor-arg value="measures.xml"/>
    94         </bean>
    95         <bean id="publishOrgUnitsXMLFilePathAndName" class="org.ibisph.model.StringHolder">     
    96                 <constructor-arg value="org_units.xml"/>
    97         </bean>
    98         <bean id="publishTopicsXMLFilePathAndName" class="org.ibisph.model.StringHolder">       
    99                 <constructor-arg value="topics.xml"/>
    100         </bean>
    101         <bean id="publishValueAttributesXMLFilePathAndName" class="org.ibisph.model.StringHolder">     
    102                 <constructor-arg value="value_attributes.xml"/>
    103         </bean>
    104         <bean id="publishValueTypesXMLFilePathAndName" class="org.ibisph.model.StringHolder">   
    105                 <constructor-arg value="value_types.xml"/>
    106         </bean>
    107 
    108         <bean id="publishPublishedIndicatorsXMLFilePathAndName" class="org.ibisph.model.StringHolder">
    109                 <description>used by indicator indexes</description>
    110                 <constructor-arg value="indicator/published_indicators.xml"/>
    111         </bean>
    112         <bean id="publishIndicatorProfileXMLPath" class="org.ibisph.model.StringHolder">
    113                 <constructor-arg value="indicator/profile"/>
    114         </bean>
    115 
    116 
    117         <bean id="publisBackupFileDateSerialNumberDateFormat" class="java.text.SimpleDateFormat">
    118                 <constructor-arg value="yyyy-MM-dd-HH-mm-ss-SS"/>
    119                 <constructor-arg type="java.util.Locale" ref="commonLocale"/>
     87                <property name="arguments"><list><value>#{commonContentBasePath.string}/#{publishIndicatorProfileFilePath}</value></list></property>
    12088        </bean>
    12189
     
    12492        <bean id="publishDocumentDAOService" class="org.ibisph.xml.service.FileStoredDocumentDAO">
    12593                <description>
    126                         Main file service used to persist xml files.
     94                        Main file service used to persist non wiki content xml files.
    12795
    12896                        XML Text Escaping.  This property controls if the system will escape
     
    137105                        within the text.
    138106                </description>
    139                 <property name="basePath" ref="publishBaseXMLPathURL"/>
     107                <property name="basePath">
     108                        <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     109                                <property name="targetObject" ref="commonContextAndPathService"/>
     110                                <property name="targetMethod" value="getPathURL"/>
     111                                <property name="arguments"><list><value>#{commonContentBasePath.string}/xml</value></list></property>
     112                        </bean>
     113                </property>
    140114                <property name="outputFormat">
    141                         <bean class="org.dom4j.io.OutputFormat">
     115                        <bean class="org.dom4j.io.OutputFormat" parent="commonWikiXMLOutputFormat">
    142116                                <description>
    143117                                        Output format used for publishing.  Defined here because several
     
    150124                                        western english characters.
    151125                                </description>
    152                                 <property name="encoding"      value="#{publishXMLEncodingScheme.string}"/>
    153                                 <property name="indentSize"    value="1"/>     <!-- count of indents -->
    154                                 <property name="indent"        value="&#09;"/> <!-- tab value: &#09; = horizontal tab or spaces etc -->
    155                                 <property name="newlines"      value="true"/>  <!-- if true puts next element on new line -->
    156                                 <property name="padText"       value="false"/> <!-- if true just adds extra blank line inbetween... -->
    157                                 <property name="trimText"      value="true"/>  <!-- cleans up dom4j extra line feeds and white space -->
     126                                <property name="trimText" value="true"/>  <!-- cleans up dom4j extra line feeds and white space -->
    158127                        </bean>
    159128                </property>
     
    163132
    164133        <bean id="publishPublishedIndicatorsXMLService" class="org.ibisph.indicatorprofile.service.PublishedIndicatorsXML">
    165                 <property name="publishedIndicatorsFilePathAndName" value="#{publishPublishedIndicatorsXMLFilePathAndName.string}"/>
    166                 <property name="indicatorProfileFilePath"           value="#{publishIndicatorProfileXMLPath.string}"/>
     134                <property name="publishedIndicatorsFilePathAndName" value="#{publishPublishedIndicatorsFilePathAndName.string}"/>
    167135                <property name="documentDAOService"                 ref="publishDocumentDAOService"/>
    168136        </bean>
     
    198166                class="org.ibisph.databean.springmvc.PublishCollectionToXMLFileController"
    199167        >
    200                 <property name="filePathAndName"         value="#{publishAncillaryValuesXMLFilePathAndName.string}"/>
     168                <property name="filePathAndName"         value="#{publishAncillaryValuesFilePathAndName.string}"/>
    201169                <property name="dataBeanClassName"       value="org.ibisph.indicatorprofile.databean.AncillaryValue"/>
    202170                <property name="containerXMLElementName" value="ANCILLARY_VALUES"/>
     
    207175                class="org.ibisph.databean.springmvc.PublishCollectionToXMLFileController"
    208176        >
    209                 <property name="filePathAndName"         value="#{publishDataSourcesXMLFilePathAndName.string}"/>
     177                <property name="filePathAndName"         value="#{publishDataSourcesFilePathAndName.string}"/>
    210178                <property name="dataBeanClassName"       value="org.ibisph.indicatorprofile.databean.DataSource"/>
    211179                <property name="containerXMLElementName" value="DATA_SOURCES"/>
     
    216184                class="org.ibisph.indicatorprofile.springmvc.databean.PublishDimensionsToXMLFileController"
    217185        >
    218                 <property name="filePathAndName"    value="#{publishDimensionsXMLFilePathAndName.string}"/>
     186                <property name="filePathAndName"    value="#{publishDimensionsFilePathAndName.string}"/>
    219187        </bean>
    220188
     
    223191                class="org.ibisph.databean.springmvc.PublishCollectionToXMLFileController"
    224192        >
    225                 <property name="filePathAndName"         value="#{publishChartsXMLFilePathAndName.string}"/>
     193                <property name="filePathAndName"         value="#{publishChartsFilePathAndName.string}"/>
    226194                <property name="dataBeanClassName"       value="org.ibisph.indicatorprofile.databean.Chart"/>
    227195                <property name="containerXMLElementName" value="CHARTS"/>
     
    232200                class="org.ibisph.databean.springmvc.PublishCollectionToXMLFileController"
    233201        >
    234                 <property name="filePathAndName"         value="#{publishMapsXMLFilePathAndName.string}"/>
     202                <property name="filePathAndName"         value="#{publishMapsFilePathAndName.string}"/>
    235203                <property name="dataBeanClassName"       value="org.ibisph.indicatorprofile.databean.Map"/>
    236204                <property name="containerXMLElementName" value="MAPS"/>
     
    241209                class="org.ibisph.databean.springmvc.PublishCollectionToXMLFileController"
    242210        >
    243                 <property name="filePathAndName"         value="#{publishMeasuresXMLFilePathAndName.string}"/>
     211                <property name="filePathAndName"         value="#{publishMeasuresFilePathAndName.string}"/>
    244212                <property name="dataBeanClassName"       value="org.ibisph.indicatorprofile.databean.Measure"/>
    245213                <property name="containerXMLElementName" value="MEASURES"/>
     
    250218                class="org.ibisph.databean.springmvc.PublishCollectionToXMLFileController"
    251219        >
    252                 <property name="filePathAndName"         value="#{publishOrgUnitsXMLFilePathAndName.string}"/>
     220                <property name="filePathAndName"         value="#{publishOrgUnitsFilePathAndName.string}"/>
    253221                <property name="dataBeanClassName"       value="org.ibisph.indicatorprofile.databean.OrgUnit"/>
    254222                <property name="containerXMLElementName" value="ORG_UNITS"/>
     
    259227                class="org.ibisph.databean.springmvc.PublishCollectionToXMLFileController"
    260228        >
    261                 <property name="filePathAndName"         value="#{publishValueAttributesXMLFilePathAndName.string}"/>
     229                <property name="filePathAndName"         value="#{publishValueAttributesFilePathAndName.string}"/>
    262230                <property name="dataBeanClassName"       value="org.ibisph.indicatorprofile.databean.ValueAttribute"/>
    263231                <property name="containerXMLElementName" value="VALUE_ATTRIBUTES"/>
     
    268236                class="org.ibisph.databean.springmvc.PublishCollectionToXMLFileController"
    269237        >
    270                 <property name="filePathAndName"         value="#{publishValueTypesXMLFilePathAndName.string}"/>
     238                <property name="filePathAndName"         value="#{publishValueTypesFilePathAndName.string}"/>
    271239                <property name="dataBeanClassName"       value="org.ibisph.indicatorprofile.databean.ValueType"/>
    272240                <property name="containerXMLElementName" value="VALUE_TYPES"/>
     
    277245                class="org.ibisph.databean.springmvc.PublishCollectionToXMLFileController"
    278246        >
    279                 <property name="filePathAndName"         value="#{publishTopicsXMLFilePathAndName.string}"/>
     247                <property name="filePathAndName"         value="#{publishTopicsFilePathAndName.string}"/>
    280248                <property name="dataBeanClassName"       value="org.ibisph.indicatorprofile.databean.Topic"/>
    281249                <property name="containerXMLElementName" value="TOPICS"/>
    282250        </bean>
    283251
    284 
    285252        <bean id="publishIndicatorSetsController"
    286253                parent="publishDataBeanCollectionToXMLFileProperties"
    287254                class="org.ibisph.databean.springmvc.PublishCollectionToXMLFileController"
    288255        >
    289                 <property name="filePathAndName"         value="#{publishIndicatorSetsXMLFilePathAndName.string}"/>
     256                <property name="filePathAndName"         value="#{publishIndicatorSetsFilePathAndName.string}"/>
    290257                <property name="dataBeanClassName"       value="org.ibisph.indicatorprofile.databean.IndicatorSet"/>
    291258                <property name="containerXMLElementName" value="INDICATOR_SETS"/>
     
    296263                <property name="childDataBeanCollectionFieldName" value="INDICATOR_TO_INDICATOR_SETS"/>
    297264        </bean>
     265
    298266
    299267        <bean id="publishIndicatorToXMLFileProperties" abstract="true">
     
    302270                <property name="indicatorViewDataBeanToXMLService" ref="indicatorViewDataBeanToXMLService"/>
    303271                <property name="publishedIndicatorsXMLService" ref="publishPublishedIndicatorsXMLService"/>
    304                 <property name="filePath"                      value="#{publishIndicatorProfileXMLPath.string}"/>
    305272                <property name="documentDAOService">
    306273                        <bean class="org.ibisph.xml.service.FileStoredDocumentDAO">
     
    310277                                        escaping.
    311278                                </description>
    312                                 <property name="basePath" ref="publishBaseXMLPathURL"/>
    313                                 <property name="outputFormat">
    314                                         <bean class="org.dom4j.io.OutputFormat">
    315                                                 <description>
    316                                                         Output format used for publishing IPs.  Main thing is can't
    317                                                         trim text for the embedded CR formatting.
    318                                                 </description>
    319                                                 <property name="encoding"      value="#{publishXMLEncodingScheme.string}"/>
    320                                                 <property name="indentSize"    value="1"/>     <!-- count of indents -->
    321                                                 <property name="indent"        value="&#09;"/> <!-- tab value: &#09; = horizontal tab or spaces etc -->
    322                                                 <property name="newlines"      value="true"/>  <!-- if true puts next element on new line -->
    323                                                 <property name="padText"       value="false"/> <!-- if true just adds extra blank line inbetween... -->
    324                                                 <property name="trimText"      value="false"/>  <!-- must be false for embedded data CRs -->
    325                                         </bean>
    326                                 </property>
    327                                 <property name="dateFormat" ref="commonDateFormat"/>
     279                                <property name="basePath"     ref="publishIndicatorProfileXMLBasePathURL"/>
     280                                <property name="outputFormat" ref="commonWikiXMLOutputFormat"/>
     281                                <property name="dateFormat"   ref="commonDateFormat"/>
    328282                                <property name="escapeTextWhenSaving" value="true"/>
    329283                        </bean>
    330284                </property>
    331285        </bean>
    332 
    333286        <bean id="publishIndicatorController"
    334287                class="org.ibisph.indicatorprofile.springmvc.databean.PublishIndicatorToXMLFileController"
    335288                parent="publishIndicatorToXMLFileProperties"
    336289        />
    337 
    338290        <bean id="publishIndicatorAllApprovedController"
    339291                class="org.ibisph.indicatorprofile.springmvc.databean.PublishAllApprovedIndicatorsToXMLFileController"
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/config/spring/security.xml

    r16458 r17645  
    7070                <constructor-arg>
    7171                        <list>
    72                                 <ref bean="securityPreAuthenticationHeaderStufferFilter"/>
     72<ref bean="securityPreAuthenticationHeaderStufferFilter"/>
    7373                                <ref bean="securitySecurityContextPersistenceFilter"/>
    7474                                <ref bean="securityLogoutFilter"/>
     
    8282                <constructor-arg>
    8383                        <list>
    84                                 <ref bean="securityPreAuthenticationHeaderStufferFilter"/>
     84<ref bean="securityPreAuthenticationHeaderStufferFilter"/>
    8585                                <ref bean="securitySecurityContextPersistenceFilter"/>
    8686                                <ref bean="securityLogoutFilter"/>
     
    9494                <constructor-arg>
    9595                        <list>
    96                                 <ref bean="securityPreAuthenticationHeaderStufferFilter"/>
     96<ref bean="securityPreAuthenticationHeaderStufferFilter"/>
    9797                                <ref bean="securitySecurityContextPersistenceFilter"/>
    9898                                <ref bean="securityLogoutFilter"/>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/available_services.jsp

    r16596 r17645  
    1111                <tag:navigationMenuItemButtons
    1212                        isAdmin="${userDetails.admin}" isReadOnly="${disabled}"
    13                         previewRequest="preview/indicator/available_services/${indicator.name}.html"
    1413                        saveRequest="edit/indicator/available_services/${indicator.name}.html"
    1514                />
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/detail.jsp

    r16599 r17645  
    6161                        isAdmin="${userDetails.admin}" isReadOnly="${disabled}"
    6262                        saveRequest="edit/indicator/detail/${indicator.name}.html"
    63                         previewRequest="preview/indicator/profile/${indicator.name}.html"
     63                        previewRequest="preview/indicator/${indicator.name}.html"
    6464                >
    6565                        <jsp:attribute name="publishRequest"><c:if test="${!indicator.statusOpen}">publish/indicator/${indicator.name}</c:if></jsp:attribute>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/more_resources.jsp

    r16596 r17645  
    99                <tag:navigationMenuItemButtons
    1010                        isAdmin="${userDetails.admin}" isReadOnly="${disabled}"
    11                         previewRequest="preview/indicator/more_resources/${indicator.name}.html"
    1211                        saveRequest="edit/indicator/more_resources/${indicator.name}.html"
    1312                />
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/related_indicators.jsp

    r16466 r17645  
    5252                                }
    5353                        }
    54                 } //~~~~~~~~~~~~~~~~~~~~~~~~~ End of Function ~~~~~~~~~~~~~~~~~~~~~~~~~
    55 
    56                 function showRelatedPreviewPage(previewRequestURL)
    57                 {
    58                         var selectedRelationName = document.form.selectedRelationName.value;
    59                         showPreviewPage(previewRequestURL + "?RelationName=" + selectedRelationName);
    6054                } //~~~~~~~~~~~~~~~~~~~~~~~~~ End of Function ~~~~~~~~~~~~~~~~~~~~~~~~~
    6155
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/detail.jsp

    r16975 r17645  
    5656                        saveRequest="edit/indicator/view/detail/${indicatorView.name}.html"
    5757                >
    58                         <jsp:attribute name="previewRequest"><c:if test="${not empty indicatorView.name}">preview/indicator/profile/view/${indicatorView.name}.html</c:if></jsp:attribute>
     58                        <jsp:attribute name="previewRequest"><c:if test="${not empty indicatorView.name}">preview/indicator/${indicatorView.name}.html</c:if></jsp:attribute>
    5959                </tag:navigationMenuItemButtons>
    6060        </jsp:attribute>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/system/info.jsp

    r14637 r17645  
    346346        Object[] params = new Object[1];
    347347        params[0] = new java.io.PrintWriter((java.io.Writer)out);
    348         Object o = c.newInstance();
     348        Object o = c.getDeclaredConstructor().newInstance();
    349349       m.invoke(o, params);
    350350}
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/web.xml

    r16235 r17645  
    433433                <url-pattern>/delete/*</url-pattern>
    434434                <url-pattern>/publish/*</url-pattern>
    435                 <url-pattern>/run/*</url-pattern>
    436                 <url-pattern>/view/system/info</url-pattern>
     435                <url-pattern>/preview/*</url-pattern>
     436                <url-pattern>/view/**</url-pattern>
    437437        </filter-mapping>
    438438
     
    469469                <url-pattern>/delete/*</url-pattern>
    470470                <url-pattern>/publish/*</url-pattern>
    471                 <url-pattern>/run/*</url-pattern>
    472471                <url-pattern>/preview/*</url-pattern>
    473                 <url-pattern>/indicator/*</url-pattern>
    474                 <url-pattern>/org_units.xml</url-pattern>
    475                 <url-pattern>/categorized_index.xml</url-pattern>
    476472                <url-pattern>/view/*</url-pattern>
    477473        </servlet-mapping>
  • trunk/ibisph-view/src/main/webapp/WEB-INF/config/SiteSpecific.properties

    r16027 r17645  
    2222# Linux   Example: http://hlcbsas/cgi-bin/hi_iq_func
    2323# Windows Example: http://localhost/cgi-bin/hi_iq_func.exe
    24 #queryBaseQueryApplicationRequestPath.string =http://localhost/cgi-bin/hi_iq_func.exe
    25 #queryBaseQueryApplicationRequestPath.string =https://kyibis.mc.uky.edu/ehl/query/proxy - chokes because cert is not verified!
    26 queryBaseQueryApplicationRequestPath.string=http://ibis.mt.gov/query/proxy
     24#queryIBISQRequestBasePath.string =http://localhost/cgi-bin/hi_iq_func.exe
     25#queryIBISQRequestBasePath.string =https://kyibis.mc.uky.edu/ehl/query/proxy - chokes because cert is not verified!
     26queryIBISQRequestBasePath.string=http://ibis.mt.gov/query/proxy
    2727
    2828
     
    4040#commonContentBasePath.string =http://localhost/ibisph-content
    4141commonContentBasePath.string =../../ibisph-content
     42
     43#--- Base admin app preview related XML file path.  Just like the content base
     44#        path above, this can be a relataive, explicit path or request URL.
     45#
     46#    IMPORTANT SECURITY NOTE: It is recommended to go through the admin app
     47#        (e.g. URL request based) for XML IP file requests so that the admin app can
     48#        handle file privs/security.  This is needed for those adopters that have
     49#        sensitive, non public IP files and is a good practice in general.
     50indicataorPreviewFilePath.string =http://localhost/ibisph-admin/view/xml/preview/indicator/profile
     51
    4252
    4353#--- Base server with app context request URL to be used by the app when creating
  • trunk/ibisph-view/src/main/webapp/WEB-INF/config/spring/SiteSpecific.xml

    r17255 r17645  
    131131                                <entry key="/indicator/view/numbers/*.html"  value-ref="indicatorViewNumbersController"/>
    132132
     133                                <entry key="/indicator/preview/*.html"       value-ref="indicatorPreviewController"/>
     134
    133135                                <!-- Q U E R Y  -->
    134136                                <entry key="/query/selection/**"             value-ref="querySelectionController"/>
     
    218220                                <!-- G E N E R I C   T R A S F O R M A T I O N -->
    219221                                <!--
    220                                         This controller is needed for admin IP preview and for adhoc
    221                                         system reports to work.  At one point it was thought to not
    222                                         enable this controller as it could be a potential security
    223                                         risk because it would bypass the spring security mechanism.
    224                                         However, this is NOT the case as the controller only can
    225                                         access xml files within its configuration limitation or via
    226                                         the xmlURL request parameter.  In either case if there were
    227                                         sensitive data in these files they should NEVER be placed in
    228                                         a non secured, public facing webapp/directory. 
     222                                        This controller is needed for adhoc system reports to work. 
     223                                        At one point it was thought to not enable this controller as
     224                                        it could be a potential security risk because it would bypass
     225                                        the spring security mechanism.  However, this is NOT the case
     226                                        as the controller only can access xml files within its
     227                                        configuration limitation or via the xmlURL request parameter. 
     228                                        In either case if there were sensitive data in these files
     229                                        they should NEVER be placed in a non secured, public facing
     230                                        webapp/directory. 
     231
     232                                        To be safe, it is probably still best to remove this request
     233                                        from production deployements.  It should only be enabled for
     234                                        local query module development and testing environment where
     235                                        the QM developer wants to test their XML files.
    229236                                -->
    230237                                <entry key="/view.html" value-ref="viewHTTPXMLXSLTRequestParameterController"/>
     
    290297
    291298        <!-- IBISQ REQUEST URL EXAMPLE OF NOT USING THE ABOVE property override file:
    292         <bean id="queryBaseQueryApplicationRequestPath" class="org.ibisph.model.StringHolder">
     299        <bean id="queryQueryApplicationRequestBasePath" class="org.ibisph.model.StringHolder">
    293300                <constructor-arg value="http://123.222.100.33:8080/cgi-bin/hi_iq_func.exe"/>
    294301        </bean>
  • trunk/ibisph-view/src/main/webapp/WEB-INF/config/spring/common.xml

    r17433 r17645  
    4444        <bean id="commonContextAndPathService" class="org.ibisph.web.ContextAndPathService"/>
    4545
    46         <bean id="commonBaseContentPathURL" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     46        <bean id="commonContentBasePathURL" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
    4747                <property name="targetObject" ref="commonContextAndPathService"/>
    4848                <property name="targetMethod" value="getPathURL"/>
     
    5050        </bean>
    5151
    52         <bean id="commonBaseXSLTPathURL" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     52        <bean id="commonXMLBasePathURL" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     53                <property name="targetObject" ref="commonContextAndPathService"/>
     54                <property name="targetMethod" value="getPathURL"/>
     55                <property name="arguments"><list><value>#{commonContentBasePath.string}/xml</value></list></property>
     56        </bean>
     57        <bean id="commonRestrictedXMLBasePathURL" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     58                <property name="targetObject" ref="commonContextAndPathService"/>
     59                <property name="targetMethod" value="getPathURL"/>
     60                <property name="arguments"><list><value>#{commonContentBasePath.string}/WEB-INF/xml</value></list></property>
     61        </bean>
     62        <bean id="commonXSLTBasePathURL" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
    5363                <property name="targetObject" ref="commonContextAndPathService"/>
    5464                <property name="targetMethod" value="getPathURL"/>
    5565                <property name="arguments"><list><value>xslt</value></list></property>
    56         </bean>
    57         <bean id="commonBaseXMLPathURL" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
    58                 <property name="targetObject" ref="commonContextAndPathService"/>
    59                 <property name="targetMethod" value="getPathURL"/>
    60                 <property name="arguments"><list><value>#{commonContentBasePath.string}/xml</value></list></property>
    61         </bean>
    62         <bean id="commonRestrictedBaseXMLPathURL" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
    63                 <property name="targetObject" ref="commonContextAndPathService"/>
    64                 <property name="targetMethod" value="getPathURL"/>
    65                 <property name="arguments"><list><value>#{commonContentBasePath.string}/WEB-INF/xml</value></list></property>
    6666        </bean>
    6767
     
    102102                        used in the transformation. 
    103103                </description>
    104                 <property name="basePath" ref="commonBaseXMLPathURL"/>
     104                <property name="basePath" ref="commonXMLBasePathURL"/>
    105105        </bean>
    106106        <bean id="commonVerifiedXMLFilePathModelService" class="org.ibisph.model.BasePathVerifiedFileURLGetModelService">
    107                 <property name="basePath" ref="commonBaseXMLPathURL"/>
     107                <property name="basePath" ref="commonXMLBasePathURL"/>
    108108        </bean>
    109109        <bean id="commonXSLTFilePathModelService" class="org.ibisph.model.BasePathVerifiedFileURLGetModelService">
    110                 <property name="basePath" ref="commonBaseXSLTPathURL"/>
     110                <property name="basePath" ref="commonXSLTBasePathURL"/>
    111111        </bean>
    112112
     
    123123                        XSLT access a file via the "document()" call.
    124124                </description>
    125                 <property name="basePath"     ref="commonBaseXMLPathURL"/>
     125                <property name="basePath"     ref="commonXMLBasePathURL"/>
    126126                <property name="escapeTextWhenSaving" value="true"/>
    127127                <property name="dateFormat"   ref="commonDateFormat"/>
     
    133133                        This is mainly used for the user profile XML files.
    134134                </description>
    135                 <property name="basePath"     ref="commonRestrictedBaseXMLPathURL"/>
     135                <property name="basePath"     ref="commonRestrictedXMLBasePathURL"/>
    136136                <property name="escapeTextWhenSaving" value="true"/>
    137137                <property name="dateFormat"   ref="commonDateFormat"/>
     
    363363                                                Injected into the main Page.xslt.
    364364                                        </description>
    365                                         <property name="modelMapKey"     value="BaseContentFilePath"/>
    366                                         <property name="model"           ref="commonBaseContentPathURL"/>
     365                                        <property name="modelMapKey"     value="ContentBaseFilePath"/>
     366                                        <property name="model"           ref="commonContentBasePathURL"/>
    367367                                </bean>
    368368
  • trunk/ibisph-view/src/main/webapp/WEB-INF/config/spring/indicator.xml

    r17123 r17645  
    2929                </description>
    3030                <constructor-arg value="indicator/profile"/>
     31        </bean>
     32        <bean id="indicataorPreviewFilePath" class="org.ibisph.model.StringHolder">
     33                <description>
     34                        Base admin app XML preview Path that an xml service uses to build/
     35                        locate the complete file path. 
     36                </description>
     37                <constructor-arg value="http://localhost/ibisph-admim/xml/preview/indicator/profile"/>
    3138        </bean>
    3239
     
    8087        </bean>
    8188
    82 
     89<!-- GARTH TODO: remove ???? -->
    8390<bean id="indicatorCategorizedIndexController" parent="commonModelMapListController">
    8491        <property name="modelMapList">
     
    143150
    144151
     152
     153        <bean id="indicatorPreviewController" parent="commonModelMapListController">
     154                <property name="modelMapList">
     155                        <list>
     156                                <bean class="org.ibisph.web.modelmap.ModelFromHTTPRequestPathLastSegment"
     157                                        parent="commonXMLServiceModelMapProperties"
     158                                >
     159                                        <property name="getModelService">
     160                                                <bean id="commonXMLFilePathModelService" class="org.ibisph.model.BasePathURLGetModelService">
     161                                                        <description>
     162                                                                Used for the admin app's preview request.  The admin app creates
     163                                                                the XML file then makes this request which is of the same form
     164                                                                as the normal IP view request.  This controller is the same as
     165                                                                the normal view controller othen than it uses a different XML
     166                                                                path.
     167                                                        </description>
     168                                                        <property name="basePath">
     169                                                                <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     170                                                                        <property name="targetObject" ref="commonContextAndPathService"/>
     171                                                                        <property name="targetMethod" value="getPathURL"/>
     172                                                                        <property name="arguments"><list><value>#{indicataorPreviewFilePath.string}</value></list></property>
     173                                                                </bean>
     174                                                        </property>
     175                                                </bean>
     176                                        </property>
     177                                </bean>
     178                                <ref bean="commonAncillaryValuesModelMap"/>
     179                                <ref bean="commonDataSourcesModelMap"/>
     180                                <ref bean="commonDimensionsModelMap"/>
     181                                <ref bean="commonMeasuresModelMap"/>
     182                                <ref bean="commonValueTypesModelMap"/>
     183                                <ref bean="commonValueAttributesModelMap"/>
     184                        </list>
     185                </property>
     186                <property name="view" ref="indicatorViewView"/>
     187        </bean>
     188
     189
     190
     191
    145192        <!--  V I E W S  -->
    146193        <bean id="indicatorAlphabeticalIndexView" parent="commonXSLTTransformationView">
  • trunk/ibisph-view/src/main/webapp/WEB-INF/config/spring/query.xml

    r17433 r17645  
    3333        </bean>
    3434
    35         <bean id="queryBaseQueryApplicationRequestPath" class="org.ibisph.model.StringHolder">
     35        <bean id="queryIBISQRequestBasePath" class="org.ibisph.model.StringHolder">
    3636                <constructor-arg value="http://localhost/cgi-bin/hi_iq_func.exe"/>
    3737        </bean>
     
    4545        <!-- S E R V I C E S -->
    4646        <bean id="queryModuleXMLService" class="org.ibisph.querymodule.service.QueryModuleXML">
    47                 <property name="baseXMLContentPathURL" ref="commonBaseContentPathURL"/>
    48                 <property name="filePath"              value="#{queryModuleFilePath.string}"/>
    49                 <property name="getModelService"       ref="queryModuleXMLModelService"/>
    50                 <property name="dateFormat"            ref="queryResult.DateTimestampFormat"/>
     47                <property name="filePath"           value="#{queryModuleFilePath.string}"/>
     48                <property name="getModelService"    ref="queryModuleXMLModelService"/>
     49                <property name="dateFormat"         ref="queryResult.DateTimestampFormat"/>
    5150        </bean>
    5251        <bean name="queryModuleRequestNameValuePairsService" class="org.ibisph.querymodule.service.QueryModuleRequestNameValuePairs">
     
    9998                <property name="queryModuleService" ref="queryModuleXMLService"/>
    10099                <property name="queryModuleRequestNameValuePairsService" ref="queryModuleRequestNameValuePairsService"/>
    101                 <property name="defaultIBISQHTTPRequestBaseURL" value="#{queryBaseQueryApplicationRequestPath.string}"/>
     100                <property name="defaultIBISQHTTPRequestBaseURL" value="#{queryIBISQRequestBasePath.string}"/>
    102101                <property name="defaultIBISQHTTPRequestType"    value="auto"/>
    103102        </bean>
  • trunk/ibisph-view/src/main/webapp/WEB-INF/config/spring/report.xml

    r15768 r17645  
    1313
    1414        <!--  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 -->
    15         <bean id="reportBaseXMLPath" class="org.ibisph.model.StringHolder">
     15        <bean id="reportXMLBasePath" class="org.ibisph.model.StringHolder">
    1616                <description>
    1717NOT USED - LEFT IN IN CASE AN ADOPTER WANTS TO HAVE THE HTML_CONTENT RESIDE
     
    3232                <property name="modelFilePathAndNameTemplate">
    3333                        <list>
    34                                 <value>#{reportBaseXMLPath}/[1]/page_selections.xml</value>
     34                                <value>#{reportXMLBasePath}/[1]/page_selections.xml</value>
    3535                        </list>
    3636                </property>
     
    4949                <property name="modelFilePathAndNameTemplate">
    5050                        <list>
    51                                 <value>#{reportBaseXMLPath}/[1]/html_content/[2].xml</value>
    52                                 <value>#{reportBaseXMLPath}/[1]/html_content/Introduction.xml</value>
     51                                <value>#{reportXMLBasePath}/[1]/html_content/[2].xml</value>
     52                                <value>#{reportXMLBasePath}/[1]/html_content/Introduction.xml</value>
    5353                        </list>
    5454                </property>
  • trunk/ibisph-view/src/main/webapp/WEB-INF/config/spring/view.xml

    r17038 r17645  
    6464                        <bean class="org.ibisph.model.BasePathVerifiedFileURLGetModelService">
    6565                                <property name="notFoundBehavior" value="ignore"/>
    66                                 <property name="basePath" ref="commonBaseXSLTPathURL"/>
     66                                <property name="basePath" ref="commonXSLTBasePathURL"/>
    6767                        </bean>
    6868                </property>
  • trunk/ibisph-view/src/main/webapp/css/_community.css

    r17416 r17645  
    1111.ComparisonClass.Worse
    1212{
    13         background-color:       red; /*#d62b2b;*/
     13        background-color:       #c43629; /*red, gauge red: fa123f;, darker gauge red: #c43629, blendy d62b2b */
    1414        background-image:       url("../image/icon/32/caution.png");
    1515}
    1616.ComparisonClass.Below
    1717{
    18         background-color:       yellow; /*#ecc479;*/
     18        background-color:       #f7f793; /* yellow dacf62 f7f793 */
    1919        background-image:       url("../image/icon/32/same.png");
    2020        color:                          black;
    2121}
     22.ComparisonClass.Similar
     23{
     24        background-color:       #f7f793; /* transparent, gauge yellow: #c8de0f, gauge brighter: #f8f933, bleandy yellow: f7f793, blend: #d8d8d8 */
     25        background-image:       url("../image/icon/32/same.png");
     26}
    2227.ComparisonClass.Above
    2328{
    24         background-color:       #a8d80f; /*#f7f793;*/
     29        background-color:       #ccec79; /* light green */
    2530        background-image:       url("../image/icon/32/same.png");
    2631        color:                          #333;
     
    2833.ComparisonClass.Better
    2934{
    30         background-color:       green; /*#3a7f3a;*/
     35        background-color:       #08a420; /* green, Gauge green: #08a420, blendy: #2fb72f;, another: #3a7f3a; */
    3136        background-image:       url("../image/icon/32/better.png");
    32 }
    33 .ComparisonClass.Similar
    34 {
    35         background-color:       yellow; /*#3a7f3a;*/
    36         background-image:       url("../image/icon/32/same.png");
    3737}
    3838
     
    237237
    238238
     239.Indicator
     240{
     241        background-color:       #e4e4e4;
     242}
     243.Indicator a
     244{
     245        font-size:                      1.1rem;
     246}
     247.Indicator div
     248{
     249        padding-left:           0.4em;
     250        font-style:                     italic;
     251        font-size:                      0.8rem;
     252        font-weight:            bold;
     253}
     254
     255
    239256@media print
    240257{
  • trunk/ibisph-view/src/main/webapp/css/_general.css

    r17021 r17645  
    5151h1
    5252{
    53         font-size:                      2.25rem;
    54         line-height:            2.25rem;
     53        font-size:                      1.75rem;
     54        line-height:            1.75rem;
     55        padding-bottom:         0.5rem;
    5556        color:                          #336699;
    5657}
     
    129130a   /*--- Must be in this order: A, link, visited, hover, active ---*/
    130131{
    131         padding:                        0.3em 0.4em 0.2em 0.4em;
    132 
     132        padding-left:           0.4em;
     133        padding-right:          0.4em;
    133134        text-decoration:        underline;
    134135        color:                          #006699;
     
    170171        min-width:                      110px;
    171172        height:                         30px;
     173        line-height:            32px;
    172174        margin-right:           6px;
    173175        padding-right:          4px;
     
    280282.TextAlignRight         {text-align:    right  !important;}
    281283
    282 .Bold                           {font: inherit; font-weight:    bold;}
    283 .Italicize                      {font: inherit; font-style:             italic; }
    284 .UnBold                         {font: inherit; font-weight:    normal;}
     284.Bold                           {font-weight:   bold;}
     285.Italicize                      {font-style:    italic; }
     286.UnBold                         {font-weight:   normal;}
    285287.Underline                      {text-decoration: underline;}
    286 .SmallerFont            {font: inherit; font-size:              80%;}     /*not really necessary, but one never knows...use it inline with a SPAN class*/
    287 .LargerFont                     {font: inherit; font-size:              120%;}     /*to emphasize words, use it inline with a span class*/
     288.SmallerFont            {font-size:             80%;}     /*not really necessary, but one never knows...use it inline with a SPAN class*/
     289.LargerFont                     {font-size:             120%;}     /*to emphasize words, use it inline with a span class*/
    288290
    289291.GrayBackground         {background-color: #e8e8e8 !important;}
     
    308310        margin-bottom:          0.5rem;
    309311}
     312.xxx h3 a
     313{
     314        padding:                        0.3em 0.4em 0.2em 0.4em;
     315        font-size:                      1.1em;
     316}
    310317
    311318
  • trunk/ibisph-view/src/main/webapp/js/L.GeoJSON.Interactive.js

    r17472 r17645  
    271271       
    272272/*     
     273GARTH TODO: ?????
    273274kendo datasource can use "view"
    274275
  • trunk/ibisph-view/src/main/webapp/xslt/_ibis-path.xslt

    r17416 r17645  
    114114
    115115
    116         <xsl:param name="BaseContentFilePath" select="'../../ibisph-content'"
     116        <xsl:param name="ContentBaseFilePath" select="'../../ibisph-content'"
    117117                ibis:doc="Injected via the common alt model map bean def.  This allows
    118118                        down stream XSLT to dynamically access the 2ndardy XML files as well
     
    128128                        prefix is added and returned."
    129129                />
    130                 <xsl:value-of select="concat($BaseContentFilePath, $contentFilePathSuffix)"/>
     130                <xsl:value-of select="concat($ContentBaseFilePath, $contentFilePathSuffix)"/>
    131131        </xsl:function>
    132132
  • trunk/ibisph-view/src/main/webapp/xslt/_ibis-title.xslt

    r17632 r17645  
    108108                <xsl:param name="indicator" ibis:doc="Indicator Profile to be used to get the title from."/>
    109109                <xsl:value-of select="
    110                         if(0 != string-length($indicator/CONCISE_TITLE))
     110                        if(0 != string-length(normalize-space($indicator/CONCISE_TITLE)))
    111111                        then $indicator/CONCISE_TITLE
    112112                        else $indicator/TITLE
  • trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/view/Page.xslt

    r17632 r17645  
    2828
    2929        <xsl:param name="Page.pageTitle" ibis:doc="Page's title text based on the 'INDICATOR/TITLE' element.">
    30                 Health Indicator Report - <xsl:value-of select="ibis:getIndicatorTitle($indicator)"/>
     30                Health Indicator Report - <xsl:value-of select="ibis:getCompleteIndicatorViewTitle($indicator, $indicatorView, $Indicator.dimensions)"/>
    3131        </xsl:param>
    3232        <xsl:param name="Page.sectionsTitle" ibis:doc="Page's content block title text based on the 'INDICATOR/TITLE' element.">
    33                 Health Indicator Report of <xsl:value-of select="ibis:getIndicatorTitle($indicator)"/>
     33                Health Indicator Report of <xsl:value-of select="ibis:getCompleteIndicatorViewTitle($indicator, $indicatorView, $Indicator.dimensions)"/>
    3434        </xsl:param>
    3535
  • trunk/ibisph-view/src/main/webapp/xslt/html/query/module/builder/Page.xslt

    r17502 r17645  
    3636        <!-- ~~~~~~~~~~~~~~~~~~~~~~~ PARAMS / VARIABLES ~~~~~~~~~~~~~~~~~~~~~~~~ -->
    3737        <xsl:param name="Page.pageTitle" ibis:doc="Page's title text which is based on the 'queryModule/TITLE' element.">
    38                 Query Builder - <xsl:value-of select="/QUERY_MODULE/TITLE"/> - <xsl:value-of select="$Page.configuration/TITLE"/>
     38                <xsl:value-of select="/QUERY_MODULE/TITLE"/> - <xsl:value-of select="$Page.configuration/TITLE"/> Query Builder
    3939        </xsl:param>
    4040        <xsl:param name="Page.sectionsTitle" ibis:doc="Page's content title text which is based on the '$selections.queryModule/TITLE' element.">
     41                Query Builder for <xsl:value-of select="/QUERY_MODULE/TITLE"/> - <xsl:value-of select="$Page.configuration/TITLE"/>
    4142<!--
    42                 Query Builder for <xsl:value-of select="/QUERY_MODULE/TITLE"/> - <xsl:value-of select="$Page.configuration/TITLE"/>
    4343                Query Builder for <xsl:value-of select="$Page.configuration/TITLE"/>
    4444                Query Builder for <xsl:value-of select="concat($Page.configuration/TITLE, '-', /QUERY_MODULE/TITLE)"/>
  • trunk/ibisph/src/main/java/org/ibisph/databean/DataBean.java

    r16500 r17645  
    157157  } //-------------------------- End of Method ------------------------------
    158158
    159 /*
    160   public boolean containsVectorField() {
    161     return(getVectorFieldKeys().length > 0);
    162   } //-------------------------- End of Method ------------------------------
    163  */
    164 
    165159
    166160  private int buildFieldArrays() {
     
    315309    getRecordKeys();
    316310    for(int i=0; i<recordKeys.length; i++)
    317 //      if(getStringFieldValue(recordKeys[i]) == null) return(false);
    318311      if( !StrLib.isSomething(getStringFieldValue( recordKeys[i]) )) return(false);
    319312    return(true);
     
    380373    DataBean clone = null;
    381374    try {
    382       clone = this.getClass().newInstance();
     375      clone = this.getClass().getDeclaredConstructor().newInstance();
    383376    }
    384377    catch(Exception e) {
     
    477470    public boolean isPersistent() { return(persist);   }
    478471    public Object  getValue    () { return(value);     }
    479 //    public int     getIntValue () { return( Integer.valueOf() );     }
    480   //  public double  getDoubleValue() { return(value);     }
    481 
    482472    public boolean isModified  () { return(modified);  }
    483473
  • trunk/ibisph/src/main/java/org/ibisph/databean/DataBeanToXMLService.java

    r16564 r17645  
    1919 * also clean up extended ASCII chars if the property is set to do so.
    2020 *
     21 * Used by the basic publish collection controllers and extended for IP, IPV,
     22 * Dataset, and Dimension services.
     23 *
    2124 *@author Garth Braithwaite, STG
    2225 */
     
    9295  public void setDataBeanDAOService(DataBeanDAOService dataBeanDAOService) {
    9396    this.dataBeanDAOService = dataBeanDAOService;
     97  } //-------------------------- End of Method ------------------------------
     98  public DataBeanDAOService getDataBeanDAOService() {
     99    return(this.dataBeanDAOService);
    94100  } //-------------------------- End of Method ------------------------------
    95101
     
    228234    Node document = XMLLib.newDocument(rootXMLElementName);
    229235    addDataBeanToNode(document, dataBean);
    230     return(document);
     236    return(document); 
    231237  } //------------------------------ End of Method ---------------------------
    232238
  • trunk/ibisph/src/main/java/org/ibisph/databean/dao/CollectionJDBCTemplateDAO.java

    r10858 r17645  
    8787    while(this.jdbcTemplate.next()) {
    8888      try {
    89         newDataBean = super.dataBean.getClass().newInstance();
     89        newDataBean = super.dataBean.getClass().getDeclaredConstructor().newInstance();
    9090      } catch(Exception e) {}
    9191      if(newDataBean != null) {
     
    112112      while(this.jdbcTemplate.next()) {
    113113        try {
    114           newDataBean = super.dataBean.getClass().newInstance();
     114          newDataBean = super.dataBean.getClass().getDeclaredConstructor().newInstance();
    115115        } catch(Exception e){}
    116116        if(newDataBean != null) {
  • trunk/ibisph/src/main/java/org/ibisph/databean/dao/DataBeanDAOService.java

    r14712 r17645  
    105105   */
    106106  public int load(Collection<DataBean> dataBeanCollection, String dataBeanClassName, String fieldKey, Object value) throws Exception {
    107     DataBean dataBean = (DataBean)Class.forName(dataBeanClassName).newInstance();
     107    DataBean dataBean = (DataBean)Class.forName(dataBeanClassName).getDeclaredConstructor().newInstance();
    108108    dataBean.setFieldValue(fieldKey, value);
    109109    return( load(dataBeanCollection, dataBean, null) );
  • trunk/ibisph/src/main/java/org/ibisph/databean/dao/JDBCTemplateDAO.java

    r16459 r17645  
    6161
    6262  public JDBCTemplateDAO(String dataBeanClassName, String tablename, JDBCTemplate jdbcTemplate) throws Exception {
    63     this((DataBean)Class.forName(dataBeanClassName).newInstance(), tablename, jdbcTemplate);
     63    this((DataBean)Class.forName(dataBeanClassName).getDeclaredConstructor().newInstance(), tablename, jdbcTemplate);
    6464  } //----------------------- End of Constructor --------------------------
    6565  public JDBCTemplateDAO(DataBean dataBean, String tablename, JDBCTemplate jdbcTemplate) {
  • trunk/ibisph/src/main/java/org/ibisph/databean/springmvc/EditDetailController.java

    r16500 r17645  
    6262
    6363    // create a blank databean to be loaded and put into the model.
    64     DataBean dataBean = (DataBean)Class.forName(this.dataBeanClassName).newInstance();
     64    DataBean dataBean = (DataBean)Class.forName(this.dataBeanClassName).getDeclaredConstructor().newInstance();
    6565
    6666    // Get the requested name from the end of the request path.  Note that in
  • trunk/ibisph/src/main/java/org/ibisph/databean/springmvc/GetCollectionXMLController.java

    r17155 r17645  
    115115  protected Node getDocument() throws Exception {
    116116    Collection<DataBean> dataBeanCollection = new ArrayList<DataBean>();
    117     DataBean dataBean = (DataBean)Class.forName(this.dataBeanClassName).newInstance();
     117    DataBean dataBean = (DataBean)Class.forName(this.dataBeanClassName).getDeclaredConstructor().newInstance();
    118118    if(dataBean.containsField("ACTIVE_FLAG") && (null != this.dataBeanFlagValue)) {
    119119      dataBean.setFieldValue("ACTIVE_FLAG", this.dataBeanFlagValue);
     
    125125        String parentPrimaryKey = db.getStringFieldValue(this.primrayKeyFieldName);
    126126
    127         DataBean childDataBean = (DataBean)Class.forName(this.childDataBeanClassName).newInstance();
     127        DataBean childDataBean = (DataBean)Class.forName(this.childDataBeanClassName).getDeclaredConstructor().newInstance();
    128128        if(childDataBean.containsField("ACTIVE_FLAG") && (null != this.dataBeanFlagValue)) {
    129129          childDataBean.setFieldValue("ACTIVE_FLAG", this.dataBeanFlagValue);
  • trunk/ibisph/src/main/java/org/ibisph/databean/springmvc/SaveController.java

    r16500 r17645  
    145145
    146146    // If bean has a modified description then insert the message.
    147     DataBean dataBean = (DataBean)Class.forName(this.dataBeanClassName).newInstance();
     147    DataBean dataBean = (DataBean)Class.forName(this.dataBeanClassName).getDeclaredConstructor().newInstance();
    148148    if(StrLib.isSomething(this.modifiedDescriptionFieldName) && dataBean.containsField(this.modifiedDescriptionFieldName)) {
    149149      UserDetails userDetails = (UserDetails)request.getSession().getAttribute(this.userDetailsSessionName);
  • trunk/ibisph/src/main/java/org/ibisph/databean/springmvc/SaveDetailListController.java

    r15559 r17645  
    5858  ) throws Exception {
    5959
    60     DataBean dataBean = (DataBean)Class.forName(this.dataBeanClassName).newInstance();
     60    DataBean dataBean = (DataBean)Class.forName(this.dataBeanClassName).getDeclaredConstructor().newInstance();
    6161    int i = 0;
    6262    i = this.requestParametersToDataBeanService.delete(request, this.deletionParameterNameToDataBeanFieldNameMap, dataBean, this.deleteBasedOnRecordKeyFields);
  • trunk/ibisph/src/main/java/org/ibisph/indicatorprofile/springmvc/databean/EditIndicatorChildController.java

    r16458 r17645  
    8282    String indicatorName = null;
    8383    String requestedChildName = IOPath.getFilenameWithoutExtension(request.getRequestURI());
    84     DataBean childDataBean = (DataBean)Class.forName(this.childDataBeanClassName).newInstance();
     84    DataBean childDataBean = (DataBean)Class.forName(this.childDataBeanClassName).getDeclaredConstructor().newInstance();
    8585
    8686    // if NEW bean then add blank bean to model and load the IP based on the
  • trunk/ibisph/src/main/java/org/ibisph/indicatorprofile/springmvc/databean/GetIndicatorXMLController.java

    r6282 r17645  
    1616  protected IndicatorViewDataBeanToXML indicatorViewDataBeanToXMLService = null;
    1717
    18  
     18
    1919  /**
    2020   * Sets the indicator DataBeanToXML service that is used to convert the
  • trunk/ibisph/src/main/java/org/ibisph/indicatorprofile/springmvc/databean/PublishIndicatorToXMLFileController.java

    r16596 r17645  
    1414import org.ibisph.databean.dao.DataBeanDAOService;
    1515import org.ibisph.indicatorprofile.databean.Indicator;
    16 import org.ibisph.indicatorprofile.service.IndicatorDataBeanToXML;
    17 import org.ibisph.indicatorprofile.service.IndicatorViewDataBeanToXML;
    1816import org.ibisph.indicatorprofile.service.PublishedIndicatorsXML;
    1917import org.ibisph.util.IOPath;
     
    3129  protected static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(PublishIndicatorToXMLFileController.class);
    3230
    33   protected DataBeanDAOService         dataBeanDAOService                = null;
    34   protected IndicatorDataBeanToXML     indicatorDataBeanToXMLService     = null;
    35   protected IndicatorViewDataBeanToXML indicatorViewDataBeanToXMLService = null;
    36   protected PublishedIndicatorsXML     publishedIndicatorsXMLService     = null;
    37   protected DocumentDAO                documentDAOService                = null;
     31  protected DataBeanDAOService     dataBeanDAOService            = null;
     32  protected PublishedIndicatorsXML publishedIndicatorsXMLService = null;
     33  protected DocumentDAO            documentDAOService            = null;
    3834
    3935  protected String filePath      = "";
     
    4642  public void setDataBeanDAOService(DataBeanDAOService dataBeanDAOService) {
    4743    this.dataBeanDAOService = dataBeanDAOService;
    48   } //-------------------------- End of Method ------------------------------
    49 
    50   /**
    51    * Sets the indicator view DataBeanToXML service that is used to convert a
    52    * IPV DataBean to an XML document.
    53    * @param indicatorViewDataBeanToXMLService service used to do the conversion.
    54    */
    55   public void setIndicatorViewDataBeanToXMLService(IndicatorViewDataBeanToXML indicatorViewDataBeanToXMLService) {
    56     this.indicatorViewDataBeanToXMLService = indicatorViewDataBeanToXMLService;
    57   } //-------------------------- End of Method ------------------------------
    58  
    59   /**
    60    * Sets the indicator DataBeanToXML service that is used to convert the
    61    * IP DataBean to an XML document.
    62    * @param indicatorDataBeanToXMLService service used to do the conversion.
    63    */
    64   public void setIndicatorDataBeanToXMLService(IndicatorDataBeanToXML indicatorDataBeanToXMLService) {
    65     this.indicatorDataBeanToXMLService = indicatorDataBeanToXMLService;
    6644  } //-------------------------- End of Method ------------------------------
    6745
     
    8361    this.documentDAOService = documentDAOService;
    8462  } //-------------------------- End of Method ------------------------------
     63
    8564
    8665  /**
  • trunk/ibisph/src/main/java/org/ibisph/querydefinition/service/QueryDefinitionXMLToQueryModuleXML.java

    r9122 r17645  
    322322   *   child element (which are loaded into the document).
    323323   */
    324   @SuppressWarnings("unchecked")
    325324  protected void setHiddenInputParameters(Node queryDefinition, Node queryModule) {
    326325
  • trunk/ibisph/src/main/java/org/ibisph/querydefinition/service/QueryModuleXMLToQueryDefinitionXML.java

    r15116 r17645  
    134134   *          are loaded into the document).
    135135   */
    136   @SuppressWarnings("unchecked")
    137136  public void setContainer(
    138137    Node sourceDocument,
  • trunk/ibisph/src/main/java/org/ibisph/querymodule/modelmap/AddIBISQResultToQueryModule.java

    r17255 r17645  
    270270
    271271  /**
    272    * Sets the request's actual groupby dim names.  This code reads the selected
     272   * Sets the request's actual groupby dim name(s).  This code reads the selected
    273273   * group bys (resolves any proxy via selected dimensions) and creates the
    274274   * actual group by values (passed to the query app via name/value pairs).
    275275   * @param queryModule query module XML document to be manipulated.
     276
     277   *
     278   *
     279   *
     280   *
     281   *<DIMENSION_USAGES>
     282    <DIMENSION_USAGE>
     283      <USAGE>category</USAGE>
     284      <NAME>GeoCnty</NAME>
     285      <VALUES>
     286        <VALUE>1</VALUE>
     287        <VALUE>3</VALUE>
     288        <VALUE>5</VALUE>
     289   *
     290   * request/chart name, map name
     291   *
     292   * ACTUAL_GROUP_BY
     293   *  can get the values simply by doing unique dims on the IBISQ result.
     294   * *** BUT CAN NOT get the usage
     295   *
     296   *
     297   *
     298   *
     299   * *********** CAN"T COUNT ON HAVING THE IBISQ RESULT !!!!!!!!!!!!!!!!
     300   *
     301   *
     302   *
     303   *
    276304   */
    277305  public void setActualGroupBys(Node queryModule) throws Exception {
     
    280308    XMLLib.replaceNode(requestContainer, "ACTUAL_GROUP_BY", actualGroupByContainer);
    281309
    282     // loop for all selected group bys.  If not proxy then add.  Else lookup
    283     // the selected dimension and use that.  If not found then throw...
     310    // loop for all REQUEST SELECTED group bys to set the ACTUAL .  If not proxy then add.  Else
     311    // lookup the selected dimension and use that.  If not found then throw...
    284312    String groupByName;
    285313    List<Node> selectedGroupBys = XMLLib.getNodes(requestContainer, "SELECTED_GROUP_BY/*");
    286314    for(Node selectedGroupBy: selectedGroupBys) {
    287       groupByName = XMLLib.getText(selectedGroupBy);
     315      groupByName = XMLLib.getText(selectedGroupBy);    // GeoProxy, YearProxy, Sex, survey question etc.
    288316
    289317      List<Node> proxiedDimensions = this.queryModuleService.getProxiedDimensions(queryModule, groupByName);
    290318      if(0 < proxiedDimensions.size()) {
    291319        groupByName = XMLLib.getText(queryModule, "/QUERY_MODULE/CRITERIA//SELECTED_DIMENSION[NAME = '" + groupByName + "']/VALUES/VALUE");
     320
     321        // if no matching SELECTED_DIMENSION then likely a single dim like
     322        // "YearAll" but using the main "Year" proxy for grouping selection.
     323        // loop all proxied dims (which are based on the selected group by)
     324        // and first selected dimension that matches is used.
     325        if(!StrLib.isSomething(groupByName)) {
     326          for(Node proxiedDimension: proxiedDimensions) {
     327            groupByName = XMLLib.getText(proxiedDimension, "NAME");    // GeoProxy, YearProxy
     328            groupByName = XMLLib.getText(queryModule, "/QUERY_MODULE/CRITERIA//SELECTED_DIMENSION[NAME = '" + groupByName + "']/NAME");
     329            if(StrLib.isSomething(groupByName)) break;
     330          }
     331        }
    292332      }
    293333
  • trunk/ibisph/src/main/java/org/ibisph/querymodule/service/QueryModuleXML.java

    r17017 r17645  
    3838
    3939  // Query Module QUERY_MODULE//PARAMETER[NAME] parameter names.
     40  // Note the contentBasePath parameter is not currently used as of 12/20108
     41  // and points to the root of the content area.  Left this code in just in
     42  // case need to reference include files from the core content path.  If used
     43  // it might make sense to be the commonXMLBasePath but this leaves it open
     44  // for any/all files...
    4045  protected String transformationConfigurationNameParameterName = "ConfigurationName";
    41   protected String baseXMLContentPathURLParameterName           = "BaseXMLContentPath";
    42 
    43   protected Object baseXMLContentPathURL = null;
     46  protected String contentBasePathURLParameterName = "ContentBasePath";
     47  protected Object contentBasePathURL = null;
     48
    4449
    4550  //------------------------------------------- P R O P E R T Y   S E T T E R S
     
    7277  public void setTransformationConfigurationNameParameterName(String transformationConfigurationNameParameterName) {this.transformationConfigurationNameParameterName = transformationConfigurationNameParameterName;}
    7378
    74   public void setBaseXMLContentPathURLParameterName(String baseXMLContentPathURLParameterName) {this.baseXMLContentPathURLParameterName = baseXMLContentPathURLParameterName;}
    75   public void setBaseXMLContentPathURL(Object baseXMLContentPathURL) {this.baseXMLContentPathURL = baseXMLContentPathURL;}
     79  public void setContentBasePathURLParameterName(String contentBasePathURLParameterName) {this.contentBasePathURLParameterName = contentBasePathURLParameterName;}
     80  public void setContentBasePathURL(Object contentBasePathURL) {this.contentBasePathURL = contentBasePathURL;}
    7681
    7782
     
    103108      HashMap<String, Object> parameterMap = new HashMap<String, Object>();
    104109      parameterMap.put(this.transformationConfigurationNameParameterName, configurationName);
    105       parameterMap.put(this.baseXMLContentPathURLParameterName, this.baseXMLContentPathURL);
     110      parameterMap.put(this.contentBasePathURLParameterName, this.contentBasePathURL);
    106111      queryModule = ((IncludeProcessingGetModel)this.getModelService).get(filePathAndName, parameterMap);
    107112    }
  • trunk/ibisph/src/main/java/org/ibisph/xml/service/FileStoredDocumentDAO.java

    r17155 r17645  
    227227    OutputFormat outputFormat
    228228  ) throws IOException {
    229     FileLib.createDir(file.getParent());
     229    FileLib.createDir(file.getParentFile());
     230//logger.error(" - Created dir: " + file.getParentFile().getAbsolutePath() + ", saving file to path: " + file.getAbsolutePath());
    230231    return( save(document, new FileOutputStream(file), outputFormat) );
    231232  } //-------------------------- End of Method ------------------------------
  • trunk/ibisph/src/main/java/org/ibisph/xslt/LoggingTransformationErrorListener.java

    r8493 r17645  
    5252      systemID,
    5353      publicID,
    54       new Integer(lineNumber),
    55       new Integer(columnNumber)
     54      Integer.valueOf(lineNumber),
     55      Integer.valueOf(columnNumber)
    5656    };
    5757    String template = " - XSLT {}: {}, SystemID: {}, PublicID: {}, Line: {}, Position: {}";
  • trunk/ibisph/src/main/java/org/ibisph/xslt/TransformerFactory.java

    r4116 r17645  
    77import javax.xml.transform.TransformerConfigurationException;
    88import javax.xml.transform.stream.StreamSource;
     9
    910
    1011/**
     
    8081// transformerFactory = javax.xml.transform.TransformerFactory.newInstance(transformerFactoryClassName, TransformerFactory.class.getClassLoader());
    8182    try {
    82       transformerFactory = (javax.xml.transform.TransformerFactory)Class.forName(transformerFactoryClassName).newInstance();
     83      transformerFactory = (javax.xml.transform.TransformerFactory) (Class.forName(transformerFactoryClassName).getDeclaredConstructor().newInstance());
    8384    }
    8485    catch(java.lang.ClassNotFoundException ex) {
     
    9091    catch(java.lang.IllegalAccessException ex) {
    9192      logger.error(".setTransformerFactoryClassName - Illegal Access, class: {} ", transformerFactoryClassName, ex);
     93    }
     94    catch(Exception ex) {
     95      logger.error(".setTransformerFactoryClassName - General Exception, class: {} ", transformerFactoryClassName, ex);
    9296    }
    9397  } //-------------------------- End of Method ------------------------------
Note: See TracChangeset for help on using the changeset viewer.