xml-soap-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From duft...@locus.apache.org
Subject cvs commit: xml-soap/java/src/org/apache/soap/server DeploymentDescriptor.java ServiceManager.java ServiceManagerClient.java
Date Tue, 01 Aug 2000 19:46:28 GMT
duftler     00/08/01 12:46:28

  Modified:    java/src/org/apache/soap Constants.java
               java/src/org/apache/soap/rpc RPCConstants.java
               java/src/org/apache/soap/server DeploymentDescriptor.java
                        ServiceManager.java ServiceManagerClient.java
  Log:
  Changed some overlooked IBM-SOAP references to XML-SOAP. Thanks to
  Mike Paolini (paolini@us.ibm.com) for pointing these out.
  
  Revision  Changes    Path
  1.6       +2 -2      xml-soap/java/src/org/apache/soap/Constants.java
  
  Index: Constants.java
  ===================================================================
  RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/Constants.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Constants.java	2000/07/28 11:40:47	1.5
  +++ Constants.java	2000/08/01 19:46:21	1.6
  @@ -86,9 +86,9 @@
       "http://www.w3.org/1999/XMLSchema-instance";
     public static String NS_URI_SCHEMA_XSD =
       "http://www.w3.org/1999/XMLSchema";
  -  public static String NS_URI_IBM_SOAP = 
  +  public static String NS_URI_XML_SOAP = 
       "http://xml.apache.org/xml-soap";
  -  public static String NS_URI_IBM_DEPLOYMENT = 
  +  public static String NS_URI_XML_SOAP_DEPLOYMENT = 
       "http://xml.apache.org/xml-soap/deployment";
     public static String NS_URI_LITERAL_XML = 
       "http://xml.apache.org/xml-soap/literalxml";
  
  
  
  1.3       +1 -1      xml-soap/java/src/org/apache/soap/rpc/RPCConstants.java
  
  Index: RPCConstants.java
  ===================================================================
  RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/rpc/RPCConstants.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RPCConstants.java	2000/05/30 10:24:01	1.2
  +++ RPCConstants.java	2000/08/01 19:46:22	1.3
  @@ -79,7 +79,7 @@
     // Other constants.
     public static String RESPONSE_SUFFIX = "Response";
   
  -  // IBM implementation defined fault codes.
  +  // XML-SOAP implementation defined fault codes.
     public static String FAULT_CODE_SERVER_BAD_TARGET_OBJECT_URI =
       Constants.FAULT_CODE_SERVER + ".BadTargetObjectURI";
   }
  
  
  
  1.4       +10 -8     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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DeploymentDescriptor.java	2000/07/20 14:37:43	1.3
  +++ DeploymentDescriptor.java	2000/08/01 19:46:24	1.4
  @@ -220,7 +220,7 @@
       PrintWriter pw = new PrintWriter (pr);
       
       pw.println ("<isd:service xmlns:isd=\"" +
  -		Constants.NS_URI_IBM_DEPLOYMENT + "\" id=\"" + id + "\">");
  +		Constants.NS_URI_XML_SOAP_DEPLOYMENT + "\" id=\"" + id + "\">");
   
       byte pt = providerType;
       String[] scopes = {"Page", "Request", "Session", "Application"};
  @@ -280,11 +280,11 @@
      */
     public static DeploymentDescriptor fromXML (Element root) {
       if ((root == null) ||
  -	!root.getNamespaceURI().equals (Constants.NS_URI_IBM_DEPLOYMENT) ||
  +	!root.getNamespaceURI().equals (Constants.NS_URI_XML_SOAP_DEPLOYMENT) ||
   	!root.getLocalName().equals ("service")) {
         throw new IllegalArgumentException ("root is null or document element " +
   					  "is not {" +
  -					  Constants.NS_URI_IBM_DEPLOYMENT +
  +					  Constants.NS_URI_XML_SOAP_DEPLOYMENT +
   					  "}service");
       }
   
  @@ -299,7 +299,7 @@
       }
       dd.setID (id);
   
  -    nl = root.getElementsByTagNameNS (Constants.NS_URI_IBM_DEPLOYMENT,
  +    nl = root.getElementsByTagNameNS (Constants.NS_URI_XML_SOAP_DEPLOYMENT,
   				      "provider");
       if ((nl == null) || nl.getLength () != 1) {
         throw new IllegalArgumentException ("exactly one 'provider' element " +
  @@ -325,7 +325,8 @@
   
       if (typeStr.equals ("java")) {
         dd.setProviderType (DeploymentDescriptor.PROVIDER_JAVA);
  -      nl = e.getElementsByTagNameNS (Constants.NS_URI_IBM_DEPLOYMENT, "java");
  +      nl = e.getElementsByTagNameNS (Constants.NS_URI_XML_SOAP_DEPLOYMENT,
  +                                     "java");
         if ((nl == null) || nl.getLength () != 1) {
   	throw new IllegalArgumentException ("exactly one 'java' element " +
   					    "missing in deployment " +
  @@ -354,7 +355,7 @@
         dd.setIsStatic (isStaticBool);
   
       } else {
  -      nl = e.getElementsByTagNameNS (Constants.NS_URI_IBM_DEPLOYMENT,
  +      nl = e.getElementsByTagNameNS (Constants.NS_URI_XML_SOAP_DEPLOYMENT,
   				     "script");
         if ((nl == null) || nl.getLength () != 1) {
   	throw new IllegalArgumentException ("exactly one 'script' element " +
  @@ -393,7 +394,7 @@
       dd.setMethods (methods);
       
       // read the type mappings
  -    nl = root.getElementsByTagNameNS (Constants.NS_URI_IBM_DEPLOYMENT,
  +    nl = root.getElementsByTagNameNS (Constants.NS_URI_XML_SOAP_DEPLOYMENT,
   				      "mappings");
       if ((nl == null) || nl.getLength () > 1) {
         throw new IllegalArgumentException ("at most one 'mappings' element " +
  @@ -401,7 +402,8 @@
       }
       if (nl.getLength () == 1) {
         e = (Element) nl.item (0);
  -      nl = e.getElementsByTagNameNS (Constants.NS_URI_IBM_DEPLOYMENT, "map");
  +      nl = e.getElementsByTagNameNS (Constants.NS_URI_XML_SOAP_DEPLOYMENT,
  +                                     "map");
         int nmaps = nl.getLength ();
         if (nmaps > 0) {
   	TypeMapping[] tms = new TypeMapping[nmaps];
  
  
  
  1.3       +2 -2      xml-soap/java/src/org/apache/soap/server/ServiceManager.java
  
  Index: ServiceManager.java
  ===================================================================
  RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/server/ServiceManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ServiceManager.java	2000/05/30 10:24:05	1.2
  +++ ServiceManager.java	2000/08/01 19:46:25	1.3
  @@ -89,13 +89,13 @@
       // objects
       smsdd.setMappings (new TypeMapping[] {
         new TypeMapping (Constants.NS_URI_SOAP_ENC,
  -		       new QName (Constants.NS_URI_IBM_SOAP,
  +		       new QName (Constants.NS_URI_XML_SOAP,
   				  "DeploymentDescriptor"),
   		       "org.apache.soap.server.DeploymentDescriptor",
   		       "org.apache.soap.encoding.soapenc.BeanSerializer",
   		       "org.apache.soap.encoding.soapenc.BeanSerializer"),
         new TypeMapping (Constants.NS_URI_SOAP_ENC,
  -		       new QName (Constants.NS_URI_IBM_SOAP,
  +		       new QName (Constants.NS_URI_XML_SOAP,
   				  "TypeMapping"),
   		       "org.apache.soap.server.TypeMapping",
   		       "org.apache.soap.server.TypeMappingSerializer",
  
  
  
  1.4       +4 -4      xml-soap/java/src/org/apache/soap/server/ServiceManagerClient.java
  
  Index: ServiceManagerClient.java
  ===================================================================
  RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/server/ServiceManagerClient.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ServiceManagerClient.java	2000/07/20 17:24:53	1.3
  +++ ServiceManagerClient.java	2000/08/01 19:46:25	1.4
  @@ -67,7 +67,7 @@
   import org.apache.soap.rpc.*;
   
   /**
  - * This is a client to talk to a IBM-SOAP ServiceManager to manage services
  + * This is a client to talk to an XML-SOAP ServiceManager to manage services
    * deployed on the server.
    *
    * @author Sanjiva Weerawarana (sanjiva@watson.ibm.com)
  @@ -86,12 +86,12 @@
       // register serializer/deserializer for DeploymentDescriptor.class
       // and TypeMapping.class
       smr.mapTypes (Constants.NS_URI_SOAP_ENC,
  -		  new QName (Constants.NS_URI_IBM_SOAP,
  +		  new QName (Constants.NS_URI_XML_SOAP,
   			     "DeploymentDescriptor"),
   		  DeploymentDescriptor.class, bs, (Deserializer) bs);
       bs = new TypeMappingSerializer ();
       smr.mapTypes (Constants.NS_URI_SOAP_ENC,
  -		  new QName (Constants.NS_URI_IBM_SOAP, "TypeMapping"),
  +		  new QName (Constants.NS_URI_XML_SOAP, "TypeMapping"),
   		  TypeMapping.class, bs, (Deserializer) bs);
     }
   
  @@ -154,7 +154,7 @@
   			ServiceManagerClient.class.getName () +
   			" url operation arguments");
       System.err.println ("where");
  -    System.err.println ("\turl is the IBM-SOAP router's URL whose services" +
  +    System.err.println ("\turl is the XML-SOAP router's URL whose services" +
   			" are managed");
       System.err.println ("\toperation and arguments are:");
       System.err.println ("\t\tdeploy deployment-descriptor-file.xml");
  
  
  

Mime
View raw message