Changeset 3652 in main


Ignore:
Timestamp:
03/22/12 00:55:43 (10 years ago)
Author:
Garth Braithwaite
Message:

view, java - next rev of xmlmodel and param map simplification/refactoring to modelmap. app starts but does not work.

Location:
branches/2.1/src/main
Files:
60 added
12 deleted
28 edited

Legend:

Unmodified
Added
Removed
  • branches/2.1/src/main/java/org/ibisph/communityprofile/springmvc/ChartGraphicController.java

    r3536 r3652  
    22
    33import org.ibisph.chart.ChartData;
     4import org.ibisph.chart.ChartDataService;
     5import org.ibisph.indicatorprofile.service.ChartDataFromIndicatorViewXML;
    46import org.ibisph.util.IOPath;
    57import org.ibisph.util.StrLib;
    6 import org.ibisph.xmlmodel.ObjectModelFromObject;
    78
    89/**
     
    1718public class ChartGraphicController extends org.ibisph.web.springmvc.ModelMapAndViewController {
    1819
    19   protected ObjectModelFromObject chartDataService = new org.ibisph.indicatorprofile.service.ChartDataFromIndicatorViewXML();
     20  protected ChartDataService chartDataService = new ChartDataFromIndicatorViewXML();
    2021  protected String xmlPath        = null;
    2122  protected String viewNamePrefix = null;
     
    4041  public ChartGraphicController(
    4142    String xmlPath,
    42     ObjectModelFromObject chartDataService,
     43    ChartDataService chartDataService,
    4344    String viewNamePrefix,
    4445    String viewNameSuffix
     
    6263   *   how to load the Indicator profile XML data into a ChartData model object.
    6364   */
    64   public void setChartDataService(ObjectModelFromObject chartDataService) {this.chartDataService  = chartDataService;}
     65  public void setChartDataService(ChartDataService chartDataService) {this.chartDataService  = chartDataService;}
    6566
    6667  /**
     
    121122    // load the chart data via the DAO
    122123    // load the chart data via the service
    123     ChartData chartData = (ChartData)this.chartDataService.getModel(xmlSystemID);
     124    ChartData chartData = this.chartDataService.getChartData(xmlSystemID);
    124125
    125126    // now build the model info
  • branches/2.1/src/main/java/org/ibisph/indicatorprofile/service/ChartDataFromIndicatorViewXML.java

    r3535 r3652  
    1010import org.dom4j.Node;
    1111
    12 import org.ibisph.chart.xmlmodel.AbstractChartData;
     12import org.ibisph.chart.AbstractChartDataService;
     13import org.ibisph.chart.ChartData;
    1314import org.ibisph.util.StrLib;
    1415import org.ibisph.util.XMLLib;
    15 import org.ibisph.xmlmodel.ObjectModelFromObject;
    1616
    1717/**
     
    2020 * @author Garth Braithwaite, STG
    2121 */
    22 public class ChartDataFromIndicatorViewXML extends AbstractChartData implements ObjectModelFromObject {
     22public class ChartDataFromIndicatorViewXML extends AbstractChartDataService {
    2323
    2424  /**
     
    3030   * @throws Exception
    3131   */
    32   public Object getModel(Object sourceXMLObject) throws Exception {
     32  public ChartData getChartData(Object sourceXMLObject) throws Exception {
    3333    Document document = getDocument(sourceXMLObject);
    3434
  • branches/2.1/src/main/java/org/ibisph/indicatorprofile/springmvc/XMLChartGraphicController.java

    r3536 r3652  
    11package org.ibisph.indicatorprofile.springmvc;
    22
     3import org.ibisph.chart.ChartData;
     4import org.ibisph.chart.ChartDataService;
     5import org.ibisph.indicatorprofile.service.ChartDataFromIndicatorViewXML;
     6import org.ibisph.systemid.FileSystemID;
     7import org.ibisph.systemid.SystemID;
     8import org.ibisph.systemid.URISystemID;
    39import org.ibisph.util.IOPath;
    410import org.ibisph.util.StrLib;
    5 import org.ibisph.xmlmodel.ObjectModelFromObject;
    6 import org.ibisph.chart.ChartData;
    7 import org.ibisph.systemid.SystemID;
    8 import org.ibisph.systemid.URISystemID;
    9 import org.ibisph.systemid.FileSystemID;
    1011
    1112/**
     
    2021public class XMLChartGraphicController extends org.ibisph.web.springmvc.ModelMapAndViewController {
    2122
    22   protected ObjectModelFromObject chartDataService = new org.ibisph.indicatorprofile.service.ChartDataFromIndicatorViewXML();
     23  protected ChartDataService chartDataService = new ChartDataFromIndicatorViewXML();
    2324  protected String xmlPath        = null;
    2425  protected String viewNamePrefix = null;
     
    4344  public XMLChartGraphicController(
    4445    String xmlPath,
    45     ObjectModelFromObject chartDataService,
     46    ChartDataService chartDataService,
    4647    String viewNamePrefix,
    4748    String viewNameSuffix
     
    6566   *   how to load the Indicator profile XML data into a ChartData model object.
    6667   */
    67   public void setChartDataService(ObjectModelFromObject chartDataService) {this.chartDataService  = chartDataService;}
     68  public void setChartDataService(ChartDataService chartDataService) {this.chartDataService  = chartDataService;}
    6869
    6970  /**
     
    116117
    117118    // load the chart data via the service
    118     ChartData chartData = (ChartData)this.chartDataService.getModel(xmlSystemID);
     119    ChartData chartData = (ChartData)this.chartDataService.getChartData(xmlSystemID);
    119120
    120121    // now build the model info
  • branches/2.1/src/main/java/org/ibisph/modelmap/package.html

    r3636 r3652  
    44
    55<head>
    6         <title>org.ibisph.xmlmodel package</title>
     6        <title>org.ibisph.modelmap package</title>
    77</head>
    88
    99<body bgcolor="white">
    10 Provides interfaces for the XML Model type services that are typically
    11 consumed by the XMLModelAndParameterMap controller.  These services are discrete
    12 and are sequentially execute to build the desired model that is passed to the
    13 appropriate view.  For the IBIS-PH View webapp the view is an XML/XSLT
     10Provides interfaces for the Model Map type services that are typically
     11consumed by the ModelMapListProcessingController.  These services are discrete
     12and are sequentially execute to build the desired model map that is passed to
     13the appropriate view.  For the IBIS-PH View webapp the view is an XML/XSLT
    1414transformation.  This controller with a list of XML Model services allow a
    1515generic controller that is easily configured and can be easily injected into
  • branches/2.1/src/main/java/org/ibisph/querymodule/springmvc/XMLChartGraphicController.java

    r3536 r3652  
    88
    99import org.dom4j.Document;
    10 
    1110import org.ibisph.chart.ChartData;
    12 import org.ibisph.querymodule.xmlmodel.ChartDataFromQueryModule;
     11import org.ibisph.chart.ChartDataService;
    1312import org.ibisph.util.IOPath;
    1413import org.ibisph.util.StrLib;
    15 import org.ibisph.xmlmodel.ObjectModelFromObject;
    1614
    1715/**
     
    2927public class XMLChartGraphicController extends org.ibisph.web.springmvc.ModelMapAndViewController {
    3028
    31   protected ObjectModelFromObject chartDataService = new ChartDataFromQueryModule();
     29  protected ChartDataService chartDataService;// = new ChartDataFromQueryModule();
    3230  protected String viewNamePrefix = null;
    3331  protected String viewNameSuffix = null;
     
    5452   */
    5553  public XMLChartGraphicController(
    56     ObjectModelFromObject chartDataService,
     54    ChartDataService chartDataService,
    5755    String viewNamePrefix,
    5856    String viewNameSuffix
     
    7876   *   how to load the Indicator profile XML data into a ChartData model object.
    7977   */
    80   public void setChartDataService(ObjectModelFromObject chartDataService) {this.chartDataService  = chartDataService;}
     78  public void setChartDataService(ChartDataService chartDataService) {this.chartDataService  = chartDataService;}
    8179
    8280  /**
     
    145143
    146144    // load the chart data via the service
    147     ChartData chartData = (ChartData)this.chartDataService.getModel(queryModule);
     145    ChartData chartData = this.chartDataService.getChartData(queryModule);
    148146    modelMap.put("ChartData", chartData);
    149147
  • branches/2.1/src/main/java/org/ibisph/user/service/SaveUserProfile.java

    r3535 r3652  
    44import java.util.Date;
    55
     6import javax.mail.Message;
     7import javax.mail.internet.InternetAddress;
    68import javax.mail.internet.MimeMessage;
    79import javax.servlet.http.HttpServletRequest;
     
    911import org.dom4j.Document;
    1012import org.dom4j.Element;
     13
     14import org.springframework.mail.MailMessage;
     15import org.springframework.mail.javamail.JavaMailSender;
     16import org.springframework.mail.javamail.MimeMessageHelper;
     17
    1118import org.ibisph.util.StrLib;
    1219import org.ibisph.util.XMLLib;
    13 import org.ibisph.xmlmodel.ObjectModelFromHTTPRequestAndObject;
    14 import org.springframework.mail.MailMessage;
    15 import org.springframework.mail.MailPreparationException;
    16 import org.springframework.mail.SimpleMailMessage;
    17 import org.springframework.mail.javamail.JavaMailSender;
    18 import org.springframework.mail.javamail.MimeMessageHelper;
    19 import org.springframework.mail.javamail.MimeMessagePreparator;
    20 
    2120
    2221
     
    2625 * @author Garth Braithwaite, STG
    2726 */
    28 public class SaveUserProfile implements ObjectModelFromHTTPRequestAndObject {
     27public class SaveUserProfile {
    2928
    3029  protected UserProfileXML userProfileService = null;
     
    6059    else
    6160      userDocument = XMLLib.newDocument((Element)object);
     61
    6262    String id = XMLLib.getText(userDocument, "/USER/ID");
    6363    if(StrLib.isSomething(id)) {
     
    6868
    6969      // if not validated then set the status to pending & send email.
    70       MailMessage mailMessage = null;
    71       if(this.baseMailMessage == null) {
    72         mailMessage = new SimpleMailMessage();
    73         mailMessage.setFrom(this.mailMessageFrom);
    74         mailMessage.setSubject(this.mailSubject);
    75       }
    76       else if(this.baseMailMessage instanceof SimpleMailMessage) {
    77         mailMessage = new SimpleMailMessage((SimpleMailMessage)this.baseMailMessage);
    78       }
    79       else {
    80         mailMessage = this.baseMailMessage;
    81       }
     70      //create a MIME message using the mail sender implementation
     71      MimeMessage mimeMessage = mailSender.createMimeMessage();
     72      mimeMessage.setFrom(new InternetAddress(this.mailMessageFrom));
     73      mimeMessage.setSubject(this.mailSubject);
     74      mimeMessage.setRecipient(Message.RecipientType.TO, new InternetAddress(emailAddress));
     75      mimeMessage.setSentDate(new Date());
    8276
    83       mailMessage.setTo(emailAddress);
    84       mailMessage.setSentDate(new Date());
    85       mailMessage.setText(
    86         "Please respond to this message to activate your account "
    87         + "by clicking on <a href='/'>Activate Your Account</a>"
    88         + "."
     77
     78     
     79      MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true);
     80//      helper.setTo("test@host.com");
     81      // use the true flag to indicate the text included is HTML
     82helper.setTo(emailAddress);
     83helper.setFrom(this.mailMessageFrom);
     84      helper.setText("<html><body>Please respond to this message to activate your account "
     85          + "by clicking on <a href='http://ibis.health.utah.gov/'>Activate Your Account</a></body></html>", true
    8986      );
    9087
    91 /*
    92       MimeMessagePreparator preparator = new MimeMessagePreparator() {
    93         public void prepare(MimeMessage mimeMessage) throws Exception {
    94            MimeMessageHelper message = new MimeMessageHelper(mimeMessage);
    95            message.setTo("");
    96            message.setFrom("webmaster@csonth.gov.uk");
    97            String text = "";
    98            message.setText(text, true);
    99         }
    100      };
    101      this.mailSender.send(preparator);
     88
     89//      mimeMessage.setContent(null);
     90//      mimeMessage.setText(
     91//          "<html><body>Please respond to this message to activate your account "
     92//          + "by clicking on <a href='/'>Activate Your Account</a>"
     93//          + ". </body></html>"
     94//        , "text/html"
     95//      );
     96
     97      this.mailSender.send(mimeMessage);
    10298
    10399
    104      //http://www.javabeat.net/articles/83-email-integration-in-spring-framework-2.html
    105      MimeMessage mimeMessage = this.mailSender.createMimeMessage();
    106100
    107      //create the message using the specified template
    108      MimeMessageHelper mimeMessageHelper;
    109      try{
    110              mimeMessageHelper = new MimeMessageHelper(mimeMessage, true, "UTF-8");
    111      }catch(Exception exception) {
    112              throw new MailPreparationException("Couble not able to create a MIME message", exception);
    113      }
    114      mimeMessageHelper.addTo("");
    115      mimeMessageHelper.setText("plainText", "html");
    116      mailSender.send(mimeMessage);
    117      
    118 */
    119      
    120      if(mailMessage instanceof SimpleMailMessage)
    121         this.mailSender.send((SimpleMailMessage)mailMessage);
    122       else if(mailMessage instanceof MimeMessage)
    123         this.mailSender.send((MimeMessage)mailMessage);
     101      //create the message using the specified template
     102//      MimeMessageHelper helper;
     103//      try{
     104//              helper = new MimeMessageHelper(message, true, "UTF-8");
     105//      }catch(MessageException exception) {
     106//              Throw new MailPreparationException("Couble not able to create a MIME message", exception);
     107//      }
    124108     
     109
     110
     111//        MimeMessagePreparator preparator = new MimeMessagePreparator() {
     112//          public void prepare(MimeMessage mimeMessage) throws Exception {
     113//             MimeMessageHelper message = new MimeMessageHelper(mimeMessage);
     114//             message.setTo("");
     115//             message.setFrom("webmaster@csonth.gov.uk");
     116//             String text = "some html???";
     117//             message.setText(text, true);
     118//          }
     119//       };
     120//       this.mailSender.send(preparator);
     121
     122
    125123
    126124      // else - validated then set the status to updated on this date.
  • branches/2.1/src/main/java/org/ibisph/user/springsecurity/CreateUserDetailsAndLogUserPreAuthenticationProcessingFilter.java

    r3636 r3652  
    1414import org.springframework.security.web.authentication.preauth.RequestHeaderAuthenticationFilter;
    1515 
    16 import org.ibisph.querydefinition.xmlmodel.AbstractQueryDefinition;
     16import org.ibisph.querydefinition.modelmap.AbstractQueryDefinitionModelMap;
    1717import org.ibisph.user.service.UserLog;
    1818import org.ibisph.util.StrLib;
     
    3838  extends RequestHeaderAuthenticationFilter 
    3939{
    40   protected static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(AbstractQueryDefinition.class);
     40  protected static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(AbstractQueryDefinitionModelMap.class);
    4141
    4242  protected String userDetailsSessionName = "user";
  • branches/2.1/src/main/java/org/ibisph/web/filter/blacklist/BlackListInterceptorRequestFilter.java

    r3636 r3652  
    1515import javax.servlet.http.HttpServletRequest;
    1616
    17 import org.ibisph.querydefinition.xmlmodel.AbstractQueryDefinition;
     17import org.ibisph.querydefinition.modelmap.AbstractQueryDefinitionModelMap;
    1818
    1919/**
     
    6262
    6363public class BlackListInterceptorRequestFilter implements Filter {
    64   protected static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(AbstractQueryDefinition.class);
     64  protected static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(AbstractQueryDefinitionModelMap.class);
    6565
    6666  protected FilterConfig filterConfig;
  • branches/2.1/src/main/java/org/ibisph/web/filter/blacklist/BlackListInterceptorRequestWrapper.java

    r3636 r3652  
    1010import javax.servlet.http.HttpServletRequest;
    1111
    12 import org.ibisph.querydefinition.xmlmodel.AbstractQueryDefinition;
     12import org.ibisph.querydefinition.modelmap.AbstractQueryDefinitionModelMap;
    1313
    1414/**
     
    2020 */
    2121public class BlackListInterceptorRequestWrapper extends javax.servlet.http.HttpServletRequestWrapper {
    22   protected static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(AbstractQueryDefinition.class);
     22  protected static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(AbstractQueryDefinitionModelMap.class);
    2323
    2424  protected Map <String, String[]> parameters = null;
  • branches/2.1/src/main/java/org/ibisph/web/springmvc/ModelMapListProcessingController.java

    r3636 r3652  
    1313import org.ibisph.modelmap.GetModelMapFromHTTPRequest;
    1414import org.ibisph.modelmap.GetModelMapFromModelMapAndHTTPRequest;
    15 import org.ibisph.modelmap.UpdateModelMap;
    16 import org.ibisph.modelmap.UpdateModelMapFromHTTPRequest;
     15import org.ibisph.modelmap.ProcessModelMap;
     16import org.ibisph.modelmap.ProcessModelMapFromHTTPRequest;
    1717
    1818
     
    103103        if(null == modelMap) modelMap = new HashMap<String, Object>();
    104104
    105         if(modelMapService instanceof UpdateModelMap)
    106           ((UpdateModelMap)modelMapService).updateModelMap(modelMap);
    107         else if(modelMapService instanceof UpdateModelMapFromHTTPRequest)
    108           ((UpdateModelMapFromHTTPRequest)modelMapService).updateModelMap(modelMap, request);
     105        if(modelMapService instanceof ProcessModelMap)
     106          ((ProcessModelMap)modelMapService).processModelMap(modelMap);
     107        else if(modelMapService instanceof ProcessModelMapFromHTTPRequest)
     108          ((ProcessModelMapFromHTTPRequest)modelMapService).processModelMap(modelMap, request);
    109109      }
    110110
  • branches/2.1/src/main/java/org/ibisph/web/springmvc/SimpleClientRedirectionView.java

    r3535 r3652  
    11package org.ibisph.web.springmvc;
     2
     3import java.util.Map;
     4
     5import javax.servlet.http.HttpServletRequest;
     6import javax.servlet.http.HttpServletResponse;
    27
    38/**
     
    5358   */
    5459  public void render(
    55     java.util.Map modelMap,
    56     javax.servlet.http.HttpServletRequest  request,
    57     javax.servlet.http.HttpServletResponse response
     60    Map modelMap,
     61    HttpServletRequest  request,
     62    HttpServletResponse response
    5863  ) throws Exception {
    5964    java.net.URL url = (java.net.URL)modelMap.get(urlModelName);
  • branches/2.1/src/main/java/org/ibisph/xml/springmvc/XSLTXMLTransformationView.java

    r3535 r3652  
    11package org.ibisph.xml.springmvc;
    22
     3import java.io.OutputStream;
     4import java.util.HashMap;
     5import java.util.Iterator;
     6import java.util.Map;
     7import java.util.Properties;
     8
     9import javax.servlet.http.HttpServletRequest;
     10import javax.servlet.http.HttpServletResponse;
     11import javax.xml.transform.Transformer;
     12
     13import org.springframework.web.servlet.View;
     14
     15import org.ibisph.systemid.SystemID;
     16import org.ibisph.util.StrLib;
     17import org.ibisph.xslt.Transformation;
     18
    319/**
    4  * Base/core XML/XSLT Transformation View.  The view is based on an XSLT
    5  * System ID resource which is passed in via the constructor (required)
    6  * and a mostly required but optional XML file/document which is passed
    7  * to the <code>render</code> method in the model map.  This view forms
    8  * the main view component for the IBISPH-View application as most of
    9  * pages are created with a XSLT stylesheet merging in XML data content.
    10  *
    11  * OTHER VIEW APPROACHES:
    12  * - Custom View Resolver
    13  * - Controller contains/builds the View Name
    14  * - View Resolver contains a list of View Names to XSLT System ID objects
    15  * - View Resolver is passed in a View
    16  * - View Resolver then calls it's view bean's render method.
    17  *
     20 * Base/core XML/XSLT Transformation View. The view is based on an XSLT System
     21 * ID resource which is passed in via the constructor (required) and a mostly
     22 * required but optional XML file/document which is passed to the
     23 * <code>render</code> method in the model map. This view forms the main view
     24 * component for the IBISPH-View application as most of pages are created with a
     25 * XSLT stylesheet merging in XML data content.
     26 *
     27 * OTHER VIEW APPROACHES: - Custom View Resolver - Controller contains/builds
     28 * the View Name - View Resolver contains a list of View Names to XSLT System ID
     29 * objects - View Resolver is passed in a View - View Resolver then calls it's
     30 * view bean's render method.
     31 *
    1832 * @author Garth Braithwaite, STG
    1933 */
    20 public class XSLTXMLTransformationView implements org.springframework.web.servlet.View {
    21 
    22   protected org.ibisph.systemid.SystemID   xmlSystemIDResource  = null;
    23   protected org.ibisph.systemid.SystemID   xsltSystemIDResource = null;
    24   protected org.ibisph.xslt.Transformation transformation       = null;
    25 
    26   protected String xsltModelName          = "XSLT";
    27   protected String xmlModelName           = "XML";
    28   protected String parametersMapModelName = "ParametersMap";
    29   protected java.util.Properties extraParameters = null;
    30 
    31   protected String responseContentType    = null;
    32 
    33 
    34 
    35   /**
    36    * Constructor with required resources.
    37    *
    38    * @param xsltSystemIDResource XSLT system ID for this view instance.
    39    * @param transformation XSLT transformation/transformer to be used for this
    40    *   view instance.
    41    */
    42   public XSLTXMLTransformationView(org.ibisph.systemid.SystemID xsltSystemIDResource, org.ibisph.xslt.Transformation transformation) {
     34public class XSLTXMLTransformationView implements View {
     35
     36  protected SystemID            xmlSystemIDResource  = null;
     37  protected SystemID            xsltSystemIDResource = null;
     38  protected Transformation      transformation       = null;
     39
     40  protected String              xsltModelName        = "XSLT";
     41  protected String              xmlModelName         = "XML";
     42  protected Map<String, Object> parametersMap;
     43  protected Properties          extraParameters      = null;
     44
     45  protected String              responseContentType  = null;
     46
     47  /**
     48   * Constructor with required resources.
     49   *
     50   * @param xsltSystemIDResource
     51   *          XSLT system ID for this view instance.
     52   * @param transformation
     53   *          XSLT transformation/transformer to be used for this view instance.
     54   */
     55  public XSLTXMLTransformationView(SystemID xsltSystemIDResource,
     56      Transformation transformation) {
    4357    setXSLTSystemIDResource(xsltSystemIDResource);
    44     setTransformation      (transformation);
    45   } //----------------------- End of Constructor ----------------------------
    46 
    47   /**
    48    * Sets XML model name map key value.  This key/name value is how the
     58    setTransformation(transformation);
     59  } // ----------------------- End of Constructor ----------------------------
     60
     61  /**
     62   * Sets XML model name map key value. This key/name value is how the
    4963   * controller and view components are able access the model portion of the
    50    * Spring MVC framework.
    51    * @param xmlModelName XML map model key that the controller and view use
    52    *   to access the model from the map.
    53    */
    54   public void setXMLModelName(String xmlModelName) {this.xmlModelName = xmlModelName;}
    55 
    56   /**
    57    * Provides a way to specify the XSLT System ID model name.  If the XSLT
    58    * model name is present in the model map, then this value is used.  Else
    59    * the XSLT system id resource property is used.  This does not really
    60    * belong as part of the model but is an option in case the controller
    61    * needs to specify it.
    62    * @param xsltModelName model map key for the XSLT system id or filename and
    63    *   path string.
    64    */
    65   public void setXSLTModelName(String xsltModelName) {this.xsltModelName = xsltModelName;}
    66 
    67   /**
    68    * Sets extra parameters map model name/key value.  This key is set by the
    69    * controller needed by the view to get any extra parameters from the model
    70    * map which need to be passed to the XSLT transformer.
    71    * @param parametersMapModelName Parameters map key that the controller
    72    *   used to put any/all parameters into the model map.
    73    */
    74   public void setParametersMapModelName(String parametersMapModelName) {this.parametersMapModelName = parametersMapModelName;}
     64   * Spring MVC framework.
     65   *
     66   * @param xmlModelName
     67   *          XML map model key that the controller and view use to access the
     68   *          model from the map.
     69   */
     70  public void setXMLModelName(String xmlModelName) {
     71    this.xmlModelName = xmlModelName;
     72  }
     73
     74  /**
     75   * Provides a way to specify the XSLT System ID model name. If the XSLT model
     76   * name is present in the model map, then this value is used. Else the XSLT
     77   * system id resource property is used. This does not really belong as part of
     78   * the model but is an option in case the controller needs to specify it.
     79   *
     80   * @param xsltModelName
     81   *          model map key for the XSLT system id or filename and path string.
     82   */
     83  public void setXSLTModelName(String xsltModelName) {
     84    this.xsltModelName = xsltModelName;
     85  }
     86
     87  /**
     88   * Sets parameters name/key value map to be added to the xslt transformer.
     89   *
     90   * @param parametersMap
     91   *          Parameters map to be added to the xslt view.
     92   */
     93  public void setParametersMap(Map<String, Object> parametersMap) {
     94    this.parametersMap = parametersMap;
     95  }
     96
     97  /**
     98   * Mechanism that allows a static list of deployment defined name/value pairs
     99   * of strings to be sent to the XSLT transformation process (as parameters).
     100   *
     101   * @param extraParameters
     102   *          property list of extra parameters that are sent to the
     103   *          transformation process to be included as parameters that the XSLT
     104   *          can use.
     105   */
     106  public void setExtraParameters(Properties extraParameters) {
     107    this.extraParameters = extraParameters;
     108  }
    75109
    76110  /**
    77111   * Sets the XML System ID for the model portion of the Spring MVC framework.
    78    * If a model does not exist in the model map then this value is used for
    79    * the XML model.
    80    * @param xmlSystemIDResource XML data file's system ID to be used for the
    81    *   XML/XSLT transformation.
    82    */
    83   public void setXMLSystemIDResource(org.ibisph.systemid.SystemID xmlSystemIDResource) {this.xmlSystemIDResource = xmlSystemIDResource;}
     112   * If a model does not exist in the model map then this value is used for the
     113   * XML model.
     114   *
     115   * @param xmlSystemIDResource
     116   *          XML data file's system ID to be used for the XML/XSLT
     117   *          transformation.
     118   */
     119  public void setXMLSystemIDResource(SystemID xmlSystemIDResource) {
     120    this.xmlSystemIDResource = xmlSystemIDResource;
     121  }
    84122
    85123  /**
    86124   * Sets the XSLT System ID for the view portion of the Spring MVC framework.
    87    * The XSLT System ID is first checked to be set within the model map.  If
    88    * not found then this property is used.
    89    * @param xsltSystemIDResource XSLT system ID to be used for the XML/XSLT
    90    *   transformation.
    91    */
    92   public void setXSLTSystemIDResource(org.ibisph.systemid.SystemID xsltSystemIDResource) {this.xsltSystemIDResource = xsltSystemIDResource;}
    93 
    94   /**
    95    * Sets the XML/XSLT transformation object.   
    96    * @param transformation Required XML/XSLT transformation object that does
    97    *   the actual work.
    98    */
    99   public void setTransformation(org.ibisph.xslt.Transformation transformation) {this.transformation = transformation;}
    100 
    101   /**
    102    * Mechanism that allows a static list of deployment defined name/value pairs
    103    * of strings to be sent to the XSLT transformation process (as parameters).
    104    * @param extraParameters property list of extra parameters that are sent to
    105    *   the transformation process to be included as parameters that the
    106    *   XSLT can use.
    107    */
    108   public void setExtraParameters(java.util.Properties extraParameters) {this.extraParameters = extraParameters;}
    109 
    110   /**
    111    * Sets the HTTP response content mime type.  Typical values are "text/html"
    112    * or "text/xml" etc.  If specified the response will be set to this mime
    113    * type.  If left null then the content mime type to be used for the response
    114    * is determined by the request's extension.
    115    * @param responseContentType Default HTTP content mime type.  This value is
    116    *   not validated and defaults to null.
    117    */
    118   public void setContentType(String responseContentType) {this.responseContentType = responseContentType;}
    119 
    120 
    121 
    122 
    123   //------------------------------------------- R E Q U I R E D   M E T H O D S
     125   * The XSLT System ID is first checked to be set within the model map. If not
     126   * found then this property is used.
     127   *
     128   * @param xsltSystemIDResource
     129   *          XSLT system ID to be used for the XML/XSLT transformation.
     130   */
     131  public void setXSLTSystemIDResource(SystemID xsltSystemIDResource) {
     132    this.xsltSystemIDResource = xsltSystemIDResource;
     133  }
     134
     135  /**
     136   * Sets the XML/XSLT transformation object.
     137   *
     138   * @param transformation
     139   *          Required XML/XSLT transformation object that does the actual work.
     140   */
     141  public void setTransformation(Transformation transformation) {
     142    this.transformation = transformation;
     143  }
     144
     145  /**
     146   * Sets the HTTP response content mime type. Typical values are "text/html" or
     147   * "text/xml" etc. If specified the response will be set to this mime type. If
     148   * left null then the content mime type to be used for the response is
     149   * determined by the request's extension.
     150   *
     151   * @param responseContentType
     152   *          Default HTTP content mime type. This value is not validated and
     153   *          defaults to null.
     154   */
     155  public void setContentType(String responseContentType) {
     156    this.responseContentType = responseContentType;
     157  }
     158
     159  // ------------------------------------------- R E Q U I R E D M E T H O D S
    124160
    125161  /**
    126162   * Spring View required method that the request dispatcher servlet probably
    127163   * calls to set the response content type.
     164   *
    128165   * @return this objects content type property value.
    129166   */
    130   public String getContentType() {return(this.responseContentType);}
    131 
     167  public String getContentType() {
     168    return (this.responseContentType);
     169  }
    132170
    133171  /**
    134172   * Spring framework MVC View Render method for XSLT/XML transformation view
    135    * requests. The model map is checked for an XSLT and XML object.  If found
    136    * these are used for the transformation.  If not found then the default
    137    * XML and XSLT system ID properties are used.  The model map parameters
    138    * and any extra parameters are then added to the transformation parameters
    139    * and the resultant transformation is then streamed back to the response's
    140    * output stream.
    141    *
    142    * @param model Spring framework MVC model map which contains XML data and
    143    *   other request parameters that need to be passed to the XSLT.
    144    * @param request HTTP request passed from Spring MVC framework.  This is
    145    *   used to get the application's content which is put into the
    146    *   <code>WebAppURLContextPrefix</code> parameter.  This parameter
    147    *   allows the XSLT to build the appropriate HTML link references. 
    148    * @param response HTTP response passed from Spring MVC framework.  This
    149    *   is used to get the output stream for the transformed contents.
    150    * @throws java.io.IOException Associated stream exceptions.
     173   * requests. The model map is checked for an XSLT and XML object. If found
     174   * these are used for the transformation. If not found then the default XML
     175   * and XSLT system ID properties are used. The model map parameters and any
     176   * extra parameters are then added to the transformation parameters and the
     177   * resultant transformation is then streamed back to the response's output
     178   * stream.
     179   *
     180   * @param model
     181   *          Spring framework MVC model map which contains XML data and other
     182   *          request parameters that need to be passed to the XSLT.
     183   * @param request
     184   *          HTTP request passed from Spring MVC framework. This is used to get
     185   *          the application's content which is put into the
     186   *          <code>WebAppURLContextPrefix</code> parameter. This parameter
     187   *          allows the XSLT to build the appropriate HTML link references.
     188   * @param response
     189   *          HTTP response passed from Spring MVC framework. This is used to
     190   *          get the output stream for the transformed contents.
     191   * @throws java.io.IOException
     192   *           Associated stream exceptions.
    151193   */
    152194  @SuppressWarnings("unchecked")
    153   public void render(
    154     java.util.Map model,
    155     javax.servlet.http.HttpServletRequest  request,
    156     javax.servlet.http.HttpServletResponse response
    157   ) throws Exception {
    158 
    159     // Get the XSLT from the model.  If not found then set to the default property.
     195  public void render(Map modelMap, HttpServletRequest request,
     196    HttpServletResponse response) throws Exception {
     197
     198    // Get the XSLT from the model. If not found then set to the default
     199    // property.
    160200    String xsltSystemID = null;
    161201    if(this.xsltModelName != null) {
    162       Object xslt = model.get(this.xsltModelName);
     202      Object xslt = modelMap.get(this.xsltModelName);
    163203      if(xslt != null) {
    164         if(xslt instanceof org.ibisph.systemid.SystemID) 
    165           xsltSystemID = ((org.ibisph.systemid.SystemID)xslt).toString();
     204        if(xslt instanceof org.ibisph.systemid.SystemID)
     205          xsltSystemID = ((org.ibisph.systemid.SystemID) xslt).toString();
    166206        else if(xslt instanceof String) {
    167           xsltSystemID = org.ibisph.systemid.VerifiedFileSystemID.toString((String)xslt);
    168           if(xsltSystemID == null) xsltSystemID = org.ibisph.systemid.VerifiedURLSystemID.toString((String)xslt);
    169           if(xsltSystemID == null) xsltSystemID = org.ibisph.systemid.URISystemID.toString((String)xslt);
     207          xsltSystemID = org.ibisph.systemid.VerifiedFileSystemID.toString((String) xslt);
     208          if(xsltSystemID == null) xsltSystemID = org.ibisph.systemid.VerifiedURLSystemID.toString((String) xslt);
     209          if(xsltSystemID == null) xsltSystemID = org.ibisph.systemid.URISystemID.toString((String) xslt);
    170210        }
    171211      }
     
    173213    if(xsltSystemID == null) xsltSystemID = this.xsltSystemIDResource.toString();
    174214
    175     // get the xml model from the map.  If not found use the default - if specified.
     215    // get the xml model from the map. If not found use the default - if
     216    // specified.
    176217    Object xmlModel = null;
    177     if(this.xmlModelName != null) xmlModel = model.get(this.xmlModelName);
    178     if((xmlModel == null) && (this.xmlSystemIDResource != null)) xmlModel = this.xmlSystemIDResource.toString();
     218    if(this.xmlModelName != null) xmlModel = modelMap.get(this.xmlModelName);
     219    if((null == xmlModel) && (null != this.xmlSystemIDResource)) xmlModel = this.xmlSystemIDResource.toString();
    179220
    180221    // Get any model parameters and extra parameters to be passed to the XSLT
    181     // via transformation as parameters. 
    182     java.util.Map parametersMap = (java.util.Map)model.get(parametersMapModelName);
    183     if(parametersMap == null)
    184       parametersMap = this.extraParameters;
    185     else if(this.extraParameters != null)
    186       parametersMap.putAll(this.extraParameters);
    187 
    188     // do the transformation and explicitly close the output stream.  It is said
    189     // that the output stream does not need to be closed that the container
    190     // handles this.  However, it's always best to close streams just to be safe.
    191     java.io.OutputStream os = response.getOutputStream();
    192     transformation.transform(xsltSystemID, xmlModel, parametersMap, os);
    193     os.close();   // not needed but just to make sure...
    194   } //-------------------------- End of Method ------------------------------
    195 
    196 } //============================ END OF CLASS =================================
    197 
     222    // via transformation as parameters.
     223    Map<String, Object> parameters = new HashMap<String, Object>();
     224    if(null != this.parametersMap) parameters.putAll(this.parametersMap);
     225    if(null != this.extraParameters) {
     226      for(Map.Entry<Object, Object> entry : this.extraParameters.entrySet()) {
     227        parameters.put((String) entry.getKey(), entry.getValue());
     228      }
     229    }
     230
     231    // add anything else that's in the model that is not XML or XSLT as a param.
     232    Map<String, Object> parameterModelMap = modelMap;
     233    for(Map.Entry<String, Object> entry: parameterModelMap.entrySet()) {
     234      if(!entry.getKey().equals(this.xmlModelName) && !entry.getKey().equals(this.xsltModelName)) {
     235        if(entry.getValue() instanceof Map<?,?>) {
     236          Map<String, Object> subMap = (Map<String, Object>)entry.getValue();
     237          for(Map.Entry<String, Object> subEntry : subMap.entrySet()) {
     238            parameters.put((String) subEntry.getKey(), subEntry.getValue());
     239          }
     240        }
     241        else {
     242          parameters.put(entry.getKey(), entry.getValue());
     243        }
     244      }
     245    }
     246
     247    // do the transformation and explicitly close the output stream. It is said
     248    // that the output stream does not need to be closed that the container
     249    // handles this. However, it's always best to close streams just to be safe.
     250    OutputStream os = response.getOutputStream();
     251    transformation.transform(xsltSystemID, xmlModel, parameters, os);
     252    os.close(); // not needed but just to make sure...
     253  } // -------------------------- End of Method ------------------------------
     254
     255
     256  /**
     257   *
     258   * @param transformer
     259   * @param parameterMap
     260   */
     261//  protected void addParametersToTransformer(Transformer transformer,
     262//    Map<String, Object> parameterMap) {
     263//    if(null != parameterMap) {
     264//      Iterator<String> keyIterator = parameterMap.keySet().iterator();
     265//      String key;
     266//      Object value;
     267//      while (keyIterator.hasNext()) {
     268//        key = (String) keyIterator.next();
     269//        value = parameterMap.get(key);
     270//        if(value instanceof Map<?, ?>) {
     271//          addParametersToTransformer(transformer, (Map<String, Object>) value);
     272//        }
     273//
     274//        // logger.debug(".transform - param key: {}, value: {}", key, value);
     275//        if(StrLib.isSomething(key))
     276//          transformer.setParameter(key, value);
     277//      }
     278//    }
     279//  } // -------------------------- End of Method ------------------------------
     280
     281} // ============================ END OF CLASS =================================
     282
  • branches/2.1/src/main/java/org/ibisph/xslt/Transformation.java

    r3535 r3652  
    11package org.ibisph.xslt;
    22
    3 import java.util.Iterator;
     3import java.io.IOException;
     4import java.io.OutputStream;
    45import java.util.Map;
    56
     7import javax.xml.transform.Result;
     8import javax.xml.transform.Source;
     9import javax.xml.transform.Transformer;
     10import javax.xml.transform.TransformerException;
     11import javax.xml.transform.TransformerFactory;
     12import javax.xml.transform.stream.StreamResult;
     13import javax.xml.transform.stream.StreamSource;
     14
    615import org.dom4j.Document;
     16import org.dom4j.io.DocumentSource;
     17
    718import org.ibisph.util.StrLib;
     19
    820
    921/**
     
    2638
    2739  static boolean problemNotShownYet = false;
    28   protected javax.xml.transform.TransformerFactory transformerFactory = null;
     40  protected TransformerFactory transformerFactory = null;
    2941
    3042
    3143  /** Default constructor which uses the JVM's JAXP Transformer Factory. */
    3244  public Transformation() {
    33     this.transformerFactory = javax.xml.transform.TransformerFactory.newInstance();
     45    this.transformerFactory = TransformerFactory.newInstance();
    3446    this.transformerFactory.setErrorListener(new LoggingTransformationErrorListener(Transformation.logger));
    3547  } //----------------------- End of Constructor ----------------------------
     
    3951   * @param transformerFactory Any JAXP TransformerFactory to be used.
    4052   */
    41   public Transformation(javax.xml.transform.TransformerFactory transformerFactory) {
     53  public Transformation(TransformerFactory transformerFactory) {
    4254    this.transformerFactory = transformerFactory;
    4355    this.transformerFactory.setErrorListener(new LoggingTransformationErrorListener(Transformation.logger));
     
    5769   *   complient JAXP transformer factory.
    5870   */
    59   public void setTransformerFactory(javax.xml.transform.TransformerFactory transformerFactory) {
     71  public void setTransformerFactory(TransformerFactory transformerFactory) {
    6072    this.transformerFactory = transformerFactory;
    6173  } //-------------------------- End of Method ------------------------------
     
    7789  public void transform(
    7890    String xsltSystemID,
    79     java.lang.Object xml,
    80     Map<String, Object> parameters,
    81     java.io.OutputStream outputStream
     91    Object xml,
     92    Map<String, Object> parameters,
     93    OutputStream outputStream
    8294  ) throws
    8395    javax.xml.transform.TransformerException,
     
    109121    Map<String, Object> parameters,
    110122    java.io.OutputStream outputStream
    111   ) throws
    112     javax.xml.transform.TransformerException,
    113     java.io.IOException
    114   {
     123  ) throws TransformerException, IOException {
    115124    transform(xsltSystemID, new javax.xml.transform.stream.StreamSource(xmlSystemID), parameters, outputStream);
    116125  } //-------------------------- End of Method ------------------------------
     
    131140    Document document,
    132141    Map<String, Object> parameters,
    133     java.io.OutputStream outputStream
    134   ) throws
    135     javax.xml.transform.TransformerException,
    136     java.io.IOException
    137   {
    138     transform(xsltSystemID, new org.dom4j.io.DocumentSource(document), parameters, outputStream);
     142    OutputStream outputStream
     143  ) throws TransformerException, IOException {
     144    transform(xsltSystemID, new DocumentSource(document), parameters, outputStream);
    139145  } //-------------------------- End of Method ------------------------------
    140146
     
    157163  public void transform(
    158164    String xsltSystemID,
    159     javax.xml.transform.Source xmlSource,
     165    Source xmlSource,
    160166    Map<String, Object> parameters,
    161167    java.io.OutputStream outputStream
    162   ) throws
    163     javax.xml.transform.TransformerException,
    164     java.io.IOException
    165   {
     168  ) throws TransformerException, IOException {
    166169    transform(
    167       new javax.xml.transform.stream.StreamSource(xsltSystemID),
     170      new StreamSource(xsltSystemID),
    168171      xmlSource,
    169172      parameters,
    170       new javax.xml.transform.stream.StreamResult(outputStream)
     173      new StreamResult(outputStream)
    171174    );
    172175    outputStream.flush();
     
    187190   */
    188191  public void transform(
    189     javax.xml.transform.Source xsltSource,
    190     javax.xml.transform.Source xmlSource,
    191     Map<String, Object> parameters,
    192     javax.xml.transform.Result result
     192    Source xsltSource,
     193    Source xmlSource,
     194    Map<String, Object> parameters,
     195    Result result
    193196  ) throws javax.xml.transform.TransformerException {
    194 
    195197    logger.debug(".transform - xsltSystemID: {}, xml model: {}", xsltSource.getSystemId(), xmlSource.getSystemId());
    196198
    197     javax.xml.transform.Transformer transformer = this.transformerFactory.newTransformer(xsltSource);
     199    Transformer transformer = this.transformerFactory.newTransformer(xsltSource);
    198200    transformer.clearParameters();
    199     if(parameters != null) {
    200       Iterator<String> keyIterator = parameters.keySet().iterator();
    201       String key;
    202       Object value;
    203       while(keyIterator.hasNext()) {
    204         key   = (String)keyIterator.next();
    205         value = parameters.get(key);
    206         logger.debug(".transform - param key: {}, value: {}", key, value);
    207         if(StrLib.isSomething(key)) transformer.setParameter(key, value);
     201    if(null != parameters) {
     202      for(Map.Entry<String, Object> entry: parameters.entrySet()) {
     203        logger.debug(".transform - param key: {}, value: {}", entry.getKey(), entry.getValue());
     204        if(StrLib.isSomething(entry.getKey())) transformer.setParameter(entry.getKey(), entry.getValue());
    208205      }
    209206    }
    210207    transformer.transform(xmlSource, result);
    211 // 2/4/10 - not really needed - memory leak was class loader and not this code
    212     // as this code didn't help the problem as I remember???
    213 //    // force the transformer object to get cleaned if an error.  This should
    214 //    // be the case anyway but is put in to make sure...
    215 //    try {
    216 //      transformer.transform(xmlSource, result);
    217 //      transformer.reset();
    218 //    }
    219 //    catch(javax.xml.transform.TransformerException e) {
    220 //      transformer.reset();
    221 //      transformer = null;
    222 //      throw e;
    223 //    }
    224208  } //-------------------------- End of Method ------------------------------
    225209
  • branches/2.1/src/main/webapps/ibisph-view/WEB-INF/config/spring/common.xml

    r3544 r3652  
    136136        </bean>
    137137
    138         <bean id="Common.XMLDateParameterName" class="java.lang.String">
     138
     139        <bean id="Common.XMLModelModelMapKey" class="java.lang.String">
     140                <constructor-arg value="XML"/>
     141        </bean>
     142        <bean id="Common.XMLDateModelMapKey" class="java.lang.String">
    139143                <constructor-arg value="XMLModifedDate"/>
    140144        </bean>
    141145
    142146
    143         <bean id="Common.WebAppURLContextPrefixFromHTTPRequest.ParameterMap" class="org.ibisph.parametermap.WebAppURLContextPrefixFromHTTPRequest">
    144                 <property name="webAppURLContextPrefixParameterName" value="WebAppURLContextPrefix"/>
    145         </bean>
    146         <bean id="Common.HTTPRequestParameters.ParameterMap" class="org.ibisph.parametermap.HTTPRequestParameters">
     147        <bean id="Common.WebAppURLContextPrefixFromHTTPRequest.ParameterMap" class="org.ibisph.web.modelmap.WebAppURLContextPrefixFromHTTPRequest">
     148                <property name="modelMapModelKey" value="WebAppURLContextPrefix"/>
     149        </bean>
     150        <bean id="Common.HTTPRequestParameters.ParameterMap" class="org.ibisph.web.modelmap.HTTPRequestParameters">
    147151                <description>
    148152                        Provides a simple mechanism to pass URL req params to the XSLT
     
    151155                        not needed for the query module builder post etc.
    152156                </description>
    153         </bean>
    154         <bean id="Common.ModifiedDateFromFileSystemID.ParameterMap" class="org.ibisph.parametermap.ModifiedDateFromFileSystemID">
    155                 <property name="XMLDateParameterName" ref="Common.XMLDateParameterName"/>
    156                 <property name="XMLDateFormat" ref="Common.DateFormat"/>
     157                <property name="modelMapModelKey" value="HTTPRequestParameters"/>
     158        </bean>
     159        <bean id="Common.ModifiedDateFromFileSystemID.ParameterMap" class="org.ibisph.modelmap.AddModelDateModelToModelMap">
     160                <property name="sourceModelModelMapKey"        ref="Common.XMLModelModelMapKey"/>
     161                <property name="formattedDateModelModelMapKey" ref="Common.XMLDateModelMapKey"/>
     162                <property name="dateFormat"                    ref="Common.DateFormat"/>
    157163        </bean>
    158164
     
    170176            <prop key="sales">sales@example.com</prop>
    171177-->
    172         <bean id="Common.FileSystemID.Controller.CommonProperties" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" abstract="true">
    173                 <property name="parameterMapList">
     178        <bean id="Common.FileSystemID.Controller.CommonProperties" class="org.ibisph.web.springmvc.ModelMapListProcessingController" abstract="true">
     179                <property name="modelMapList">
    174180                        <list>
    175181                                <ref bean="Common.WebAppURLContextPrefixFromHTTPRequest.ParameterMap"/>
     
    308314                <constructor-arg value="BlockedURLMessage_HTMLContent.xml"/>
    309315        </bean>
    310         <bean id="Common.BannedXMLAccess.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Common.FileSystemID.Controller.CommonProperties">
    311                 <property name="XMLModelList">
     316        <bean id="Common.BannedXMLAccess.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Common.FileSystemID.Controller.CommonProperties">
     317                <property name="modelMapList">
    312318                        <list>
    313                                 <bean class="org.ibisph.xmlmodel.object.StaticObject">
    314                                         <property name="modelObject" ref="Common.RestrictedXMLAccess.XML.SystemID"/>
     319                                <bean class="org.ibisph.modelmap.SimpleModelMap">
     320                                        <property name="model" ref="Common.RestrictedXMLAccess.XML.SystemID"/>
    315321                                </bean>
    316322                        </list>
  • branches/2.1/src/main/webapps/ibisph-view/WEB-INF/config/spring/community.xml

    r3536 r3652  
    4242
    4343
    44         <bean id="Community.HTMLContent.XMLModel" class="org.ibisph.systemid.xmlmodel.SystemIDFromHTTPRequestEndOfPathInfo">
     44        <bean id="Community.HTMLContent.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestEndOfPathInfo">
    4545                <property name="XMLPath" ref="Community.HTMLContent.XML.Path"/>
    4646        </bean>
    47         <bean id="Community.DefaultHTMLContent.XMLModel" class="org.ibisph.xmlmodel.object.StaticObjectIfNullObject">
    48                 <property name="modelObject" ref="Community.Introduction.XML.SystemID"/>
     47        <bean id="Community.DefaultHTMLContent.ModelMap" class="org.ibisph.modelmap.DefaultModelIfNullModel">
     48                <property name="defaultModelIfNullModel" ref="Community.Introduction.XML.SystemID"/>
    4949        </bean>
    5050
    51         <bean id="Community.Dimensions.XMLModel" class="org.ibisph.xmlmodel.object.StaticObject">
    52                 <property name="modelObject" ref="Community.Dimensions.XML.SystemID"/>
     51        <bean id="Community.Dimensions.ModelMap" class="org.ibisph.modelmap.SimpleModelMap">
     52                <property name="model" ref="Community.Dimensions.XML.SystemID"/>
    5353        </bean>
    5454
     
    5656
    5757        <!--  C O N T R O L L E R S  -->
    58         <bean id="Community.HTMLContent.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Common.FileSystemID.Controller.CommonProperties">
    59                 <property name="XMLModelList">
     58        <bean id="Community.HTMLContent.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Common.FileSystemID.Controller.CommonProperties">
     59                <property name="modelMapList">
    6060                        <list>
    61                                 <ref bean="Community.HTMLContent.XMLModel"/>
    62                                 <ref bean="Community.DefaultHTMLContent.XMLModel"/>
     61                                <ref bean="Community.HTMLContent.ModelMap"/>
     62                                <ref bean="Community.DefaultHTMLContent.ModelMap"/>
    6363                        </list>
    6464                </property>
     
    6666        </bean>
    6767
    68         <bean id="Community.Snapshot.Builder.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Common.FileSystemID.Controller.CommonProperties">
    69                 <property name="XMLModelList">
     68        <bean id="Community.Snapshot.Builder.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Common.FileSystemID.Controller.CommonProperties">
     69                <property name="modelMapList">
    7070                        <list>
    71                                 <ref bean="Community.Dimensions.XMLModel"/>
     71                                <ref bean="Community.Dimensions.ModelMap"/>
    7272                        </list>
    7373                </property>
     
    7575        </bean>
    7676
    77         <bean id="Community.Highlight.Selection.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Common.FileSystemID.Controller.CommonProperties">
    78                 <property name="XMLModelList">
     77        <bean id="Community.Highlight.Selection.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Common.FileSystemID.Controller.CommonProperties">
     78                <property name="modelMapList">
    7979                        <list>
    80                                 <ref bean="Community.Dimensions.XMLModel"/>
     80                                <ref bean="Community.Dimensions.ModelMap"/>
    8181                        </list>
    8282                </property>
    8383                <property name="view" ref="Community.Highlight.Selection.View"/>
    8484        </bean>
    85 <bean id="Community.Highlight.Index.Controller" class="org.ibisph.communityprofile.xmlmodel.XMLModelAndDate">
     85<bean id="Community.Highlight.Index.Controller" class="org.ibisph.communityprofile.modelmap.XMLModelAndDate">
     86<!--
    8687                <property name="view" ref="Community.Highlight.Index.View"/>
     88-->
    8789        </bean>
    88 <bean id="Community.Highlight.Introduction.Controller" class="org.ibisph.communityprofile.xmlmodel.XMLModelAndDate">
     90<bean id="Community.Highlight.Introduction.Controller" class="org.ibisph.communityprofile.modelmap.XMLModelAndDate">
     91<!--
    8992                <property name="view" ref="Community.Highlight.Introduction.View"/>
     93-->
    9094        </bean>
    91 <bean id="Community.Highlight.Profile.Controller" class="org.ibisph.communityprofile.xmlmodel.XMLModelAndDate">
     95<bean id="Community.Highlight.Profile.Controller" class="org.ibisph.communityprofile.modelmap.XMLModelAndDate">
    9296<!--
    9397                <property name="XMLFilePath">               <ref bean="Community.XML.Path"/>
    9498                <property name="pageNameModelName">         <value>IndicatorViewName"/>
     99                <property name="view" ref="Community.Highlight.Profile.View"/>
    95100-->
    96                 <property name="view" ref="Community.Highlight.Profile.View"/>
    97101        </bean>
    98 <bean id="Community.Highlight.Report.Controller" class="org.ibisph.communityprofile.xmlmodel.XMLModelAndDate">
     102<bean id="Community.Highlight.Report.Controller" class="org.ibisph.communityprofile.modelmap.XMLModelAndDate">
     103<!--
    99104                <property name="view" ref="Community.Highlight.Report.View"/>
     105-->
    100106        </bean>
    101107
    102108        <bean id="Community.Highlight.ChartGraphic.Controller" class="org.ibisph.communityprofile.springmvc.ChartGraphicController">
    103109                <property name="XMLPath"          ref="Indicator.Profile.XML.Path"/>
    104                 <property name="chartDataService" ref="Indicator.ChartData.XMLModel"/>
     110<!--
     111                <property name="chartDataService" ref="Indicator.ChartData.ModelMap"/>
     112-->
    105113                <property name="view"             ref="Chart.CommunityHighlight.Bar.View"/>
    106114        </bean>
  • branches/2.1/src/main/webapps/ibisph-view/WEB-INF/config/spring/dispatcher_servlet.xml

    r3599 r3652  
    5858                        <map>
    5959                                <!-- H O M E -->
    60                                 <entry key="/home/phom**" value-ref="PHOM.HTMLContent.Controller"/>
    6160                                <entry key="/home/**"     value-ref="Home.HTMLContent.Controller"/>
    6261
     
    103102
    104103
    105 <entry key="/query/definition/List.html"    value-ref="QueryDefinition.DefinitionList.Controller"/>
    106 
    107 <entry key="/query/definition/Result.html"  value-ref="QueryDefinition.DefinitionResult.Controller"/>
    108 <entry key="/query/definition/Builder.html" value-ref="QueryDefinition.DefinitionBuilder.Controller"/>
    109 <entry key="/query/criteria/Builder.html"   value-ref="QueryDefinition.CriteriaBuilder.Controller"/>
    110 
    111 <entry key="/query/definition/detail/edit*" value-ref="QueryDefinition.EditDetail.Controller"/>
    112 <entry key="/query/definition/detail/save*" value-ref="QueryDefinition.SaveDetail.Controller"/>
    113 <entry key="/query/definition/delete"       value-ref="QueryDefinition.DeleteDefinition.Controller"/>
     104<entry key="/query/definition/List.html"  value-ref="QueryDefinition.DefinitionList.Controller"/>
     105
     106<entry key="/query/definition/result/**"  value-ref="QueryDefinition.DefinitionResult.Controller"/>
     107<entry key="/query/definition/builder/**" value-ref="QueryDefinition.DefinitionBuilder.Controller"/>
     108<entry key="/query/criteria/builder/**"   value-ref="QueryDefinition.CriteriaBuilder.Controller"/>
     109
     110<entry key="/query/definition/edit/**"    value-ref="QueryDefinition.EditDetail.Controller"/>
     111<entry key="/query/definition/save/**"    value-ref="QueryDefinition.SaveDetail.Controller"/>
     112<entry key="/query/definition/delete"     value-ref="QueryDefinition.DeleteDefinition.Controller"/>
    114113
    115114<!-- run directly with name being specified as a get...
     
    119118
    120119                                <!-- S E C U R E  -->
    121 <entry key="/secure/selection/*.html"            value-ref="Secure.Selection.Controller"/>
    122 <entry key="/secure/query/selection/**"          value-ref="Secure.Query.Selection.Controller"/>
    123 <entry key="/secure/query/builder/**"            value-ref="Secure.Query.Builder.Controller"/>
    124 <entry key="/secure/query/submit/**"             value-ref="Secure.Query.Submit.Controller"/>
    125 <entry key="/secure/query/result/**/*.html"      value-ref="Secure.Query.Result.Controller"/>
    126 <entry key="/secure/query/result/**/*.xls"       value-ref="Query.Result.Controller"/>  <!-- put here so can plug in Excel specifici controller in the future. -->
    127 <entry key="/secure/query/result/**/*.xml"       value-ref="Query.IBISQResult.Controller"/>     
    128 <entry key="/secure/query/configuration/**"      value-ref="Query.Configuration.Controller"/>
    129 
    130 <entry key="/secure/MyQueries.html"              value-ref="User.QuerySelectionList.Controller"/>
    131 <entry key="/secure"                             value-ref="Secure.Selection.Controller"/>
     120                                <entry key="/secure/selection/*.html"       value-ref="Secure.Selection.Controller"/>
     121                                <entry key="/secure/query/selection/**"     value-ref="Secure.Query.Selection.Controller"/>
     122                                <entry key="/secure/query/builder/**"       value-ref="Secure.Query.Builder.Controller"/>
     123                                <entry key="/secure/query/submit/**"        value-ref="Secure.Query.Submit.Controller"/>
     124                                <entry key="/secure/query/result/**/*.html" value-ref="Secure.Query.Result.Controller"/>
     125                                <entry key="/secure/query/result/**/*.xls"  value-ref="Query.Result.Controller"/>       <!-- put here so can plug in Excel specifici controller in the future. -->
     126                                <entry key="/secure/query/result/**/*.xml"  value-ref="Query.IBISQResult.Controller"/> 
     127                                <entry key="/secure/query/configuration/**" value-ref="Query.Configuration.Controller"/>
     128
     129                                <entry key="/secure/MyQueries.html"         value-ref="User.QuerySelectionList.Controller"/>
     130                                <entry key="/secure"                        value-ref="Secure.Selection.Controller"/>
    132131
    133132
     
    149148
    150149
    151                                 <!-- O T H E R   -   G E N E R I C   T R A S F O R M A T I O N -->
    152                                 <entry key="/view" value-ref="View.Controller"/>
    153 
    154 
    155150                                <!-- P H O M   R E P O R T   P A G E S -->
    156151                                <entry key="/phom/expanded_view/*.html" value-ref="PHOM.ExpandedView.Controller"/>
     
    169164
    170165                                <!-- U S E R   P R O F I L E -->
    171 <entry key="/user/Login.html"            value-ref="User.HTMLContent.Controller"/>
    172 <entry key="/user/email/Password.html"   value-ref="User.EmailPassword.Controller"/>
    173 <entry key="/user/new/Registration.html" value-ref="User.HTMLContent.Controller"/>
    174 <entry key="/user/save/registration"     value-ref="User.SaveRegistration.Controller"/>
    175 <entry key="/user/verify/registration"   value-ref="User.VerifyRegistration.Controller"/>
    176 <entry key="/user/edit/Profile.html"     value-ref="User.EditProfile.Controller"/>
    177 <entry key="/user/save/profile"          value-ref="User.SaveProfile.Controller"/>
    178 
    179 <entry key="/user/MyQueries.html"        value-ref="User.QuerySelectionList.Controller"/>
    180 
    181 
    182 
     166                                <entry key="/user/Login.html"           value-ref="User.HTMLContent.Controller"/>
     167                                <entry key="/user/password/send"        value-ref="User.EmailPassword.Controller"/>
     168                                <entry key="/user/NewRegistration.html" value-ref="User.HTMLContent.Controller"/>
     169                                <entry key="/user/registration/save"    value-ref="User.SaveRegistration.Controller"/>
     170                                <entry key="/user/registration/verify"  value-ref="User.VerifyRegistration.Controller"/>
     171                                <entry key="/user/EditProfile.html"     value-ref="User.EditProfile.Controller"/>
     172                                <entry key="/user/profile/save"         value-ref="User.SaveProfile.Controller"/>
     173                               
     174                                <entry key="/user/MyQueries.html"       value-ref="User.QuerySelectionList.Controller"/>
    183175
    184176                                <!-- external URL blocker mapping -->
    185177                                <entry key="/xml/users/**/*.xml" value-ref="Common.BannedXMLAccess.Controller"/>
     178
     179
     180                                <!-- O T H E R   -   G E N E R I C   T R A S F O R M A T I O N -->
     181                                <entry key="/view" value-ref="View.Controller"/>
    186182
    187183
  • branches/2.1/src/main/webapps/ibisph-view/WEB-INF/config/spring/home.xml

    r3535 r3652  
    2424        </bean>
    2525
    26         <bean id="Home.HTMLContent.XMLModel" class="org.ibisph.systemid.xmlmodel.SystemIDFromHTTPRequestEndOfPathInfo">
     26        <bean id="Home.HTMLContent.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestEndOfPathInfo">
    2727                <property name="XMLPath" ref="Home.HTMLContent.XML.Path"/>
    2828        </bean>
    29         <bean id="Home.DefaultHTMLContent.XMLModel" class="org.ibisph.xmlmodel.object.StaticObjectIfNullObject">
    30                 <property name="modelObject" ref="Home.Introduction.XML.SystemID"/>
     29        <bean id="Home.DefaultHTMLContent.ModelMap" class="org.ibisph.modelmap.DefaultModelIfNullModel">
     30                <property name="defaultModelIfNullModel" ref="Home.Introduction.XML.SystemID"/>
    3131        </bean>
    3232
    3333
    3434        <!--  C O N T R O L L E R S  -->
    35         <bean id="Home.HTMLContent.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Common.FileSystemID.Controller.CommonProperties">
    36                 <property name="XMLModelList">
     35        <bean id="Home.HTMLContent.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Common.FileSystemID.Controller.CommonProperties">
     36                <property name="modelMapList">
    3737                        <list>
    38                                 <ref bean="Home.HTMLContent.XMLModel"/>
    39                                 <ref bean="Home.DefaultHTMLContent.XMLModel"/>
     38                                <ref bean="Home.HTMLContent.ModelMap"/>
     39                                <ref bean="Home.DefaultHTMLContent.ModelMap"/>
    4040                        </list>
    4141                </property>
  • branches/2.1/src/main/webapps/ibisph-view/WEB-INF/config/spring/indicator.xml

    r3636 r3652  
    4646
    4747        <!-- X M L   M O D E L S -->
    48         <bean id="Indicator.HTMLContent.XMLModel" class="org.ibisph.systemid.xmlmodel.SystemIDFromHTTPRequestEndOfPathInfo">
     48        <bean id="Indicator.HTMLContent.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestEndOfPathInfo">
    4949                <property name="XMLPath" ref="Indicator.HTMLContent.XML.Path"/>
    5050        </bean>
    51         <bean id="Indicator.DefaultHTMLContent.XMLModel" class="org.ibisph.xmlmodel.object.StaticObjectIfNullObject">
    52                 <property name="modelObject" ref="Indicator.Introduction.XML.SystemID"/>
    53         </bean>
    54         <bean id="Indicator.PublishedIndicatorProfiles.XMLModel" class="org.ibisph.xmlmodel.object.StaticObject">
    55                 <property name="modelObject" ref="Indicator.PublishedIndicatorProfiles.XML.SystemID"/>
    56         </bean>
    57         <bean id="Indicator.CategorziedIndex.XMLModel" class="org.ibisph.xmlmodel.object.StaticObject">
    58                 <property name="modelObject" ref="Indicator.CategorziedIndex.XML.SystemID"/>
    59         </bean>
    60         <bean id="Indicator.Profile.XMLModel" class="org.ibisph.systemid.xmlmodel.SystemIDFromHTTPRequestEndOfPathInfo">
     51        <bean id="Indicator.DefaultHTMLContent.ModelMap" class="org.ibisph.modelmap.DefaultModelIfNullModel">
     52                <property name="defaultModelIfNullModel" ref="Indicator.Introduction.XML.SystemID"/>
     53        </bean>
     54        <bean id="Indicator.PublishedIndicatorProfiles.ModelMap" class="org.ibisph.modelmap.SimpleModelMap">
     55                <property name="model" ref="Indicator.PublishedIndicatorProfiles.XML.SystemID"/>
     56        </bean>
     57        <bean id="Indicator.CategorziedIndex.ModelMap" class="org.ibisph.modelmap.SimpleModelMap">
     58                <property name="model" ref="Indicator.CategorziedIndex.XML.SystemID"/>
     59        </bean>
     60        <bean id="Indicator.Profile.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestEndOfPathInfo">
    6161                <property name="XMLPath" ref="Indicator.Profile.XML.Path"/>
    6262        </bean>
    63         <bean id="Indicator.ChartData.XMLModel" class="org.ibisph.indicatorprofile.service.ChartDataFromIndicatorViewXML"/>
    64 
    65         <bean id="Indicator.RelatedIndicators.ParameterMap" class="org.ibisph.parametermap.RelatedIndicatorsFromHTTPRequest"/>
     63        <bean id="Indicator.ChartData.Service" class="org.ibisph.indicatorprofile.service.ChartDataFromIndicatorViewXML"/>
     64
     65        <bean id="Indicator.RelatedIndicators.ParameterMap" class="org.ibisph.indicatorprofile.modelmap.RelationNameFromHTTPRequest">
     66                <property name="modelMapModelKey" value="RelationName"/>
     67        </bean>
    6668
    6769
    6870
    6971        <!--  C O N T R O L L E R S  -->
    70         <bean id="Indicator.HTMLContent.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Common.FileSystemID.Controller.CommonProperties">
    71                 <property name="XMLModelList">
    72                         <list>
    73                                 <ref bean="Indicator.HTMLContent.XMLModel"/>
    74                                 <ref bean="Indicator.DefaultHTMLContent.XMLModel"/>
     72        <bean id="Indicator.HTMLContent.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Common.FileSystemID.Controller.CommonProperties">
     73                <property name="modelMapList">
     74                        <list>
     75                                <ref bean="Indicator.HTMLContent.ModelMap"/>
     76                                <ref bean="Indicator.DefaultHTMLContent.ModelMap"/>
    7577                        </list>
    7678                </property>
     
    7880        </bean>
    7981
    80         <bean id="Indicator.AlphabeticalIndex.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Common.FileSystemID.Controller.CommonProperties">
    81                 <property name="XMLModelList">
    82                         <list>
    83                                 <ref bean="Indicator.PublishedIndicatorProfiles.XMLModel"/>
     82        <bean id="Indicator.AlphabeticalIndex.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Common.FileSystemID.Controller.CommonProperties">
     83                <property name="modelMapList">
     84                        <list>
     85                                <ref bean="Indicator.PublishedIndicatorProfiles.ModelMap"/>
    8486                        </list>
    8587                </property>
    8688                <property name="view" ref="Indicator.AlphabeticalIndex.View"/>
    8789        </bean>
    88         <bean id="Indicator.CategorizedIndex.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Common.FileSystemID.Controller.CommonProperties">
    89                 <property name="XMLModelList">
    90                         <list>
    91                                 <ref bean="Indicator.CategorziedIndex.XMLModel"/>
     90        <bean id="Indicator.CategorizedIndex.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Common.FileSystemID.Controller.CommonProperties">
     91                <property name="modelMapList">
     92                        <list>
     93                                <ref bean="Indicator.CategorziedIndex.ModelMap"/>
    9294                        </list>
    9395                </property>
     
    9597        </bean>
    9698
    97         <bean id="Indicator.Profile.Controller.CommonProperties" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController"
     99        <bean id="Indicator.Profile.Controller.CommonProperties" class="org.ibisph.web.springmvc.ModelMapListProcessingController"
    98100                parent="Common.FileSystemID.Controller.CommonProperties" abstract="true"
    99101        >
    100                 <property name="XMLModelList">
    101                         <list>
    102                                 <ref bean="Indicator.Profile.XMLModel"/>
    103                         </list>
    104                 </property>
    105         </bean>
    106 
    107         <bean id="Indicator.View.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Indicator.Profile.Controller.CommonProperties">
     102                <property name="modelMapList">
     103                        <list>
     104                                <ref bean="Indicator.Profile.ModelMap"/>
     105                        </list>
     106                </property>
     107        </bean>
     108
     109        <bean id="Indicator.View.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Indicator.Profile.Controller.CommonProperties">
    108110                <property name="view" ref="Indicator.View.View"/>
    109111        </bean>
    110         <bean id="Indicator.ImportantFacts.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Indicator.Profile.Controller.CommonProperties">
     112        <bean id="Indicator.ImportantFacts.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Indicator.Profile.Controller.CommonProperties">
    111113                <property name="view" ref="Indicator.ImportantFacts.View"/>
    112114        </bean>
    113115
    114         <bean id="Indicator.RelatedIndicators.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Indicator.Profile.Controller.CommonProperties">
    115                 <property name="parameterMapList">
     116        <bean id="Indicator.RelatedIndicators.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Indicator.Profile.Controller.CommonProperties">
     117                <property name="modelMapList">
    116118                        <list>
    117119                                <ref bean="Common.WebAppURLContextPrefixFromHTTPRequest.ParameterMap"/>
     
    123125        </bean>
    124126
    125         <bean id="Indicator.AvailableServices.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Indicator.Profile.Controller.CommonProperties">
     127        <bean id="Indicator.AvailableServices.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Indicator.Profile.Controller.CommonProperties">
    126128                <property name="view" ref="Indicator.AvailableServices.View"/>
    127129        </bean>
    128         <bean id="Indicator.OtherResources.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Indicator.Profile.Controller.CommonProperties">
     130        <bean id="Indicator.OtherResources.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Indicator.Profile.Controller.CommonProperties">
    129131                <property name="view" ref="Indicator.OtherResources.View"/>
    130132        </bean>
    131         <bean id="Indicator.ViewNumbers.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Indicator.Profile.Controller.CommonProperties">
     133        <bean id="Indicator.ViewNumbers.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Indicator.Profile.Controller.CommonProperties">
    132134                <property name="view" ref="Indicator.ViewNumbers.View"/>
    133135        </bean>
    134         <bean id="Indicator.CompleteProfile.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Indicator.Profile.Controller.CommonProperties">
     136        <bean id="Indicator.CompleteProfile.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Indicator.Profile.Controller.CommonProperties">
    135137                <property name="view" ref="Indicator.CompleteProfile.View"/>
    136138        </bean>
     
    138140        <bean id="Indicator.ChartGraphic.Controller" class="org.ibisph.indicatorprofile.springmvc.XMLChartGraphicController">
    139141                <property name="XMLPath"          ref="Indicator.Profile.XML.Path"/>
    140                 <property name="chartDataService" ref="Indicator.ChartData.XMLModel"/>
     142                <property name="chartDataService" ref="Indicator.ChartData.Service"/>
    141143                <property name="viewNamePrefix"   ref="Chart.ViewNamePrefix"/>
    142144                <property name="viewNameSuffix"   ref="Chart.ViewNameSuffix"/>
  • branches/2.1/src/main/webapps/ibisph-view/WEB-INF/config/spring/phom.xml

    r3535 r3652  
    2626
    2727
    28         <bean id="PHOM.HTMLContent.XMLModel" class="org.ibisph.systemid.xmlmodel.SystemIDFromHTTPRequestEndOfPathInfo">
     28        <bean id="PHOM.HTMLContent.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestEndOfPathInfo">
    2929                <property name="XMLPath" ref="PHOM.HTMLContent.XML.Path"/>
    3030        </bean>
    31         <bean id="PHOM.DefaultHTMLContent.XMLModel" class="org.ibisph.xmlmodel.object.StaticObjectIfNullObject">
    32                 <property name="modelObject" ref="PHOM.Introduction.XML.SystemID"/>
     31        <bean id="PHOM.DefaultHTMLContent.ModelMap" class="org.ibisph.modelmap.DefaultModelIfNullModel">
     32                <property name="defaultModelIfNullModel" ref="PHOM.Introduction.XML.SystemID"/>
    3333        </bean>
    3434
     
    3636
    3737        <!--  C O N T R O L L E R S  -->
    38         <bean id="PHOM.HTMLContent.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Common.FileSystemID.Controller.CommonProperties">
    39                 <property name="XMLModelList">
     38        <bean id="PHOM.HTMLContent.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Common.FileSystemID.Controller.CommonProperties">
     39                <property name="modelMapList">
    4040                        <list>
    41                                 <ref bean="PHOM.HTMLContent.XMLModel"/>
    42                                 <ref bean="PHOM.DefaultHTMLContent.XMLModel"/>
     41                                <ref bean="PHOM.HTMLContent.ModelMap"/>
     42                                <ref bean="PHOM.DefaultHTMLContent.ModelMap"/>
    4343                        </list>
    4444                </property>
    4545                <property name="view" ref="PHOM.HTMLContent.View"/>
    4646        </bean>
    47         <bean id="PHOM.CondensedView.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Indicator.Profile.Controller.CommonProperties">
     47        <bean id="PHOM.CondensedView.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Indicator.Profile.Controller.CommonProperties">
    4848                <property name="view" ref="PHOM.CondensedView.View"/>
    4949        </bean>
    50         <bean id="PHOM.ExpandedView.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Indicator.Profile.Controller.CommonProperties">
     50        <bean id="PHOM.ExpandedView.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Indicator.Profile.Controller.CommonProperties">
    5151                <property name="view" ref="PHOM.ExpandedView.View"/>
    5252        </bean>
  • branches/2.1/src/main/webapps/ibisph-view/WEB-INF/config/spring/publications.xml

    r3535 r3652  
    2929
    3030
    31         <bean id="Publications.HTMLContent.XMLModel" class="org.ibisph.systemid.xmlmodel.SystemIDFromHTTPRequestEndOfPathInfo">
     31        <bean id="Publications.HTMLContent.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestEndOfPathInfo">
    3232                <property name="XMLPath" ref="Publications.HTMLContent.XML.Path"/>
    3333        </bean>
    34         <bean id="Publications.DefaultHTMLContent.XMLModel" class="org.ibisph.xmlmodel.object.StaticObjectIfNullObject">
    35                 <property name="modelObject" ref="Publications.Introduction.XML.SystemID"/>
     34        <bean id="Publications.DefaultHTMLContent.ModelMap" class="org.ibisph.modelmap.DefaultModelIfNullModel">
     35                <property name="defaultModelIfNullModel" ref="Publications.Introduction.XML.SystemID"/>
    3636        </bean>
    3737
    38         <bean id="Publications.List.XMLModel" class="org.ibisph.xmlmodel.object.StaticObject">
    39                 <property name="modelObject" ref="Publications.List.XML.SystemID"/>
     38        <bean id="Publications.List.ModelMap" class="org.ibisph.modelmap.SimpleModelMap">
     39                <property name="model" ref="Publications.List.XML.SystemID"/>
    4040        </bean>
    4141
     
    4343
    4444        <!--  C O N T R O L L E R S  -->
    45         <bean id="Publications.HTMLContent.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Common.FileSystemID.Controller.CommonProperties">
    46                 <property name="XMLModelList">
     45        <bean id="Publications.HTMLContent.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Common.FileSystemID.Controller.CommonProperties">
     46                <property name="modelMapList">
    4747                        <list>
    48                                 <ref bean="Publications.HTMLContent.XMLModel"/>
    49                                 <ref bean="Publications.DefaultHTMLContent.XMLModel"/>
     48                                <ref bean="Publications.HTMLContent.ModelMap"/>
     49                                <ref bean="Publications.DefaultHTMLContent.ModelMap"/>
    5050                        </list>
    5151                </property>
    5252                <property name="view" ref="Publications.HTMLContent.View"/>
    5353        </bean>
    54         <bean id="Publications.ChronologicalIndex.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Common.FileSystemID.Controller.CommonProperties">
    55                 <property name="XMLModelList">
     54        <bean id="Publications.ChronologicalIndex.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Common.FileSystemID.Controller.CommonProperties">
     55                <property name="modelMapList">
    5656                        <list>
    57                                 <ref bean="Publications.List.XMLModel"/>
     57                                <ref bean="Publications.List.ModelMap"/>
    5858                        </list>
    5959                </property>
    6060                <property name="view" ref="Publications.ChronologicalIndex.View"/>
    6161        </bean>
    62         <bean id="Publications.TopicalIndex.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Common.FileSystemID.Controller.CommonProperties">
    63                 <property name="XMLModelList">
     62        <bean id="Publications.TopicalIndex.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Common.FileSystemID.Controller.CommonProperties">
     63                <property name="modelMapList">
    6464                        <list>
    65                                 <ref bean="Publications.List.XMLModel"/>
     65                                <ref bean="Publications.List.ModelMap"/>
    6666                        </list>
    6767                </property>
  • branches/2.1/src/main/webapps/ibisph-view/WEB-INF/config/spring/query.xml

    r3536 r3652  
    5454
    5555        <!-- S E R V I C E S -->
    56         <bean id="Query.Module.XML.Service" class="org.ibisph.querymodule.xmlmodel.QueryModuleXMLService">
     56        <bean id="Query.Module.XML.Service" class="org.ibisph.querymodule.modelmap.QueryModuleXMLService">
    5757                <property name="XMLPath"     ref="Query.ModuleBase.XML.Path"/>
    5858                <property name="documentDAO" ref="Query.QueryModuleXML.DAO"/>
     
    6161
    6262        <!-- X M L   M O D E L S -->
    63         <bean id="Query.HTMLContent.XMLModel" class="org.ibisph.systemid.xmlmodel.SystemIDFromHTTPRequestEndOfPathInfo">
     63        <bean id="Query.HTMLContent.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestEndOfPathInfo">
    6464                <property name="XMLPath" ref="Query.HTMLContent.XML.Path"/>
    6565        </bean>
    66         <bean id="Query.DefaultHTMLContent.XMLModel" class="org.ibisph.xmlmodel.object.StaticObjectIfNullObject">
    67                 <property name="modelObject" ref="Query.Introduction.XML.SystemID"/>
    68         </bean>
    69 
    70         <bean id="Query.ModuleSelectionSystemID.XMLModel" class="org.ibisph.systemid.xmlmodel.SystemIDFromHTTPRequestPathInfo">
     66        <bean id="Query.DefaultHTMLContent.ModelMap" class="org.ibisph.modelmap.DefaultModelIfNullModel">
     67                <property name="defaultModelIfNullModel" ref="Query.Introduction.XML.SystemID"/>
     68        </bean>
     69
     70        <bean id="Query.ModuleSelectionSystemID.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestPathInfo">
    7171                <property name="XMLPath" ref="Query.ModuleBase.XML.Path"/>
    7272        </bean>
    7373
    74         <bean id="Query.Module.DocumentFromHTTPRequest.XMLModel" class="org.ibisph.querymodule.xmlmodel.QueryModuleFromHTTPRequest">
     74        <bean id="Query.Module.DocumentFromHTTPRequest.ModelMap" class="org.ibisph.querymodule.modelmap.QueryModuleFromHTTPRequest">
    7575                <property name="queryModuleSessionName" ref="Query.Module.SessionName"/>
    7676                <property name="queryModuleService"     ref="Query.Module.XML.Service"/>
    7777        </bean>
    7878
    79         <bean id="Query.Module.DocumentFromSession.XMLModel" class="org.ibisph.xmlmodel.object.ObjectFromHTTPSessionAttribute">
     79        <bean id="Query.Module.DocumentFromSession.ModelMap" class="org.ibisph.web.modelmap.ModelFromHTTPSessionAttribute">
     80                <property name="modelMapModelKey" ref="Common.XMLModelModelMapKey"/>
    8081                <property name="modelObjectSessionAttributeName" ref="Query.Module.SessionName"/>
    8182        </bean>
    8283
    83         <bean id="Query.Module.AddUserSelections.XMLModel" class="org.ibisph.querymodule.xmlmodel.AddHTTPRequestParametersToQueryModule">
     84        <bean id="Query.Module.AddUserSelections.ModelMap" class="org.ibisph.querymodule.modelmap.AddHTTPRequestParametersToQueryModule">
     85                <property name="queryModuleModelMapModelKey" ref="Common.XMLModelModelMapKey"/>
    8486                <property name="queryModuleService" ref="Query.Module.XML.Service"/>
    8587        </bean>
    8688
    8789
    88         <bean id="Query.Module.DeleteIBISQResult.XMLModel" class="org.ibisph.xmlmodel.object.DeleteElementsFromDocument">
     90        <bean id="Query.Module.DeleteIBISQResult.ModelMap" class="org.ibisph.xml.modelmap.DeleteElementsFromDocument">
    8991                <property name="elementToDeleteXPathList">
    9092                        <list>
     
    9597        </bean>
    9698
    97         <bean id="Query.Module.AddIBISQResult.XMLModel" class="org.ibisph.querymodule.xmlmodel.AddIBISQResultToQueryModule">
     99        <bean id="Query.Module.AddIBISQResult.ModelMap" class="org.ibisph.querymodule.modelmap.AddIBISQResultToQueryModule">
    98100                <property name="queryApplicationURL"  ref="Common.QueryApplication.URL"/>
    99101                <property name="URLCharacterEncoding" ref="Query.URLCharacterEncoding"/>
    100102                <property name="dateFormat"           ref="Query.Result.DateTimestampFormat"/>
    101103        </bean>
    102         <bean id="Query.Module.AddMissingDimensionRecords.XMLModel" class="org.ibisph.querymodule.xmlmodel.AddMissingDimensionQueryRecordsToQueryModule">
    103         </bean>
    104 
    105         <bean id="Query.Module.ChangeDisplay.XMLModel" class="org.ibisph.querymodule.xmlmodel.UpdateDisplayOptionsFromHTTPRequest">
     104        <bean id="Query.Module.AddMissingDimensionRecords.ModelMap" class="org.ibisph.querymodule.modelmap.AddMissingDimensionQueryRecordsToQueryModule">
     105        </bean>
     106
     107        <bean id="Query.Module.ChangeDisplay.ModelMap" class="org.ibisph.querymodule.modelmap.UpdateDisplayOptionsFromHTTPRequest">
    106108                <property name="queryModuleService" ref="Query.Module.XML.Service"/>
    107109        </bean>
    108110
    109 
    110         <bean id="Query.Module.ModifiedDate.ParameterMap" class="org.ibisph.parametermap.ModifiedDateFromQueryModule">
    111                 <property name="XMLDateParameterName" ref="Common.XMLDateParameterName"/>
    112                 <property name="XMLDateFormat"        ref="Common.DateFormat"/>
    113         </bean>
    114 
    115         <bean id="Query.Module.IBISQQueryResultSubDocument.XMLModel" class="org.ibisph.xmlmodel.object.SubDocumentFromDocument">
     111        <bean id="Query.Module.ModifiedDate.ParameterMap" class="org.ibisph.modelmap.AddModelDateModelToModelMap">
     112                <property name="sourceModelModelMapKey"        ref="Common.XMLModelModelMapKey"/>
     113                <property name="formattedDateModelModelMapKey" ref="Common.XMLDateModelMapKey"/>
     114                <property name="sourceModelDateXPath" value="/QUERY_MODULE/FILE_LAST_MODIFIED_DTS"/>
     115                <property name="dateFormat"        ref="Common.DateFormat"/>
     116        </bean>
     117
     118        <bean id="Query.Module.IBISQQueryResultSubDocument.ModelMap" class="org.ibisph.xml.modelmap.SubDocumentFromDocument">
    116119                <property name="startingNodeXPath" value="/QUERY_MODULE/IBISQ_QUERY_RESULT"/>
    117120        </bean>
    118121
    119         <bean id="Query.Module.ChartData.XMLModel" class="org.ibisph.querymodule.xmlmodel.ChartDataFromQueryModule"/>
     122        <bean id="Query.Module.ChartData.Service" class="org.ibisph.querymodule.modelmap.ChartDataFromQueryModuleService"/>
    120123
    121124
    122125
    123126        <!--  C O N T R O L L E R S  -->
    124         <bean id="Query.HTMLContent.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Common.FileSystemID.Controller.CommonProperties">
    125                 <property name="XMLModelList">
    126                         <list>
    127                                 <ref bean="Query.HTMLContent.XMLModel"/>
    128                                 <ref bean="Query.DefaultHTMLContent.XMLModel"/>
     127        <bean id="Query.HTMLContent.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Common.FileSystemID.Controller.CommonProperties">
     128                <property name="modelMapList">
     129                        <list>
     130                                <ref bean="Query.HTMLContent.ModelMap"/>
     131                                <ref bean="Query.DefaultHTMLContent.ModelMap"/>
    129132                        </list>
    130133                </property>
     
    132135        </bean>
    133136
    134         <bean id="Query.Selection.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Common.FileSystemID.Controller.CommonProperties">
    135                 <property name="XMLModelList">
    136                         <list>
    137                                 <ref bean="Query.ModuleSelectionSystemID.XMLModel"/>
     137        <bean id="Query.Selection.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Common.FileSystemID.Controller.CommonProperties">
     138                <property name="modelMapList">
     139                        <list>
     140                                <ref bean="Query.ModuleSelectionSystemID.ModelMap"/>
    138141                        </list>
    139142                </property>
     
    143146
    144147        <bean id="Query.Module.Controller.CommonProperties" abstract="true">
    145                 <property name="parameterMapList">
     148                <property name="modelMapList">
    146149                        <list>
    147150                                <ref bean="Common.WebAppURLContextPrefixFromHTTPRequest.ParameterMap"/>
     
    152155        </bean>
    153156
    154         <bean id="Query.Builder.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Query.Module.Controller.CommonProperties">
    155                 <property name="XMLModelList">
    156                         <list>
    157                                 <ref bean="Query.Module.DocumentFromHTTPRequest.XMLModel"/>
     157        <bean id="Query.Builder.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Query.Module.Controller.CommonProperties">
     158                <property name="modelMapList">
     159                        <list>
     160                                <ref bean="Query.Module.DocumentFromHTTPRequest.ModelMap"/>
    158161                        </list>
    159162                </property>
     
    161164        </bean>
    162165
    163         <bean id="Query.Submit.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Query.Module.Controller.CommonProperties">
    164                 <property name="XMLModelList">
    165                         <list>
    166                                 <ref bean="Query.Module.DocumentFromHTTPRequest.XMLModel"/>
    167                                 <ref bean="Query.Module.AddUserSelections.XMLModel"/>
    168                                 <ref bean="Query.Module.DeleteIBISQResult.XMLModel"/>
     166        <bean id="Query.Submit.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Query.Module.Controller.CommonProperties">
     167                <property name="modelMapList">
     168                        <list>
     169                                <ref bean="Query.Module.DocumentFromHTTPRequest.ModelMap"/>
     170                                <ref bean="Query.Module.AddUserSelections.ModelMap"/>
     171                                <ref bean="Query.Module.DeleteIBISQResult.ModelMap"/>
    169172                        </list>
    170173                </property>
     
    172175        </bean>
    173176
    174         <bean id="Query.Result.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Query.Module.Controller.CommonProperties">
    175                 <property name="XMLModelList">
    176                         <list>
    177                                 <ref bean="Query.Module.DocumentFromHTTPRequest.XMLModel"/>
    178                                 <ref bean="Query.Module.AddIBISQResult.XMLModel"/>
    179                                 <ref bean="Query.Module.AddMissingDimensionRecords.XMLModel"/>
    180                                 <ref bean="Query.Module.ChangeDisplay.XMLModel"/>
     177        <bean id="Query.Result.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Query.Module.Controller.CommonProperties">
     178                <property name="modelMapList">
     179                        <list>
     180                                <ref bean="Query.Module.DocumentFromHTTPRequest.ModelMap"/>
     181                                <ref bean="Query.Module.AddIBISQResult.ModelMap"/>
     182                                <ref bean="Query.Module.AddMissingDimensionRecords.ModelMap"/>
     183                                <ref bean="Query.Module.ChangeDisplay.ModelMap"/>
    181184                        </list>
    182185                </property>
     
    186189        <bean id="Query.ChartGraphic.Controller" class="org.ibisph.querymodule.springmvc.XMLChartGraphicController">
    187190                <property name="queryModuleSessionName" ref="Query.Module.SessionName"/>
    188                 <property name="chartDataService"       ref="Query.Module.ChartData.XMLModel"/>
     191                <property name="chartDataService"       ref="Query.Module.ChartData.Service"/>
    189192                <property name="viewNamePrefix"         ref="Chart.ViewNamePrefix"/>
    190193                <property name="viewNameSuffix"         ref="Chart.ViewNameSuffix"/>
    191194                <property name="noCacheHTTPHeader"      value="true"/>
    192195        </bean>
    193         <bean id="Query.MapGraphic.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController">
    194                 <property name="XMLModelList">
    195                         <list>
    196                                 <ref bean="Query.Module.DocumentFromSession.XMLModel"/>
    197                         </list>
    198                 </property>
    199                 <property name="parameterMapList">
    200                         <list>
     196        <bean id="Query.MapGraphic.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController">
     197                <property name="modelMapList">
     198                        <list>
     199                                <ref bean="Query.Module.DocumentFromSession.ModelMap"/>
    201200                                <ref bean="Common.WebAppURLContextPrefixFromHTTPRequest.ParameterMap"/>
    202201                                <ref bean="Common.HTTPRequestParameters.ParameterMap"/>
     
    209208
    210209
    211         <bean id="Query.Configuration.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController">
    212                 <property name="XMLModelList">
    213                         <list>
    214                                 <ref bean="Query.Module.DocumentFromHTTPRequest.XMLModel"/>
    215                         </list>
    216                 </property>
    217                 <property name="view" ref="Query.XMLModel.View"/>
    218                 <property name="noCacheHTTPHeader" value="true"/>
    219         </bean>
    220 
    221         <bean id="Query.IBISQResult.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController">
    222                 <property name="XMLModelList">
    223                         <list>
    224                                 <ref bean="Query.Module.DocumentFromHTTPRequest.XMLModel"/>
    225                                 <ref bean="Query.Module.IBISQQueryResultSubDocument.XMLModel"/>
    226                         </list>
    227                 </property>
    228                 <property name="view" ref="Query.XMLModel.View"/>
     210        <bean id="Query.Configuration.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController">
     211                <property name="modelMapList">
     212                        <list>
     213                                <ref bean="Query.Module.DocumentFromHTTPRequest.ModelMap"/>
     214                        </list>
     215                </property>
     216                <property name="view" ref="Query.modelmap.View"/>
     217                <property name="noCacheHTTPHeader" value="true"/>
     218        </bean>
     219
     220        <bean id="Query.IBISQResult.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController">
     221                <property name="modelMapList">
     222                        <list>
     223                                <ref bean="Query.Module.DocumentFromHTTPRequest.ModelMap"/>
     224                                <ref bean="Query.Module.IBISQQueryResultSubDocument.ModelMap"/>
     225                        </list>
     226                </property>
     227                <property name="view" ref="Query.modelmap.View"/>
    229228                <property name="noCacheHTTPHeader" value="true"/>
    230229        </bean>
     
    282281        </bean>
    283282
    284         <bean id="Query.XMLModel.View" class="org.ibisph.xml.springmvc.XMLView">
     283        <bean id="Query.modelmap.View" class="org.ibisph.xml.springmvc.XMLView">
    285284        </bean>
    286285
  • branches/2.1/src/main/webapps/ibisph-view/WEB-INF/config/spring/query_definition.xml

    r3536 r3652  
    2323
    2424        <!-- S E R V I C E S -->
    25         <bean id="QueryDefinition.XML.Service" class="org.ibisph.querydefinition.xmlmodel.QueryDefinitionXMLService">
     25        <bean id="QueryDefinition.XML.Service" class="org.ibisph.querydefinition.modelmap.QueryDefinitionXMLService">
    2626                <property name="XMLPath"     ref="QueryDefinition.XML.Path"/>
    2727                <property name="documentDAO" ref="Common.XML.DAO"/>
    2828        </bean>
    29         <bean id="QueryDefinition.DefinitionToModule.Service" class="org.ibisph.querydefinition.xmlmodel.QueryDefinitionXMLToQueryModuleXMLService"/>
    30         <bean id="QueryDefinition.ModuleToDefinition.Service" class="org.ibisph.querydefinition.xmlmodel.QueryModuleXMLToQueryDefinitionXMLService"/>
     29        <bean id="QueryDefinition.DefinitionToModule.Service" class="org.ibisph.querydefinition.modelmap.QueryDefinitionXMLToQueryModuleXMLService"/>
     30        <bean id="QueryDefinition.ModuleToDefinition.Service" class="org.ibisph.querydefinition.modelmap.QueryModuleXMLToQueryDefinitionXMLService"/>
    3131
    3232
    3333
    3434        <!-- X M L   M O D E L S -->
    35         <bean id="QueryDefinition.DeleteQueryModuleFromHTTPSession.XMLModel" class="org.ibisph.xmlmodel.object.DeleteSessionAttributeFromHTTPRequest">
     35        <bean id="QueryDefinition.DeleteQueryModuleFromHTTPSession.ModelMap" class="org.ibisph.web.modelmap.DeleteSessionAttributeFromHTTPRequest">
    3636                <property name="sessionAttributeName" ref="Query.Module.SessionName"/>
    3737        </bean>
    3838
    39         <bean id="QueryDefinition.QueryDefinitionsFromHTTPRequest.XMLModel" class="org.ibisph.querydefinition.xmlmodel.QueryDefinitionsFromHTTPRequest">
     39        <bean id="QueryDefinition.QueryDefinitionsFromHTTPRequest.ModelMap" class="org.ibisph.querydefinition.modelmap.QueryDefinitionsFromHTTPRequest">
    4040                <description>"_system_" definitions XML list model.</description>
    4141                <property name="queryDefinitionsService" ref="QueryDefinition.XML.Service"/>
    4242        </bean>
    4343
    44         <bean id="QueryDefinition.DeleteQueryDefinitionParamaeters.XMLModel" class="org.ibisph.xmlmodel.object.DeleteElementsFromDocument">
     44        <bean id="QueryDefinition.DeleteQueryDefinitionParamaeters.ModelMap" class="org.ibisph.xml.modelmap.DeleteElementsFromDocument">
    4545                <description>
    4646                        used inline to remove the parameters from the query definition that is
     
    5757        </bean>
    5858
    59         <bean id="QueryDefinition.QueryModuleFromHTTPRequestAndQueryDefinition.XMLModel" class="org.ibisph.querymodule.xmlmodel.QueryModuleFromHTTPRequestAndQueryDefinition">
     59        <bean id="QueryDefinition.QueryModuleFromHTTPRequestAndQueryDefinition.ModelMap" class="org.ibisph.querymodule.modelmap.QueryModuleFromHTTPRequestAndQueryDefinition">
    6060                <description>
    6161                        QD is passed in, QM is from the session if not found then the QD's
     
    6868        </bean>
    6969
    70         <bean id="QueryDefinition.QueryDefinitionFromHTTPRequest.XMLModel" class="org.ibisph.querydefinition.xmlmodel.QueryDefinitionFromHTTPRequest">
     70        <bean id="QueryDefinition.QueryDefinitionFromHTTPRequest.ModelMap" class="org.ibisph.querydefinition.modelmap.QueryDefinitionFromHTTPRequest">
    7171                <description>QD from HTTP REQUEST PARAM - POSTED OR GET.</description>
    7272                <property name="queryDefinitionNameHTTPRequestParameterName" value="queryDefinitionName"/>
     
    7474        </bean>
    7575
    76         <bean id="QueryDefinition.DeleteQueryDefinitionFromHTTPRequest.XMLModel" class="org.ibisph.querydefinition.xmlmodel.DeleteQueryDefinitionFromHTTPRequest">
     76        <bean id="QueryDefinition.DeleteQueryDefinitionFromHTTPRequest.ModelMap" class="org.ibisph.querydefinition.modelmap.DeleteQueryDefinitionFromHTTPRequest">
    7777                <description>QD from HTTP REQUEST PARAM - POSTED OR GET.</description>
    7878                <property name="queryDefinitionNameHTTPRequestParameterName" value="queryDefinitionName"/>
     
    8080        </bean>
    8181
    82         <bean id="QueryDefinition.QueryDefinitionCoreFromHTTPRequestParameters.XMLModel" class="org.ibisph.xmlmodel.object.HTTPRequestParametersToContainerElement">
     82        <bean id="QueryDefinition.QueryDefinitionCoreFromHTTPRequestParameters.Service" class="org.ibisph.web.HTTPRequestParametersToContainerElementService">
    8383                <description>HTTP REQUEST PARAMS to QD - POSTED - SAVE QUERY DEF</description>
    8484                <property name="containerElementName" value="QUERY_DEFINITION"/>
    8585                <property name="HTTPRequestParameterNameToXMLElementNameList">
    8686                        <list>
    87                                 <bean class="org.ibisph.xmlmodel.object.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="configurationPath"/><constructor-arg value="CONFIGURATION_PATH"/></bean>
    88                                 <bean class="org.ibisph.xmlmodel.object.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="name"/>       <constructor-arg value="NAME"/></bean>
    89                                 <bean class="org.ibisph.xmlmodel.object.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="title"/>      <constructor-arg value="TITLE"/></bean>
    90                                 <bean class="org.ibisph.xmlmodel.object.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="description"/><constructor-arg value="DESCRIPTION"/></bean>
    91                         </list>
    92                 </property>
    93         </bean>
    94 
    95         <bean id="QueryDefinition.QueryDefinitionWithCriteriaFromHTTPRequestQueryModuleAndQueryDefinitionCore.XMLModel" class="org.ibisph.querydefinition.xmlmodel.QueryModuleToQueryDefinition">
     87                                <bean class="org.ibisph.web.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="configurationPath"/><constructor-arg value="CONFIGURATION_PATH"/></bean>
     88                                <bean class="org.ibisph.web.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="name"/>       <constructor-arg value="NAME"/></bean>
     89                                <bean class="org.ibisph.web.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="title"/>      <constructor-arg value="TITLE"/></bean>
     90                                <bean class="org.ibisph.web.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="description"/><constructor-arg value="DESCRIPTION"/></bean>
     91                        </list>
     92                </property>
     93        </bean>
     94
     95        <bean id="QueryDefinition.QueryDefinitionWithCriteriaFromHTTPRequestQueryModuleAndQueryDefinitionCore.ModelMap" class="org.ibisph.querydefinition.modelmap.QueryModuleToQueryDefinition">
    9696                <description>
    9797                        loads the QM from the HTTP session
     
    102102        </bean>
    103103
    104         <bean id="QueryDefinition.SavedQueryDefinitionFromHTTPRequestAndLoadedQueryDefinitoin.XMLModel" class="org.ibisph.querydefinition.xmlmodel.QueryDefinitionToQueryDefinitions">
     104        <bean id="QueryDefinition.SavedQueryDefinitionFromHTTPRequestAndLoadedQueryDefinitoin.ModelMap" class="org.ibisph.querydefinition.modelmap.QueryDefinitionToQueryDefinitions">
    105105                <property name="queryDefinitionsService" ref="QueryDefinition.XML.Service"/>
    106106        </bean>
     
    110110        <!--  C O N T R O L L E R S  -->
    111111        <bean id="QueryDefinition.Controller.CommonProperties" abstract="true">
    112                 <property name="parameterMapList">
     112                <property name="modelMapList">
    113113                        <list>
    114114                                <ref bean="Common.WebAppURLContextPrefixFromHTTPRequest.ParameterMap"/>
     
    119119        </bean>
    120120
    121         <bean id="QueryDefinition.DefinitionList.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="QueryDefinition.Controller.CommonProperties">
     121        <bean id="QueryDefinition.DefinitionList.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="QueryDefinition.Controller.CommonProperties">
    122122                <description>DEFINITION SELECTION LIST PAGE</description>
    123                 <property name="XMLModelList">
    124                         <list>
    125                                 <ref bean="QueryDefinition.QueryDefinitionsFromHTTPRequest.XMLModel"/>
     123                <property name="modelMapList">
     124                        <list>
     125                                <ref bean="QueryDefinition.QueryDefinitionsFromHTTPRequest.ModelMap"/>
    126126                        </list>
    127127                </property>
     
    130130
    131131
    132         <bean id="QueryDefinition.DefinitionResult.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="QueryDefinition.Controller.CommonProperties">
     132        <bean id="QueryDefinition.DefinitionResult.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="QueryDefinition.Controller.CommonProperties">
    133133                <description>POST FROM DEFINITION LIST PAGE - CLEAN QM, LOAD QD, RESULT VIEW</description>
    134                 <property name="XMLModelList">
    135                         <list>
    136                                 <ref bean="QueryDefinition.DeleteQueryModuleFromHTTPSession.XMLModel"/>
    137                                 <ref bean="QueryDefinition.QueryDefinitionFromHTTPRequest.XMLModel"/>
    138                                 <ref bean="QueryDefinition.QueryModuleFromHTTPRequestAndQueryDefinition.XMLModel"/>
     134                <property name="modelMapList">
     135                        <list>
     136                                <ref bean="QueryDefinition.DeleteQueryModuleFromHTTPSession.ModelMap"/>
     137                                <ref bean="QueryDefinition.QueryDefinitionFromHTTPRequest.ModelMap"/>
     138                                <ref bean="QueryDefinition.QueryModuleFromHTTPRequestAndQueryDefinition.ModelMap"/>
    139139                        </list>
    140140                </property>
    141141                <property name="view" ref="Query.Result.View"/>
    142142        </bean>
    143         <bean id="QueryDefinition.DefinitionBuilder.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="QueryDefinition.Controller.CommonProperties">
     143        <bean id="QueryDefinition.DefinitionBuilder.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="QueryDefinition.Controller.CommonProperties">
    144144                <description>POST FROM DEFINITION LIST PAGE - CLEAN QM, LOAD QD, BUILDER VIEW</description>
    145                 <property name="XMLModelList">
    146                         <list>
    147                                 <ref bean="QueryDefinition.DeleteQueryModuleFromHTTPSession.XMLModel"/>
    148                                 <ref bean="QueryDefinition.QueryDefinitionFromHTTPRequest.XMLModel"/>
    149                                 <ref bean="QueryDefinition.DeleteQueryDefinitionParamaeters.XMLModel"/>
    150                                 <ref bean="QueryDefinition.QueryModuleFromHTTPRequestAndQueryDefinition.XMLModel"/>
     145                <property name="modelMapList">
     146                        <list>
     147                                <ref bean="QueryDefinition.DeleteQueryModuleFromHTTPSession.ModelMap"/>
     148                                <ref bean="QueryDefinition.QueryDefinitionFromHTTPRequest.ModelMap"/>
     149                                <ref bean="QueryDefinition.DeleteQueryDefinitionParamaeters.ModelMap"/>
     150                                <ref bean="QueryDefinition.QueryModuleFromHTTPRequestAndQueryDefinition.ModelMap"/>
    151151                        </list>
    152152                </property>
    153153                <property name="view" ref="Query.Builder.View"/>
    154154        </bean>
    155         <bean id="QueryDefinition.CriteriaBuilder.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="QueryDefinition.Controller.CommonProperties">
     155        <bean id="QueryDefinition.CriteriaBuilder.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="QueryDefinition.Controller.CommonProperties">
    156156                <description>POST FROM DEFINITION LIST PAGE - EXISTING QM, LOAD QD, BUILDER VIEW</description>
    157                 <property name="XMLModelList">
    158                         <list>
    159                                 <ref bean="QueryDefinition.QueryDefinitionFromHTTPRequest.XMLModel"/>
    160                                 <ref bean="QueryDefinition.DeleteQueryDefinitionParamaeters.XMLModel"/>
    161                                 <ref bean="QueryDefinition.QueryModuleFromHTTPRequestAndQueryDefinition.XMLModel"/>
     157                <property name="modelMapList">
     158                        <list>
     159                                <ref bean="QueryDefinition.QueryDefinitionFromHTTPRequest.ModelMap"/>
     160                                <ref bean="QueryDefinition.DeleteQueryDefinitionParamaeters.ModelMap"/>
     161                                <ref bean="QueryDefinition.QueryModuleFromHTTPRequestAndQueryDefinition.ModelMap"/>
    162162                        </list>
    163163                </property>
     
    166166
    167167
    168         <bean id="QueryDefinition.EditDetail.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="QueryDefinition.Controller.CommonProperties">
     168        <bean id="QueryDefinition.EditDetail.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="QueryDefinition.Controller.CommonProperties">
    169169                <description>
    170170                        /query/definition/edit*"
     
    172172                        DEFINITION SELECTION LIST PAGE
    173173                </description>
    174                 <property name="XMLModelList">
    175                         <list>
    176                                 <ref bean="Query.Module.DocumentFromSession.XMLModel"/>
     174                <property name="modelMapList">
     175                        <list>
     176                                <ref bean="Query.Module.DocumentFromSession.ModelMap"/>
    177177                        </list>
    178178                </property>
    179179                <property name="view" ref="QueryDefinitions.EditDetail.View"/>
    180180        </bean>
    181         <bean id="QueryDefinition.SaveDetail.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="QueryDefinition.Controller.CommonProperties">
     181        <bean id="QueryDefinition.SaveDetail.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="QueryDefinition.Controller.CommonProperties">
    182182                <description>
    183183                        /query/definition/save* -OR- /query/critera/save*
     
    187187                        Get the QDs and return the LIST view.
    188188                </description>
    189                 <property name="XMLModelList">
    190                         <list>
    191                                 <ref bean="QueryDefinition.QueryDefinitionCoreFromHTTPRequestParameters.XMLModel"/>
    192                                 <ref bean="QueryDefinition.QueryDefinitionWithCriteriaFromHTTPRequestQueryModuleAndQueryDefinitionCore.XMLModel"/>
    193                                 <ref bean="QueryDefinition.SavedQueryDefinitionFromHTTPRequestAndLoadedQueryDefinitoin.XMLModel"/>
    194                                 <ref bean="QueryDefinition.QueryDefinitionsFromHTTPRequest.XMLModel"/>
     189                <property name="modelMapList">
     190                        <list>
     191<!--
     192                                <ref bean="QueryDefinition.QueryDefinitionCoreFromHTTPRequestParameters.Service"/>
     193-->
     194                                <ref bean="QueryDefinition.QueryDefinitionWithCriteriaFromHTTPRequestQueryModuleAndQueryDefinitionCore.ModelMap"/>
     195                                <ref bean="QueryDefinition.SavedQueryDefinitionFromHTTPRequestAndLoadedQueryDefinitoin.ModelMap"/>
     196                                <ref bean="QueryDefinition.QueryDefinitionsFromHTTPRequest.ModelMap"/>
    195197                        </list>
    196198                </property>
     
    198200        </bean>
    199201
    200         <bean id="QueryDefinition.DeleteDefinition.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="QueryDefinition.Controller.CommonProperties">
    201                 <description>
    202                 </description>
    203                 <property name="XMLModelList">
    204                         <list>
    205                                 <ref bean="QueryDefinition.DeleteQueryDefinitionFromHTTPRequest.XMLModel"/>
     202        <bean id="QueryDefinition.DeleteDefinition.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="QueryDefinition.Controller.CommonProperties">
     203                <description>
     204                </description>
     205                <property name="modelMapList">
     206                        <list>
     207                                <ref bean="QueryDefinition.DeleteQueryDefinitionFromHTTPRequest.ModelMap"/>
    206208                        </list>
    207209                </property>
  • branches/2.1/src/main/webapps/ibisph-view/WEB-INF/config/spring/secure.xml

    r3599 r3652  
    2929        </bean>
    3030
    31         <bean id="Secure.UserAuthoritiesXML.ParameterMap" class="org.ibisph.user.springsecurity.UserAuthoritiesXMLParameterMap"/>
     31        <bean id="Secure.UserAuthoritiesXML.ParameterMap" class="org.ibisph.user.springsecurity.UserAuthoritiesXMLModelMap"/>
    3232
    33         <bean id="Secure.QueryModule.XML.Service" class="org.ibisph.querymodule.xmlmodel.QueryModuleXMLService">
     33        <bean id="Secure.QueryModule.XML.Service" class="org.ibisph.querymodule.modelmap.QueryModuleXMLService">
    3434                <property name="XMLPath"     ref="Secure.QueryModuleBase.XML.Path"/>
    3535                <property name="documentDAO" ref="Query.QueryModuleXML.DAO"/>
     
    3838
    3939        <!-- X M L   M O D E L S -->
    40         <bean id="Secure.DefaultSelection.XMLModel" class="org.ibisph.xmlmodel.object.StaticObjectIfNullObject">
    41                 <property name="modelObject" ref="Secure.DefaultSelection.XML.SystemID"/>
     40        <bean id="Secure.DefaultSelection.ModelMap" class="org.ibisph.modelmap.DefaultModelIfNullModel">
     41                <property name="defaultModelIfNullModel" ref="Secure.DefaultSelection.XML.SystemID"/>
    4242        </bean>
    43         <bean id="Secure.Selection.XMLModel" class="org.ibisph.systemid.xmlmodel.SystemIDFromHTTPRequestEndOfPathInfo">
     43        <bean id="Secure.Selection.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestEndOfPathInfo">
    4444                <property name="XMLPath" ref="Secure.Selection.XML.Path"/>
    4545        </bean>
    4646
    47         <bean id="Secure.Query.ModuleSelectionSystemID.XMLModel" class="org.ibisph.systemid.xmlmodel.SystemIDFromHTTPRequestPathInfo">
     47        <bean id="Secure.Query.ModuleSelectionSystemID.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestPathInfo">
    4848                <property name="XMLPath" ref="Secure.QueryModuleBase.XML.Path"/>
    4949        </bean>
    50         <bean id="Secure.QueryModule.DocumentFromHTTPRequest.XMLModel" class="org.ibisph.querymodule.xmlmodel.QueryModuleFromHTTPRequest">
     50        <bean id="Secure.QueryModule.DocumentFromHTTPRequest.ModelMap" class="org.ibisph.querymodule.modelmap.QueryModuleFromHTTPRequest">
    5151                <property name="queryModuleSessionName" ref="Query.Module.SessionName"/>
    5252                <property name="queryModuleService"     ref="Secure.QueryModule.XML.Service"/>
     
    5555
    5656        <!--  C O N T R O L L E R S  -->
    57         <bean id="Secure.Selection.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Common.FileSystemID.Controller.CommonProperties">
    58                 <property name="XMLModelList">
     57        <bean id="Secure.Selection.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Common.FileSystemID.Controller.CommonProperties">
     58                <property name="modelMapList">
    5959                        <list>
    60                                 <ref bean="Secure.Selection.XMLModel"/>
    61                                 <ref bean="Secure.DefaultSelection.XMLModel"/>
    62                         </list>
    63                 </property>
    64                 <property name="parameterMapList">
    65                         <list>
     60                                <ref bean="Secure.Selection.ModelMap"/>
     61                                <ref bean="Secure.DefaultSelection.ModelMap"/>
    6662                                <ref bean="Secure.UserAuthoritiesXML.ParameterMap"/>
    6763
     
    7470
    7571
    76         <bean id="Secure.Query.Selection.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Common.FileSystemID.Controller.CommonProperties">
    77                 <property name="XMLModelList">
     72        <bean id="Secure.Query.Selection.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Common.FileSystemID.Controller.CommonProperties">
     73                <property name="modelMapList">
    7874                        <list>
    79                                 <ref bean="Secure.Query.ModuleSelectionSystemID.XMLModel"/>
     75                                <ref bean="Secure.Query.ModuleSelectionSystemID.ModelMap"/>
    8076                        </list>
    8177                </property>
    8278                <property name="view" ref="Secure.Query.Selection.View"/>
    8379        </bean>
    84         <bean id="Secure.Query.Builder.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Query.Module.Controller.CommonProperties">
    85                 <property name="XMLModelList">
     80        <bean id="Secure.Query.Builder.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Query.Module.Controller.CommonProperties">
     81                <property name="modelMapList">
    8682                        <list>
    87                                 <ref bean="Secure.QueryModule.DocumentFromHTTPRequest.XMLModel"/>
     83                                <ref bean="Secure.QueryModule.DocumentFromHTTPRequest.ModelMap"/>
    8884                        </list>
    8985                </property>
     
    9187        </bean>
    9288
    93         <bean id="Secure.Query.Submit.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Query.Module.Controller.CommonProperties">
    94                 <property name="XMLModelList">
     89        <bean id="Secure.Query.Submit.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Query.Module.Controller.CommonProperties">
     90                <property name="modelMapList">
    9591                        <list>
    96                                 <ref bean="Query.Module.DocumentFromHTTPRequest.XMLModel"/>
    97                                 <ref bean="Query.Module.AddUserSelections.XMLModel"/>
    98                                 <ref bean="Query.Module.DeleteIBISQResult.XMLModel"/>
     92                                <ref bean="Query.Module.DocumentFromHTTPRequest.ModelMap"/>
     93                                <ref bean="Query.Module.AddUserSelections.ModelMap"/>
     94                                <ref bean="Query.Module.DeleteIBISQResult.ModelMap"/>
    9995                        </list>
    10096                </property>
     
    10298        </bean>
    10399
    104         <bean id="Secure.Query.Result.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Query.Module.Controller.CommonProperties">
    105                 <property name="XMLModelList">
     100        <bean id="Secure.Query.Result.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Query.Module.Controller.CommonProperties">
     101                <property name="modelMapList">
    106102                        <list>
    107                                 <ref bean="Query.Module.DocumentFromHTTPRequest.XMLModel"/>
    108                                 <ref bean="Query.Module.AddIBISQResult.XMLModel"/>
    109                                 <ref bean="Query.Module.AddMissingDimensionRecords.XMLModel"/>
    110                                 <ref bean="Query.Module.ChangeDisplay.XMLModel"/>
     103                                <ref bean="Query.Module.DocumentFromHTTPRequest.ModelMap"/>
     104                                <ref bean="Query.Module.AddIBISQResult.ModelMap"/>
     105                                <ref bean="Query.Module.AddMissingDimensionRecords.ModelMap"/>
     106                                <ref bean="Query.Module.ChangeDisplay.ModelMap"/>
    111107                        </list>
    112108                </property>
  • branches/2.1/src/main/webapps/ibisph-view/WEB-INF/config/spring/user.xml

    r3599 r3652  
    110110                <property name="host" value="smtp.gmail.com"/>
    111111                <property name="port" value="465"/>
    112                 <property name="username" value="ibisph@gmail.com"/>
    113                 <property name="password" value="xxxxxxx"/>
     112                <property name="username" value="garth.braithwaite@stgutah.com"/>
     113                <property name="password" value="karlyn.0"/>
    114114                <property name="javaMailProperties">
    115115                        <props>
     
    140140
    141141        <!-- X M L   M O D E L S -->
    142         <bean id="User.DefaultHTMLContent.XMLModel" class="org.ibisph.xmlmodel.object.StaticObjectIfNullObject">
    143         </bean>
    144 
    145         <bean id="User.HTMLContent.XMLModel" class="org.ibisph.systemid.xmlmodel.SystemIDFromHTTPRequestEndOfPathInfo">
     142        <bean id="User.DefaultHTMLContent.ModelMap" class="org.ibisph.modelmap.DefaultModelIfNullModel">
     143        </bean>
     144
     145        <bean id="User.HTMLContent.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestEndOfPathInfo">
    146146                <property name="XMLPath" ref="User.HTMLContent.XML.Path"/>
    147147        </bean>
    148148
    149149
    150         <bean id="User.UserProfileFromHTTPRequestParameters.XMLModel" class="org.ibisph.xmlmodel.object.HTTPRequestParametersToContainerElement">
     150        <bean id="User.UserProfileFromHTTPRequestParameters.Service" class="org.ibisph.web.HTTPRequestParametersToContainerElementService">
    151151                <description>HTTP REQUEST PARAMS to USER - POSTED - SAVE USER PROFILE</description>
    152152                <property name="containerElementName" value="USER"/>
    153153                <property name="HTTPRequestParameterNameToXMLElementNameList">
    154154                        <list>
    155                                 <bean class="org.ibisph.xmlmodel.object.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="fullName"/>        <constructor-arg value="FULL_NAME"/></bean>
    156                                 <bean class="org.ibisph.xmlmodel.object.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="emailAddress"/>    <constructor-arg value="ID"/></bean>
    157                                 <bean class="org.ibisph.xmlmodel.object.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="emailAddress"/>    <constructor-arg value="EMAIL_ADDRESS"/></bean>
    158                                 <bean class="org.ibisph.xmlmodel.object.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="password"/>        <constructor-arg value="PASSWORD"/></bean>
    159                                 <bean class="org.ibisph.xmlmodel.object.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="telephoneNumber"/> <constructor-arg value="TELEPHONE_NUMBER"/></bean>
    160                                 <bean class="org.ibisph.xmlmodel.object.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="organization"/>    <constructor-arg value="ORGANIZATION"/></bean>
    161                                 <bean class="org.ibisph.xmlmodel.object.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="securityQuestion"/><constructor-arg value="SECURITY_QUESTION"/></bean>
    162                                 <bean class="org.ibisph.xmlmodel.object.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="securityAnswer"/>  <constructor-arg value="SECURITY_ANSWER"/></bean>
    163                         </list>
    164                 </property>
    165         </bean>
    166 
    167         <bean id="User.SaveUserProfile.XMLModel" class="org.ibisph.user.service.SaveUserProfile">
     155                                <bean class="org.ibisph.web.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="fullName"/>        <constructor-arg value="FULL_NAME"/></bean>
     156                                <bean class="org.ibisph.web.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="emailAddress"/>    <constructor-arg value="ID"/></bean>
     157                                <bean class="org.ibisph.web.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="emailAddress"/>    <constructor-arg value="EMAIL_ADDRESS"/></bean>
     158                                <bean class="org.ibisph.web.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="password"/>        <constructor-arg value="PASSWORD"/></bean>
     159                                <bean class="org.ibisph.web.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="telephoneNumber"/> <constructor-arg value="TELEPHONE_NUMBER"/></bean>
     160                                <bean class="org.ibisph.web.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="organization"/>    <constructor-arg value="ORGANIZATION"/></bean>
     161                                <bean class="org.ibisph.web.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="securityQuestion"/><constructor-arg value="SECURITY_QUESTION"/></bean>
     162                                <bean class="org.ibisph.web.HTTPRequestParameterNameToXMLElementName"><constructor-arg value="securityAnswer"/>  <constructor-arg value="SECURITY_ANSWER"/></bean>
     163                        </list>
     164                </property>
     165        </bean>
     166
     167        <bean id="User.SaveUserProfile.ModelMap" class="org.ibisph.user.service.SaveUserProfile">
    168168                <property name="userProfileService" ref="User.XML.Service"/>
    169169                <property name="javaMailSender"     ref="User.MailSender"/>
     
    174174        <!--  C O N T R O L L E R S  -->
    175175        <bean id="User.Controller.CommonProperties" abstract="true">
    176                 <property name="parameterMapList">
     176                <property name="modelMapList">
    177177                        <list>
    178178                                <ref bean="Common.WebAppURLContextPrefixFromHTTPRequest.ParameterMap"/>
     
    183183        </bean>
    184184
    185         <bean id="User.HTMLContent.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Common.FileSystemID.Controller.CommonProperties">
    186                 <property name="XMLModelList">
    187                         <list>
    188                                 <ref bean="User.HTMLContent.XMLModel"/>
    189                                 <ref bean="User.DefaultHTMLContent.XMLModel"/>
     185        <bean id="User.HTMLContent.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Common.FileSystemID.Controller.CommonProperties">
     186                <property name="modelMapList">
     187                        <list>
     188                                <ref bean="User.HTMLContent.ModelMap"/>
     189                                <ref bean="User.DefaultHTMLContent.ModelMap"/>
    190190                        </list>
    191191                </property>
     
    193193        </bean>
    194194
    195         <bean id="User.EmailPassword.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Common.FileSystemID.Controller.CommonProperties">
    196         </bean>
    197 
    198         <bean id="User.NewRegistration.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Common.FileSystemID.Controller.CommonProperties">
    199         </bean>
    200 
    201         <bean id="User.SaveRegistration.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="User.Controller.CommonProperties">
     195        <bean id="User.EmailPassword.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Common.FileSystemID.Controller.CommonProperties">
     196        </bean>
     197
     198        <bean id="User.NewRegistration.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Common.FileSystemID.Controller.CommonProperties">
     199        </bean>
     200
     201        <bean id="User.SaveRegistration.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="User.Controller.CommonProperties">
    202202                <description>
    203203                        /query/definition/save* -OR- /query/critera/save*
    204204                        Get the POSTED HTTP request params and create a new USER
    205205                </description>
    206                 <property name="XMLModelList">
    207                         <list>
    208                                 <ref bean="User.UserProfileFromHTTPRequestParameters.XMLModel"/>
    209                                 <ref bean="User.SaveUserProfile.XMLModel"/>
     206                <property name="modelMapList">
     207                        <list>
     208<!--
     209                                <ref bean="User.UserProfileFromHTTPRequestParameters.Service"/>
     210-->
     211                                <ref bean="User.SaveUserProfile.ModelMap"/>
    210212                        </list>
    211213                </property>
     
    213215        </bean>
    214216
    215         <bean id="User.VerifyRegistration.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Common.FileSystemID.Controller.CommonProperties">
    216         </bean>
    217 
    218         <bean id="User.EditProfile.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Common.FileSystemID.Controller.CommonProperties">
    219         </bean>
    220 
    221         <bean id="User.SaveProfile.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="Common.FileSystemID.Controller.CommonProperties">
     217        <bean id="User.VerifyRegistration.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Common.FileSystemID.Controller.CommonProperties">
     218        </bean>
     219
     220        <bean id="User.EditProfile.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Common.FileSystemID.Controller.CommonProperties">
     221        </bean>
     222
     223        <bean id="User.SaveProfile.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="Common.FileSystemID.Controller.CommonProperties">
    222224        </bean>
    223225
     
    235237
    236238
    237         <bean id="User.QueryDefinitionsXML.ParameterMap" class="org.ibisph.querydefinition.xmlmodel.QueryDefinitionsXMLParameterMap">
     239        <bean id="User.QueryDefinitionsXML.ParameterMap" class="org.ibisph.querydefinition.modelmap.QueryDefinitionsFromHTTPRequest">
    238240                <property name="queryDefinitionsService" ref="QueryDefinition.XML.Service"/>
    239241        </bean>
    240         <bean id="User.UserAuthoritiesXML.ParameterMap" class="org.ibisph.user.springsecurity.UserAuthoritiesXMLParameterMap"/>
    241 
    242         <bean id="User.QuerySelectionList.Controller" class="org.ibisph.xml.springmvc.XMLModelListAndParameterMapListController" parent="QueryDefinition.Controller.CommonProperties">
     242        <bean id="User.UserAuthoritiesXML.ParameterMap" class="org.ibisph.user.springsecurity.UserAuthoritiesXMLModelMap"/>
     243
     244        <bean id="User.QuerySelectionList.Controller" class="org.ibisph.web.springmvc.ModelMapListProcessingController" parent="QueryDefinition.Controller.CommonProperties">
    243245                <description>    </description>
    244                 <property name="XMLModelList">
    245                         <list>
    246                                 <ref bean="Secure.DefaultSelection.XMLModel"/>
    247                         </list>
    248                 </property>
    249                 <property name="parameterMapList">
    250                         <list>
     246                <property name="modelMapList">
     247                        <list>
     248                                <ref bean="Secure.DefaultSelection.ModelMap"/>
    251249                                <ref bean="User.QueryDefinitionsXML.ParameterMap"/>
    252250                                <ref bean="User.UserAuthoritiesXML.ParameterMap"/>
  • branches/2.1/src/main/webapps/ibisph-view/xslt/html/query/definition/detail/Page.xslt

    r3544 r3652  
    6363                <xsl:param name="graphicName"         select="/QUERY_MODULE/REQUEST/GRAPHIC_NAME"/>
    6464
    65                 <form name="form" method="post" action="{$ibis.urlPrefix}query/definition/detail/save">
     65                <form name="form" method="post" action="{$ibis.urlPrefix}save/query/definition/detail">
    6666                        <xsl:call-template name="Selections.userCriteria">
    6767                                <xsl:with-param name="queryModule"         select="/QUERY_MODULE"/>
Note: See TracChangeset for help on using the changeset viewer.