vmassol 01/04/28 07:04:22 Modified: cactus/src/framework/share/org/apache/commons/cactus/client JspHttpClient.java ServletHttpClient.java Log: refactorings Revision Changes Path 1.4 +7 -7 jakarta-commons/cactus/src/framework/share/org/apache/commons/cactus/client/JspHttpClient.java Index: JspHttpClient.java =================================================================== RCS file: /home/cvs/jakarta-commons/cactus/src/framework/share/org/apache/commons/cactus/client/JspHttpClient.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- JspHttpClient.java 2001/04/19 23:31:52 1.3 +++ JspHttpClient.java 2001/04/28 14:04:21 1.4 @@ -75,14 +75,14 @@ /** * Default URL to call the <code>jspRedirector</code> JSP. */ - protected final static String m_JspRedirectorURL = - PropertyResourceBundle.getBundle("cactus").getString("cactus.jspRedirectorURL"); + protected final static String JSP_REDIRECTOR_URL = + CONFIG.getString("cactus.jspRedirectorURL"); /** - * Default URL to call the <code>ServletRedirector</code> servlet. + * Default URL to call the <code>servletRedirector</code> servlet. */ - protected final static String m_ServletRedirectorURL = - PropertyResourceBundle.getBundle("cactus").getString("cactus.servletRedirectorURL"); + protected final static String SERVLET_REDIRECTOR_URL = + CONFIG.getString("cactus.servletRedirectorURL"); /** * Calls the test method indirectly by calling the Redirector JSP and @@ -104,7 +104,7 @@ HttpURLConnection connection = null; // Open the first connection to the redirector JSP - HttpClientHelper helper1 = new HttpClientHelper(m_JspRedirectorURL); + HttpClientHelper helper1 = new HttpClientHelper(JSP_REDIRECTOR_URL); // Specify the service to call on the redirector side theRequest.addParameter(ServiceDefinition.SERVICE_NAME_PARAM, @@ -117,7 +117,7 @@ // Open the second connection (to the Servlet redirector) to get the // test results - HttpClientHelper helper2 = new HttpClientHelper(m_ServletRedirectorURL); + HttpClientHelper helper2 = new HttpClientHelper(SERVLET_REDIRECTOR_URL); ServletTestRequest resultsRequest = new ServletTestRequest(); resultsRequest.addParameter(ServiceDefinition.SERVICE_NAME_PARAM, ServiceEnumeration.GET_RESULTS_SERVICE.toString()); 1.3 +4 -4 jakarta-commons/cactus/src/framework/share/org/apache/commons/cactus/client/ServletHttpClient.java Index: ServletHttpClient.java =================================================================== RCS file: /home/cvs/jakarta-commons/cactus/src/framework/share/org/apache/commons/cactus/client/ServletHttpClient.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ServletHttpClient.java 2001/04/19 23:22:10 1.2 +++ ServletHttpClient.java 2001/04/28 14:04:22 1.3 @@ -75,8 +75,8 @@ /** * Default URL to call the <code>ServletRedirector</code> servlet. */ - protected final static String m_ServletRedirectorURL = - PropertyResourceBundle.getBundle("cactus").getString("cactus.servletRedirectorURL"); + protected final static String SERVLET_REDIRECTOR_URL = + CONFIG.getString("cactus.servletRedirectorURL"); /** * Calls the test method indirectly by calling the Redirector servlet and @@ -97,7 +97,7 @@ HttpURLConnection connection = null; // Open the first connection to the redirector servlet - HttpClientHelper helper1 = new HttpClientHelper(m_ServletRedirectorURL); + HttpClientHelper helper1 = new HttpClientHelper(SERVLET_REDIRECTOR_URL); // Specify the service to call on the redirector side theRequest.addParameter(ServiceDefinition.SERVICE_NAME_PARAM, @@ -109,7 +109,7 @@ connection.getInputStream(); // Open the second connection to get the test results - HttpClientHelper helper2 = new HttpClientHelper(m_ServletRedirectorURL); + HttpClientHelper helper2 = new HttpClientHelper(SERVLET_REDIRECTOR_URL); ServletTestRequest resultsRequest = new ServletTestRequest(); resultsRequest.addParameter(ServiceDefinition.SERVICE_NAME_PARAM, ServiceEnumeration.GET_RESULTS_SERVICE.toString());