Changeset 3654 in main


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

view and java - few more updates before starting query def updates.

Location:
branches/2.1/src/main
Files:
12 added
7 deleted
19 edited

Legend:

Unmodified
Added
Removed
  • branches/2.1/src/main/java/org/ibisph/querydefinition/modelmap/AbstractQueryDefinitionModelMap.java

    r3652 r3654  
    88
    99import org.ibisph.modelmap.AbstractModelMap;
     10import org.ibisph.querydefinition.service.QueryDefinitionXML;
    1011import org.ibisph.user.springsecurity.UserDetails;
    1112
     
    1819  protected static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(AbstractQueryDefinitionModelMap.class);
    1920
    20   protected QueryDefinitionXMLService queryDefinitionsService = null;
     21  protected QueryDefinitionXML queryDefinitionsService = null;
    2122
    2223  protected String userDetailsBeanSessionName = "user";
     
    2526  //------------------------------------------- P R O P E R T Y   S E T T E R S
    2627
    27   public void setQueryDefinitionsService(QueryDefinitionXMLService queryDefinitionsService) {
     28  public void setQueryDefinitionsService(QueryDefinitionXML queryDefinitionsService) {
    2829    this.queryDefinitionsService = queryDefinitionsService;
    2930  } //-------------------------- End of Method ------------------------------
  • branches/2.1/src/main/java/org/ibisph/querydefinition/modelmap/DirectSaveQueryModuleToQueryDefinition.java

    r3652 r3654  
    66import org.dom4j.Element;
    77
     8import org.ibisph.querydefinition.service.QueryDefinitionXML;
     9import org.ibisph.querydefinition.service.QueryModuleXMLToQueryDefinitionXML;
    810import org.ibisph.util.XMLLib;
    911
     
    1820  protected static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DirectSaveQueryModuleToQueryDefinition.class);
    1921
    20   protected QueryModuleXMLToQueryDefinitionXMLService queryModuleToQueryDefinitionService = null;
    21   protected QueryDefinitionXMLService queryDefinitionsService = null;
     22  protected QueryModuleXMLToQueryDefinitionXML queryModuleToQueryDefinitionService = null;
     23  protected QueryDefinitionXML queryDefinitionsService = null;
    2224 
    2325
    2426  //------------------------------------------- P R O P E R T Y   S E T T E R S
    2527
    26   public void setQueryModuleToQueryDefinitionService(QueryModuleXMLToQueryDefinitionXMLService queryModuleToSavedQueryDefinitionService) {
     28  public void setQueryModuleToQueryDefinitionService(QueryModuleXMLToQueryDefinitionXML queryModuleToSavedQueryDefinitionService) {
    2729    this.queryModuleToQueryDefinitionService = queryModuleToSavedQueryDefinitionService;
    2830  }
    29   public void setQueryDefinitionsService(QueryDefinitionXMLService queryDefinitionsService) {
     31  public void setQueryDefinitionsService(QueryDefinitionXML queryDefinitionsService) {
    3032    this.queryDefinitionsService = queryDefinitionsService;
    3133  }
  • branches/2.1/src/main/java/org/ibisph/querydefinition/modelmap/QueryModuleToQueryDefinition.java

    r3652 r3654  
    1919  protected String queryModuleSessionName = "QueryModule";
    2020
    21   protected org.ibisph.querydefinition.modelmap.QueryModuleXMLToQueryDefinitionXMLService queryModuleToQueryDefinitionService = null;
     21  protected org.ibisph.querydefinition.service.QueryModuleXMLToQueryDefinitionXML queryModuleToQueryDefinitionService = null;
    2222 
    2323
    2424  //------------------------------------------- P R O P E R T Y   S E T T E R S
    2525
    26   public void setQueryModuleToQueryDefinitionService(org.ibisph.querydefinition.modelmap.QueryModuleXMLToQueryDefinitionXMLService queryModuleToSavedQueryDefinitionService) {
     26  public void setQueryModuleToQueryDefinitionService(org.ibisph.querydefinition.service.QueryModuleXMLToQueryDefinitionXML queryModuleToSavedQueryDefinitionService) {
    2727    this.queryModuleToQueryDefinitionService = queryModuleToSavedQueryDefinitionService;
    2828  }
  • branches/2.1/src/main/java/org/ibisph/querydefinition/modelmap/package.html

    r3652 r3654  
    44
    55<head>
    6         <title>org.ibisph.querydefinition.xmlmodel package</title>
     6        <title>org.ibisph.querydefinition.modelmap package</title>
    77</head>
    88
    99<body bgcolor="white">
    1010
    11 Provides the QueryDefinition based "getModel" objects.  This includes services
    12 that get QueryDefintion model objects.  This includes load the query definition
    13 to/from QueryModule documents and from/to a file etc.
     11Provides the QueryDefinition based "getModel" objects. 
    1412</body>
    1513</html>
  • branches/2.1/src/main/java/org/ibisph/querymodule/modelmap/AddHTTPRequestParametersToQueryModule.java

    r3653 r3654  
    1111import org.dom4j.Node;
    1212import org.ibisph.modelmap.ProcessModelMapFromHTTPRequest;
     13import org.ibisph.querymodule.service.QueryModuleXML;
    1314import org.ibisph.util.StrLib;
    1415import org.ibisph.util.XMLLib;
     
    2829{
    2930
    30   protected QueryModuleXMLService queryModuleService = null;
     31  protected QueryModuleXML queryModuleService = null;
    3132
    3233  // HTTP Request group by parameter names.
     
    4647   * @param queryModuleService service to use.
    4748   */   
    48   public void setQueryModuleService(QueryModuleXMLService queryModuleService) {this.queryModuleService = queryModuleService;}
     49  public void setQueryModuleService(QueryModuleXML queryModuleService) {this.queryModuleService = queryModuleService;}
    4950
    5051
  • branches/2.1/src/main/java/org/ibisph/querymodule/modelmap/AddIBISQResultToQueryModule.java

    r3653 r3654  
    2828 * @author Garth Braithwaite, STG
    2929 */
    30 public class AddIBISQResultToQueryModule extends AbstractQueryModuleModelMap implements ProcessModelMap {
     30public class AddIBISQResultToQueryModule
     31  extends AbstractQueryModuleModelMap
     32  implements ProcessModelMap
     33{
    3134
    3235  protected String queryApplicationURL = null;
  • branches/2.1/src/main/java/org/ibisph/querymodule/modelmap/AddMissingDimensionQueryRecordsToQueryModule.java

    r3653 r3654  
    2222
    2323import org.ibisph.modelmap.ProcessModelMap;
     24import org.ibisph.querymodule.service.ArrayIndexIncrementer;
    2425import org.ibisph.util.XMLLib;
    2526
     
    3233 * @author Garth Braithwaite, STG
    3334 */
    34 public class AddMissingDimensionQueryRecordsToQueryModule extends AbstractQueryModuleModelMap implements ProcessModelMap {
     35public class AddMissingDimensionQueryRecordsToQueryModule
     36  extends AbstractQueryModuleModelMap
     37  implements ProcessModelMap
     38{
    3539
    3640  protected String defaultMissingValue = "";
  • branches/2.1/src/main/java/org/ibisph/querymodule/modelmap/QueryModuleFromHTTPRequest.java

    r3652 r3654  
    77import org.ibisph.modelmap.AbstractModelMap;
    88import org.ibisph.modelmap.GetModelMapFromHTTPRequest;
     9import org.ibisph.querymodule.service.QueryModuleXML;
    910import org.ibisph.util.IOPath;
    1011
     
    1920 * @author Garth Braithwaite, STG
    2021 */
    21 public class QueryModuleFromHTTPRequest extends AbstractModelMap implements GetModelMapFromHTTPRequest {
     22public class QueryModuleFromHTTPRequest
     23  extends AbstractModelMap
     24  implements GetModelMapFromHTTPRequest
     25{
    2226
    2327  protected String queryModuleSessionName          = "QueryModule";
     
    2529  protected String configurationPathPrefixToRemove = null;
    2630
    27   protected QueryModuleXMLService queryModuleService = null;
     31  protected QueryModuleXML queryModuleService = null;
    2832
    2933
     
    3337   * Sets the Query XML document session name.  This method is simply the
    3438   * standardized way of setting/accessing the query module session document.
     39   *
    3540   * @param key User HTTP session object container key/name.  This value is
    3641   *   the key which is used to put and get the query module XML
     
    4348   * @param queryModuleService service to use.
    4449   */   
    45   public void setQueryModuleService(QueryModuleXMLService queryModuleService) {this.queryModuleService = queryModuleService;}
     50  public void setQueryModuleService(QueryModuleXML queryModuleService) {this.queryModuleService = queryModuleService;}
    4651
    4752  /**
     
    5257   * match the name value that the UI will use with its value simply being any
    5358   * non blank character - controller simply checks for existence.
     59   *
    5460   * @param reloadRequestParameterName HTTP Request Query string parameter name.
    5561   */   
     
    7379   * This code also inits some default values after loading.  The Query Module
    7480   * document object is then added to the user's session for later use.
     81   *
    7582   * @param request HttpServletRequest that the configuration path is retrieved from.
    7683   * @return the fully loaded query module xml document object.
  • branches/2.1/src/main/java/org/ibisph/querymodule/modelmap/QueryModuleFromHTTPRequestAndQueryDefinition.java

    r3652 r3654  
    99
    1010import org.ibisph.modelmap.GetModelMapFromModelMapAndHTTPRequest;
    11 import org.ibisph.querydefinition.modelmap.QueryDefinitionXMLToQueryModuleXMLService;
     11import org.ibisph.querydefinition.service.QueryDefinitionXMLToQueryModuleXML;
     12import org.ibisph.querymodule.service.QueryModuleXML;
    1213import org.ibisph.util.XMLLib;
    1314
     
    2425  protected String queryDefinitionModelMapModelKey = "QueryDefinition";
    2526
    26   protected QueryDefinitionXMLToQueryModuleXMLService queryDefinitionToQueryModuleService = null;
    27   protected QueryModuleXMLService queryModuleService = null;
     27  protected QueryDefinitionXMLToQueryModuleXML queryDefinitionToQueryModuleService = null;
     28  protected QueryModuleXML queryModuleService = null;
    2829
    2930
     
    3334   * Sets the Query XML document session name.  This method is simply the
    3435   * standardized way of setting/accessing the query module session document.
     36   *
    3537   * @param key User HTTP session object container key/name.  This value is
    3638   *   the key which is used to put and get the query module XML
     
    4345   * @param queryDefinitionToQueryModuleService
    4446   */   
    45   public void setQueryDefinitionToQueryModuleService(QueryDefinitionXMLToQueryModuleXMLService queryDefinitionToQueryModuleService) {
     47  public void setQueryDefinitionToQueryModuleService(QueryDefinitionXMLToQueryModuleXML queryDefinitionToQueryModuleService) {
    4648    this.queryDefinitionToQueryModuleService = queryDefinitionToQueryModuleService;
    4749  }
     
    5153   * @param queryModuleService service to use.
    5254   */   
    53   public void setQueryModuleService(QueryModuleXMLService queryModuleService) {this.queryModuleService = queryModuleService;}
     55  public void setQueryModuleService(QueryModuleXML queryModuleService) {this.queryModuleService = queryModuleService;}
    5456
    5557
  • branches/2.1/src/main/java/org/ibisph/querymodule/modelmap/UpdateDisplayOptionsFromHTTPRequest.java

    r3653 r3654  
    88
    99import org.ibisph.modelmap.ProcessModelMapFromHTTPRequest;
     10import org.ibisph.querymodule.service.QueryModuleXML;
    1011import org.ibisph.util.StrLib;
    1112
     
    2526  protected String measureHTTPParameterName = "MeasureName";
    2627
    27   protected QueryModuleXMLService queryModuleService = null;
     28  protected QueryModuleXML queryModuleService = null;
    2829
    2930
     
    4546   * @param queryModuleService service to use.
    4647   */   
    47   public void setQueryModuleService(QueryModuleXMLService queryModuleService) {this.queryModuleService = queryModuleService;}
     48  public void setQueryModuleService(QueryModuleXML queryModuleService) {this.queryModuleService = queryModuleService;}
    4849
    4950
     
    5455   * Get's the query module XML document and changes the measure and graphic
    5556   * names if specified.
     57   *
    5658   * @param request HttpServletRequest that the display params are retrieved from.
    5759   * @param queryModuleXMLModelObject query module document to have the display
  • branches/2.1/src/main/java/org/ibisph/querymodule/springmvc/ChartDataModelMapFromHTTPRequestQueryModule.java

    r3652 r3654  
    99import org.ibisph.chart.ChartData;
    1010import org.ibisph.chart.ChartDataService;
    11 import org.ibisph.querymodule.modelmap.ChartDataFromQueryModuleService;
     11import org.ibisph.querymodule.service.ChartDataFromQueryModule;
    1212import org.ibisph.util.IOPath;
    1313import org.ibisph.util.StrLib;
     
    2929public class ChartDataModelMapFromHTTPRequestQueryModule {
    3030
    31   protected ChartDataService chartDataService = new ChartDataFromQueryModuleService();
     31  protected ChartDataService chartDataService = new ChartDataFromQueryModule();
    3232
    3333  protected String defaultChartHeight = "350";
  • branches/2.1/src/main/java/org/ibisph/web/modelmap/ModelFromHTTPSessionAttribute.java

    r3652 r3654  
    2525   * session.  This method is a simple way to string together a series of model
    2626   * builders which needs to get an object from the users session.
     27   *
    2728   * @param key User HTTP session object container key/name.  This value is
    2829   *   the key which is used to get the model object from the user's session. 
  • branches/2.1/src/main/webapps/ibisph-view/WEB-INF/config/spring/query.xml

    r3653 r3654  
    5454
    5555        <!-- S E R V I C E S -->
    56         <bean id="Query.Module.XML.Service" class="org.ibisph.querymodule.modelmap.QueryModuleXMLService">
     56        <bean id="Query.Module.XML.Service" class="org.ibisph.querymodule.service.QueryModuleXML">
    5757                <property name="XMLPath"     ref="Query.ModuleBase.XML.Path"/>
    5858                <property name="documentDAO" ref="Query.QueryModuleXML.DAO"/>
     
    123123        </bean>
    124124
    125         <bean id="Query.Module.ChartData.Service" class="org.ibisph.querymodule.modelmap.ChartDataFromQueryModuleService"/>
     125        <bean id="Query.Module.ChartData.Service" class="org.ibisph.querymodule.service.ChartDataFromQueryModule"/>
    126126
    127127
  • branches/2.1/src/main/webapps/ibisph-view/WEB-INF/config/spring/query_definition.xml

    r3653 r3654  
    2323
    2424        <!-- S E R V I C E S -->
    25         <bean id="QueryDefinition.XML.Service" class="org.ibisph.querydefinition.modelmap.QueryDefinitionXMLService">
     25        <bean id="QueryDefinition.XML.Service" class="org.ibisph.querydefinition.service.QueryDefinitionXML">
    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.modelmap.QueryDefinitionXMLToQueryModuleXMLService"/>
    30         <bean id="QueryDefinition.ModuleToDefinition.Service" class="org.ibisph.querydefinition.modelmap.QueryModuleXMLToQueryDefinitionXMLService"/>
     29        <bean id="QueryDefinition.DefinitionToModule.Service" class="org.ibisph.querydefinition.service.QueryDefinitionXMLToQueryModuleXML"/>
     30        <bean id="QueryDefinition.ModuleToDefinition.Service" class="org.ibisph.querydefinition.service.QueryModuleXMLToQueryDefinitionXML"/>
    3131
    3232
  • branches/2.1/src/main/webapps/ibisph-view/WEB-INF/config/spring/secure.xml

    r3653 r3654  
    3131        <bean id="Secure.UserAuthoritiesXML.ParameterMap" class="org.ibisph.user.springsecurity.UserAuthoritiesXMLModelMap"/>
    3232
    33         <bean id="Secure.QueryModule.XML.Service" class="org.ibisph.querymodule.modelmap.QueryModuleXMLService">
     33        <bean id="Secure.QueryModule.XML.Service" class="org.ibisph.querymodule.service.QueryModuleXML">
    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.ModelMap" class="org.ibisph.modelmap.DefaultModelIfNullModel">
     40        <bean id="Secure.DefaultSelection.ModelMap" class="org.ibisph.modelmap.DefaultModelIfNullModel" parent="Common.XMLModelMap.CommonProperties">
    4141                <property name="defaultModelIfNullModel" ref="Secure.DefaultSelection.XML.SystemID"/>
    4242        </bean>
    43         <bean id="Secure.Selection.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestEndOfPathInfo">
     43        <bean id="Secure.Selection.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestEndOfPathInfo" parent="Common.XMLModelMap.CommonProperties">
    4444                <property name="XMLPath" ref="Secure.Selection.XML.Path"/>
    4545        </bean>
    4646
    47         <bean id="Secure.Query.ModuleSelectionSystemID.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestPathInfo">
     47        <bean id="Secure.Query.ModuleSelectionSystemID.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestPathInfo" parent="Common.XMLModelMap.CommonProperties">
    4848                <property name="XMLPath" ref="Secure.QueryModuleBase.XML.Path"/>
    4949        </bean>
    50         <bean id="Secure.QueryModule.DocumentFromHTTPRequest.ModelMap" class="org.ibisph.querymodule.modelmap.QueryModuleFromHTTPRequest">
     50        <bean id="Secure.QueryModule.DocumentFromHTTPRequest.ModelMap" class="org.ibisph.querymodule.modelmap.QueryModuleFromHTTPRequest" parent="Common.XMLModelMap.CommonProperties">
    5151                <property name="queryModuleSessionName" ref="Query.Module.SessionName"/>
    5252                <property name="queryModuleService"     ref="Secure.QueryModule.XML.Service"/>
  • branches/2.1/src/main/webapps/ibisph-view/WEB-INF/config/spring/user.xml

    r3653 r3654  
    140140
    141141        <!-- X M L   M O D E L S -->
    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">
     142        <bean id="User.DefaultHTMLContent.ModelMap" class="org.ibisph.modelmap.DefaultModelIfNullModel" parent="Common.XMLModelMap.CommonProperties">
     143        </bean>
     144        <bean id="User.HTMLContent.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestEndOfPathInfo" parent="Common.XMLModelMap.CommonProperties">
    146145                <property name="XMLPath" ref="User.HTMLContent.XML.Path"/>
    147146        </bean>
Note: See TracChangeset for help on using the changeset viewer.