cvs commit: xml-axis/java/src/org/apache/axis/deployment/wsdd WSDDDeployment.java WSDDService.java WSDDTypeMapping.java

[scheu]

scheu       02/02/07 15:47:41

  Modified:    java/src/org/apache/axis/deployment/wsdd WSDDDeployment.java
                        WSDDService.java WSDDTypeMapping.java
  Log:
  Following changes were made per Request from Greg Truty:
  
     1) Added WSDDTypeMapping.setSerializer(String) and 
WSDDTypeMapping.setDeserializer(String)
        so that the WSDDTypeMapping can be built without loading the
        serializer/deserializer factory classes.
  
     2) Changed the WSDDService so that it remembers all deployed typeMappings.
        This is necessary to get all the typeMappings correctly written
        to the context.
  
  Revision  Changes    Path
  1.23      +4 -2      
xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployment.java
  
  Index: WSDDDeployment.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployment.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- WSDDDeployment.java       5 Feb 2002 00:38:54 -0000       1.22
  +++ WSDDDeployment.java       7 Feb 2002 23:47:40 -0000       1.23
  @@ -151,7 +151,9 @@
       public void deployTypeMapping(WSDDTypeMapping typeMapping)
           throws WSDDException
       {
  -        typeMappings.add(typeMapping);
  +        if (!typeMappings.contains(typeMapping)) {
  +            typeMappings.add(typeMapping);
  +        }
           if (tmrDeployed)
               deployMapping(typeMapping);
       }
  @@ -256,7 +258,7 @@
           }
       }
   
  -    public void deployMapping(WSDDTypeMapping mapping)
  +    private void deployMapping(WSDDTypeMapping mapping)
               throws WSDDException
       {
           try {
  
  
  
  1.37      +3 -0      
xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDService.java
  
  Index: WSDDService.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDService.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- WSDDService.java  5 Feb 2002 00:38:54 -0000       1.36
  +++ WSDDService.java  7 Feb 2002 23:47:40 -0000       1.37
  @@ -272,6 +272,9 @@
       public void deployTypeMapping(WSDDTypeMapping mapping)
           throws WSDDException
       {
  +        if (!typeMappings.contains(mapping)) {
  +            typeMappings.add(mapping);
  +        }
           if (tmr == null) {
               tmr = new TypeMappingRegistryImpl();
           }
  
  
  
  1.22      +18 -0     
xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDTypeMapping.java
  
  Index: WSDDTypeMapping.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDTypeMapping.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- WSDDTypeMapping.java      7 Feb 2002 18:16:39 -0000       1.21
  +++ WSDDTypeMapping.java      7 Feb 2002 23:47:40 -0000       1.22
  @@ -272,6 +272,15 @@
       }
   
       /**
  +     * Set the serializer factory name
  +     * @param ser name of the serializer factory class
  +     */
  +    public void setSerializer(String ser)
  +    {
  +        serializer = ser;
  +    }
  +
  +    /**
        *
        * @return XXX
        * @throws ClassNotFoundException XXX
  @@ -298,6 +307,15 @@
       public void setDeserializer(Class deser)
       {
           deserializer = deser.getName();
  +    }
  +
  +    /**
  +     * Set the deserializer factory name
  +     * @param deser name of the deserializer factory class
  +     */
  +    public void setDeserializer(String deser)
  +    {
  +        deserializer = deser;
       }
   }