You are viewing a plain text version of this content. The canonical link for it is here.
Posted to soap-dev@ws.apache.org by du...@locus.apache.org on 2000/08/17 22:58:14 UTC

cvs commit: xml-soap/java/webapps/soap/admin deploy.jsp showdetails.jsp

duftler     00/08/17 13:58:14

  Modified:    java/src/org/apache/soap/server DeploymentDescriptor.java
               java/webapps/soap/admin deploy.jsp showdetails.jsp
  Log:
  Removed references to 'Page' scope.
  
  Revision  Changes    Path
  1.5       +6 -9      xml-soap/java/src/org/apache/soap/server/DeploymentDescriptor.java
  
  Index: DeploymentDescriptor.java
  ===================================================================
  RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/server/DeploymentDescriptor.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DeploymentDescriptor.java	2000/08/01 19:46:24	1.4
  +++ DeploymentDescriptor.java	2000/08/17 20:58:13	1.5
  @@ -71,10 +71,9 @@
    */
   public class DeploymentDescriptor implements Serializable {
     // scopes for the lifecycles of the provider class
  -  public static final int SCOPE_PAGE = 0;
  -  public static final int SCOPE_REQUEST = 1;
  -  public static final int SCOPE_SESSION = 2;
  -  public static final int SCOPE_APPLICATION = 3;
  +  public static final int SCOPE_REQUEST = 0;
  +  public static final int SCOPE_SESSION = 1;
  +  public static final int SCOPE_APPLICATION = 2;
   
     // types of providers
     public static final byte PROVIDER_JAVA = (byte) 0;
  @@ -223,7 +222,7 @@
   		Constants.NS_URI_XML_SOAP_DEPLOYMENT + "\" id=\"" + id + "\">");
   
       byte pt = providerType;
  -    String[] scopes = {"Page", "Request", "Session", "Application"};
  +    String[] scopes = {"Request", "Session", "Application"};
       pw.print ("  <isd:provider type=\"" + 
   	      (pt == DeploymentDescriptor.PROVIDER_JAVA ? "java" : "script") +
   	      "\" scope=\"" + scopes[scope] + "\" methods=\"");
  @@ -312,7 +311,7 @@
       if ((typeStr == null) ||
   	(!typeStr.equals ("java") && !typeStr.equals ("script")) ||
   	(scopeStr == null) ||
  -	(!scopeStr.equals ("Page") && !scopeStr.equals ("Request") &&
  +	(!scopeStr.equals ("Request") &&
   	 !scopeStr.equals ("Session") && !scopeStr.equals ("Application")) ||
   	(methodsStr == null) || methodsStr.equals ("")) {
         throw new IllegalArgumentException ("invalid value for type or scope " +
  @@ -374,9 +373,7 @@
         }
       }
   
  -    if (scopeStr.equals ("Page")) {
  -      scope = DeploymentDescriptor.SCOPE_PAGE;
  -    } else if (scopeStr.equals ("Request")) {
  +    if (scopeStr.equals ("Request")) {
         scope = DeploymentDescriptor.SCOPE_REQUEST;
       } else if (scopeStr.equals ("Session")) {
         scope = DeploymentDescriptor.SCOPE_SESSION;
  
  
  
  1.2       +3 -4      xml-soap/java/webapps/soap/admin/deploy.jsp
  
  Index: deploy.jsp
  ===================================================================
  RCS file: /home/cvs/xml-soap/java/webapps/soap/admin/deploy.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- deploy.jsp	2000/08/10 02:25:58	1.1
  +++ deploy.jsp	2000/08/17 20:58:13	1.2
  @@ -31,10 +31,9 @@
           <tr>
               <td>Scope</td>
               <td><select name="scope" size="1">
  -                <option selected value="0">Page</option>
  -                <option value="1">Request</option>
  -                <option value="2">Session</option>
  -                <option value="3">Application</option>
  +                <option selected value="0">Request</option>
  +                <option value="1">Session</option>
  +                <option value="2">Application</option>
               </select></td>
           </tr>
           <tr>
  
  
  
  1.2       +1 -1      xml-soap/java/webapps/soap/admin/showdetails.jsp
  
  Index: showdetails.jsp
  ===================================================================
  RCS file: /home/cvs/xml-soap/java/webapps/soap/admin/showdetails.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- showdetails.jsp	2000/08/10 02:25:58	1.1
  +++ showdetails.jsp	2000/08/17 20:58:14	1.2
  @@ -13,7 +13,7 @@
     DeploymentDescriptor dd = (id != null) 
                               ? serviceManager.query (id) 
   			    : null;
  -  String[] scopes = {"Page", "Request", "Session", "Application"}; 
  +  String[] scopes = {"Request", "Session", "Application"}; 
   
     if (id == null) {
       out.println ("<p>Huh? You hafta select a service to display ..</p>");