tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amy...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/webapps/admin/service service.jsp
Date Sun, 23 Mar 2003 02:10:31 GMT
amyroh      2003/03/22 18:10:30

  Modified:    webapps/admin/WEB-INF/classes/org/apache/webapp/admin
                        Lists.java
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host
                        AddHostAction.java DeleteHostAction.java
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
                        DataSourceForm.java DataSourcesForm.java
                        DeleteDataSourcesAction.java
                        DeleteEnvEntriesAction.java
                        DeleteMailSessionsAction.java
                        DeleteResourceLinksAction.java EnvEntriesForm.java
                        EnvEntryForm.java ListDataSourcesAction.java
                        MailSessionForm.java MailSessionsForm.java
                        ResourceLinkForm.java ResourceLinksForm.java
                        ResourceUtils.java SaveDataSourceAction.java
                        SaveEnvEntryAction.java SaveMailSessionAction.java
                        SaveResourceLinkAction.java
                        SetUpDataSourceAction.java SetUpEnvEntryAction.java
                        SetUpMailSessionAction.java
                        SetUpResourceLinkAction.java
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service
                        AddServiceAction.java DeleteServiceAction.java
                        SaveServiceAction.java
               webapps/admin/resources dataSource.jsp dataSources.jspf
                        deleteDataSources.jsp deleteEnvEntries.jsp
                        deleteMailSessions.jsp deleteResourceLinks.jsp
                        envEntries.jspf envEntry.jsp listDataSources.jsp
                        listDataSources.jspf listEnvEntries.jsp
                        listEnvEntries.jspf listMailSessions.jsp
                        listMailSessions.jspf listResourceLinks.jsp
                        listResourceLinks.jspf mailSession.jsp
                        mailSessions.jspf resourceLink.jsp
                        resourceLinks.jspf
               webapps/admin/server server.jsp
               webapps/admin/service service.jsp
  Removed:     webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
                        DeleteConnectorForm.java
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context
                        DeleteContextForm.java
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext
                        DeleteDefaultContextForm.java
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host
                        DeleteHostForm.java
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger
                        DeleteLoggerForm.java
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
                        DeleteRealmForm.java
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service
                        DeleteServiceForm.java
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve
                        DeleteValveForm.java
  Log:
  Update naming resource handling in admin.
  
  Revision  Changes    Path
  1.8       +9 -7      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java
  
  Index: Lists.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Lists.java	21 Mar 2003 08:19:12 -0000	1.7
  +++ Lists.java	23 Mar 2003 02:10:26 -0000	1.8
  @@ -628,8 +628,9 @@
           (MBeanServer mbserver, String domain, HttpServletRequest request)
           throws Exception {
   
  +        String adminDomain = TomcatTreeBuilder.DEFAULT_DOMAIN;
           // Get the admin app's service name
  -        StringBuffer sb = new StringBuffer(domain);
  +        StringBuffer sb = new StringBuffer(adminDomain);
           sb.append(":type=Service,*");
           ObjectName search = new ObjectName(sb.toString());
           Iterator names = mbserver.queryNames(search, null).iterator();
  @@ -656,7 +657,8 @@
           throws Exception {
           
           // Get the admin app's host name
  -        StringBuffer sb = new StringBuffer(domain);
  +        String adminDomain = TomcatTreeBuilder.DEFAULT_DOMAIN;
  +        StringBuffer sb = new StringBuffer(adminDomain);
           sb.append(":j2eeType=WebModule,*"); 
           ObjectName search = new ObjectName(sb.toString());
           Iterator names = mbserver.queryNames(search, null).iterator();
  @@ -675,7 +677,7 @@
                   return host;
               }
           }
  -        return "";
  +        return host;
   
       }
   
  
  
  
  1.4       +5 -5      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java
  
  Index: AddHostAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AddHostAction.java	16 Sep 2002 04:46:18 -0000	1.3
  +++ AddHostAction.java	23 Mar 2003 02:10:26 -0000	1.4
  @@ -124,7 +124,7 @@
   
           // the service Name is needed to retrieve the engine mBean to
           // which the new host mBean will be added.
  -        String serviceName = request.getParameter("serviceName");
  +        String serviceName = request.getParameter("select");
   
           // Fill in the form values for display and editing
           HostForm hostFm = new HostForm();
  
  
  
  1.5       +4 -5      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java
  
  Index: DeleteHostAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DeleteHostAction.java	20 Mar 2003 05:40:09 -0000	1.4
  +++ DeleteHostAction.java	23 Mar 2003 02:10:26 -0000	1.5
  @@ -154,7 +154,6 @@
               ("Cannot acquire MBeanServer reference", t);
           }
           
  -        String serviceName = request.getParameter("serviceName");
           // Set up a form bean containing the currently selected
           // objects to be deleted
           HostsForm hostsForm = new HostsForm();
  
  
  
  1.2       +12 -12    jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourceForm.java
  
  Index: DataSourceForm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourceForm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DataSourceForm.java	18 Jul 2002 16:48:27 -0000	1.1
  +++ DataSourceForm.java	23 Mar 2003 02:10:26 -0000	1.2
  @@ -254,22 +254,22 @@
       
          
       /**
  -     * The service of this data source.
  +     * The domain of this data source.
        */
  -    private String service = null;
  +    private String domain = null;
       
       /**
  -     * Return the service of the data source this bean refers to.
  +     * Return the domain of the data source this bean refers to.
        */
  -    public String getService() {
  -        return this.service;
  +    public String getDomain() {
  +        return this.domain;
       }
   
       /**
  -     * Set the service of the data source this bean refers to.
  +     * Set the domain of the data source this bean refers to.
        */
  -    public void setService(String service) {
  -        this.service = service;
  +    public void setDomain(String domain) {
  +        this.domain = domain;
       }
       
       /**
  
  
  
  1.2       +12 -12    jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourcesForm.java
  
  Index: DataSourcesForm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourcesForm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DataSourcesForm.java	18 Jul 2002 16:48:27 -0000	1.1
  +++ DataSourcesForm.java	23 Mar 2003 02:10:26 -0000	1.2
  @@ -157,22 +157,22 @@
       
          
       /**
  -     * The service of this data source.
  +     * The domain of this data source.
        */
  -    private String service = null;
  +    private String domain = null;
       
       /**
  -     * Return the service of the data source this bean refers to.
  +     * Return the domain of the data source this bean refers to.
        */
  -    public String getService() {
  -        return this.service;
  +    public String getDomain() {
  +        return this.domain;
       }
   
       /**
  -     * Set the service of the data source this bean refers to.
  +     * Set the domain of the data source this bean refers to.
        */
  -    public void setService(String service) {
  -        this.service = service;
  +    public void setDomain(String domain) {
  +        this.domain = domain;
       }
   
       // --------------------------------------------------------- Public Methods
  
  
  
  1.5       +5 -5      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteDataSourcesAction.java
  
  Index: DeleteDataSourcesAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteDataSourcesAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DeleteDataSourcesAction.java	18 Mar 2003 10:48:24 -0000	1.4
  +++ DeleteDataSourcesAction.java	23 Mar 2003 02:10:26 -0000	1.5
  @@ -177,7 +177,7 @@
               String resourcetype = dataSourcesForm.getResourcetype();
               String path = dataSourcesForm.getPath();
               String host = dataSourcesForm.getHost();
  -            String service = dataSourcesForm.getService();
  +            //String domain = dataSourcesForm.getDomain();
               
               ObjectName dname = null;
   
  
  
  
  1.5       +4 -5      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteEnvEntriesAction.java
  
  Index: DeleteEnvEntriesAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteEnvEntriesAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DeleteEnvEntriesAction.java	18 Mar 2003 10:48:24 -0000	1.4
  +++ DeleteEnvEntriesAction.java	23 Mar 2003 02:10:26 -0000	1.5
  @@ -171,7 +171,6 @@
           String resourcetype = envEntriesForm.getResourcetype();
           String path = envEntriesForm.getPath();
           String host = envEntriesForm.getHost();
  -        String service = envEntriesForm.getService();
           
           if (envEntries == null) {
               envEntries = new String[0];
  
  
  
  1.5       +4 -5      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteMailSessionsAction.java
  
  Index: DeleteMailSessionsAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteMailSessionsAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DeleteMailSessionsAction.java	18 Mar 2003 10:48:24 -0000	1.4
  +++ DeleteMailSessionsAction.java	23 Mar 2003 02:10:26 -0000	1.5
  @@ -177,7 +177,6 @@
               String resourcetype = mailSessionsForm.getResourcetype();
               String path = mailSessionsForm.getPath();
               String host = mailSessionsForm.getHost();
  -            String service = mailSessionsForm.getService();
               
               ObjectName dname = null;
   
  
  
  
  1.5       +4 -5      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteResourceLinksAction.java
  
  Index: DeleteResourceLinksAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteResourceLinksAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DeleteResourceLinksAction.java	18 Mar 2003 10:48:24 -0000	1.4
  +++ DeleteResourceLinksAction.java	23 Mar 2003 02:10:26 -0000	1.5
  @@ -177,7 +177,6 @@
               String resourcetype = resourceLinksForm.getResourcetype();
               String path = resourceLinksForm.getPath();
               String host = resourceLinksForm.getHost();
  -            String service = resourceLinksForm.getService();
               
               ObjectName dname = null;
   
  
  
  
  1.2       +12 -12    jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntriesForm.java
  
  Index: EnvEntriesForm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntriesForm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- EnvEntriesForm.java	18 Jul 2002 16:48:26 -0000	1.1
  +++ EnvEntriesForm.java	23 Mar 2003 02:10:26 -0000	1.2
  @@ -158,22 +158,22 @@
       
          
       /**
  -     * The service of this environment entry.
  +     * The domain of this environment entry.
        */
  -    private String service = null;
  +    private String domain = null;
       
       /**
  -     * Return the service of the environment entry this bean refers to.
  +     * Return the domain of the environment entry this bean refers to.
        */
  -    public String getService() {
  -        return this.service;
  +    public String getDomain() {
  +        return this.domain;
       }
   
       /**
  -     * Set the service of the environment entry this bean refers to.
  +     * Set the domain of the environment entry this bean refers to.
        */
  -    public void setService(String service) {
  -        this.service = service;
  +    public void setDomain(String domain) {
  +        this.domain = domain;
       }
       
       // --------------------------------------------------------- Public Methods
  
  
  
  1.2       +12 -12    jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java
  
  Index: EnvEntryForm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- EnvEntryForm.java	18 Jul 2002 16:48:27 -0000	1.1
  +++ EnvEntryForm.java	23 Mar 2003 02:10:26 -0000	1.2
  @@ -215,22 +215,22 @@
       
          
       /**
  -     * The service of this environment entry.
  +     * The domain of this environment entry.
        */
  -    private String service = null;
  +    private String domain = null;
       
       /**
  -     * Return the service of the environment entry this bean refers to.
  +     * Return the domain of the environment entry this bean refers to.
        */
  -    public String getService() {
  -        return this.service;
  +    public String getDomain() {
  +        return this.domain;
       }
   
       /**
  -     * Set the service of the environment entry this bean refers to.
  +     * Set the domain of the environment entry this bean refers to.
        */
  -    public void setService(String service) {
  -        this.service = service;
  +    public void setDomain(String domain) {
  +        this.domain = domain;
       }
       
       /**
  
  
  
  1.4       +4 -5      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListDataSourcesAction.java
  
  Index: ListDataSourcesAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListDataSourcesAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ListDataSourcesAction.java	21 Mar 2003 08:19:15 -0000	1.3
  +++ ListDataSourcesAction.java	23 Mar 2003 02:10:26 -0000	1.4
  @@ -164,7 +164,6 @@
               domain = URLDecoder.decode(domain);
           }
           
  -        System.out.println("list datasource "+resourcetype+path+host+domain);
           // Create a form bean containing the requested MBean Names
           DataSourcesForm dataSourcesForm = null;
           try {
  
  
  
  1.2       +12 -12    jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.java
  
  Index: MailSessionForm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MailSessionForm.java	18 Jul 2002 16:48:27 -0000	1.1
  +++ MailSessionForm.java	23 Mar 2003 02:10:26 -0000	1.2
  @@ -173,22 +173,22 @@
       
          
       /**
  -     * The service of this mail session.
  +     * The domain of this mail session.
        */
  -    private String service = null;
  +    private String domain = null;
       
       /**
  -     * Return the service of the mail session this bean refers to.
  +     * Return the domain of the mail session this bean refers to.
        */
  -    public String getService() {
  -        return this.service;
  +    public String getDomain() {
  +        return this.domain;
       }
   
       /**
  -     * Set the service of the mail session this bean refers to.
  +     * Set the domain of the mail session this bean refers to.
        */
  -    public void setService(String service) {
  -        this.service = service;
  +    public void setDomain(String domain) {
  +        this.domain = domain;
       }
       
       /**
  
  
  
  1.2       +12 -12    jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionsForm.java
  
  Index: MailSessionsForm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionsForm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MailSessionsForm.java	18 Jul 2002 16:48:27 -0000	1.1
  +++ MailSessionsForm.java	23 Mar 2003 02:10:26 -0000	1.2
  @@ -157,22 +157,22 @@
       
          
       /**
  -     * The service of this mail session.
  +     * The domain of this mail session.
        */
  -    private String service = null;
  +    private String domain = null;
       
       /**
  -     * Return the service of the mail session this bean refers to.
  +     * Return the domain of the mail session this bean refers to.
        */
  -    public String getService() {
  -        return this.service;
  +    public String getDomain() {
  +        return this.domain;
       }
   
       /**
  -     * Set the service of the mail session this bean refers to.
  +     * Set the domain of the mail session this bean refers to.
        */
  -    public void setService(String service) {
  -        this.service = service;
  +    public void setDomain(String domain) {
  +        this.domain = domain;
       }
   
       // --------------------------------------------------------- Public Methods
  
  
  
  1.2       +12 -12    jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.java
  
  Index: ResourceLinkForm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ResourceLinkForm.java	18 Jul 2002 16:48:27 -0000	1.1
  +++ ResourceLinkForm.java	23 Mar 2003 02:10:27 -0000	1.2
  @@ -173,22 +173,22 @@
       
          
       /**
  -     * The service of this resource link.
  +     * The domain of this resource link.
        */
  -    private String service = null;
  +    private String domain = null;
       
       /**
  -     * Return the service of the resource link this bean refers to.
  +     * Return the domain of the resource link this bean refers to.
        */
  -    public String getService() {
  -        return this.service;
  +    public String getDomain() {
  +        return this.domain;
       }
   
       /**
  -     * Set the service of the resource link this bean refers to.
  +     * Set the domain of the resource link this bean refers to.
        */
  -    public void setService(String service) {
  -        this.service = service;
  +    public void setDomain(String domain) {
  +        this.domain = domain;
       }
       
       /**
  
  
  
  1.2       +12 -12    jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinksForm.java
  
  Index: ResourceLinksForm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinksForm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ResourceLinksForm.java	18 Jul 2002 16:48:27 -0000	1.1
  +++ ResourceLinksForm.java	23 Mar 2003 02:10:27 -0000	1.2
  @@ -158,22 +158,22 @@
       
          
       /**
  -     * The service of this resource link.
  +     * The domain of this resource link.
        */
  -    private String service = null;
  +    private String domain = null;
       
       /**
  -     * Return the service of the resource link this bean refers to.
  +     * Return the domain of the resource link this bean refers to.
        */
  -    public String getService() {
  -        return this.service;
  +    public String getDomain() {
  +        return this.domain;
       }
   
       /**
  -     * Set the service of the resource link this bean refers to.
  +     * Set the domain of the resource link this bean refers to.
        */
  -    public void setService(String service) {
  -        this.service = service;
  +    public void setDomain(String domain) {
  +        this.domain = domain;
       }
   
       // --------------------------------------------------------- Public Methods
  
  
  
  1.6       +24 -6     jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java
  
  Index: ResourceUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ResourceUtils.java	21 Mar 2003 08:19:15 -0000	1.5
  +++ ResourceUtils.java	23 Mar 2003 02:10:27 -0000	1.6
  @@ -193,6 +193,11 @@
           } else {
               envEntriesForm.setHost("");
           }          
  +        if (domain != null) {
  +            envEntriesForm.setDomain(domain);
  +        } else {
  +            envEntriesForm.setDomain("");
  +        }          
           
           return (envEntriesForm);
   
  @@ -231,7 +236,6 @@
                   }
               }
           }
  -        System.out.println("get datasource "+rname.toString());
           Iterator iterator = (mserver.queryMBeans(rname, null).iterator());
           
           ArrayList results = new ArrayList();        
  @@ -261,7 +265,11 @@
           } else {
               dataSourcesForm.setHost("");
           }        
  -        
  +        if (domain != null) {
  +            dataSourcesForm.setDomain(domain);
  +        } else {
  +            dataSourcesForm.setDomain("");
  +        }          
           return (dataSourcesForm);
   
       }
  @@ -329,6 +337,11 @@
           } else {
               mailSessionsForm.setHost("");
           }        
  +        if (domain != null) {
  +            mailSessionsForm.setDomain(domain);
  +        } else {
  +            mailSessionsForm.setDomain("");
  +        }          
           
           return (mailSessionsForm);
   
  @@ -395,6 +408,11 @@
           } else {
               resourceLinksForm.setHost("");
           }        
  +        if (domain != null) {
  +            resourceLinksForm.setDomain(domain);
  +        } else {
  +            resourceLinksForm.setDomain("");
  +        }          
           
           return (resourceLinksForm);
           
  
  
  
  1.7       +5 -6      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java
  
  Index: SaveDataSourceAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SaveDataSourceAction.java	18 Mar 2003 10:48:24 -0000	1.6
  +++ SaveDataSourceAction.java	23 Mar 2003 02:10:27 -0000	1.7
  @@ -181,12 +181,11 @@
               String resourcetype = dataSourceForm.getResourcetype();
               String path = dataSourceForm.getPath();
               String host = dataSourceForm.getHost();
  -            String service = dataSourceForm.getService();
  +            String domain = dataSourceForm.getDomain();
   
               ObjectName oname = null;
   
               try {
  -                String domain = (new ObjectName(objectName)).getDomain();
                   oname = ResourceUtils.getNamingResourceObjectName(domain,
                               resourcetype, path, host);
                   // Create the new object and associated MBean
  
  
  
  1.5       +5 -7      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java
  
  Index: SaveEnvEntryAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SaveEnvEntryAction.java	18 Mar 2003 10:48:24 -0000	1.4
  +++ SaveEnvEntryAction.java	23 Mar 2003 02:10:27 -0000	1.5
  @@ -184,13 +184,11 @@
               String resourcetype = envEntryForm.getResourcetype();
               String path = envEntryForm.getPath();
               String host = envEntryForm.getHost();
  -            String service = envEntryForm.getService();
  +            String domain = envEntryForm.getDomain();
               
               ObjectName oname = null;
   
               try {
  -
  -                String domain = (new ObjectName(objectName)).getDomain();
                   oname = ResourceUtils.getNamingResourceObjectName(domain,
                               resourcetype, path, host);
                   // Create the new object and associated MBean
  
  
  
  1.5       +5 -6      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveMailSessionAction.java
  
  Index: SaveMailSessionAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveMailSessionAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SaveMailSessionAction.java	18 Mar 2003 10:48:24 -0000	1.4
  +++ SaveMailSessionAction.java	23 Mar 2003 02:10:27 -0000	1.5
  @@ -181,12 +181,11 @@
               String resourcetype = mailSessionForm.getResourcetype();
               String path = mailSessionForm.getPath();
               String host = mailSessionForm.getHost();
  -            String service = mailSessionForm.getService();
  +            String domain = mailSessionForm.getDomain();
               
               ObjectName oname = null;
   
               try {
  -                String domain = (new ObjectName(objectName)).getDomain();
                   oname = ResourceUtils.getNamingResourceObjectName(domain,
                               resourcetype, path, host);
   
  
  
  
  1.7       +5 -6      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveResourceLinkAction.java
  
  Index: SaveResourceLinkAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveResourceLinkAction.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SaveResourceLinkAction.java	18 Mar 2003 10:48:24 -0000	1.6
  +++ SaveResourceLinkAction.java	23 Mar 2003 02:10:27 -0000	1.7
  @@ -181,12 +181,11 @@
               String resourcetype = resourceLinkForm.getResourcetype();
               String path = resourceLinkForm.getPath();
               String host = resourceLinkForm.getHost();
  -            String service = resourceLinkForm.getService();
  +            String domain = resourceLinkForm.getDomain();
                          
               ObjectName oname = null;
   
               try {
  -                String domain = (new ObjectName(objectName)).getDomain();
                   oname = ResourceUtils.getNamingResourceObjectName(domain,
                               resourcetype, path, host);
                   // Create the new object and associated MBean
  
  
  
  1.3       +6 -6      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpDataSourceAction.java
  
  Index: SetUpDataSourceAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpDataSourceAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SetUpDataSourceAction.java	16 Aug 2002 23:25:31 -0000	1.2
  +++ SetUpDataSourceAction.java	23 Mar 2003 02:10:27 -0000	1.3
  @@ -155,13 +155,13 @@
           String resourcetype = request.getParameter("resourcetype");
           String path = request.getParameter("path");
           String host = request.getParameter("host");
  -        String service = request.getParameter("service");
  +        String domain = request.getParameter("domain");
   
           DataSourceForm dataSourceForm = new DataSourceForm();
           dataSourceForm.setResourcetype(resourcetype);
           dataSourceForm.setPath(path);
           dataSourceForm.setHost(host);
  -        dataSourceForm.setService(service);
  +        dataSourceForm.setDomain(domain);
           dataSourceForm.setType(ResourceUtils.DATASOURCE_CLASS);
   
           if (objectName == null) {
  
  
  
  1.2       +6 -6      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpEnvEntryAction.java
  
  Index: SetUpEnvEntryAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpEnvEntryAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SetUpEnvEntryAction.java	18 Jul 2002 16:48:27 -0000	1.1
  +++ SetUpEnvEntryAction.java	23 Mar 2003 02:10:27 -0000	1.2
  @@ -156,13 +156,13 @@
           String resourcetype = request.getParameter("resourcetype");
           String path = request.getParameter("path");
           String host = request.getParameter("host");
  -        String service = request.getParameter("service");
  +        String domain = request.getParameter("domain");
           
           EnvEntryForm envEntryForm = new EnvEntryForm();           
           envEntryForm.setResourcetype(resourcetype);
           envEntryForm.setPath(path);
           envEntryForm.setHost(host);
  -        envEntryForm.setService(service);
  +        envEntryForm.setDomain(domain);
           if (objectName == null) {
               envEntryForm.setNodeLabel
                   (resources.getMessage(locale, "resources.actions.env.create"));
  
  
  
  1.2       +6 -6      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpMailSessionAction.java
  
  Index: SetUpMailSessionAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpMailSessionAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SetUpMailSessionAction.java	18 Jul 2002 16:48:27 -0000	1.1
  +++ SetUpMailSessionAction.java	23 Mar 2003 02:10:27 -0000	1.2
  @@ -155,13 +155,13 @@
           String resourcetype = request.getParameter("resourcetype");
           String path = request.getParameter("path");
           String host = request.getParameter("host");
  -        String service = request.getParameter("service");
  +        String domain = request.getParameter("domain");
           
           MailSessionForm mailSessionForm = new MailSessionForm();       
           mailSessionForm.setResourcetype(resourcetype);
           mailSessionForm.setPath(path);
           mailSessionForm.setHost(host);
  -        mailSessionForm.setService(service);
  +        mailSessionForm.setDomain(domain);
           mailSessionForm.setType(ResourceUtils.MAILSESSION_CLASS);
   
           if (objectName == null) {
  
  
  
  1.2       +6 -6      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpResourceLinkAction.java
  
  Index: SetUpResourceLinkAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpResourceLinkAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SetUpResourceLinkAction.java	18 Jul 2002 16:48:27 -0000	1.1
  +++ SetUpResourceLinkAction.java	23 Mar 2003 02:10:27 -0000	1.2
  @@ -155,13 +155,13 @@
           String resourcetype = request.getParameter("resourcetype");
           String path = request.getParameter("path");
           String host = request.getParameter("host");
  -        String service = request.getParameter("service");
  +        String domain = request.getParameter("domain");
           
           ResourceLinkForm resourceLinkForm = new ResourceLinkForm();       
           resourceLinkForm.setResourcetype(resourcetype);
           resourceLinkForm.setPath(path);
           resourceLinkForm.setHost(host);
  -        resourceLinkForm.setService(service);
  +        resourceLinkForm.setDomain(domain);
               
           if (objectName == null) {
               resourceLinkForm.setNodeLabel
  
  
  
  1.3       +5 -5      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/AddServiceAction.java
  
  Index: AddServiceAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/AddServiceAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AddServiceAction.java	20 Mar 2003 05:40:11 -0000	1.2
  +++ AddServiceAction.java	23 Mar 2003 02:10:28 -0000	1.3
  @@ -122,7 +122,7 @@
               resources = getServlet().getResources();
           }
           
  -        String serverName = request.getParameter("serverName");
  +        String serverName = request.getParameter("select");
           
           // Fill in the form values for display and editing
           ServiceForm serviceFm = new ServiceForm();
  
  
  
  1.3       +5 -5      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServiceAction.java
  
  Index: DeleteServiceAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServiceAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DeleteServiceAction.java	18 Mar 2003 10:48:26 -0000	1.2
  +++ DeleteServiceAction.java	23 Mar 2003 02:10:28 -0000	1.3
  @@ -188,7 +188,7 @@
           // Accumulate a list of all available services
           ArrayList list = new ArrayList();
           try {
  -            String pattern = domain + TomcatTreeBuilder.SERVICE_TYPE +
  +            String pattern = "*" + TomcatTreeBuilder.SERVICE_TYPE +
                   TomcatTreeBuilder.WILDCARD;
               Iterator items =
                   mBServer.queryNames(new ObjectName(pattern), null).iterator();
  
  
  
  1.5       +13 -5     jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SaveServiceAction.java
  
  Index: SaveServiceAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SaveServiceAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SaveServiceAction.java	21 Mar 2003 08:19:16 -0000	1.4
  +++ SaveServiceAction.java	23 Mar 2003 02:10:28 -0000	1.5
  @@ -234,6 +234,10 @@
                                       values, createStandardEngineServiceTypes);
                   eoname = (ObjectName)onames.get(0);
                   soname = (ObjectName)onames.get(1);
  +                //Enumeration enum = onames.elements();
  +                //while (enum.hasMoreElements()) {
  +                //    getServlet().log("save service "+enum.nextElement());
  +                //}
                   sObjectName = soname.toString();
                   eObjectName = eoname.toString();
                   
  @@ -269,7 +273,8 @@
                       TreeControlNode parentNode = control.findNode(parentName);
                       if (parentNode != null) {
                           String nodeLabel =
  -                            "Service (" + oname.getDomain() + ")";
  +                            "Service (" + soname.getKeyProperty("serviceName") 
  +                                    + ")";
                           String encodedName =
                               URLEncoder.encode(sObjectName);
                           TreeControlNode childNode =
  @@ -309,6 +314,9 @@
           // Perform attribute updates as requested
           String attribute = null;
           try {
  +        
  +            eoname = new ObjectName(eObjectName);
  +            soname = new ObjectName(sObjectName);
   
               attribute = "debug";
               int debug = 0;
  
  
  
  1.4       +7 -7      jakarta-tomcat-catalina/webapps/admin/resources/dataSource.jsp
  
  Index: dataSource.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/dataSource.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- dataSource.jsp	23 Jan 2003 00:07:09 -0000	1.3
  +++ dataSource.jsp	23 Mar 2003 02:10:28 -0000	1.4
  @@ -33,9 +33,9 @@
                  name="dataSourceForm" property="host"/>
     <html:hidden property="host"/>
   
  -  <bean:define id="serviceInfo" type="java.lang.String"
  -               name="dataSourceForm" property="service"/>
  -  <html:hidden property="service"/>
  +  <bean:define id="domainInfo" type="java.lang.String"
  +               name="dataSourceForm" property="domain"/>
  +  <html:hidden property="domain"/>
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr class="page-title-row">
  @@ -57,15 +57,15 @@
           <controls:action url='<%= "/resources/setUpDataSource.do?resourcetype=" +
                               URLEncoder.encode(resourcetypeInfo) + "&path="+
                               URLEncoder.encode(pathInfo) + "&host="+
  -                            URLEncoder.encode(hostInfo) + "&service="+
  -                            URLEncoder.encode(serviceInfo) %>'>
  +                            URLEncoder.encode(hostInfo) + "&domain="+
  +                            URLEncoder.encode(domainInfo) %>'>
                   <bean:message key="resources.actions.datasrc.create"/>
               </controls:action>
               <controls:action url='<%= "/resources/listDataSources.do?resourcetype=" +
                               URLEncoder.encode(resourcetypeInfo) + "&path="+
                               URLEncoder.encode(pathInfo) + "&host="+
  -                            URLEncoder.encode(hostInfo) + "&service="+
  -                            URLEncoder.encode(serviceInfo) + "&forward=" +
  +                            URLEncoder.encode(hostInfo) + "&domain="+
  +                            URLEncoder.encode(domainInfo) + "&forward=" +
                               URLEncoder.encode("DataSources Delete List") %>'>
                   <bean:message key="resources.actions.datasrc.delete"/>
               </controls:action>
  
  
  
  1.3       +2 -2      jakarta-tomcat-catalina/webapps/admin/resources/dataSources.jspf
  
  Index: dataSources.jspf
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/dataSources.jspf,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- dataSources.jspf	23 Jan 2003 00:07:09 -0000	1.2
  +++ dataSources.jspf	23 Mar 2003 02:10:28 -0000	1.3
  @@ -34,8 +34,8 @@
                                  URLEncoder.encode(dataSource) + "&resourcetype=" +
                                  URLEncoder.encode(resourcetypeInfo) + "&path="+
                                  URLEncoder.encode(pathInfo) + "&host="+
  -                               URLEncoder.encode(hostInfo) + "&service="+
  -                               URLEncoder.encode(serviceInfo) %>'>
  +                               URLEncoder.encode(hostInfo) + "&domain="+
  +                               URLEncoder.encode(domainInfo)  %>'>
               <controls:attribute name="dataSource" attribute="name"/>
             </html:link>
           </div></td>
  
  
  
  1.3       +6 -6      jakarta-tomcat-catalina/webapps/admin/resources/deleteDataSources.jsp
  
  Index: deleteDataSources.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/deleteDataSources.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- deleteDataSources.jsp	24 Jul 2002 20:57:27 -0000	1.2
  +++ deleteDataSources.jsp	23 Mar 2003 02:10:28 -0000	1.3
  @@ -30,9 +30,9 @@
                  name="dataSourcesForm" property="host"/>
     <html:hidden property="host"/>
   
  -  <bean:define id="serviceInfo" type="java.lang.String"
  -               name="dataSourcesForm" property="service"/>
  -  <html:hidden property="service"/>
  +  <bean:define id="domainInfo" type="java.lang.String"
  +               name="dataSourcesForm" property="domain"/>
  +  <html:hidden property="domain"/>
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  @@ -69,9 +69,9 @@
                  name="dataSourcesForm" property="host"/>
     <html:hidden property="host"/>
   
  -  <bean:define id="serviceInfo" type="java.lang.String"
  -               name="dataSourcesForm" property="service"/>
  -  <html:hidden property="service"/>
  +  <bean:define id="domainInfo" type="java.lang.String"
  +               name="dataSourcesForm" property="domain"/>
  +  <html:hidden property="domain"/>
   
     <%@ include file="../buttons.jsp" %>
     <br>
  
  
  
  1.3       +6 -6      jakarta-tomcat-catalina/webapps/admin/resources/deleteEnvEntries.jsp
  
  Index: deleteEnvEntries.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/deleteEnvEntries.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- deleteEnvEntries.jsp	24 Jul 2002 20:57:27 -0000	1.2
  +++ deleteEnvEntries.jsp	23 Mar 2003 02:10:28 -0000	1.3
  @@ -30,9 +30,9 @@
                  name="envEntriesForm" property="host"/>
     <html:hidden property="host"/>
   
  -  <bean:define id="serviceInfo" type="java.lang.String"
  -               name="envEntriesForm" property="service"/>
  -  <html:hidden property="service"/>
  +  <bean:define id="domainInfo" type="java.lang.String"
  +               name="envEntriesForm" property="domain"/>
  +  <html:hidden property="domain"/>
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  @@ -69,9 +69,9 @@
                  name="envEntriesForm" property="host"/>
     <html:hidden property="host"/>
   
  -  <bean:define id="serviceInfo" type="java.lang.String"
  -               name="envEntriesForm" property="service"/>
  -  <html:hidden property="service"/>
  +  <bean:define id="domainInfo" type="java.lang.String"
  +               name="envEntriesForm" property="domain"/>
  +  <html:hidden property="domain"/>
   
     <%@ include file="../buttons.jsp" %>
     <br>
  
  
  
  1.3       +6 -6      jakarta-tomcat-catalina/webapps/admin/resources/deleteMailSessions.jsp
  
  Index: deleteMailSessions.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/deleteMailSessions.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- deleteMailSessions.jsp	24 Jul 2002 20:57:27 -0000	1.2
  +++ deleteMailSessions.jsp	23 Mar 2003 02:10:28 -0000	1.3
  @@ -30,9 +30,9 @@
                  name="mailSessionsForm" property="host"/>
     <html:hidden property="host"/>
   
  -  <bean:define id="serviceInfo" type="java.lang.String"
  -               name="mailSessionsForm" property="service"/>
  -  <html:hidden property="service"/>
  +  <bean:define id="domainInfo" type="java.lang.String"
  +               name="mailSessionsForm" property="domain"/>
  +  <html:hidden property="domain"/>
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  @@ -69,9 +69,9 @@
                  name="mailSessionsForm" property="host"/>
     <html:hidden property="host"/>
   
  -  <bean:define id="serviceInfo" type="java.lang.String"
  -               name="mailSessionsForm" property="service"/>
  -  <html:hidden property="service"/>
  +  <bean:define id="domainInfo" type="java.lang.String"
  +               name="mailSessionsForm" property="domain"/>
  +  <html:hidden property="domain"/>
   
     <%@ include file="../buttons.jsp" %>
     <br>
  
  
  
  1.3       +6 -6      jakarta-tomcat-catalina/webapps/admin/resources/deleteResourceLinks.jsp
  
  Index: deleteResourceLinks.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/deleteResourceLinks.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- deleteResourceLinks.jsp	24 Jul 2002 20:57:27 -0000	1.2
  +++ deleteResourceLinks.jsp	23 Mar 2003 02:10:28 -0000	1.3
  @@ -30,9 +30,9 @@
                  name="resourceLinksForm" property="host"/>
     <html:hidden property="host"/>
   
  -  <bean:define id="serviceInfo" type="java.lang.String"
  -               name="resourceLinksForm" property="service"/>
  -  <html:hidden property="service"/>
  +  <bean:define id="domainInfo" type="java.lang.String"
  +               name="resourceLinksForm" property="domain"/>
  +  <html:hidden property="domain"/>
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  @@ -67,9 +67,9 @@
                  name="resourceLinksForm" property="host"/>
     <html:hidden property="host"/>
   
  -  <bean:define id="serviceInfo" type="java.lang.String"
  -               name="resourceLinksForm" property="service"/>
  -  <html:hidden property="service"/>
  +  <bean:define id="domainInfo" type="java.lang.String"
  +               name="resourceLinksForm" property="domain"/>
  +  <html:hidden property="domain"/>
   
     <%@ include file="../buttons.jsp" %>
     <br>
  
  
  
  1.3       +2 -2      jakarta-tomcat-catalina/webapps/admin/resources/envEntries.jspf
  
  Index: envEntries.jspf
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/envEntries.jspf,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- envEntries.jspf	23 Jan 2003 00:07:09 -0000	1.2
  +++ envEntries.jspf	23 Mar 2003 02:10:28 -0000	1.3
  @@ -37,8 +37,8 @@
                                  URLEncoder.encode(envEntry) + "&resourcetype=" +
                                  URLEncoder.encode(resourcetypeInfo) + "&path="+
                                  URLEncoder.encode(pathInfo) + "&host="+
  -                               URLEncoder.encode(hostInfo) + "&service="+
  -                               URLEncoder.encode(serviceInfo) %>'>
  +                               URLEncoder.encode(hostInfo) + "&domain="+
  +                               URLEncoder.encode(domainInfo) %>'>
               <controls:attribute name="envEntry" attribute="name"/>
             </html:link>
           </div></td>
  
  
  
  1.4       +7 -7      jakarta-tomcat-catalina/webapps/admin/resources/envEntry.jsp
  
  Index: envEntry.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/envEntry.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- envEntry.jsp	23 Jan 2003 00:07:09 -0000	1.3
  +++ envEntry.jsp	23 Mar 2003 02:10:28 -0000	1.4
  @@ -33,9 +33,9 @@
                  name="envEntryForm" property="host"/>
     <html:hidden property="host"/>
   
  -  <bean:define id="serviceInfo" type="java.lang.String"
  -               name="envEntryForm" property="service"/>
  -  <html:hidden property="service"/>
  +  <bean:define id="domainInfo" type="java.lang.String"
  +               name="envEntryForm" property="domain"/>
  +  <html:hidden property="domain"/>
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr class="page-title-row">
  @@ -57,15 +57,15 @@
           <controls:action url='<%= "/resources/setUpEnvEntry.do?resourcetype=" +
                               URLEncoder.encode(resourcetypeInfo) + "&path="+
                               URLEncoder.encode(pathInfo) + "&host="+
  -                            URLEncoder.encode(hostInfo) + "&service="+
  -                            URLEncoder.encode(serviceInfo) %>'>
  +                            URLEncoder.encode(hostInfo) + "&domain="+
  +                            URLEncoder.encode(domainInfo) %>'>
                   <bean:message key="resources.actions.env.create"/>
               </controls:action>
               <controls:action url='<%= "/resources/listEnvEntries.do?resourcetype=" +
                               URLEncoder.encode(resourcetypeInfo) + "&path="+
                               URLEncoder.encode(pathInfo) + "&host="+
  -                            URLEncoder.encode(hostInfo) + "&service="+
  -                            URLEncoder.encode(serviceInfo) + "&forward=" +
  +                            URLEncoder.encode(hostInfo) + "&domain="+
  +                            URLEncoder.encode(domainInfo) + "&forward=" +
                               URLEncoder.encode("EnvEntries Delete List") %>'>
                   <bean:message key="resources.actions.env.delete"/>
               </controls:action>
  
  
  
  1.3       +3 -3      jakarta-tomcat-catalina/webapps/admin/resources/listDataSources.jsp
  
  Index: listDataSources.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/listDataSources.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- listDataSources.jsp	24 Jul 2002 20:57:27 -0000	1.2
  +++ listDataSources.jsp	23 Mar 2003 02:10:28 -0000	1.3
  @@ -30,9 +30,9 @@
                  name="dataSourcesForm" property="host"/>
     <html:hidden property="host"/>
   
  -  <bean:define id="serviceInfo" type="java.lang.String"
  -               name="dataSourcesForm" property="service"/>
  -  <html:hidden property="service"/>
  +  <bean:define id="domainInfo" type="java.lang.String"
  +               name="dataSourcesForm" property="domain"/>
  +  <html:hidden property="domain"/>
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  
  
  
  1.3       +4 -4      jakarta-tomcat-catalina/webapps/admin/resources/listDataSources.jspf
  
  Index: listDataSources.jspf
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/listDataSources.jspf,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- listDataSources.jspf	23 Jan 2003 00:07:09 -0000	1.2
  +++ listDataSources.jspf	23 Mar 2003 02:10:28 -0000	1.3
  @@ -13,16 +13,16 @@
     <controls:action url='<%= "/resources/setUpDataSource.do?resourcetype=" +
                               URLEncoder.encode(resourcetypeInfo) + "&path="+
                               URLEncoder.encode(pathInfo) + "&host="+
  -                            URLEncoder.encode(hostInfo) + "&service="+
  -                            URLEncoder.encode(serviceInfo) %>'>
  +                            URLEncoder.encode(hostInfo) + "&domain="+
  +                            URLEncoder.encode(domainInfo)%>'>
       <bean:message key="resources.actions.datasrc.create"/>
     </controls:action>
   
     <controls:action url='<%= "/resources/listDataSources.do?resourcetype=" +
                               URLEncoder.encode(resourcetypeInfo) + "&path="+
                               URLEncoder.encode(pathInfo) + "&host="+
  -                            URLEncoder.encode(hostInfo) + "&service="+
  -                            URLEncoder.encode(serviceInfo) + "&forward=" + 
  +                            URLEncoder.encode(hostInfo) + "&domain="+
  +                            URLEncoder.encode(domainInfo) + "&forward=" + 
                               URLEncoder.encode("DataSources Delete List") %>'>
       <bean:message key="resources.actions.datasrc.delete"/>
     </controls:action>
  
  
  
  1.3       +3 -3      jakarta-tomcat-catalina/webapps/admin/resources/listEnvEntries.jsp
  
  Index: listEnvEntries.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/listEnvEntries.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- listEnvEntries.jsp	24 Jul 2002 20:57:27 -0000	1.2
  +++ listEnvEntries.jsp	23 Mar 2003 02:10:28 -0000	1.3
  @@ -30,9 +30,9 @@
                  name="envEntriesForm" property="host"/>
     <html:hidden property="host"/>
   
  -  <bean:define id="serviceInfo" type="java.lang.String"
  -               name="envEntriesForm" property="service"/>
  -  <html:hidden property="service"/>
  +  <bean:define id="domainInfo" type="java.lang.String"
  +               name="envEntriesForm" property="domain"/>
  +  <html:hidden property="domain"/>
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  
  
  
  1.3       +4 -4      jakarta-tomcat-catalina/webapps/admin/resources/listEnvEntries.jspf
  
  Index: listEnvEntries.jspf
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/listEnvEntries.jspf,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- listEnvEntries.jspf	23 Jan 2003 00:07:09 -0000	1.2
  +++ listEnvEntries.jspf	23 Mar 2003 02:10:28 -0000	1.3
  @@ -13,16 +13,16 @@
     <controls:action url='<%= "/resources/setUpEnvEntry.do?resourcetype=" +
                               URLEncoder.encode(resourcetypeInfo) + "&path="+
                               URLEncoder.encode(pathInfo) + "&host="+
  -                            URLEncoder.encode(hostInfo) + "&service="+
  -                            URLEncoder.encode(serviceInfo) %>'>
  +                            URLEncoder.encode(hostInfo) + "&domain="+
  +                            URLEncoder.encode(domainInfo) %>'>
       <bean:message key="resources.actions.env.create"/>
     </controls:action>
   
     <controls:action url='<%= "/resources/listEnvEntries.do?resourcetype=" +
                               URLEncoder.encode(resourcetypeInfo) + "&path="+
                               URLEncoder.encode(pathInfo) + "&host="+
  -                            URLEncoder.encode(hostInfo) + "&service="+
  -                            URLEncoder.encode(serviceInfo) + "&forward="+ 
  +                            URLEncoder.encode(hostInfo) + "&domain="+
  +                            URLEncoder.encode(domainInfo) + "&forward="+ 
                               URLEncoder.encode("EnvEntries Delete List") %>'>
       <bean:message key="resources.actions.env.delete"/>
     </controls:action>
  
  
  
  1.3       +3 -3      jakarta-tomcat-catalina/webapps/admin/resources/listMailSessions.jsp
  
  Index: listMailSessions.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/listMailSessions.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- listMailSessions.jsp	24 Jul 2002 20:57:27 -0000	1.2
  +++ listMailSessions.jsp	23 Mar 2003 02:10:28 -0000	1.3
  @@ -30,9 +30,9 @@
                  name="mailSessionsForm" property="host"/>
     <html:hidden property="host"/>
   
  -  <bean:define id="serviceInfo" type="java.lang.String"
  -               name="mailSessionsForm" property="service"/>
  -  <html:hidden property="service"/>
  +  <bean:define id="domainInfo" type="java.lang.String"
  +               name="mailSessionsForm" property="domain"/>
  +  <html:hidden property="domain"/>
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  
  
  
  1.3       +4 -4      jakarta-tomcat-catalina/webapps/admin/resources/listMailSessions.jspf
  
  Index: listMailSessions.jspf
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/listMailSessions.jspf,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- listMailSessions.jspf	23 Jan 2003 00:07:09 -0000	1.2
  +++ listMailSessions.jspf	23 Mar 2003 02:10:28 -0000	1.3
  @@ -13,16 +13,16 @@
     <controls:action url='<%= "/resources/setUpMailSession.do?resourcetype=" +
                               URLEncoder.encode(resourcetypeInfo) + "&path="+
                               URLEncoder.encode(pathInfo) + "&host="+
  -                            URLEncoder.encode(hostInfo) + "&service="+
  -                            URLEncoder.encode(serviceInfo) %>'>
  +                            URLEncoder.encode(hostInfo) + "&domain="+
  +                            URLEncoder.encode(domainInfo) %>'>
       <bean:message key="resources.actions.mailsession.create"/>
     </controls:action>
   
     <controls:action url='<%= "/resources/listMailSessions.do?resourcetype=" +
                               URLEncoder.encode(resourcetypeInfo) + "&path="+
                               URLEncoder.encode(pathInfo) + "&host="+
  -                            URLEncoder.encode(hostInfo) + "&service="+
  -                            URLEncoder.encode(serviceInfo) + "&forward=" + 
  +                            URLEncoder.encode(hostInfo) + "&domain="+
  +                            URLEncoder.encode(domainInfo) + "&forward=" + 
                               URLEncoder.encode("MailSessions Delete List") %>'>
       <bean:message key="resources.actions.mailsession.delete"/>
     </controls:action>
  
  
  
  1.3       +3 -3      jakarta-tomcat-catalina/webapps/admin/resources/listResourceLinks.jsp
  
  Index: listResourceLinks.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/listResourceLinks.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- listResourceLinks.jsp	24 Jul 2002 20:57:27 -0000	1.2
  +++ listResourceLinks.jsp	23 Mar 2003 02:10:28 -0000	1.3
  @@ -30,9 +30,9 @@
                  name="resourceLinksForm" property="host"/>
     <html:hidden property="host"/>
   
  -  <bean:define id="serviceInfo" type="java.lang.String"
  -               name="resourceLinksForm" property="service"/>
  -  <html:hidden property="service"/>
  +  <bean:define id="domainInfo" type="java.lang.String"
  +               name="resourceLinksForm" property="domain"/>
  +  <html:hidden property="domain"/>
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  
  
  
  1.3       +4 -4      jakarta-tomcat-catalina/webapps/admin/resources/listResourceLinks.jspf
  
  Index: listResourceLinks.jspf
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/listResourceLinks.jspf,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- listResourceLinks.jspf	23 Jan 2003 00:07:09 -0000	1.2
  +++ listResourceLinks.jspf	23 Mar 2003 02:10:28 -0000	1.3
  @@ -13,16 +13,16 @@
     <controls:action url='<%= "/resources/setUpResourceLink.do?resourcetype=" +
                               URLEncoder.encode(resourcetypeInfo) + "&path="+
                               URLEncoder.encode(pathInfo) + "&host="+
  -                            URLEncoder.encode(hostInfo) + "&service="+
  -                            URLEncoder.encode(serviceInfo) %>'>
  +                            URLEncoder.encode(hostInfo) + "&domain="+
  +                            URLEncoder.encode(domainInfo) %>'>
       <bean:message key="resources.actions.resourcelk.create"/>
     </controls:action>
   
     <controls:action url='<%= "/resources/listResourceLinks.do?resourcetype=" +
                               URLEncoder.encode(resourcetypeInfo) + "&path="+
                               URLEncoder.encode(pathInfo) + "&host="+
  -                            URLEncoder.encode(hostInfo) + "&service="+
  -                            URLEncoder.encode(serviceInfo) +"&forward=" + 
  +                            URLEncoder.encode(hostInfo) + "&domain="+
  +                            URLEncoder.encode(domainInfo) +"&forward=" + 
                               URLEncoder.encode("ResourceLinks Delete List") %>'>
       <bean:message key="resources.actions.resourcelk.delete"/>
     </controls:action>
  
  
  
  1.4       +7 -7      jakarta-tomcat-catalina/webapps/admin/resources/mailSession.jsp
  
  Index: mailSession.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/mailSession.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mailSession.jsp	23 Jan 2003 00:07:09 -0000	1.3
  +++ mailSession.jsp	23 Mar 2003 02:10:28 -0000	1.4
  @@ -33,9 +33,9 @@
                  name="mailSessionForm" property="host"/>
     <html:hidden property="host"/>
   
  -  <bean:define id="serviceInfo" type="java.lang.String"
  -               name="mailSessionForm" property="service"/>
  -  <html:hidden property="service"/>
  +  <bean:define id="domainInfo" type="java.lang.String"
  +               name="mailSessionForm" property="domain"/>
  +  <html:hidden property="domain"/>
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr class="page-title-row">
  @@ -57,15 +57,15 @@
           <controls:action url='<%= "/resources/setUpMailSession.do?resourcetype=" +
                               URLEncoder.encode(resourcetypeInfo) + "&path="+
                               URLEncoder.encode(pathInfo) + "&host="+
  -                            URLEncoder.encode(hostInfo) + "&service="+
  -                            URLEncoder.encode(serviceInfo) %>'>
  +                            URLEncoder.encode(hostInfo) + "&domain="+
  +                            URLEncoder.encode(domainInfo) %>'>
                   <bean:message key="resources.actions.mailsession.create"/>
               </controls:action>
               <controls:action url='<%= "/resources/listMailSessions.do?resourcetype=" +
                               URLEncoder.encode(resourcetypeInfo) + "&path="+
                               URLEncoder.encode(pathInfo) + "&host="+
  -                            URLEncoder.encode(hostInfo) + "&service="+
  -                            URLEncoder.encode(serviceInfo) + "&forward=" +
  +                            URLEncoder.encode(hostInfo) + "&domain="+
  +                            URLEncoder.encode(domainInfo) + "&forward=" +
                               URLEncoder.encode("MailSessions Delete List") %>'>
                   <bean:message key="resources.actions.mailsession.delete"/>
               </controls:action>
  
  
  
  1.3       +2 -2      jakarta-tomcat-catalina/webapps/admin/resources/mailSessions.jspf
  
  Index: mailSessions.jspf
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/mailSessions.jspf,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mailSessions.jspf	23 Jan 2003 00:07:09 -0000	1.2
  +++ mailSessions.jspf	23 Mar 2003 02:10:28 -0000	1.3
  @@ -34,8 +34,8 @@
                                  URLEncoder.encode(mailSession) + "&resourcetype=" +
                                  URLEncoder.encode(resourcetypeInfo) + "&path="+
                                  URLEncoder.encode(pathInfo) + "&host="+
  -                               URLEncoder.encode(hostInfo) + "&service="+
  -                               URLEncoder.encode(serviceInfo) %>'>
  +                               URLEncoder.encode(hostInfo) + "&domain="+
  +                               URLEncoder.encode(domainInfo) %>'>
               <controls:attribute name="mailSession" attribute="name"/>
             </html:link>
           </div></td>
  
  
  
  1.4       +7 -7      jakarta-tomcat-catalina/webapps/admin/resources/resourceLink.jsp
  
  Index: resourceLink.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/resourceLink.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- resourceLink.jsp	23 Jan 2003 00:07:09 -0000	1.3
  +++ resourceLink.jsp	23 Mar 2003 02:10:28 -0000	1.4
  @@ -33,9 +33,9 @@
                  name="resourceLinkForm" property="host"/>
     <html:hidden property="host"/>
   
  -  <bean:define id="serviceInfo" type="java.lang.String"
  -               name="resourceLinkForm" property="service"/>
  -  <html:hidden property="service"/>
  +  <bean:define id="domainInfo" type="java.lang.String"
  +               name="resourceLinkForm" property="domain"/>
  +  <html:hidden property="domain"/>
   
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
  @@ -58,15 +58,15 @@
               <controls:action url='<%= "/resources/setUpResourceLink.do?resourcetype=" +
                               URLEncoder.encode(resourcetypeInfo) + "&path="+
                               URLEncoder.encode(pathInfo) + "&host="+
  -                            URLEncoder.encode(hostInfo) + "&service="+
  -                            URLEncoder.encode(serviceInfo) %>'>
  +                            URLEncoder.encode(hostInfo) + "&domain="+
  +                            URLEncoder.encode(domainInfo) %>'>
                   <bean:message key="resources.actions.resourcelk.create"/>
               </controls:action>
               <controls:action url='<%= "/resources/listResourceLinks.do?resourcetype=" +
                               URLEncoder.encode(resourcetypeInfo) + "&path="+
                               URLEncoder.encode(pathInfo) + "&host="+
  -                            URLEncoder.encode(hostInfo) + "&service="+
  -                            URLEncoder.encode(serviceInfo) + "&forward=" +
  +                            URLEncoder.encode(hostInfo) + "&domain="+
  +                            URLEncoder.encode(domainInfo) + "&forward=" +
                               URLEncoder.encode("ResourceLinks Delete List") %>'>
                   <bean:message key="resources.actions.resourcelk.delete"/>
               </controls:action>
  
  
  
  1.3       +2 -2      jakarta-tomcat-catalina/webapps/admin/resources/resourceLinks.jspf
  
  Index: resourceLinks.jspf
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/resourceLinks.jspf,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- resourceLinks.jspf	23 Jan 2003 00:07:09 -0000	1.2
  +++ resourceLinks.jspf	23 Mar 2003 02:10:28 -0000	1.3
  @@ -33,8 +33,8 @@
                                  URLEncoder.encode(resourceLink) + "&resourcetype=" +
                                  URLEncoder.encode(resourcetypeInfo) + "&path="+
                                  URLEncoder.encode(pathInfo) + "&host="+
  -                               URLEncoder.encode(hostInfo) + "&service="+
  -                               URLEncoder.encode(serviceInfo) %>'>
  +                               URLEncoder.encode(hostInfo) + "&domain="+
  +                               URLEncoder.encode(domainInfo) %>'>
               <controls:attribute name="resourceLink" attribute="name"/>
             </html:link>
           </div></td>
  
  
  
  1.5       +2 -2      jakarta-tomcat-catalina/webapps/admin/server/server.jsp
  
  Index: server.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/server/server.jsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- server.jsp	20 Mar 2003 05:40:11 -0000	1.4
  +++ server.jsp	23 Mar 2003 02:10:30 -0000	1.5
  @@ -38,11 +38,11 @@
             <controls:action>
               ---------------------------------
             </controls:action>
  -          <controls:action url='<%= "/AddService.do?serverName=" +
  +          <controls:action url='<%= "/AddService.do?select=" +
                                         URLEncoder.encode(thisObjectName) %>'>
               <bean:message key="actions.services.create"/>
             </controls:action>
  -          <controls:action url='<%= "/DeleteService.do?serverName=" +
  +          <controls:action url='<%= "/DeleteService.do?select=" +
                                         URLEncoder.encode(thisObjectName) %>'>
               <bean:message key="actions.services.deletes"/>
             </controls:action>
  
  
  
  1.6       +2 -2      jakarta-tomcat-catalina/webapps/admin/service/service.jsp
  
  Index: service.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/service/service.jsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- service.jsp	21 Mar 2003 08:19:16 -0000	1.5
  +++ service.jsp	23 Mar 2003 02:10:30 -0000	1.6
  @@ -75,11 +75,11 @@
                 <controls:action disabled="true">
                   -------------------------------------
                 </controls:action>
  -              <controls:action url='<%= "/AddHost.do?serviceName=" +
  +              <controls:action url='<%= "/AddHost.do?select=" +
                                           URLEncoder.encode(thisObjectName) %>'>
                   <bean:message key="actions.hosts.create"/>
                 </controls:action>
  -              <controls:action url='<%= "/DeleteHost.do?serviceName=" +
  +              <controls:action url='<%= "/DeleteHost.do?select=" +
                                           URLEncoder.encode(thisObjectName) %>'>
                   <bean:message key="actions.hosts.deletes"/>
                 </controls:action>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message