Changeset 3727 in main


Ignore:
Timestamp:
04/18/12 17:32:43 (10 years ago)
Author:
Garth Braithwaite
Message:

java and view webapp - temp commit - refactored blob handing to be pluggable. Getting close - compiles, runs but user throws error.

Location:
trunk/src/main
Files:
9 added
1 deleted
18 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/main/java/org/ibisph/indicatorprofile/service/PublishedIndicatorsXML.java

    r3535 r3727  
    2424  protected String activeFlag = "x";
    2525
    26   protected File publishedIndicatorsFile  = null;
     26  protected String publishedIndicatorsPathAndFilename = null;
    2727  protected String indicatorProfileXMLPath = null;
    2828
    29   protected org.ibisph.xml.dao.Document documentDAO = null;
     29  protected org.ibisph.xml.service.Document xmlDocumentService = null;
    3030
    3131  protected org.ibisph.filebackup.FileBackupFactory fileBackupFactory  = null;
     
    4141  ) throws java.net.URISyntaxException {
    4242    java.net.URI uri = new java.net.URI(publishedIndicatorProfilesSystemID.toString());
    43     this.publishedIndicatorsFile = new java.io.File(uri);
     43//    this.publishedIndicatorsPathAndFilename = new java.io.File(uri);
    4444  } //-------------------------- End of Method ------------------------------
    4545
     
    6767   * Sets the DAO object that will be used to save the XML content with. 
    6868   * This simply keeps with the plugable Spring framework.
    69    * @param documentDAO Standard Document DAO used to save the XML document
    70    *   to disk.
    71    */
    72   public void setDocumentDAO(org.ibisph.xml.dao.Document documentDAO) {this.documentDAO = documentDAO;}
     69   * @param xmlDocumentService Document DAO type service used to persist the XML.
     70   */
     71  public void setXMLDocumentService(org.ibisph.xml.service.Document xmlDocumentService) {
     72    this.xmlDocumentService = xmlDocumentService;
     73  } //-------------------------- End of Method ------------------------------
    7374
    7475  /**
     
    8889   */
    8990  public Document getPublishedIndicators() throws Exception {
    90     Document document = documentDAO.get(this.publishedIndicatorsFile);
     91    Document document = xmlDocumentService.get(this.publishedIndicatorsPathAndFilename);
    9192    if(document == null) document = XMLLib.newDocument("INDICATORS");
    9293    return(document);
     
    184185    StringBuffer actionsReturnMessage = new StringBuffer();
    185186    org.ibisph.filebackup.FileBackup fileBackup = null;
    186     if(this.fileBackupFactory != null) fileBackup = this.fileBackupFactory.newFileBackup(publishedIndicatorsFile);
     187    if(this.fileBackupFactory != null) fileBackup = this.fileBackupFactory.newFileBackup(publishedIndicatorsPathAndFilename);
    187188    try {
    188189      // Note: used null output format so that the pretty printer would be used.
     
    190191      // messed if the standard output format (which works great for indicator
    191192      // xml) is used???
    192       documentDAO.save(publishedIndicators, publishedIndicatorsFile);
     193      xmlDocumentService.save(publishedIndicators, publishedIndicatorsPathAndFilename);
    193194      actionsReturnMessage.append("Published indicator profiles document saved to XML file.  ");
    194195    }
     
    196197      actionsReturnMessage.append("Problem saving the published indicator profiles file.  ");
    197198      if(fileBackup != null) {
    198         publishedIndicatorsFile.delete();
     199//        publishedIndicatorsPathAndFilename.delete();
    199200        fileBackup.restore();
    200201      }
     
    215216  public synchronized String verifyPublishedIndicatorsXMLFile() throws Exception {
    216217    StringBuffer statusMessage = new StringBuffer();
    217     statusMessage.append("Checking Published Indicators XML File ").append(this.publishedIndicatorsFile.getName());
    218     if(this.publishedIndicatorsFile.exists()) {
    219       statusMessage.append(".  File exists.");
    220     }
    221     else {
    222       statusMessage.append(".  File DOES NOT EXIST.  Recreating it.  Status: ");
    223       statusMessage.append(createPublishedIndicatorsXMLFile());
    224     }
     218//    statusMessage.append("Checking Published Indicators XML File ").append(this.publishedIndicatorsPathAndFilename.getName());
     219//    if(this.publishedIndicatorsPathAndFilename.exists()) {
     220//      statusMessage.append(".  File exists.");
     221//    }
     222//    else {
     223//      statusMessage.append(".  File DOES NOT EXIST.  Recreating it.  Status: ");
     224//      statusMessage.append(createPublishedIndicatorsXMLFile());
     225//    }
    225226    logger.info(".verifyPublishedIndicatorsXMLFile - status: {}", statusMessage);
    226227    return(statusMessage.toString());
     
    237238
    238239    String directoryPath = this.indicatorProfileXMLPath;
    239     if(directoryPath == null) directoryPath = IOPath.getPath( this.publishedIndicatorsFile.getAbsolutePath() );
     240//    if(directoryPath == null) directoryPath = IOPath.getPath( this.publishedIndicatorsPathAndFilename.getAbsolutePath() );
    240241    File directory = new File(directoryPath);
    241242    String[] xmlFiles = directory.list( new XMLFileNameFilter() );
     
    244245      org.ibisph.filebackup.FileBackup fileBackup = null;
    245246      if(this.fileBackupFactory != null)
    246         fileBackup = this.fileBackupFactory.newFileBackup(publishedIndicatorsFile);
    247       else if(this.publishedIndicatorsFile.exists())
    248         this.publishedIndicatorsFile.delete();
     247        fileBackup = this.fileBackupFactory.newFileBackup(publishedIndicatorsPathAndFilename);
     248//      else if(this.publishedIndicatorsPathAndFilename.exists())
     249//        this.publishedIndicatorsPathAndFilename.delete();
    249250      Document publishedProfilesDocument = getPublishedIndicators();
    250251      Document indicatorProfileDocument;
     
    252253      try {
    253254        for(int i=0; i < xmlFiles.length; i++) {
    254           indicatorProfileDocument = documentDAO.get( IOPath.concat(directoryPath, xmlFiles[i]));
     255          indicatorProfileDocument = xmlDocumentService.get( IOPath.concat(directoryPath, xmlFiles[i]));
    255256          if(indicatorProfileDocument.getRootElement().getName().equals("INDICATOR")) {
    256257            actionsReturnMessage.append(
     
    264265        actionsReturnMessage.append("Problem saving the published indicator profiles file.  ");
    265266        if(fileBackup != null) {
    266           this.publishedIndicatorsFile.delete();
     267//          this.publishedIndicatorsPathAndFilename.delete();
    267268          fileBackup.restore();
    268269        }
  • trunk/src/main/java/org/ibisph/jdbc/JDBCTemplate.java

    r3726 r3727  
    220220    }
    221221    catch(SQLException ex) {
    222       logException("setPreparedStatementBLOB", "Position: "+ position+ ", inputStream: "+inputStream, ex);
     222      logException("setPreparedStatementInputStream", "Position: "+ position+ ", inputStream: "+inputStream, ex);
    223223    }
    224224    return(false);
     
    227227  public boolean setPreparedStatementBlob(int position, byte[] byteArray) {
    228228    ByteArrayInputStream bais = new ByteArrayInputStream(byteArray);
    229     try {
    230       preparedStatement.setBinaryStream(position, bais);
    231 //      setPreparedStatementInputStream(position, bais);
    232       return(true);
    233     }
    234     catch(SQLException ex) {
    235       logException("setPreparedStatementBLOB", "Position: "+ position+ ", byteArray length: "+byteArray.length, ex);
    236     }
    237     finally {
    238       try { bais.close(); }
    239       catch(Exception e) {}
    240     }
    241     return(false);
    242   } //-------------------------- End of Method ------------------------------
    243 
    244 
    245 
    246 
    247 
     229    return(
     230      setPreparedStatementInputStream(position, bais)
     231    );
     232  } //-------------------------- End of Method ------------------------------
    248233
    249234
  • trunk/src/main/java/org/ibisph/querydefinition/service/QueryDefinitionXML.java

    r3679 r3727  
    11package org.ibisph.querydefinition.service;
    22
    3 import java.io.IOException;
    43import java.util.Date;
    54
    65import org.dom4j.Document;
    7 import org.dom4j.DocumentException;
    86import org.dom4j.Element;
    97
     
    2018  protected static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(QueryDefinitionXML.class);
    2119
     20  protected String queryDefinitionsRootElementName = "QUERY_DEFINITIONS";
    2221  protected String xmlPath = "";
    23 
    24   protected String queryDefinitionsRootElementName = "QUERY_DEFINITIONS";
    25   protected org.ibisph.xml.dao.Document documentDAO = new org.ibisph.xml.dao.Document();
     22  protected org.ibisph.xml.service.Document xmlDocumentService = null;
    2623
    2724
    2825  //------------------------------------------- P R O P E R T Y   S E T T E R S
    29 
    30   /**
    31    * Sets the DAO object that will be used to save the XML content with. 
    32    * This simply keeps with the plugable Spring framework.
    33    * @param documentDAO Standard Document DAO used to save the XML document
    34    *   to disk.
    35    */
    36   public void setDocumentDAO(org.ibisph.xml.dao.Document documentDAO) {
    37     this.documentDAO = documentDAO;
    38   } //-------------------------- End of Method ------------------------------
    3926
    4027  /**
     
    4633  } //-------------------------- End of Method ------------------------------
    4734
     35  /**
     36   * Sets the DAO object that will be used to save the XML content with. 
     37   * This simply keeps with the plugable Spring framework.
     38   * @param xmlDocumentService Service/DAO used to save the XML document to disk.
     39   */
     40  public void setXMLDocumentService(org.ibisph.xml.service.Document xmlDocumentService) {
     41    this.xmlDocumentService = xmlDocumentService;
     42  } //-------------------------- End of Method ------------------------------
     43
    4844
    4945  //-------------------------------------------- P U B L I C   S E R V I C E S
    5046
    51   public Document getQueryDefinitions(String queryDefinitionsName) throws DocumentException {
     47  public Document getQueryDefinitions(String queryDefinitionsName) throws Exception {
    5248    String filename = getQueryDefinitionsXMLPathAndFilename(queryDefinitionsName);
    53     Document document = this.documentDAO.get(filename);
     49    Document document = this.xmlDocumentService.get(filename);
    5450    if(document == null) {
    5551      document = XMLLib.newDocument(this.queryDefinitionsRootElementName);
     
    6258    Document queryDefinitionsDocument,
    6359    String   queryDefinitionsName
    64   ) throws IOException {
     60  ) throws Exception {
    6561    XMLLib.setElementText(queryDefinitionsDocument.getRootElement(), "NAME", queryDefinitionsName);
    6662    String filename = getQueryDefinitionsXMLPathAndFilename(queryDefinitionsName);
    67     this.documentDAO.save(queryDefinitionsDocument, filename);
     63    this.xmlDocumentService.save(queryDefinitionsDocument, filename);
    6864  } //-------------------------- End of Method ------------------------------
    6965
    7066
    71   public void saveQueryDefinition(
    72     String  queryDefinitionsName,
    73     Element queryDefinition
    74   ) throws IOException, DocumentException  {
     67  public void saveQueryDefinition(String queryDefinitionsName, Element queryDefinition) throws Exception {
    7568    Date now = new Date();
    7669    XMLLib.replaceElement(queryDefinition, XMLLib.newElement("MODIFIED_DATE", now.toString()));
     
    8376
    8477
    85   public Element getQueryDefinition(
    86     String queryDefinitionsName,
    87     String queryDefinitionName
    88   ) throws IOException, DocumentException  {
     78  public Element getQueryDefinition(String queryDefinitionsName, String queryDefinitionName) throws Exception {
    8979    Document queryDefinitions = this.getQueryDefinitions(queryDefinitionsName);
    9080    return( (Element)XMLLib.getNode(queryDefinitions, "/QUERY_DEFINITIONS/QUERY_DEFINITION[NAME='" + queryDefinitionName + "']") );
  • trunk/src/main/java/org/ibisph/querymodule/service/QueryModuleXML.java

    r3654 r3727  
    11package org.ibisph.querymodule.service;
    22
     3import java.util.HashMap;
    34import java.util.Map;
    4 import java.util.HashMap;
    55
    66import org.dom4j.Document;
     
    1010import org.ibisph.util.StrLib;
    1111import org.ibisph.util.XMLLib;
     12import org.ibisph.xml.service.XIncludeDocument;
    1213
    1314/**
     
    2526  private static long loadCount = 0L; // used to track number of times query modules are loaded.
    2627
    27   protected String xmlPath            = null;
    28   protected Object documentDAO = null;
     28  protected String xmlPath = null;
     29  protected XIncludeDocument xmlDocumentService = null;
    2930
    3031
     
    5657   * Sets the XML DAO to be used to load the query module file.  This usually
    5758   * is an XInclude XSLT transformation DAO or a straight XML file reader etc.
    58    * @param documentDAO DAO to be used.
     59   * @param xmlDocumentService DAO to be used.
    5960   */   
    60   public void setDocumentDAO(Object documentDAO) {this.documentDAO = documentDAO;}
     61  public void setXMLDocumentService(XIncludeDocument xmlDocumentService) {
     62    this.xmlDocumentService = xmlDocumentService;
     63  }
    6164
    6265  /**
     
    8689    String configurationName = IOPath.getFilenameWithoutExtension(configurationPath);
    8790    String xmlFilename       = IOPath.concat(xmlPath, IOPath.getPath(configurationPath) + ".xml");
    88     if(documentDAO instanceof org.ibisph.xml.dao.XIncludeDocument) {
     91    if(xmlDocumentService instanceof org.ibisph.xml.service.XIncludeDocument) {
    8992      HashMap<String, Object> parameterMap = new HashMap<String, Object>();
    9093      parameterMap.put(transformationConfigurationNameParameterName, configurationName);
    91       queryModule = ((org.ibisph.xml.dao.XIncludeDocument)documentDAO).get(xmlFilename, parameterMap);
    92     }
    93     else if(documentDAO instanceof org.ibisph.xml.dao.Document)
    94       queryModule = ((org.ibisph.xml.dao.Document)documentDAO).get(xmlFilename);
     94      queryModule = ((org.ibisph.xml.service.XIncludeDocument)xmlDocumentService).get(xmlFilename, parameterMap);
     95    }
     96    else if(xmlDocumentService instanceof org.ibisph.xml.service.Document)
     97      queryModule = ((org.ibisph.xml.service.Document)xmlDocumentService).get(xmlFilename);
    9598
    9699    // create the new query module object and populate with the just acquired
  • trunk/src/main/java/org/ibisph/user/service/UserProfileXML.java

    r3715 r3727  
    11package org.ibisph.user.service;
    22
    3 import java.io.IOException;
    43
    54import org.dom4j.Document;
    6 import org.dom4j.DocumentException;
    75
    86import org.ibisph.util.IOPath;
     
    2119
    2220  protected String userRootElementName = "USER";
    23   protected org.ibisph.xml.dao.Document documentDAO = new org.ibisph.xml.dao.Document();
     21  protected org.ibisph.xml.service.Document xmlDocumentService = null;
    2422
    2523
     
    2927   * Sets the DAO object that will be used to get/save the XML content with. 
    3028   * This simply keeps with the plugable Spring framework.
    31    * @param documentDAO Standard Document DAO used to save the XML document
    32    *   to disk.
     29   * @param xmlDocumentService Standard Document DAO used to persist the XML document.
    3330   */
    34   public void setDocumentDAO(org.ibisph.xml.dao.Document documentDAO) {
    35     this.documentDAO = documentDAO;
     31  public void setXMLDocumentService(org.ibisph.xml.service.Document xmlDocumentService) {
     32    this.xmlDocumentService = xmlDocumentService;
    3633  } //-------------------------- End of Method ------------------------------
    3734
     
    4744  //-------------------------------------------- P U B L I C   S E R V I C E S
    4845
    49   public Document getUser(String userName) throws DocumentException {
     46  public Document getUser(String userName) throws Exception {
    5047    String filename = getXMLPathAndFilename(userName);
    51     Document document = this.documentDAO.get(filename);
     48    Document document = this.xmlDocumentService.get(filename);
    5249//    if(document == null) {
    5350//      document = XMLLib.newDocument(this.userRootElementName);
     
    5754  } //-------------------------- End of Method ------------------------------
    5855
    59   public void saveUser(Document userDocument) throws IOException {
     56  public void saveUser(Document userDocument) throws Exception {
    6057    String id = XMLLib.getText(userDocument, "/USER/ID");
    6158    String filename = getXMLPathAndFilename(id);
    62     this.documentDAO.save(userDocument, filename);
     59    this.xmlDocumentService.save(userDocument, filename);
    6360  } //-------------------------- End of Method ------------------------------
    6461
  • trunk/src/main/java/org/ibisph/user/springsecurity/XMLUserDetailsService.java

    r3715 r3727  
    4343  protected boolean enableGroups      = true;
    4444
    45   protected org.ibisph.xml.dao.Document documentDAO = new org.ibisph.xml.dao.Document();
     45  protected org.ibisph.xml.service.Document xmlDocumentService = null;
    4646  protected String xmlPath = "";
    4747//protected UserProfile userProfileXMLService = new UserProfile();
     
    6767
    6868  /**
    69    * Injects the XML DAO Service to be used to load the User Bean.
    70    * @param beanDAOService
    71    */
    72 //  public void setUserProfileXMLService(UserProfile userProfileXMLService) {
    73 //    this.userProfileXMLService = userProfileXMLService;
    74 //  } //-------------------------- End of Method ------------------------------
    75 
    76   /**
    7769   * Sets the DAO object that will be used to get/save the XML content with. 
    7870   * This simply keeps with the plugable Spring framework.
    79    * @param documentDAO Standard Document DAO used to save the XML document
    80    *   to disk.
    81    */
    82   public void setDocumentDAO(org.ibisph.xml.dao.Document documentDAO) {
    83     this.documentDAO = documentDAO;
     71   * @param xmlDocumentService Standard Document DAO used to persist the XML document.
     72   */
     73  public void setXMLDocumentService(org.ibisph.xml.service.Document xmlDocumentService) {
     74    this.xmlDocumentService = xmlDocumentService;
    8475  } //-------------------------- End of Method ------------------------------
    8576
     
    10495//      userDocument = userProfileXMLService.getUser(username);
    10596      String xmlFilename = IOPath.concat(this.xmlPath, username + ".xml");
    106       userDocument = this.documentDAO.get(xmlFilename);
     97      userDocument = this.xmlDocumentService.get(xmlFilename);
    10798      if(userDocument == null) {
    10899        throw new UsernameNotFoundException(
  • trunk/src/main/java/org/ibisph/util/XMLLib.java

    r3535 r3727  
    2828    return(DocumentHelper.parseText(xmlString));
    2929  } //------------------------------ End of Method ---------------------------
     30
     31  /**
     32   * Localizes the parsing of an XML byte array into a new document.
     33   * @param xmlByteArray XML structured byte array to be parsed.
     34   * @return new Document based on the parsed XML.
     35   * @throws DocumentException
     36   */
     37  public static Document parseToNewDocument(byte[] xmlByteArray) throws DocumentException {
     38    return(DocumentHelper.parseText(new String(xmlByteArray)));
     39  } //------------------------------ End of Method ---------------------------
     40
    3041
    3142  /**
  • trunk/src/main/java/org/ibisph/xml/springmvc/RemotePublishRequestController.java

    r3536 r3727  
    3333  protected String destinationFilePath = null;
    3434
    35   protected org.ibisph.xml.dao.Document documentDAO = null;
     35  protected org.ibisph.xml.service.Document xmlDocumentService = null;
    3636
    3737  protected org.ibisph.filebackup.FileBackupFactory fileBackupFactory  = null;
     
    5555   * Sets the DAO object that will be used to save the XML content with. 
    5656   * This simply keeps with the plugable Spring framework.
    57    * @param documentDAO Standard Document DAO used to save the XML document
    58    *   to disk.
    59    */
    60   public void setDocumentDAO(org.ibisph.xml.dao.Document documentDAO) {this.documentDAO = documentDAO;}
     57   * @param xmlDocumentService Document DAO type service used to persist the XML.
     58   */
     59  public void setXMLDocumentService(org.ibisph.xml.service.Document xmlDocumentService) {
     60    this.xmlDocumentService = xmlDocumentService;
     61  } //-------------------------- End of Method ------------------------------
    6162
    6263  /**
     
    225226    }
    226227
    227     documentDAO.save(document, filenameAndPath);
     228    xmlDocumentService.save(document, filenameAndPath);
    228229    responseMessage.append("Content saved to: ").append(filenameAndPath).append(".  ");
    229230  } //-------------------------- End of Method ------------------------------
  • trunk/src/main/webapps/ibisph-view/WEB-INF/config/spring/common.xml

    r3726 r3727  
    181181        </bean>
    182182
    183         <bean id="Common.XML.DAO" class="org.ibisph.xml.dao.Document">
     183        <bean id="Common.FileStoredXML.Service" class="org.ibisph.xml.service.FileStoredDocument">
    184184                <property name="outputFormat" ref="Common.XML.OutputFormat"/>
    185185        </bean>
    186 <bean id="Common.BLOB.DAO" class="org.ibisph.xml.dao.BLOBDocument">
    187         <property name="outputFormat" ref="Common.XML.OutputFormat"/>
    188         <property name="JDBCTemplateFactory">
    189                 <bean class="org.ibisph.jdbc.JDBCTemplateFactory">
    190                         <property name="dataSource">
    191                                 <bean class="org.springframework.jndi.JndiObjectFactoryBean">
    192                                         <property name="jndiName" value="java:comp/env/jdbc/doh_ibisph"/>
    193                                 </bean>
    194                         </property>
    195                 </bean>
    196         </property>
    197 </bean>
    198 <!--
    199         <bean id="Common.JDBCTemplate.Factory" class="org.ibisph.jdbc.JDBCTemplateFactory">
    200                 <property name="dataSource" ref="Common.DataSource.JNDI"/>
    201         </bean>
    202                 <property name="JDBCTemplateFactory" ref="Common.JDBCTemplate.Factory"/>
    203 -->
     186        <bean id="Common.BLOBStoredXML.Service" class="org.ibisph.xml.service.BLOBStoredDocument">
     187                <property name="outputFormat" ref="Common.XML.OutputFormat"/>
     188                <property name="JDBCTemplateFactory">
     189                        <bean class="org.ibisph.jdbc.JDBCTemplateFactory">
     190                                <property name="dataSource">
     191                                        <bean class="org.springframework.jndi.JndiObjectFactoryBean">
     192                                                <property name="jndiName" value="java:comp/env/jdbc/doh_ibisph"/>
     193                                        </bean>
     194                                </property>
     195                        </bean>
     196                </property>
     197        </bean>
     198
    204199
    205200
  • trunk/src/main/webapps/ibisph-view/WEB-INF/config/spring/publish-remote.xml

    r3687 r3727  
    8888        <bean id="Publish.PublishedIndicators.Service" class="org.ibisph.indicatorprofile.service.PublishedIndicatorsXML">
    8989                <property name="publishedIndicatorProfilesSystemID" ref="Indicator.PublishedIndicatorProfiles.XML.SystemID"/>
    90                 <property name="documentDAO"                ref="Common.XML.DAO"/>
     90<property name="XMLDocumentService"         ref="Common.FileStoredXML.Service"/>
    9191                <property name="fileBackupFactory"          ref="Publish.Versioned.FileBackupFactory"/>
    9292                <property name="indicatorProfileXMLPath"    ref="Indicator.Profile.XML.Path"/>
     
    9999                <property name="baseRequestURL"             ref="Common.AdminApp.CategorizedIndexXML.BaseURL"/>
    100100                <property name="destinationFilePath"        ref="Indicator.XML.Path"/>
    101                 <property name="documentDAO"                ref="Common.XML.DAO"/>
     101<property name="XMLDocumentService"         ref="Common.FileStoredXML.Service"/>
    102102                <property name="fileBackupFactory"          ref="Publish.Versioned.FileBackupFactory"/>
    103103        </bean>
     
    107107                <property name="baseIndicatorViewRequestURL" ref="Common.AdminApp.IndicatorViewXML.BaseURL"/>
    108108                <property name="destinationFilePath"        ref="Indicator.Profile.XML.Path"/>
    109                 <property name="documentDAO"                ref="Common.XML.DAO"/>
     109<property name="XMLDocumentService"         ref="Common.FileStoredXML.Service"/>
    110110                <property name="fileBackupFactory"          ref="Publish.Versioned.FileBackupFactory"/>
    111111                <property name="publishedIndicatorsService" ref="Publish.PublishedIndicators.Service"/>
     
    115115                <property name="baseRequestURL"             ref="Common.AdminApp.OrgUnitsXML.BaseURL"/>
    116116                <property name="destinationFilePath"        ref="Publish.OrgUnitsXML.Path"/>
    117                 <property name="documentDAO"                ref="Common.XML.DAO"/>
     117<property name="XMLDocumentService"         ref="Common.FileStoredXML.Service"/>
    118118                <property name="fileBackupFactory"          ref="Publish.Versioned.FileBackupFactory"/>
    119119        </bean>
  • trunk/src/main/webapps/ibisph-view/WEB-INF/config/spring/query.xml

    r3710 r3727  
    3737                <constructor-arg value="xslt/xml/query/module/ConfigurationIncludeCriteriaExclude.xslt"/>
    3838        </bean>
    39         <bean id="Query.QueryModuleXML.DAO" class="org.ibisph.xml.dao.XIncludeDocument">
     39        <bean id="Query.QueryModule.XMLDocumentService" class="org.ibisph.xml.service.XIncludeDocument">
    4040                <property name="xincludeXSLTSystemIDResource" ref="Query.ModuleXInclude.XSLT.SystemID"/>
    4141                <property name="transformation" ref="Common.XSLT.Transformation"/>
     
    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"/>
    58                 <property name="documentDAO" ref="Query.QueryModuleXML.DAO"/>
     57                <property name="XMLPath"            ref="Query.ModuleBase.XML.Path"/>
     58                <property name="XMLDocumentService" ref="Query.QueryModule.XMLDocumentService"/>
    5959        </bean>
    6060       
  • trunk/src/main/webapps/ibisph-view/WEB-INF/config/spring/query_definition.xml

    r3726 r3727  
    3535        <!-- S E R V I C E S -->
    3636        <bean id="QueryDefinition.XML.Service" class="org.ibisph.querydefinition.service.QueryDefinitionXML">
    37                 <property name="XMLPath"     ref="QueryDefinition.XML.Path"/>
    38                 <property name="documentDAO" ref="Common.BLOB.DAO"/>
     37                <property name="XMLPath"            ref="QueryDefinition.XML.Path"/>
     38                <property name="XMLDocumentService" ref="Common.BLOBStoredXML.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

    r3710 r3727  
    3232
    3333        <bean id="Secure.QueryModule.XML.Service" class="org.ibisph.querymodule.service.QueryModuleXML">
    34                 <property name="XMLPath"     ref="Secure.QueryModuleBase.XML.Path"/>
    35                 <property name="documentDAO" ref="Query.QueryModuleXML.DAO"/>
     34                <property name="XMLPath"            ref="Secure.QueryModuleBase.XML.Path"/>
     35                <property name="XMLDocumentService" ref="Query.QueryModule.XMLDocumentService"/>
    3636        </bean>
    3737
  • trunk/src/main/webapps/ibisph-view/WEB-INF/config/spring/security-xml_authentication.xml

    r3687 r3727  
    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="documentDAO"        ref="Common.XML.DAO"/>
     26                <property name="XMLDocumentService" ref="Common.FileStoredXML.Service"/>
    2727        </bean>
    2828
  • trunk/src/main/webapps/ibisph-view/WEB-INF/config/spring/user.xml

    r3726 r3727  
    125125        <bean id="User.XML.Service" class="org.ibisph.user.service.UserProfileXML">
    126126                <property name="XMLPath"            ref="User.XML.Path"/>
    127                 <property name="documentDAO"        ref="Common.XML.DAO"/>
     127<property name="XMLDocumentService" ref="Common.BLOBStoredXML.Service"/>
    128128        </bean>
    129129
  • trunk/src/main/webapps/ibisph-view/WEB-INF/web.xml

    r3726 r3727  
    4343
    4444        <!-- =========================================== J N D I   R E S O U R C E S -->
    45         <!-- For a detailed discussion of JNDI resources, see the comments within
    46                 the admin app's web.xml.  This gist is that resource refs provide an
    47                 alias mechanism so that the app server can define the actual name
     45        <!-- For a detailed discussion of JDBC and JNDI resources, see the comments
     46                within the admin app's web.xml.  This gist is that resource refs provide
     47                an alias mechanism so that the app server can define the actual name
    4848                according to their IT naming convention.  An intermediary xml config/
    4949                mapping file then maps the real JNDI server name with the aliased
     
    5151                entry is not needed.  In the case of enterprise app servers it typically
    5252                is used.
    53 
     53        -->
    5454        <resource-ref>
    5555                <description>Resource reference to the app server container managed JNDI database connection factory</description>
     
    5757                <res-ref-type>javax.sql.DataSource</res-ref-type>
    5858                <res-auth>Container</res-auth>
     59                <res-sharing-scope>Shareable</res-sharing-scope>
    5960        </resource-ref>
    60         -->
    6161        <resource-ref>
    6262                <description>Resource reference to the app server container managed JNDI JavaMail factory</description>
Note: See TracChangeset for help on using the changeset viewer.