Changeset 3743 in main


Ignore:
Timestamp:
04/25/12 22:17:41 (10 years ago)
Author:
Garth Braithwaite
Message:

java & webapps - temp commit - working with indicator data from blobs. app runs but not all IP model maps are exposed for the xslts.

Location:
trunk/src/main
Files:
3 added
1 deleted
49 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/main/db/mysql/filestore_tab_c.sql

    r3727 r3743  
    88create table FILE_STORE(
    99  NAME                            varchar (1000)  not null,
    10   CONTENT                         blob,
     10  CONTENT                         longblob,
    1111  MODIFIED_DTS                    datetime,
    1212  ACCESSED_DTS                    datetime,
  • trunk/src/main/java/org/ibisph/databean/DataBeanToXMLService.java

    r3536 r3743  
    1919
    2020  protected boolean convertExtendedASCIIChars  = true;
    21   protected java.text.DateFormat xmlDateFormat = new java.text.SimpleDateFormat();
     21  protected java.text.DateFormat dateFormat = new java.text.SimpleDateFormat();
    2222
    2323
     
    4848   * Optional Java date format property used to convert a bean's date to a
    4949   * string when creating the XML element.
    50    * @param xmlDateFormat Java date format used to convert a bean's date to a
     50   * @param dateFormat Java date format used to convert a bean's date to a
    5151   *   string when creating the XML (Default is a SimpleDateFormat).
    5252   * @see java.text.DateFormat
    5353   */
    54   public void setXMLDateFormat(java.text.DateFormat xmlDateFormat) {
    55     this.xmlDateFormat = xmlDateFormat;
     54  public void setDateFormat(java.text.DateFormat dateFormat) {
     55    this.dateFormat = dateFormat;
    5656  } //-------------------------- End of Method ------------------------------
    5757
     
    8787          Date date = dataBean.getDateFieldValue(fieldKey[i]);
    8888          temp = "";
    89           if(date != null) temp = this.xmlDateFormat.format(date);
     89          if(date != null) temp = this.dateFormat.format(date);
    9090          containerElement.add( XMLLib.newElement(fieldKey[i], temp) );
    9191          break;
     
    9696          break;
    9797        case DataBean.Field.TYPE_COLLECTION:
    98           // create a container element and loop through all the elements and add.
     98          // TODO: create a container element and loop through all the elements and add.
    9999          break;
    100100        default:
  • trunk/src/main/java/org/ibisph/indicatorprofile/service/PublishedIndicatorsXML.java

    r3734 r3743  
    11package org.ibisph.indicatorprofile.service;
    22
    3 import java.io.File;
    4 import java.io.FilenameFilter;
     3import java.util.List;
    54
    65import org.dom4j.Document;
     
    236235    StringBuffer actionsReturnMessage = new StringBuffer();
    237236
     237    // get a list of all files for the path.  If files exist then either backup
     238    // or delete the existing published indicators. 
    238239    String directoryPath = this.xmlPath;
    239240    if(!StrLib.isSomething(directoryPath)) directoryPath = IOPath.getPath(this.publishedIndicatorsPathAndFilename);
    240 
    241     File publishedIndicatorsPathAndFile = new File(this.publishedIndicatorsPathAndFilename);
    242     File directory = new File(directoryPath);
    243     String[] xmlFiles = directory.list( new XMLFileNameFilter() );
    244     if(xmlFiles != null) {
     241    List<String> pathAndFilenames = this.xmlDocumentService.getDirectoryPathAndFilenames(directoryPath);
     242    if(pathAndFilenames.size() > 0) {
    245243      // backup published IP xml else if file exists, then delete it...
    246244      org.ibisph.filebackup.FileBackup fileBackup = null;
    247       if(this.fileBackupFactory != null)
     245      if(null != this.fileBackupFactory)
    248246        fileBackup = this.fileBackupFactory.newFileBackup(publishedIndicatorsPathAndFilename);
    249       else if(publishedIndicatorsPathAndFile.exists())
    250         publishedIndicatorsPathAndFile.delete();
     247      else
     248        this.xmlDocumentService.delete(this.publishedIndicatorsPathAndFilename);
     249
     250      // Now loop through all the IP's and put into the published IP XML.
    251251      Document publishedProfilesDocument = getPublishedIndicators();
    252252      Document indicatorProfileDocument;
    253 
    254253      try {
    255         for(int i=0; i < xmlFiles.length; i++) {
    256           indicatorProfileDocument = xmlDocumentService.get( IOPath.concat(directoryPath, xmlFiles[i]));
    257           if(indicatorProfileDocument.getRootElement().getName().equals("INDICATOR")) {
     254        for(String pathAndFilename: pathAndFilenames) {
     255          indicatorProfileDocument = xmlDocumentService.get(pathAndFilename);
     256          if((null != indicatorProfileDocument) && indicatorProfileDocument.getRootElement().getName().equals("INDICATOR")) {
    258257            actionsReturnMessage.append(
    259258              updatePublishedIndicators(publishedProfilesDocument, indicatorProfileDocument)
     
    261260          }
    262261        }
    263         this.savePublishedIndicatorsXMLFile(publishedProfilesDocument);
     262        this.xmlDocumentService.save(publishedProfilesDocument, this.publishedIndicatorsPathAndFilename);
    264263      }
    265264      catch(Exception ex) {
    266265        actionsReturnMessage.append("Problem saving the published indicator profiles file.  ");
    267266        if(fileBackup != null) {
    268           publishedIndicatorsPathAndFile.delete();
    269267          fileBackup.restore();
    270268        }
     
    284282  } //-------------------------- End of Method ------------------------------
    285283
    286 
    287   // needs to be moved into the utils...
    288   class XMLFileNameFilter implements FilenameFilter {
    289     public boolean accept(File dir, String name) {
    290       if(new File(dir, name).isDirectory() ) return false;
    291       name = name.toLowerCase();
    292       return( name.endsWith(".xml") );
    293     }
    294   } //------------------------End of Internal Class--------------------------
    295 
    296284} //============================ END OF CLASS =================================
    297285
  • trunk/src/main/java/org/ibisph/indicatorprofile/springmvc/XMLChartGraphicController.java

    r3652 r3743  
    11package org.ibisph.indicatorprofile.springmvc;
     2
     3import java.util.Map;
     4
     5import javax.servlet.http.HttpServletRequest;
     6
     7import org.dom4j.Document;
    28
    39import org.ibisph.chart.ChartData;
     
    2127public class XMLChartGraphicController extends org.ibisph.web.springmvc.ModelMapAndViewController {
    2228
     29  protected String xmlPath        = null;
     30  protected org.ibisph.xml.service.Document xmlDocumentService = null;
     31
    2332  protected ChartDataService chartDataService = new ChartDataFromIndicatorViewXML();
    24   protected String xmlPath        = null;
    2533  protected String viewNamePrefix = null;
    2634  protected String viewNameSuffix = null;
     
    6169  public void setXMLPath(String xmlPath) {this.xmlPath  = xmlPath;}
    6270
     71  /**
     72   * Sets the DAO type service that can be used to retrieve the XML content with. 
     73   * @param xmlDocumentService Document DAO type service used to retrieve the
     74   *   XML.  If not set then the controller will use the system id.
     75   */
     76  public void setXMLDocumentService(org.ibisph.xml.service.Document xmlDocumentService) {
     77    this.xmlDocumentService = xmlDocumentService;
     78  } //-------------------------- End of Method ------------------------------
     79
    6380  /**
    6481   * Sets the indicator profile ChartData XML model service.
     
    98115  //      servlet   / controller / path 1     / indicator view name . image type [?GraphicType|type, name, printerfriendly]
    99116  // url: indicator / chart      / chart name / InfMort.Ut_US.svg 
    100   protected java.util.Map<String, Object> getModelMap(javax.servlet.http.HttpServletRequest request) throws Exception {
     117  protected Map<String, Object> getModelMap(HttpServletRequest request) throws Exception {
    101118    String   urlPath               = request.getPathInfo();
    102119    String   xmlFilenameWithHeight = IOPath.getFilenameWithoutExtension(urlPath);
     
    117134
    118135    // load the chart data via the service
    119     ChartData chartData = (ChartData)this.chartDataService.getChartData(xmlSystemID);
     136// can handle system id, file, document, xml string...
     137    ChartData chartData = null;
     138    if(null != this.xmlDocumentService) {
     139      Document document = this.xmlDocumentService.get(IOPath.concat(this.xmlPath, xmlFilename, "/"));
     140      chartData = (ChartData)this.chartDataService.getChartData(document);
     141    }
     142    else {
     143      chartData = (ChartData)this.chartDataService.getChartData(xmlSystemID);
     144    }
    120145
    121146    // now build the model info
  • trunk/src/main/java/org/ibisph/indicatorprofile/springmvc/databean/EditIndicatorViewDataSourcesController.java

    r3536 r3743  
    88
    99import org.ibisph.databean.DataBean;
    10 import org.ibisph.databean.dao.*;
    1110import org.ibisph.indicatorprofile.databean.DataSource;
    1211import org.ibisph.indicatorprofile.databean.IndicatorView;
  • trunk/src/main/java/org/ibisph/indicatorprofile/springmvc/databean/EditIndicatorViewValuesController.java

    r3536 r3743  
    77
    88import org.ibisph.databean.DataBean;
    9 import org.ibisph.databean.dao.*;
    109import org.ibisph.indicatorprofile.databean.DatasetCategory;
    1110import org.ibisph.indicatorprofile.databean.DatasetCategoryValue;
  • trunk/src/main/java/org/ibisph/jdbc/JDBCTemplate.java

    r3734 r3743  
    11package org.ibisph.jdbc;
    22
    3 import java.io.BufferedInputStream;
    43import java.io.ByteArrayInputStream;
    5 import java.io.ByteArrayOutputStream;
    64import java.io.IOException;
    75import java.io.InputStream;
  • trunk/src/main/java/org/ibisph/modelmap/AddModelDateModelToModelMap.java

    r3734 r3743  
    105105  public void processModelMap(Map<String, Object> modelMap) throws Exception {
    106106    Object sourceModel = modelMap.get(this.sourceModelModelMapKey);
    107 
     107    String dateString = this.defaultDateString;
    108108    long date = 0;
    109109
     
    122122          s = XMLLib.getText(document.getRootElement(), sourceModelDateXPath);
    123123
     124        // did have parsing with the date format but later reformat with same
     125        // format so no point.  If the datestring is something then use it.
     126        // The other option is to use a Joda type date handler.
    124127        if(StrLib.isSomething(s)) {
    125           date = Long.parseLong(s);
     128          dateString = s;
    126129          break;
    127130        }
     
    137140
    138141    // finally format the date and put into the model map.
    139     String dateString = this.defaultDateString;
    140142    if(date > 0) dateString = this.getFormattedDate(date);
    141143    modelMap.put(this.formattedDateModelMapKey, dateString);
  • trunk/src/main/java/org/ibisph/querydefinition/modelmap/QueryModuleToQueryDefinition.java

    r3678 r3743  
    1717 * @author Garth Braithwaite, STG
    1818 */
    19   public class QueryModuleToQueryDefinition implements ProcessModelMapFromHTTPRequest {
     19public class QueryModuleToQueryDefinition implements ProcessModelMapFromHTTPRequest {
    2020
    2121  protected static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(QueryModuleToQueryDefinition.class);
  • trunk/src/main/java/org/ibisph/system/databean/AdminDatabaseInfo.java

    r3535 r3743  
    22
    33import org.ibisph.databean.DataBean;
    4 import org.ibisph.databean.DataBean.Field;
    54
    65/**
  • trunk/src/main/java/org/ibisph/system/databean/RecordInfo.java

    r3535 r3743  
    22
    33import org.ibisph.databean.DataBean;
    4 import org.ibisph.databean.DataBean.Field;
    54
    65/**
  • trunk/src/main/java/org/ibisph/system/databean/SurveyResponse.java

    r3535 r3743  
    44
    55import org.ibisph.databean.DataBean;
    6 import org.ibisph.databean.DataBean.Field;
    76
    87/**
  • trunk/src/main/java/org/ibisph/system/databean/SystemCommand.java

    r3535 r3743  
    22
    33import org.ibisph.databean.DataBean;
    4 import org.ibisph.databean.DataBean.Field;
    54import org.ibisph.util.StrLib;
    65
  • trunk/src/main/java/org/ibisph/user/databean/RoleAuthority.java

    r3535 r3743  
    22
    33import org.ibisph.databean.DataBean;
    4 import org.ibisph.databean.DataBean.Field;
    54
    65/**
  • trunk/src/main/java/org/ibisph/user/databean/User.java

    r3535 r3743  
    22
    33import org.ibisph.databean.DataBean;
    4 import org.ibisph.databean.DataBean.Field;
    54import org.ibisph.util.StrLib;
    65
  • trunk/src/main/java/org/ibisph/user/databean/UserAuthority.java

    r3535 r3743  
    22
    33import org.ibisph.databean.DataBean;
    4 import org.ibisph.databean.DataBean.Field;
    54
    65/**
  • trunk/src/main/java/org/ibisph/user/databean/UserLog.java

    r3535 r3743  
    44
    55import org.ibisph.databean.DataBean;
    6 import org.ibisph.databean.DataBean.Field;
    76
    87/**
  • trunk/src/main/java/org/ibisph/user/databean/UserRole.java

    r3535 r3743  
    22
    33import org.ibisph.databean.DataBean;
    4 import org.ibisph.databean.DataBean.Field;
    54
    65/**
  • trunk/src/main/java/org/ibisph/xml/modelmap/DocumentFromHTTPRequestEndOfPathInfo.java

    r3735 r3743  
    5656   *   contains the XML model file(s).   
    5757   */
    58   public void setFilePath(String xmlPath) {this.xmlPath = xmlPath;}
     58  public void setXMLPath(String xmlPath) {this.xmlPath = xmlPath;}
    5959 
    6060  /**
  • trunk/src/main/java/org/ibisph/xml/modelmap/DocumentFromHTTPRequestParameter.java

    r3735 r3743  
    55import org.dom4j.Document;
    66
    7 import org.ibisph.modelmap.AbstractModelMap;
    87import org.ibisph.modelmap.GetModelMapFromHTTPRequest;
    98import org.ibisph.util.StrLib;
     
    1615 */
    1716public class DocumentFromHTTPRequestParameter
    18   extends AbstractModelMap
     17  extends SimpleDocument
    1918  implements GetModelMapFromHTTPRequest
    2019{
    21   protected String defaultXMLFilePathAndFilename = null;
    2220  protected String xmlPathAndFilenameHTTPRequestParameterName  = null;
    23   protected org.ibisph.xml.service.Document xmlDocumentService = null;
    2421
    2522
    2623  public DocumentFromHTTPRequestParameter() {}
    2724  public DocumentFromHTTPRequestParameter(String filePathAndFilename) {
    28     this.defaultXMLFilePathAndFilename = filePathAndFilename;
     25    super(filePathAndFilename);
    2926  } //----------------------- End of Constructor ----------------------------
    3027
    3128
    3229  /**
    33    * Sets/specifies the file path/key for the XML content IF the http request
    34    * param is not set or if the actual value does not exist.  If the request
    35    * param name is not set and this is then this effectively provides a simple
    36    * XML document model map.
    37    * @param defaultXMLFilePathAndFilename directory path and filename that is
    38    *   the key to the rdbms blob record or disk file that contains the XML model.   
    39    */
    40   public void setXMLDefaultFilePathAndFilename(String defaultXMLFilePathAndFilename) {
    41     this.defaultXMLFilePathAndFilename = defaultXMLFilePathAndFilename;
    42   } //-------------------------- End of Method ------------------------------
    43 
    44   /**
    4530   * Sets the http request parameter name to use for the XML document to be
    46    * retrieved from. 
     31   * retrieved from.  IF the http request param is not set or if the actual
     32   * value does not exist then the filename and path defaults to the parent's
     33   * xmlFilePathAndFilename property.
     34   *
    4735   * @param xmlPathAndFilenameHTTPRequestParameterName key/path to the XML.  If
    4836   *   blank (either this value or the actual request parameter) then the
    49    *   defaultPathAndFilename will be used. 
     37   *   default XMLPathAndFilename will be used. 
    5038   */
    5139  public void setXMLPathAndFilenameHTTPRequestParameterName(String xmlPathAndFilenameHTTPRequestParameterName) {
    5240    this.xmlPathAndFilenameHTTPRequestParameterName = xmlPathAndFilenameHTTPRequestParameterName;
    53   } //-------------------------- End of Method ------------------------------
    54 
    55   /**
    56    * Sets the DAO object that will be used to save the XML content with. 
    57    * This simply keeps with the plugable Spring framework.
    58    * @param xmlDocumentService Service/DAO used to save the XML document to disk.
    59    */
    60   public void setXMLDocumentService(org.ibisph.xml.service.Document xmlDocumentService) {
    61     this.xmlDocumentService = xmlDocumentService;
    6241  } //-------------------------- End of Method ------------------------------
    6342
     
    7049   */
    7150  protected Object getModel(HttpServletRequest request) throws Exception {
    72     String pathAndFilename = this.defaultXMLFilePathAndFilename;
     51    String pathAndFilename = this.xmlPathAndFilename;
    7352    if(StrLib.isSomething(this.xmlPathAndFilenameHTTPRequestParameterName)) {
    7453      pathAndFilename = request.getParameter(this.xmlPathAndFilenameHTTPRequestParameterName);
    75       if(!StrLib.isSomething(pathAndFilename)) pathAndFilename = this.defaultXMLFilePathAndFilename;
     54      if(!StrLib.isSomething(pathAndFilename)) pathAndFilename = this.xmlPathAndFilename;
    7655    }
    7756    Document document = this.xmlDocumentService.get(pathAndFilename);
  • trunk/src/main/java/org/ibisph/xml/service/AbstractDocument.java

    r3727 r3743  
    33import java.io.IOException;
    44import java.net.URLConnection;
     5import java.text.DateFormat;
    56
    67import org.dom4j.DocumentException;
     
    89
    910import org.ibisph.util.NetLib;
     11import org.ibisph.util.StrLib;
    1012import org.ibisph.util.StreamLib;
    1113
     
    2224  protected OutputFormat outputFormat    = null;
    2325  protected boolean escapeTextWhenSaving = true;
     26
     27  protected DateFormat dateFormat = null;
    2428
    2529
     
    3943    this.outputFormat = outputFormat;
    4044  } //-------------------------- End of Method ------------------------------
    41  
     45
     46  /**
     47   * XML file date format property.  This date format property is used to create
     48   * the last modified date string which may be used by the XSLT to display the
     49   * source file's last modified date. 
     50   *
     51   * @param dateFormat Any valid date format (typically a SimpleDateFormat).
     52   * @see java.text.DateFormat
     53   */
     54  public void setDateFormat(DateFormat dateFormat) {this.dateFormat = dateFormat;}
     55
    4256  /**
    4357   * Sets escape text boolean flag used to control escaping reserved characters
     
    5064  public void setEscapeTextWhenSaving(boolean escapeTextWhenSaving) {
    5165    this.escapeTextWhenSaving = escapeTextWhenSaving;
     66  } //-------------------------- End of Method ------------------------------
     67  public void setEscapeTextWhenSaving(Boolean escapeTextWhenSaving) {
     68    this.escapeTextWhenSaving = escapeTextWhenSaving.booleanValue();
     69  } //-------------------------- End of Method ------------------------------
     70  public void setEscapeTextWhenSaving(String escapeTextWhenSaving) {
     71    this.escapeTextWhenSaving = StrLib.isTorYorX(escapeTextWhenSaving);
     72  } //-------------------------- End of Method ------------------------------
     73
     74  public boolean getEscapeTextWhenSaving() {
     75    return(this.escapeTextWhenSaving);
    5276  } //-------------------------- End of Method ------------------------------
    5377
  • trunk/src/main/java/org/ibisph/xml/service/BLOBStoredDocument.java

    r3734 r3743  
    77import java.sql.SQLException;
    88import java.sql.Timestamp;
     9import java.text.DateFormat;
     10import java.util.ArrayList;
    911import java.util.Date;
     12import java.util.List;
    1013
    1114import org.dom4j.DocumentException;
     
    3437  ;
    3538
    36   protected String fileStoreSQLExistsQuery =
     39  protected String fileStoreExistsSQLQuery =
    3740      "select NAME " +
    3841      "from FILE_STORE " +
     
    4043  ;
    4144
     45  protected String fileStoreListSQLQuery =
     46      "select NAME " +
     47      "from FILE_STORE " +
     48      "where NAME like ? "
     49  ;
     50 
    4251  protected String fileStoreSQLInsert =
    4352    "insert into FILE_STORE " +
     
    8897    this.fileStoreSQLDelete = fileStoreSQLDelete;
    8998  } //-------------------------- End of Method ------------------------------
     99
     100  public void setFileStoreExistsSQLQuery(String fileStoreExistsSQLQuery) {
     101    this.fileStoreExistsSQLQuery = fileStoreExistsSQLQuery;
     102  } //-------------------------- End of Method ------------------------------
     103 
     104  public void setFileStoreListSQLQuery(String fileStoreListSQLQuery) {
     105    this.fileStoreListSQLQuery = fileStoreListSQLQuery;
     106  } //-------------------------- End of Method ------------------------------
     107
    90108
    91109  /**
     
    127145      // add in the modified dts so that the modelmap will put this value in
    128146      // for the xslt view to access and present to the user.
     147      String dateString = this.dateFormat.format(modifiedDTS.getTime());
    129148      XMLLib.replaceElement(document.getRootElement(),
    130         XMLLib.newElement("MODIFIED_DTS", modifiedDTS.toString())
     149        XMLLib.newElement("MODIFIED_DTS", dateString)
    131150      );
    132151
     
    229248  public boolean exists(String xmlPathAndFilename) {
    230249    JDBCTemplate jdbcTemplate = this.jdbcTemplateFactory.get();
    231     jdbcTemplate.setPreparedStatement(this.fileStoreSQLExistsQuery);
     250    jdbcTemplate.setPreparedStatement(this.fileStoreExistsSQLQuery);
    232251    jdbcTemplate.setPreparedStatementString(1, xmlPathAndFilename);
    233252    jdbcTemplate.executePreparedStatement();
     
    236255    return(exists);
    237256  } //-------------------------- End of Method ------------------------------
    238  
    239    
     257
     258
     259
     260  public List<String> getDirectoryPathAndFilenames(String xmlPath) {
     261    List<String> fileList = new ArrayList<String>();
     262    JDBCTemplate jdbcTemplate = this.jdbcTemplateFactory.get();
     263    jdbcTemplate.setPreparedStatement(this.fileStoreListSQLQuery);
     264    jdbcTemplate.setPreparedStatementString(1, xmlPath);
     265    jdbcTemplate.executePreparedStatementQuery();
     266    while(jdbcTemplate.next()) {
     267      String name = jdbcTemplate.getString("NAME");
     268      fileList.add(name);
     269    }
     270    jdbcTemplate.close();
     271
     272    return(fileList);
     273  } //-------------------------- End of Method ------------------------------
     274
    240275
    241276  /**
  • trunk/src/main/java/org/ibisph/xml/service/Document.java

    r3734 r3743  
    11package org.ibisph.xml.service;
     2
     3import java.util.List;
    24
    35/**
     
    4749   */
    4850  public boolean exists(String xmlPathAndFilename) throws Exception;
     51
     52
     53  /**
     54   * Get's a list of files based on the supplied path name. 
     55   * @param xmlPath either a file disk path or a file disk path that the rdbms
     56   *   uses to select the xml from.
     57   * @return list of filenames with their full path.
     58   * @throws Exception
     59   */
     60  public List<String> getDirectoryPathAndFilenames(String xmlPath) throws Exception;
    4961} //--------------------------- END OF INTERFACE -----------------------------
  • trunk/src/main/java/org/ibisph/xml/service/FileStoredDocument.java

    r3735 r3743  
    22
    33import java.io.File;
     4import java.io.FilenameFilter;
    45import java.io.IOException;
    56import java.io.OutputStream;
    67import java.io.UnsupportedEncodingException;
     8import java.util.ArrayList;
     9import java.util.List;
    710
    811import org.dom4j.DocumentException;
     
    183186    return(null);
    184187  } //-------------------------- End of Method ------------------------------
    185    
     188
     189
     190  public List<String> getDirectoryPathAndFilenames(String xmlPath) {
     191    List<String> fileList = new ArrayList<String>();
     192    File directory = new File(xmlPath);
     193    String[] xmlFiles = directory.list( new XMLFileNameFilter() );
     194    for(int i=0; i < xmlFiles.length; i++) {
     195      fileList.add(IOPath.concat(xmlPath, xmlFiles[i], "/"));
     196    }
     197    return(fileList);
     198  } //-------------------------- End of Method ------------------------------
     199
     200
     201  // needs to be moved into the utils...
     202  class XMLFileNameFilter implements FilenameFilter {
     203    public boolean accept(File dir, String name) {
     204      if(new File(dir, name).isDirectory() ) return false;
     205      name = name.toLowerCase();
     206      return( name.endsWith(".xml") );
     207    }
     208  } //------------------------End of Internal Class--------------------------
     209
    186210} //============================ END OF CLASS =================================
    187211
  • trunk/src/main/webapps/ibisph-admin/WEB-INF/config/site_specific.properties

    r3493 r3743  
    2828ViewApp.PreviewIndicatorProfile.URL     =http://localhost/ibisph-view/view?xslt=html/indicator/profile/complete_profile/CompleteProfilePage.xslt&xmlURL=http://localhost/ibisph-admin/indicator/########.xml
    2929ViewApp.PreviewImportantFacts.URL       =http://localhost/ibisph-view/view?xslt=html/indicator/profile/important_facts/ImportantFactsPage.xslt&xmlURL=http://localhost/ibisph-admin/indicator/########.xml
    30 ViewApp.PreviewAvailableServices.URL    =http://localhost/ibisph-view/view?xslt=html/indicator/profile/availables_services/AvailableServicesPage.xslt&xmlURL=http://localhost/ibisph-admin/indicator/########.xml
     30ViewApp.PreviewAvailableServices.URL    =http://localhost/ibisph-view/view?xslt=html/indicator/profile/available_services/AvailableServicesPage.xslt&xmlURL=http://localhost/ibisph-admin/indicator/########.xml
    3131ViewApp.PreviewIndicatorViewChart.URL   =http://localhost/ibisph-view/view?xslt=html/indicator/profile/view/ViewPage.xslt&xmlURL=http://localhost/ibisph-admin/indicator/########.xml
    3232ViewApp.PreviewIndicatorViewNumbers.URL =http://localhost/ibisph-view/view?xslt=html/indicator/profile/view_numbers/ViewNumbersPage.xslt&xmlURL=http://localhost/ibisph-admin/indicator/########.xml
  • trunk/src/main/webapps/ibisph-admin/WEB-INF/config/spring/common.xml

    r3734 r3743  
    141141        <bean id="Common.XML.OutputFormat" class="org.dom4j.io.OutputFormat">
    142142                <property name="encoding"   value="${XML.EncodingScheme}"/>
    143                 <property name="indentSize" value="0"/> <!-- \t = &#09; = horizontal tab -->
    144                 <property name="indent"     value=""/>
    145                 <property name="newlines"   value="false"/> <!-- if true just adds extra blank line inbetween... -->
     143                <property name="indentSize" value="1"/>  <!-- count of indents indents are tabs: \t = &#09; = horizontal tab -->
     144                <property name="indent"     value="true"/>
     145                <property name="newlines"   value="true"/> <!-- if true just adds extra blank line inbetween... -->
    146146                <property name="padText"    value="false"/> <!-- if true just adds extra blank line inbetween... -->
    147147                <property name="trimText"   value="false"/> <!-- do NOT set to true -->
     
    263263                <property name="outputFormat" ref="Common.XML.OutputFormat"/>
    264264                <property name="escapeTextWhenSaving" value="${XML.EscapeText}"/>
     265                <property name="dateFormat" ref="Common.DateFormat"/>
    265266        </bean>
    266267
    267268        <bean id="Common.DataBeanToXML.Service" class="org.ibisph.databean.DataBeanToXMLService">
    268269                <property name="convertExtendedASCIIChars" value="${XML.ConvertExtendedASCIIChars}"/>
    269                 <property name="XMLDateFormat"            ref="Common.DateFormat"/>
     270                <property name="dateFormat" ref="Common.DateFormat"/>
    270271        </bean>
    271272
  • trunk/src/main/webapps/ibisph-admin/WEB-INF/config/spring/indicator.xml

    r3688 r3743  
    6767                <property name="relationDataBeanCollection" ref="Indicator.Relation.DataBeanCollection"/>
    6868                <property name="convertExtendedASCIIChars"  ref="Common.XML.ConvertExtendedASCIIChars"/>
    69                 <property name="XMLDateFormat"              ref="Common.DateFormat"/>
     69                <property name="dateFormat"                 ref="Common.DateFormat"/>
    7070        </bean>
    7171
  • trunk/src/main/webapps/ibisph-admin/WEB-INF/config/spring/indicator_view.xml

    r3688 r3743  
    1818                <property name="dataBeanDAOService"        ref="Common.DataBeanDAO.Service"/>
    1919                <property name="convertExtendedASCIIChars" ref="Common.XML.ConvertExtendedASCIIChars"/>
    20                 <property name="XMLDateFormat"             ref="Common.DateFormat"/>
     20                <property name="dateFormat"                ref="Common.DateFormat"/>
    2121        </bean>
    2222
  • trunk/src/main/webapps/ibisph-admin/WEB-INF/config/spring/publish-blob.xml

    r3734 r3743  
    1616    provides published_indicators.xml file management.
    1717  -->
    18         <bean id="Publish.CategorizedIndex.XML.PathAndFilename" class="java.lang.String">
     18        <bean id="Publish.CategorizedIndexXML.PathAndFilename" class="java.lang.String">
    1919                <constructor-arg value="xml/indicator/categorized_index.xml"/>
    2020        </bean>
    21         <bean id="Publish.OrgUnits.XML.PathAndFilename" class="java.lang.String">
     21        <bean id="Publish.OrgUnitsXML.PathAndFilename" class="java.lang.String">
    2222                <constructor-arg value="xml/org_units.xml"/>
    2323        </bean>
     
    2525                <constructor-arg value="xml/indicator/published_profiles.xml"/>
    2626        </bean>
    27         <bean id="Publish.IndicatorProfile.XML.Path" class="java.lang.String">
     27        <bean id="Publish.IndicatorProfileXML.Path" class="java.lang.String">
    2828                <constructor-arg value="xml/indicator/profile"/>
    2929        </bean>
     
    3131        <bean id="Publish.BLOBStoredXML.Service" class="org.ibisph.xml.service.BLOBStoredDocument">
    3232                <property name="outputFormat" ref="Common.XML.OutputFormat"/>
    33                 <property name="escapeTextWhenSaving" value="false"/>
     33                <property name="escapeTextWhenSaving" value="true"/>
     34                <property name="dateFormat"   ref="Common.DateFormat"/>
    3435                <property name="JDBCTemplateFactory">
    3536                        <bean class="org.ibisph.jdbc.JDBCTemplateFactory">
     
    4849        <bean id="Publish.PublishedIndicators.Service" class="org.ibisph.indicatorprofile.service.PublishedIndicatorsXML">
    4950                <property name="publishedIndicatorsPathAndFilename" ref="Publish.PublishedIndicatorProfilesXML.PathAndFilename"/>
    50                 <property name="XMLPath" ref="Publish.IndicatorProfile.XML.Path"/>
     51                <property name="XMLPath" ref="Publish.IndicatorProfileXML.Path"/>
    5152                <property name="XMLDocumentService" ref="Publish.BLOBStoredXML.Service"/>
    5253        </bean>
     
    6566                class="org.ibisph.databean.springmvc.PublishCollectionToXMLFileController"
    6667        >
    67                 <property name="XMLPathAndFilename" ref="Publish.CategorizedIndex.XML.PathAndFilename"/>
     68                <property name="XMLPathAndFilename" ref="Publish.CategorizedIndexXML.PathAndFilename"/>
    6869                <property name="dataBeanClassName"  value="org.ibisph.indicatorprofile.databean.CategorizedIndex"/>
    6970                <property name="rootXMLElementName" value="CATEGORIZED_INDEXES"/>
     
    7475                class="org.ibisph.databean.springmvc.PublishCollectionToXMLFileController"
    7576        >
    76                 <property name="XMLPathAndFilename"  ref="Publish.OrgUnits.XML.PathAndFilename"/>
     77                <property name="XMLPathAndFilename"  ref="Publish.OrgUnitsXML.PathAndFilename"/>
    7778                <property name="dataBeanClassName"  value="org.ibisph.indicatorprofile.databean.OrgUnit"/>
    7879                <property name="rootXMLElementName" value="ORG_UNITS"/>
     
    8586                <property name="indicatorViewDataBeanToXMLService" ref="IndicatorView.DataBeanToXML.Service"/>
    8687                <property name="publishedIndicatorsService"    ref="Publish.PublishedIndicators.Service"/>
    87                 <property name="XMLPath"                       ref="Publish.IndicatorProfile.XML.Path"/>
    88                 <property name="XMLDocumentService"        ref="Publish.BLOBStoredXML.Service"/>
     88                <property name="XMLPath"                       ref="Publish.IndicatorProfileXML.Path"/>
     89                <property name="XMLDocumentService"            ref="Publish.BLOBStoredXML.Service"/>
    8990        </bean>
    9091        <bean id="Publish.Indicator.Controller"
  • trunk/src/main/webapps/ibisph-admin/WEB-INF/config/spring/publish-direct.xml

    r3734 r3743  
    4343          provides published_indicators.xml file management.
    4444        -->
    45         <bean id="Publish.CategorizedIndex.XML.PathAndFilename" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">     
     45        <bean id="Publish.CategorizedIndexXML.PathAndFilename" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">     
    4646                <description>used by indicator indexes</description>
    4747                <property name="targetObject" ref="Common.Context.Servlet"/>
     
    4949                <property name="arguments"><list><value>../ibisph-view/xml/indicator/categorized_index.xml</value></list></property>
    5050        </bean>
    51         <bean id="Publish.OrgUnits.XML.PathAndFilename" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">     
     51        <bean id="Publish.OrgUnitsXML.PathAndFilename" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">     
    5252                <description>used by indicator indexes</description>
    5353                <property name="targetObject" ref="Common.Context.Servlet"/>
     
    6161                <property name="arguments"><list><value>../ibisph-view/xml/indicator/published_profiles.xml</value></list></property>
    6262        </bean>
    63         <bean id="Publish.IndicatorProfile.XML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     63        <bean id="Publish.IndicatorProfileXML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
    6464                <property name="targetObject" ref="Common.Context.Servlet"/>
    6565                <property name="targetMethod" value="getRealPath"/>
     
    6969        <bean id="Publish.PublishedIndicators.Service" class="org.ibisph.indicatorprofile.service.PublishedIndicatorsXML">
    7070                <property name="publishedIndicatorsPathAndFilename" ref="Publish.PublishedIndicatorProfilesXML.PathAndFilename"/>
    71                 <property name="XMLPath" ref="Publish.IndicatorProfile.XML.Path"/>
     71                <property name="XMLPath" ref="Publish.IndicatorProfileXML.Path"/>
    7272                <property name="XMLDocumentService" ref="Common.FileStoredXML.Service"/>
    7373                <property name="fileBackupFactory"  ref="Common.Versioned.FileBackupFactory"/>
     
    8888                class="org.ibisph.databean.springmvc.PublishCollectionToXMLFileController"
    8989        >
    90                 <property name="XMLPathAndFilename" ref="Publish.CategorizedIndex.XML.PathAndFilename"/>
     90                <property name="XMLPathAndFilename" ref="Publish.CategorizedIndexXML.PathAndFilename"/>
    9191                <property name="dataBeanClassName"  value="org.ibisph.indicatorprofile.databean.CategorizedIndex"/>
    9292                <property name="rootXMLElementName" value="CATEGORIZED_INDEXES"/>
     
    9797                class="org.ibisph.databean.springmvc.PublishCollectionToXMLFileController"
    9898        >
    99                 <property name="XMLPathAndFilename"  ref="Publish.OrgUnits.XML.PathAndFilename"/>
     99                <property name="XMLPathAndFilename"  ref="Publish.OrgUnitsXML.PathAndFilename"/>
    100100                <property name="dataBeanClassName"  value="org.ibisph.indicatorprofile.databean.OrgUnit"/>
    101101                <property name="rootXMLElementName" value="ORG_UNITS"/>
     
    108108                <property name="indicatorViewDataBeanToXMLService" ref="IndicatorView.DataBeanToXML.Service"/>
    109109                <property name="publishedIndicatorsService"    ref="Publish.PublishedIndicators.Service"/>
    110                 <property name="XMLPath"                       ref="Publish.IndicatorProfile.XML.Path"/>
     110                <property name="XMLPath"                       ref="Publish.IndicatorProfileXML.Path"/>
    111111                <property name="XMLDocumentService"            ref="Common.FileStoredXML.Service"/>
    112112                <property name="fileBackupFactory"             ref="Common.Versioned.FileBackupFactory"/>
  • trunk/src/main/webapps/ibisph-view/WEB-INF/config/spring/common.xml

    r3734 r3743  
    175175        </bean>
    176176
     177        <bean id="Common.OrgUnits.ModelMap" class="org.ibisph.xml.modelmap.SimpleDocument">
     178                <description>
     179                </description>
     180                <property name="modelMapKey"        value="Page.orgUnits"/>
     181                <property name="XMLDocumentService" ref="Common.XMLDocument.Service"/>
     182                <property name="XMLPathAndFilename" value="xml/org_units.xml"/>
     183        </bean>
     184
    177185
    178186        <!--  X M L   R E S O U R C E S  -->
     
    186194        </bean>
    187195
     196<!--
    188197        <bean id="Common.FileStoredXML.Service" class="org.ibisph.xml.service.FileStoredDocument">
     198                <description>
     199                        Provides a local disk based document get, save, delete service.
     200                </description>
    189201                <property name="outputFormat" ref="Common.XML.OutputFormat"/>
    190202        </bean>
    191         <bean id="Common.BLOBStoredXML.Service" class="org.ibisph.xml.service.BLOBStoredDocument">
     203-->
     204        <bean id="Common.XMLDocument.Service" class="org.ibisph.xml.service.BLOBStoredDocument">
     205                <description>
     206                        Provides the RDBMS BLOB based document get, save, delete service.
     207                </description>
    192208                <property name="outputFormat" ref="Common.XML.OutputFormat"/>
     209                <property name="escapeTextWhenSaving" value="true"/>
     210                <property name="dateFormat" ref="Common.DateFormat"/>
    193211                <property name="JDBCTemplateFactory">
    194212                        <bean class="org.ibisph.jdbc.JDBCTemplateFactory">
  • trunk/src/main/webapps/ibisph-view/WEB-INF/config/spring/community.xml

    r3710 r3743  
    2525        </bean>
    2626
    27         <bean id="Community.HTMLContent.XML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     27        <bean id="Community.HTMLContentXML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
    2828                <property name="targetObject" ref="Common.Context.Servlet"/>
    2929                <property name="targetMethod" value="getRealPath"/>
     
    3131        </bean>
    3232        <bean id="Community.Introduction.XML.SystemID" class="org.ibisph.systemid.FileSystemID">
    33                 <constructor-arg ref="Community.HTMLContent.XML.Path"/>
     33                <constructor-arg ref="Community.HTMLContentXML.Path"/>
    3434                <constructor-arg value="Introduction.xml"/>
    3535        </bean>
    3636
    37         <bean id="Community.Highlight.XML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     37        <bean id="Community.HighlightXML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
    3838                <property name="targetObject" ref="Common.Context.Servlet"/>
    3939                <property name="targetMethod" value="getRealPath"/>
     
    4343
    4444        <bean id="Community.HTMLContent.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestEndOfPathInfo" parent="Common.XMLModelMap.CommonProperties">
    45                 <property name="FilePath" ref="Community.HTMLContent.XML.Path"/>
     45                <property name="filePath" ref="Community.HTMLContentXML.Path"/>
    4646        </bean>
    4747        <bean id="Community.DefaultHTMLContent.ModelMap" class="org.ibisph.modelmap.DefaultModelIfNullModel" parent="Common.XMLModelMap.CommonProperties">
     
    6161                                <ref bean="Community.HTMLContent.ModelMap"/>
    6262                                <ref bean="Community.DefaultHTMLContent.ModelMap"/>
     63                                <ref bean="Common.OrgUnits.ModelMap"/>
    6364                                <ref bean="Common.ModifiedDateFromFileSystemID.ModelMap"/>
    6465                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
     
    7374                        <list>
    7475                                <ref bean="Community.Dimensions.ModelMap"/>
     76                                <ref bean="Common.OrgUnits.ModelMap"/>
    7577                                <ref bean="Common.ModifiedDateFromFileSystemID.ModelMap"/>
    7678                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
     
    8587                        <list>
    8688                                <ref bean="Community.Dimensions.ModelMap"/>
     89                                <ref bean="Common.OrgUnits.ModelMap"/>
    8790                                <ref bean="Common.ModifiedDateFromFileSystemID.ModelMap"/>
    8891                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
     
    97100-->
    98101        </bean>
     102
     103
    99104<bean id="Community.Highlight.Introduction.Controller" class="org.ibisph.communityprofile.modelmap.XMLModelAndDate">
    100105<!--
     
    102107-->
    103108        </bean>
     109
     110
    104111<bean id="Community.Highlight.Profile.Controller" class="org.ibisph.communityprofile.modelmap.XMLModelAndDate">
    105112<!--
     
    116123
    117124        <bean id="Community.Highlight.ChartGraphic.Controller" class="org.ibisph.communityprofile.springmvc.ChartGraphicController">
    118                 <property name="XMLPath"          ref="Indicator.Profile.XML.Path"/>
     125                <property name="XMLPath"          ref="Indicator.ProfileXML.Path"/>
    119126<!--
    120127                <property name="chartDataService" ref="Indicator.ChartData.ModelMap"/>
  • trunk/src/main/webapps/ibisph-view/WEB-INF/config/spring/home.xml

    r3710 r3743  
    1414
    1515        <!--  M O D E L S   /   C O N T R O L L E R   R E S O R U C E S -->
    16         <bean id="Home.HTMLContent.XML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     16        <bean id="Home.HTMLContentXML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
    1717                <property name="targetObject" ref="Common.Context.Servlet"/>
    1818                <property name="targetMethod" value="getRealPath"/>
     
    2020        </bean>
    2121        <bean id="Home.Introduction.XML.SystemID" class="org.ibisph.systemid.FileSystemID">
    22                 <constructor-arg ref="Home.HTMLContent.XML.Path"/>
     22                <constructor-arg ref="Home.HTMLContentXML.Path"/>
    2323                <constructor-arg value="Welcome.xml"/>
    2424        </bean>
    2525
    2626        <bean id="Home.HTMLContent.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestEndOfPathInfo" parent="Common.XMLModelMap.CommonProperties">
    27                 <property name="FilePath" ref="Home.HTMLContent.XML.Path"/>
     27                <property name="filePath" ref="Home.HTMLContentXML.Path"/>
    2828        </bean>
    2929        <bean id="Home.DefaultHTMLContent.ModelMap" class="org.ibisph.modelmap.DefaultModelIfNullModel" parent="Common.XMLModelMap.CommonProperties">
     
    3838                                <ref bean="Home.HTMLContent.ModelMap"/>
    3939                                <ref bean="Home.DefaultHTMLContent.ModelMap"/>
     40                                <ref bean="Common.OrgUnits.ModelMap"/>
    4041                                <ref bean="Common.ModifiedDateFromFileSystemID.ModelMap"/>
    4142                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
  • trunk/src/main/webapps/ibisph-view/WEB-INF/config/spring/indicator.xml

    r3710 r3743  
    1515
    1616        <!--  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 -->
    17         <bean id="Indicator.XML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
    18                 <property name="targetObject" ref="Common.Context.Servlet"/>
    19                 <property name="targetMethod" value="getRealPath"/>
    20                 <property name="arguments">   <list><value>xml/indicator</value></list></property>
    21         </bean>
    22         <bean id="Indicator.Profile.XML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     17        <bean id="Indicator.ProfileXML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
    2318                <property name="targetObject" ref="Common.Context.Servlet"/>
    2419                <property name="targetMethod" value="getRealPath"/>
    2520                <property name="arguments">   <list><value>xml/indicator/profile</value></list></property>
    2621        </bean>
    27         <bean id="Indicator.HTMLContent.XML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     22        <bean id="Indicator.HTMLContentXML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
    2823                <property name="targetObject" ref="Common.Context.Servlet"/>
    2924                <property name="targetMethod" value="getRealPath"/>
     
    3227
    3328        <bean id="Indicator.Introduction.XML.SystemID" class="org.ibisph.systemid.FileSystemID">
    34                 <constructor-arg ref="Indicator.HTMLContent.XML.Path"/>
     29                <constructor-arg ref="Indicator.HTMLContentXML.Path"/>
    3530                <constructor-arg value="Introduction.xml"/>
    3631        </bean>
     
    4742        <!-- X M L   M O D E L S -->
    4843        <bean id="Indicator.HTMLContent.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestEndOfPathInfo" parent="Common.XMLModelMap.CommonProperties">
    49                 <property name="FilePath" ref="Indicator.HTMLContent.XML.Path"/>
     44                <property name="filePath" ref="Indicator.HTMLContentXML.Path"/>
    5045        </bean>
    5146        <bean id="Indicator.DefaultHTMLContent.ModelMap" class="org.ibisph.modelmap.DefaultModelIfNullModel" parent="Common.XMLModelMap.CommonProperties">
     
    5954        </bean>
    6055        <bean id="Indicator.Profile.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestEndOfPathInfo" parent="Common.XMLModelMap.CommonProperties">
    61                 <property name="FilePath" ref="Indicator.Profile.XML.Path"/>
     56                <property name="filePath" ref="Indicator.ProfileXML.Path"/>
    6257        </bean>
    6358
     
    6661        </bean>
    6762
     63        <bean id="Indicator.PublishedIndicatorsXML.ModelMap" class="org.ibisph.xml.modelmap.SimpleDocument">
     64                <description>
     65                </description>
     66                <property name="modelMapKey"        value="Indicator.publishedIndicators"/>
     67                <property name="XMLDocumentService" ref="Common.XMLDocument.Service"/>
     68                <property name="XMLPathAndFilename" value="xml/indicator/published_profiles.xml"/>
     69        </bean>
     70
    6871
    6972        <!--  C O N T R O L L E R S  -->
     
    7376                                <ref bean="Indicator.HTMLContent.ModelMap"/>
    7477                                <ref bean="Indicator.DefaultHTMLContent.ModelMap"/>
     78                                <ref bean="Common.OrgUnits.ModelMap"/>
    7579                                <ref bean="Common.ModifiedDateFromFileSystemID.ModelMap"/>
    7680                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
     
    8589                        <list>
    8690                                <ref bean="Indicator.PublishedIndicatorProfiles.ModelMap"/>
     91                                <ref bean="Common.OrgUnits.ModelMap"/>
    8792                                <ref bean="Common.ModifiedDateFromFileSystemID.ModelMap"/>
    8893                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
     
    96101                        <list>
    97102                                <ref bean="Indicator.CategorziedIndex.ModelMap"/>
     103                                <ref bean="Common.OrgUnits.ModelMap"/>
    98104                                <ref bean="Common.ModifiedDateFromFileSystemID.ModelMap"/>
    99105                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
     
    109115                        <list>
    110116                                <ref bean="Indicator.Profile.ModelMap"/>
    111                                 <ref bean="Common.ModifiedDateFromFileSystemID.ModelMap"/>
    112                                 <ref bean="Common.HTTPRequestParameters.ModelMap"/>
    113                                 <ref bean="Common.WebAppURLContextPrefixFromHTTPRequest.ModelMap"/>
    114                         </list>
    115                 </property>
    116         </bean>
    117         <bean id="Indicator.View.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Indicator.Profile.Controller.CommonProperties">
     117                                <ref bean="Common.OrgUnits.ModelMap"/>
     118                                <ref bean="Common.ModifiedDateFromFileSystemID.ModelMap"/>
     119                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
     120                                <ref bean="Common.WebAppURLContextPrefixFromHTTPRequest.ModelMap"/>
     121                        </list>
     122                </property>
     123        </bean>
     124        <bean id="Indicator.View.Controller"
     125                class="org.ibisph.web.springmvc.ModelMapListProcessingController"
     126                parent="Indicator.Profile.Controller.CommonProperties"
     127        >
    118128                <property name="view" ref="Indicator.View.View"/>
    119129        </bean>
    120         <bean id="Indicator.ImportantFacts.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Indicator.Profile.Controller.CommonProperties">
     130        <bean id="Indicator.ImportantFacts.Controller"
     131                class="org.ibisph.web.springmvc.ModelMapListProcessingController"
     132                parent="Indicator.Profile.Controller.CommonProperties"
     133        >
    121134                <property name="view" ref="Indicator.ImportantFacts.View"/>
    122135        </bean>
    123136
    124         <bean id="Indicator.RelatedIndicators.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Indicator.Profile.Controller.CommonProperties">
     137        <bean id="Indicator.RelatedIndicators.Controller"
     138                class="org.ibisph.web.springmvc.ModelMapListProcessingController"
     139                parent="Indicator.Profile.Controller.CommonProperties"
     140        >
    125141                <property name="modelMapList">
    126142                        <list>
    127143                                <ref bean="Indicator.SelectedRelationName.ModelMap"/>
    128144                                <ref bean="Indicator.Profile.ModelMap"/>
     145                                <ref bean="Indicator.PublishedIndicatorsXML.ModelMap"/>
    129146                                <ref bean="Common.ModifiedDateFromFileSystemID.ModelMap"/>
    130147                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
     
    135152        </bean>
    136153
    137         <bean id="Indicator.AvailableServices.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Indicator.Profile.Controller.CommonProperties">
     154        <bean id="Indicator.AvailableServices.Controller"
     155                class="org.ibisph.web.springmvc.ModelMapListProcessingController"
     156                parent="Indicator.Profile.Controller.CommonProperties"
     157        >
    138158                <property name="view" ref="Indicator.AvailableServices.View"/>
    139159        </bean>
    140         <bean id="Indicator.OtherResources.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Indicator.Profile.Controller.CommonProperties">
     160        <bean id="Indicator.OtherResources.Controller"
     161                class="org.ibisph.web.springmvc.ModelMapListProcessingController"
     162                parent="Indicator.Profile.Controller.CommonProperties"
     163        >
    141164                <property name="view" ref="Indicator.OtherResources.View"/>
    142165        </bean>
    143         <bean id="Indicator.ViewNumbers.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Indicator.Profile.Controller.CommonProperties">
     166        <bean id="Indicator.ViewNumbers.Controller"
     167                class="org.ibisph.web.springmvc.ModelMapListProcessingController"
     168                parent="Indicator.Profile.Controller.CommonProperties"
     169        >
    144170                <property name="view" ref="Indicator.ViewNumbers.View"/>
    145171        </bean>
    146         <bean id="Indicator.CompleteProfile.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Indicator.Profile.Controller.CommonProperties">
     172        <bean id="Indicator.CompleteProfile.Controller"
     173                class="org.ibisph.web.springmvc.ModelMapListProcessingController"
     174                parent="Indicator.Profile.Controller.CommonProperties"
     175        >
     176                <property name="modelMapList">
     177                        <list>
     178                                <ref bean="Indicator.Profile.ModelMap"/>
     179                                <ref bean="Indicator.PublishedIndicatorsXML.ModelMap"/>
     180                                <ref bean="Common.OrgUnits.ModelMap"/>
     181                                <ref bean="Common.ModifiedDateFromFileSystemID.ModelMap"/>
     182                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
     183                                <ref bean="Common.WebAppURLContextPrefixFromHTTPRequest.ModelMap"/>
     184                        </list>
     185                </property>
    147186                <property name="view" ref="Indicator.CompleteProfile.View"/>
    148187        </bean>
    149188
    150189        <bean id="Indicator.ChartGraphic.Controller" class="org.ibisph.indicatorprofile.springmvc.XMLChartGraphicController">
    151                 <property name="XMLPath"          ref="Indicator.Profile.XML.Path"/>
     190                <property name="XMLPath"          ref="Indicator.ProfileXML.Path"/>
    152191                <property name="chartDataService"><bean class="org.ibisph.indicatorprofile.service.ChartDataFromIndicatorViewXML"/></property>
    153192                <property name="viewNamePrefix"   ref="Chart.ViewNamePrefix"/>
  • trunk/src/main/webapps/ibisph-view/WEB-INF/config/spring/phom.xml

    r3710 r3743  
    1414
    1515        <!--  M O D E L S   /   C O N T R O L L E R   R E S O R U C E S -->
    16         <bean id="PHOM.HTMLContent.XML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     16        <bean id="PHOM.HTMLContentXML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
    1717                <property name="targetObject" ref="Common.Context.Servlet"/>
    1818                <property name="targetMethod" value="getRealPath"/>
     
    2121
    2222        <bean id="PHOM.Introduction.XML.SystemID" class="org.ibisph.systemid.FileSystemID">
    23                 <constructor-arg ref="PHOM.HTMLContent.XML.Path"/>
     23                <constructor-arg ref="PHOM.HTMLContentXML.Path"/>
    2424                <constructor-arg value="Introduction.xml"/>
    2525        </bean>
     
    2727
    2828        <bean id="PHOM.HTMLContent.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestEndOfPathInfo" parent="Common.XMLModelMap.CommonProperties">
    29                 <property name="FilePath" ref="PHOM.HTMLContent.XML.Path"/>
     29                <property name="filePath" ref="PHOM.HTMLContentXML.Path"/>
    3030        </bean>
    3131        <bean id="PHOM.DefaultHTMLContent.ModelMap" class="org.ibisph.modelmap.DefaultModelIfNullModel" parent="Common.XMLModelMap.CommonProperties">
     
    4141                                <ref bean="PHOM.HTMLContent.ModelMap"/>
    4242                                <ref bean="PHOM.DefaultHTMLContent.ModelMap"/>
     43                                <ref bean="Common.OrgUnits.ModelMap"/>
    4344                                <ref bean="Common.ModifiedDateFromFileSystemID.ModelMap"/>
    4445                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
  • trunk/src/main/webapps/ibisph-view/WEB-INF/config/spring/publications.xml

    r3710 r3743  
    1414
    1515        <!--  M O D E L S   /   C O N T R O L L E R   R E S O R U C E S -->
    16         <bean id="Publications.HTMLContent.XML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     16        <bean id="Publications.HTMLContentXML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
    1717                <property name="targetObject" ref="Common.Context.Servlet"/>
    1818                <property name="targetMethod" value="getRealPath"/>
     
    2020        </bean>
    2121        <bean id="Publications.Introduction.XML.SystemID" class="org.ibisph.systemid.FileSystemID">
    22                 <constructor-arg ref="Publications.HTMLContent.XML.Path"/>
     22                <constructor-arg ref="Publications.HTMLContentXML.Path"/>
    2323                <constructor-arg value="Introduction.xml"/>
    2424        </bean>
     
    3030
    3131        <bean id="Publications.HTMLContent.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestEndOfPathInfo" parent="Common.XMLModelMap.CommonProperties">
    32                 <property name="FilePath" ref="Publications.HTMLContent.XML.Path"/>
     32                <property name="filePath" ref="Publications.HTMLContentXML.Path"/>
    3333        </bean>
    3434        <bean id="Publications.DefaultHTMLContent.ModelMap" class="org.ibisph.modelmap.DefaultModelIfNullModel" parent="Common.XMLModelMap.CommonProperties">
     
    4848                                <ref bean="Publications.HTMLContent.ModelMap"/>
    4949                                <ref bean="Publications.DefaultHTMLContent.ModelMap"/>
     50                                <ref bean="Common.OrgUnits.ModelMap"/>
    5051                                <ref bean="Common.ModifiedDateFromFileSystemID.ModelMap"/>
    5152                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
     
    5960                        <list>
    6061                                <ref bean="Publications.List.ModelMap"/>
     62                                <ref bean="Common.OrgUnits.ModelMap"/>
    6163                                <ref bean="Common.ModifiedDateFromFileSystemID.ModelMap"/>
    6264                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
     
    7072                        <list>
    7173                                <ref bean="Publications.List.ModelMap"/>
     74                                <ref bean="Common.OrgUnits.ModelMap"/>
    7275                                <ref bean="Common.ModifiedDateFromFileSystemID.ModelMap"/>
    7376                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
  • trunk/src/main/webapps/ibisph-view/WEB-INF/config/spring/publish-remote.xml

    r3734 r3743  
    55        a remote admin application.  This mechanism is used when the admin and view
    66        apps exist on different app servers or do not have access to a shared/common 
    7         file server.  Direct file publishing offers several advantages over the 
    8         remote publishing mechanism; like faster, and easier to configure. 
     7        file server or when not using the RDBMS publishing mechanism.  Direct file
     8        publishing offers several advantages over the remote publishing mechanism;
     9        like faster, and easier to configure.  Publishing to an RDBMS has advantages
     10        in that published files are not contained within the app so deployments are
     11        cleaner.
    912
    1013        To use remote publishing both apps need to be configured to the appropriate
     
    6063                <property name="targetObject" ref="Common.Context.Servlet"/>
    6164                <property name="targetMethod" value="getRealPath"/>
    62                 <property name="arguments"><list><value>../ibisph-view/xml/indicator/published_profiles.xml</value></list></property>
     65                <property name="arguments"><list><value>xml/indicator/published_profiles.xml</value></list></property>
    6366        </bean>
    6467
     
    7477                (bean creation).  If the admin app is wired to publish directly then
    7578                this service is not needed (which is not the case with remote
    76                 publishing).   Summary: Service provides published_indicators.xml file
     79                publishing).   Summary: Service provides published_profiles.xml file
    7780                management.
    7881        -->
     
    9497        <bean id="Publish.PublishedIndicators.Service" class="org.ibisph.indicatorprofile.service.PublishedIndicatorsXML">
    9598                <property name="publishedIndicatorsPathAndFilename" ref="Publish.PublishedIndicatorProfilesXML.PathAndFilename"/>
    96                 <property name="XMLPath" ref="Indicator.Profile.XML.Path"/>
    97 <property name="XMLDocumentService" ref="Common.FileStoredXML.Service"/>
    98 <!--
     99                <property name="XMLPath" ref="Indicator.ProfileXML.Path"/>
     100                <property name="XMLDocumentService" ref="Common.XMLDocument.Service"/>
    99101                <property name="fileBackupFactory"  ref="Publish.Versioned.FileBackupFactory"/>
    100 -->
    101102        </bean>
    102103
     
    106107        <bean id="Publish.CategorizedIndex.Controller" class="org.ibisph.xml.springmvc.RemotePublishRequestController">
    107108                <property name="baseRequestURL"             ref="Common.AdminApp.CategorizedIndexXML.BaseURL"/>
    108                 <property name="destinationFilePath"        ref="Indicator.XML.Path"/>
    109 <property name="XMLDocumentService"         ref="Common.FileStoredXML.Service"/>
     109                <property name="destinationFilePath"        value="xml/indicator"/>
     110                <property name="XMLDocumentService"         ref="Common.XMLDocument.Service"/>
    110111                <property name="fileBackupFactory"          ref="Publish.Versioned.FileBackupFactory"/>
    111112        </bean>
     
    114115                <property name="baseRequestURL"             ref="Common.AdminApp.IndicatorXML.BaseURL"/>
    115116                <property name="baseIndicatorViewRequestURL" ref="Common.AdminApp.IndicatorViewXML.BaseURL"/>
    116                 <property name="destinationFilePath"        ref="Indicator.Profile.XML.Path"/>
    117 <property name="XMLDocumentService"         ref="Common.FileStoredXML.Service"/>
     117                <property name="destinationFilePath"        ref="Indicator.ProfileXML.Path"/>
     118                <property name="XMLDocumentService"         ref="Common.XMLDocument.Service"/>
    118119                <property name="fileBackupFactory"          ref="Publish.Versioned.FileBackupFactory"/>
    119120                <property name="publishedIndicatorsService" ref="Publish.PublishedIndicators.Service"/>
     
    123124                <property name="baseRequestURL"             ref="Common.AdminApp.OrgUnitsXML.BaseURL"/>
    124125                <property name="destinationFilePath"        ref="Publish.OrgUnitsXML.Path"/>
    125 <property name="XMLDocumentService"         ref="Common.FileStoredXML.Service"/>
     126                <property name="XMLDocumentService"         ref="Common.XMLDocument.Service"/>
    126127                <property name="fileBackupFactory"          ref="Publish.Versioned.FileBackupFactory"/>
    127128        </bean>
    128129
    129130</beans>
     131
  • trunk/src/main/webapps/ibisph-view/WEB-INF/config/spring/query.xml

    r3737 r3743  
    1818        </bean>
    1919
    20         <bean id="Query.HTMLContent.XML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     20        <bean id="Query.HTMLContentXML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
    2121                <property name="targetObject" ref="Common.Context.Servlet"/>
    2222                <property name="targetMethod" value="getRealPath"/>
     
    2424        </bean>
    2525        <bean id="Query.Introduction.XML.SystemID" class="org.ibisph.systemid.FileSystemID">
    26                 <constructor-arg ref="Query.HTMLContent.XML.Path"/>
     26                <constructor-arg ref="Query.HTMLContentXML.Path"/>
    2727                <constructor-arg value="Introduction.xml"/>
    2828        </bean>
    2929
    30         <bean id="Query.ModuleBase.XML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     30        <bean id="Query.ModuleXML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
    3131                <property name="targetObject" ref="Common.Context.Servlet"/>
    3232                <property name="targetMethod" value="getRealPath"/>
     
    5555        <!-- S E R V I C E S -->
    5656        <bean id="Query.Module.XML.Service" class="org.ibisph.querymodule.service.QueryModuleXML">
    57                 <property name="XMLPath"            ref="Query.ModuleBase.XML.Path"/>
     57                <property name="XMLPath"            ref="Query.ModuleXML.Path"/>
    5858                <property name="XMLDocumentService" ref="Query.QueryModule.XMLDocumentService"/>
    5959        </bean>
     
    6565        <!-- X M L   M O D E L S -->
    6666        <bean id="Query.HTMLContent.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestEndOfPathInfo" parent="Common.XMLModelMap.CommonProperties">
    67                 <property name="FilePath" ref="Query.HTMLContent.XML.Path"/>
     67                <property name="filePath" ref="Query.HTMLContentXML.Path"/>
    6868        </bean>
    6969        <bean id="Query.DefaultHTMLContent.ModelMap" class="org.ibisph.modelmap.DefaultModelIfNullModel" parent="Common.XMLModelMap.CommonProperties">
     
    7272
    7373        <bean id="Query.ModuleSelectionSystemID.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestPathInfo" parent="Common.XMLModelMap.CommonProperties">
    74                 <property name="FilePath" ref="Query.ModuleBase.XML.Path"/>
     74                <property name="filePath" ref="Query.ModuleXML.Path"/>
    7575        </bean>
    7676
     
    133133                                <ref bean="Query.HTMLContent.ModelMap"/>
    134134                                <ref bean="Query.DefaultHTMLContent.ModelMap"/>
     135                                <ref bean="Common.OrgUnits.ModelMap"/>
    135136                                <ref bean="Common.ModifiedDateFromFileSystemID.ModelMap"/>
    136137                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
     
    145146                        <list>
    146147                                <ref bean="Query.ModuleSelectionSystemID.ModelMap"/>
     148                                <ref bean="Common.OrgUnits.ModelMap"/>
    147149                                <ref bean="Common.ModifiedDateFromFileSystemID.ModelMap"/>
    148150                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
     
    159161                                <ref bean="Query.Module.ModifiedDate.ModelMap"/>
    160162                                <ref bean="QueryDefinition.AddStickyDefinition.ModelMap"/>
     163                                <ref bean="Common.OrgUnits.ModelMap"/>
    161164                                <ref bean="Common.WebAppURLContextPrefixFromHTTPRequest.ModelMap"/>
    162165                        </list>
     
    188191                                <ref bean="Query.Module.ChangeDisplay.ModelMap"/>
    189192                                <ref bean="Query.Module.ModifiedDate.ModelMap"/>
     193                                <ref bean="Common.OrgUnits.ModelMap"/>
    190194                                <ref bean="Common.WebAppURLContextPrefixFromHTTPRequest.ModelMap"/>
    191195                        </list>
  • trunk/src/main/webapps/ibisph-view/WEB-INF/config/spring/query_definition.xml

    r3727 r3743  
    3636        <bean id="QueryDefinition.XML.Service" class="org.ibisph.querydefinition.service.QueryDefinitionXML">
    3737                <property name="XMLPath"            ref="QueryDefinition.XML.Path"/>
    38                 <property name="XMLDocumentService" ref="Common.BLOBStoredXML.Service"/>
     38                <property name="XMLDocumentService" ref="Common.XMLDocument.Service"/>
    3939        </bean>
    4040        <bean id="QueryDefinition.DefinitionToModule.Service" class="org.ibisph.querydefinition.service.QueryDefinitionXMLToQueryModuleXML"/>
  • trunk/src/main/webapps/ibisph-view/WEB-INF/config/spring/secure.xml

    r3727 r3743  
    1414
    1515        <!--  M O D E L S   /   C O N T R O L L E R   R E S O R U C E S -->
    16         <bean id="Secure.Selection.XML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     16        <bean id="Secure.SelectionXML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
    1717                <property name="targetObject" ref="Common.Context.Servlet"/>
    1818                <property name="targetMethod" value="getRealPath"/>
     
    2020        </bean>
    2121        <bean id="Secure.DefaultSelection.XML.SystemID" class="org.ibisph.systemid.FileSystemID">
    22                 <constructor-arg ref="Secure.Selection.XML.Path"/>
     22                <constructor-arg ref="Secure.SelectionXML.Path"/>
    2323                <constructor-arg value="Index.xml"/>
    2424        </bean>
    25         <bean id="Secure.QueryModuleBase.XML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     25        <bean id="Secure.QueryModuleXML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
    2626                <property name="targetObject" ref="Common.Context.Servlet"/>
    2727                <property name="targetMethod" value="getRealPath"/>
     
    3232
    3333        <bean id="Secure.QueryModule.XML.Service" class="org.ibisph.querymodule.service.QueryModuleXML">
    34                 <property name="XMLPath"            ref="Secure.QueryModuleBase.XML.Path"/>
     34                <property name="XMLPath"            ref="Secure.QueryModuleXML.Path"/>
    3535                <property name="XMLDocumentService" ref="Query.QueryModule.XMLDocumentService"/>
    3636        </bean>
     
    4242        </bean>
    4343        <bean id="Secure.Selection.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestEndOfPathInfo" parent="Common.XMLModelMap.CommonProperties">
    44                 <property name="FilePath" ref="Secure.Selection.XML.Path"/>
     44                <property name="filePath" ref="Secure.SelectionXML.Path"/>
    4545        </bean>
    4646
    4747        <bean id="Secure.Query.ModuleSelectionSystemID.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestPathInfo" parent="Common.XMLModelMap.CommonProperties">
    48                 <property name="FilePath" ref="Secure.QueryModuleBase.XML.Path"/>
     48                <property name="filePath" ref="Secure.QueryModuleXML.Path"/>
    4949        </bean>
    5050        <bean id="Secure.QueryModule.DocumentFromHTTPRequest.ModelMap" class="org.ibisph.querymodule.modelmap.QueryModuleFromHTTPRequest" parent="Common.XMLModelMap.CommonProperties">
     
    6161                                <ref bean="Secure.DefaultSelection.ModelMap"/>
    6262                                <ref bean="Secure.UserAuthoritiesXML.ModelMap"/>
     63                                <ref bean="Common.OrgUnits.ModelMap"/>
    6364                                <ref bean="Common.ModifiedDateFromFileSystemID.ModelMap"/>
    6465                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
     
    7475                        <list>
    7576                                <ref bean="Secure.Query.ModuleSelectionSystemID.ModelMap"/>
     77                                <ref bean="Common.OrgUnits.ModelMap"/>
    7678                                <ref bean="Common.ModifiedDateFromFileSystemID.ModelMap"/>
    7779                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
     
    8688                                <ref bean="Secure.QueryModule.DocumentFromHTTPRequest.ModelMap"/>
    8789                                <ref bean="Query.Module.ModifiedDate.ModelMap"/>
     90                                <ref bean="Common.OrgUnits.ModelMap"/>
    8891                                <ref bean="Common.WebAppURLContextPrefixFromHTTPRequest.ModelMap"/>
    8992                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
     
    100103                                <ref bean="Query.Module.DeleteIBISQResult.ModelMap"/>
    101104                                <ref bean="Query.Module.ModifiedDate.ModelMap"/>
     105                                <ref bean="Common.OrgUnits.ModelMap"/>
    102106                                <ref bean="Common.WebAppURLContextPrefixFromHTTPRequest.ModelMap"/>
    103107                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
     
    115119                                <ref bean="Query.Module.ChangeDisplay.ModelMap"/>
    116120                                <ref bean="Query.Module.ModifiedDate.ModelMap"/>
     121                                <ref bean="Common.OrgUnits.ModelMap"/>
    117122                                <ref bean="Common.WebAppURLContextPrefixFromHTTPRequest.ModelMap"/>
    118123                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
  • trunk/src/main/webapps/ibisph-view/WEB-INF/config/spring/security-xml_authentication.xml

    r3727 r3743  
    2424        <bean id="Security-XML.Authentication.UserDetails.Service" class="org.ibisph.user.springsecurity.XMLUserDetailsService">
    2525                <property name="XMLPath"            ref="Security-XML.UserXML.Path"/>
    26                 <property name="XMLDocumentService" ref="Common.FileStoredXML.Service"/>
     26                <property name="XMLDocumentService" ref="Common.XMLDocument.Service"/>
    2727        </bean>
    2828
  • trunk/src/main/webapps/ibisph-view/WEB-INF/config/spring/user.xml

    r3727 r3743  
    1818        </bean>
    1919
    20         <bean id="User.HTMLContent.XML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     20        <bean id="User.HTMLContentXML.Path" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
    2121                <property name="targetObject" ref="Common.Context.Servlet"/>
    2222                <property name="targetMethod" value="getRealPath"/>
     
    3131
    3232        <bean id="User.RegistartionStatus.HTMLContent.XML.SystemID" class="org.ibisph.systemid.FileSystemID">
    33                 <constructor-arg ref="User.HTMLContent.XML.Path"/>
     33                <constructor-arg ref="User.HTMLContentXML.Path"/>
    3434                <constructor-arg value="Status.xml"/>
    3535        </bean>
     
    125125        <bean id="User.XML.Service" class="org.ibisph.user.service.UserProfileXML">
    126126                <property name="XMLPath"            ref="User.XML.Path"/>
    127 <property name="XMLDocumentService" ref="Common.BLOBStoredXML.Service"/>
     127                <property name="XMLDocumentService" ref="Common.XMLDocument.Service"/>
    128128        </bean>
    129129
     
    241241        </bean>
    242242        <bean id="User.HTMLContent.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestEndOfPathInfo" parent="Common.XMLModelMap.CommonProperties">
    243                 <property name="FilePath" ref="User.HTMLContent.XML.Path"/>
     243                <property name="filePath" ref="User.HTMLContentXML.Path"/>
    244244        </bean>
    245245
     
    304304                                <ref bean="User.HTMLContent.ModelMap"/>
    305305                                <ref bean="User.DefaultHTMLContent.ModelMap"/>
     306                                <ref bean="Common.OrgUnits.ModelMap"/>
    306307                                <ref bean="Common.ModifiedDateFromFileSystemID.ModelMap"/>
    307308                                <ref bean="Common.HTTPRequestParameters.ModelMap"/>
  • trunk/src/main/webapps/ibisph-view/WEB-INF/web.xml

    r3727 r3743  
    172172                                /WEB-INF/config/spring/home.xml
    173173                                /WEB-INF/config/spring/publications.xml
    174                                 /WEB-INF/config/spring/indicator.xml
     174                                /WEB-INF/config/spring/indicator_blob.xml
    175175                                /WEB-INF/config/spring/community.xml
    176176                                /WEB-INF/config/spring/query.xml
  • trunk/src/main/webapps/ibisph-view/xslt/html/Page.xslt

    r3484 r3743  
    393393        >
    394394                <xsl:param name="orgUnitName" select="if(string-length($Page.orgUnitName) = 0) then 'DEFAULT' else $Page.orgUnitName"/>
    395                 <xsl:param name="orgUnit" select="$Page.orgUnits/ORG_UNIT[NAME=$orgUnitName]"/>
     395                <xsl:param name="orgUnit" select="$Page.orgUnits//ORG_UNIT[NAME=$orgUnitName]"/>
    396396
    397397                <xsl:if test="string-length($orgUnit/TITLE) &gt; 0">
  • trunk/src/main/webapps/ibisph-view/xslt/html/indicator/index/categorized/Page.xslt

    r3225 r3743  
    2525
    2626        <xsl:param name="CategorizedIndexName"/>
    27 
    28         <xsl:param name="CategorizedIndex.publishedProfilesXMLFilePath" select="'published_profiles.xml'"/>
    29 
    30 
    31         <!-- changed 1/12/07 to accomodate the admin cat index preview
    32         <xsl:param name="publishedIndicators" select="document('published_profiles.xml', /)/INDICATORS"/>
    33         -->
    34         <xsl:param name="publishedIndicators" select="document($CategorizedIndex.publishedProfilesXMLFilePath, /)/INDICATORS"/>
    35 
    36         <xsl:param name="categorizedIndexes" select="/CATEGORIZED_INDEXES"/>
     27        <xsl:param name="publishedIndicators" select="document('published_profiles.xml', /)"/>
     28        <xsl:param name="categorizedIndexes"  select="/CATEGORIZED_INDEXES"/>
    3729
    3830        <xsl:param name="indexTitle">
     
    216208                                -->
    217209                                <xsl:choose>
    218                                         <xsl:when test="exists($publishedIndicators/INDICATOR[NAME=$indexElement/INDICATOR_NAME])">
     210                                        <xsl:when test="exists($publishedIndicators//INDICATOR[NAME=$indexElement/INDICATOR_NAME])">
    219211                                                <a class="Document" title="Go to the Indicator Profile report page view."
    220                                                         href="{concat($ibis.urlPrefix, 'indicator/view/', $publishedIndicators/INDICATOR[NAME=$indexElement/INDICATOR_NAME]/DEFAULT_INDICATOR_VIEW_NAME, '.html')}"
     212                                                        href="{concat($ibis.urlPrefix, 'indicator/view/', $publishedIndicators//INDICATOR[NAME=$indexElement/INDICATOR_NAME]/DEFAULT_INDICATOR_VIEW_NAME, '.html')}"
    221213                                                >
    222214                                                        <span class="Icon"/>
     
    227219                                                                        </xsl:when>
    228220                                                                        <xsl:otherwise>
    229                                                                                 <xsl:value-of select="$publishedIndicators/INDICATOR[NAME=$indexElement/INDICATOR_NAME]/TITLE"/>
     221                                                                                <xsl:value-of select="$publishedIndicators//INDICATOR[NAME=$indexElement/INDICATOR_NAME]/TITLE"/>
    230222                                                                        </xsl:otherwise>
    231223                                                                </xsl:choose>
  • trunk/src/main/webapps/ibisph-view/xslt/html/indicator/profile/Graphic.xslt

    r3225 r3743  
    127127                                <h2><xsl:value-of select="$indicatorView/SUPPLEMENTAL_IMAGE_TITLE"/></h2>
    128128                        </xsl:if>
    129                         <img src="{$indicatorView/SUPPLEMENTAL_IMAGE_URL}"/>
     129                        <img width="590" src="{$indicatorView/SUPPLEMENTAL_IMAGE_URL}"/>
    130130                        <br/>
    131131
  • trunk/src/main/webapps/ibisph-view/xslt/html/indicator/profile/Indicator.xslt

    r3738 r3743  
    404404                <xsl:param name="relatedIndicatorNames" select="
    405405                        if($previewFlag)then $relation/RELATED_INDICATOR_NAMES/RELATED_INDICATOR_NAME
    406                         else $relation/RELATED_INDICATOR_NAMES/RELATED_INDICATOR_NAME[text() = $Indicator.publishedIndicators/INDICATOR/NAME]"
     406                        else $relation/RELATED_INDICATOR_NAMES/RELATED_INDICATOR_NAME[text() = $Indicator.publishedIndicators//INDICATOR/NAME]"
    407407                />
    408408
     
    418418                        <ul>
    419419                        <xsl:for-each select="$relatedIndicatorNames">
    420                                 <xsl:variable name="indicatorXMLFilename" select="concat(current(), '.xml')"/>
    421                                 <xsl:variable name="indicator" select="document($indicatorXMLFilename, /)/INDICATOR"/>
     420<xsl:variable name="indicatorXMLFilename" select="concat(current(), '.xml')"/>
     421<xsl:variable name="indicator" select="document($indicatorXMLFilename, /)/INDICATOR"/>
    422422                                <li>
    423423                                        <a href="{if($previewFlag) then '#' else concat($ibis.urlPrefix, 'indicator/view/', $indicator/DEFAULT_INDICATOR_VIEW_NAME, '.html')}">
Note: See TracChangeset for help on using the changeset viewer.