axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r528544 - in /webservices/axis2/branches/java/1_2/modules: addressing/src/org/apache/axis2/addressing/ java2wsdl/src/org/apache/ws/java2wsdl/ kernel/src/org/apache/axis2/deployment/ kernel/src/org/apache/axis2/deployment/util/ kernel/src/or...
Date Fri, 13 Apr 2007 16:16:52 GMT
Author: dims
Date: Fri Apr 13 09:16:50 2007
New Revision: 528544

URL: http://svn.apache.org/viewvc?view=rev&rev=528544
Log:
sync up with changes in trunk

Modified:
    webservices/axis2/branches/java/1_2/modules/addressing/src/org/apache/axis2/addressing/AddressingFaultsHelper.java
    webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
    webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
    webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
    webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
    webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/AxisService.java
    webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
    webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/transport/mail/MailTransportSender.java
    webservices/axis2/branches/java/1_2/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
    webservices/axis2/branches/java/1_2/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java

Modified: webservices/axis2/branches/java/1_2/modules/addressing/src/org/apache/axis2/addressing/AddressingFaultsHelper.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/addressing/src/org/apache/axis2/addressing/AddressingFaultsHelper.java?view=diff&rev=528544&r1=528543&r2=528544
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/addressing/src/org/apache/axis2/addressing/AddressingFaultsHelper.java
(original)
+++ webservices/axis2/branches/java/1_2/modules/addressing/src/org/apache/axis2/addressing/AddressingFaultsHelper.java
Fri Apr 13 09:16:50 2007
@@ -293,13 +293,13 @@
         String namespace =
                 (String)messageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
         if (Submission.WSA_NAMESPACE.equals(namespace)) {
-            triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_IRI, address,
+            triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_IRI, null,
                                    AddressingConstants.FAULT_ADDRESSING_DESTINATION_UNREACHABLE,
                                    null,
                                    AddressingMessages.getMessage(
                                            "spec.submission.FAULT_ADDRESSING_DESTINATION_UNREACHABLE_REASON"));
         } else {
-            triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_IRI, null,
+            triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_IRI, address,
                                    AddressingConstants.FAULT_ADDRESSING_DESTINATION_UNREACHABLE,
                                    null,
                                    AddressingMessages.getMessage(

Modified: webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java?view=diff&rev=528544&r1=528543&r2=528544
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
(original)
+++ webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
Fri Apr 13 09:16:50 2007
@@ -1,13 +1,39 @@
 package org.apache.ws.java2wsdl;
 
-import org.apache.ws.commons.schema.*;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
+import org.apache.ws.commons.schema.XmlSchemaComplexContent;
+import org.apache.ws.commons.schema.XmlSchemaComplexContentExtension;
+import org.apache.ws.commons.schema.XmlSchemaComplexType;
+import org.apache.ws.commons.schema.XmlSchemaElement;
+import org.apache.ws.commons.schema.XmlSchemaForm;
+import org.apache.ws.commons.schema.XmlSchemaImport;
+import org.apache.ws.commons.schema.XmlSchemaSequence;
 import org.apache.ws.commons.schema.utils.NamespaceMap;
 import org.apache.ws.java2wsdl.bytecode.MethodTable;
 import org.apache.ws.java2wsdl.utils.TypeTable;
-import org.codehaus.jam.*;
+import org.codehaus.jam.JAnnotation;
+import org.codehaus.jam.JClass;
+import org.codehaus.jam.JField;
+import org.codehaus.jam.JMethod;
+import org.codehaus.jam.JPackage;
+import org.codehaus.jam.JParameter;
+import org.codehaus.jam.JProperty;
+import org.codehaus.jam.JamClassIterator;
+import org.codehaus.jam.JamService;
+import org.codehaus.jam.JamServiceFactory;
+import org.codehaus.jam.JamServiceParams;
 
 import javax.xml.namespace.QName;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
 
 /*
 * Copyright 2004,2005 The Apache Software Foundation.
@@ -103,7 +129,8 @@
             this.schemaTargetNameSpace = schematargetNamespace;
         } else {
             this.schemaTargetNameSpace =
-                    Java2WSDLUtils.schemaNamespaceFromClassName(className, loader, getNsGen()).toString();
+                    Java2WSDLUtils.schemaNamespaceFromClassName(className, loader, getNsGen())
+                            .toString();
         }
         
         if (schematargetNamespacePrefix != null
@@ -115,8 +142,8 @@
     }
 
     /**
-     * Generates schema for all the parameters in method. First generates schema
-     * for all different parameter type and later refers to them.
+     * Generates schema for all the parameters in method. First generates schema for all
different
+     * parameter type and later refers to them.
      *
      * @return Returns XmlSchema.
      * @throws Exception
@@ -151,7 +178,8 @@
                  */
                 JAnnotation annotation = jclass.getAnnotation(AnnotationConstants.WEB_SERVICE);
                 if(annotation!=null){
-                    String tns = annotation.getValue(AnnotationConstants.TARGETNAMESPACE).asString();
+                    String tns =
+                            annotation.getValue(AnnotationConstants.TARGETNAMESPACE).asString();
                     if(tns!=null&&!"".equals(tns)){
                         targetNamespace = tns;
                     }
@@ -190,11 +218,13 @@
                         continue;
                     }
                     if (jMethod.getExceptionTypes().length > 0) {
-                        methodSchemaType = createSchemaTypeForMethodPart(getSimpleName(jMethod)
+ "Fault");
+                        methodSchemaType =
+                                createSchemaTypeForMethodPart(getSimpleName(jMethod) + "Fault");
                         sequence = new XmlSchemaSequence();
                         XmlSchemaElement elt1 = new XmlSchemaElement();
                         elt1.setName(getSimpleName(jMethod) + "Fault");
-                        elt1.setSchemaTypeName(typeTable.getQNamefortheType(Object.class.getName()));
+                        elt1.setSchemaTypeName(
+                                typeTable.getQNamefortheType(Object.class.getName()));
                         sequence.getItems().add(elt1);
                         methodSchemaType.setParticle(sequence);
                     }
@@ -215,12 +245,15 @@
                     for (int j = 0; j < paras.length; j++) {
                         JParameter methodParameter = paras[j];
                         String parameterName =null;
-                        JAnnotation paramterAnnon= methodParameter.getAnnotation(AnnotationConstants.WEB_PARAM);
+                        JAnnotation paramterAnnon =
+                                methodParameter.getAnnotation(AnnotationConstants.WEB_PARAM);
                         if(paramterAnnon!=null){
-                            parameterName = paramterAnnon.getValue(AnnotationConstants.NAME).asString();
+                            parameterName =
+                                    paramterAnnon.getValue(AnnotationConstants.NAME).asString();
                         }
                         if(parameterName==null||"".equals(parameterName)){
-                            parameterName = (parameterNames != null && parameterNames[j]
!= null) ? parameterNames[j] : getSimpleName(methodParameter);
+                            parameterName = (parameterNames != null && parameterNames[j]
!= null) ?
+                                    parameterNames[j] : getSimpleName(methodParameter);
                         }
                         JClass paraType = methodParameter.getType();
                         if(nonRpcMethods.contains(getSimpleName(jMethod))){
@@ -234,10 +267,12 @@
                     JClass returnType = jMethod.getReturnType();
 
                     if (!returnType.isVoidType()) {
-                        methodSchemaType = createSchemaTypeForMethodPart(getSimpleName(jMethod)
+ RESPONSE);
+                        methodSchemaType =
+                                createSchemaTypeForMethodPart(getSimpleName(jMethod) + RESPONSE);
                         sequence = new XmlSchemaSequence();
                         methodSchemaType.setParticle(sequence);
-                        JAnnotation returnAnnon= jMethod.getAnnotation(AnnotationConstants.WEB_RESULT);
+                        JAnnotation returnAnnon =
+                                jMethod.getAnnotation(AnnotationConstants.WEB_RESULT);
                         String returnName ="return";
                         if(returnAnnon!=null){
                             returnName= returnAnnon.getValue(AnnotationConstants.NAME).asString();
@@ -265,9 +300,9 @@
     }
 
     /**
-     * JAM convert first name of an attribute into UpperCase as an example if
-     * there is a instance variable called foo in a bean , then Jam give that as
-     * Foo so this method is to correct that error
+     * JAM convert first name of an attribute into UpperCase as an example if there is a
instance
+     * variable called foo in a bean , then Jam give that as Foo so this method is to correct
that
+     * error
      *
      * @param wrongName
      * @return the right name, using english as the locale for case conversion
@@ -282,6 +317,8 @@
     }
 
     /**
+     * Generate schema construct for given type
+     * 
      * @param javaType
      */
     private QName generateSchema(JClass javaType) throws Exception {
@@ -298,7 +335,8 @@
 
             XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema);
             XmlSchemaSequence sequence = new XmlSchemaSequence();
-            XmlSchemaComplexContentExtension complexExtension = new XmlSchemaComplexContentExtension()
;
+            XmlSchemaComplexContentExtension complexExtension =
+                    new XmlSchemaComplexContentExtension();
 
             XmlSchemaElement eltOuter = new XmlSchemaElement();
             schemaTypeName = new QName(targetNameSpace, simpleName, targetNamespacePrefix);
@@ -318,7 +356,8 @@
                     tgtNamespace =qName.getNamespaceURI();
                     tgtNamespacepfx = qName.getPrefix();
                 } else {
-                     tgtNamespace = resolveSchemaNamespace(sup.getContainingPackage().getQualifiedName())
;
+                    tgtNamespace =
+                            resolveSchemaNamespace(sup.getContainingPackage().getQualifiedName());
                      tgtNamespacepfx = (String) targetNamespacePrefixMap.get(tgtNamespace);
                  }
 
@@ -333,10 +372,9 @@
             	            	
             	complexType.setContentModel(contentModel) ;
             
-            }
-            else           
+            } else {
             	complexType.setParticle(sequence);
-
+            }
             
             complexType.setName(simpleName);
 
@@ -374,7 +412,8 @@
                 
                 propertiesNames.add(propname) ;
                 
-                this.generateSchemaforFieldsandProperties(xmlSchema,sequence,property.getType(),propname,
isArryType) ;
+                this.generateSchemaforFieldsandProperties(xmlSchema, sequence, property.getType(),
+                                                          propname, isArryType);
                 
             }
             
@@ -429,18 +468,20 @@
                 String propertyName = field.getType().getQualifiedName();
                 boolean isArryType = field.getType().isArrayType();
                
-                this.generateSchemaforFieldsandProperties(xmlSchema, sequence,field.getType(),field.getSimpleName(),
isArryType) ;
+                this.generateSchemaforFieldsandProperties(xmlSchema, sequence, field.getType(),
+                                                          field.getSimpleName(), isArryType);
             }     
      
             
-            
         }
         return schemaTypeName;
     }
     
 
     // moved code common to Fields & properties out of above method 
-    private void generateSchemaforFieldsandProperties(XmlSchema xmlSchema,XmlSchemaSequence
sequence, JClass type, String name, boolean isArryType) 
+    private void generateSchemaforFieldsandProperties(XmlSchema xmlSchema,
+                                                      XmlSchemaSequence sequence, JClass
type,
+                                                      String name, boolean isArryType)
 	throws Exception {
     	
     	String propertyName ;
@@ -489,19 +530,21 @@
     		if (!((NamespaceMap) xmlSchema.getNamespaceContext()).values().
     				contains(typeTable.getComplexSchemaType(propertyName).getNamespaceURI())) {
     			XmlSchemaImport importElement = new XmlSchemaImport();
-    			importElement.setNamespace(typeTable.getComplexSchemaType(propertyName).getNamespaceURI());
+                importElement.setNamespace(
+                        typeTable.getComplexSchemaType(propertyName).getNamespaceURI());
     			xmlSchema.getItems().add(importElement);
     			((NamespaceMap) xmlSchema.getNamespaceContext()).
-    			put(generatePrefix(), typeTable.getComplexSchemaType(propertyName).getNamespaceURI());
+                        put(generatePrefix(),
+                            typeTable.getComplexSchemaType(propertyName).getNamespaceURI());
     		}
     	}
     	
 
-
     }
 
 
-    private QName generateSchemaForType(XmlSchemaSequence sequence, JClass type, String partName)
throws Exception {
+    private QName generateSchemaForType(XmlSchemaSequence sequence, JClass type, String partName)
+            throws Exception {
 
         boolean isArrayType = false;
         if(type!=null){
@@ -564,7 +607,8 @@
     private XmlSchemaComplexType createSchemaTypeForMethodPart(String localPartName) {
         //XmlSchema xmlSchema = (XmlSchema)schemaMap.get(schemaTargetNameSpace);
         XmlSchema xmlSchema = getXmlSchema(schemaTargetNameSpace);
-        QName elementName = new QName(this.schemaTargetNameSpace, localPartName, this.schema_namespace_prefix);
+        QName elementName =
+                new QName(this.schemaTargetNameSpace, localPartName, this.schema_namespace_prefix);
         XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema);
 
         XmlSchemaElement globalElement = new XmlSchemaElement();
@@ -589,8 +633,7 @@
             if ( targetNamespace.equals(schemaTargetNameSpace) && 
                     schema_namespace_prefix != null ) {
                 targetNamespacePrefix = schema_namespace_prefix;
-            }
-            else {
+            } else {
                 targetNamespacePrefix = generatePrefix();
             }
 
@@ -625,6 +668,7 @@
     }
 
     public void setExcludeMethods(ArrayList excludeMethods) {
+        if (excludeMethods == null) excludeMethods = new ArrayList();
         this.excludeMethods = excludeMethods;
     }
 
@@ -730,12 +774,15 @@
    protected String getSimpleName(JMethod method){
        return method.getSimpleName();
    }
+
     protected String getSimpleName(JClass type){
        return type.getSimpleName();
    }
+
     protected String getSimpleName(JProperty peroperty){
         return peroperty.getSimpleName();
     }
+
     protected String getSimpleName(JParameter parameter){
         return parameter.getSimpleName();
    }
@@ -743,18 +790,23 @@
     protected String getQualifiedName(JMethod method){
         return method.getQualifiedName();
     }
+
     protected String getQualifiedName(JClass type){
         return type.getQualifiedName();
     }
+
     protected String getQualifiedName(JProperty peroperty){
         return peroperty.getQualifiedName();
     }
+
     protected String getQualifiedName(JParameter parameter){
         return parameter.getQualifiedName();
     }
+
     protected String getQualifiedName(JPackage packagez){
         return packagez.getQualifiedName();
     }
+
     public void setNonRpcMethods(ArrayList nonRpcMethods) {
         if(nonRpcMethods!=null){
             this.nonRpcMethods = nonRpcMethods;

Modified: webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java?view=diff&rev=528544&r1=528543&r2=528544
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
(original)
+++ webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
Fri Apr 13 09:16:50 2007
@@ -244,7 +244,7 @@
 
     private void processDeployers(Iterator deployerItr) {
         HashMap directoryToExtensionMappingMap = new HashMap();
-        HashMap extensioToDeployerMappingMap = new HashMap();
+        HashMap extensionToDeployerMappingMap = new HashMap();
         while (deployerItr.hasNext()) {
             OMElement element = (OMElement) deployerItr.next();
             String directory = element.getAttributeValue(new QName(DIRECTORY));
@@ -260,7 +260,7 @@
                         deployer.setDirectory(directory);
                         deployer.setExtension(extension);
                         directoryToExtensionMappingMap.put(directory, extension);
-                        extensioToDeployerMappingMap.put(extension, deployer);
+                        extensionToDeployerMappingMap.put(extension, deployer);
                     } catch (ClassNotFoundException e) {
                         log.error(e);
                     } catch (InstantiationException e) {
@@ -273,7 +273,7 @@
         }
         if (deploymentEngine != null) {
             deploymentEngine.setDirectoryToExtensionMappingMap(directoryToExtensionMappingMap);
-            deploymentEngine.setExtensioToDeployerMappingMap(extensioToDeployerMappingMap);
+            deploymentEngine.setExtensionToDeployerMappingMap(extensionToDeployerMappingMap);
         }
     }
 

Modified: webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?view=diff&rev=528544&r1=528543&r2=528544
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
(original)
+++ webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
Fri Apr 13 09:16:50 2007
@@ -104,7 +104,7 @@
     private HashMap directoryToExtensionMappingMap = new HashMap();
     //to keep map of which deployer can process which file extension ,
     // for example ServiceDeployer will process .aar file
-    private HashMap extensioToDeployerMappingMap = new HashMap();
+    private HashMap extensionToDeployerMappingMap = new HashMap();
 
     public void loadServices() {
         repoListener.checkServices();
@@ -586,7 +586,7 @@
                     } else if (TYPE_MODULE.equals(type)) {
                         moduleDeployer.deploy(currentDeploymentFile);
                     } else {
-                        Deployer deployer = (Deployer) extensioToDeployerMappingMap.get(type);
+                        Deployer deployer = (Deployer) extensionToDeployerMappingMap.get(type);
                         if (deployer != null) {
                             try {
                                 deployer.deploy(currentDeploymentFile);
@@ -675,7 +675,7 @@
                     } else {
                         if (isHotUpdate()) {
                             Deployer deployer =
-                                    (Deployer) extensioToDeployerMappingMap.get(fileType);
+                                    (Deployer) extensionToDeployerMappingMap.get(fileType);
                             if (deployer != null) {
                                 deployer.unDeploy(wsInfo.getFileName());
                             }
@@ -880,7 +880,7 @@
     private void initializeDeployers(ConfigurationContext configContext) {
         serviceDeployer = new ServiceDeployer();
         serviceDeployer.init(configContext);
-        Iterator deployers = extensioToDeployerMappingMap.values().iterator();
+        Iterator deployers = extensionToDeployerMappingMap.values().iterator();
         while (deployers.hasNext()) {
             Deployer deployer = (Deployer) deployers.next();
             deployer.init(configContext);
@@ -1023,8 +1023,8 @@
         return repositoryDir;
     }
 
-    public void setExtensioToDeployerMappingMap(HashMap extensioToDeployerMappingMap) {
-        this.extensioToDeployerMappingMap = extensioToDeployerMappingMap;
+    public void setExtensionToDeployerMappingMap(HashMap extensionToDeployerMappingMap) {
+        this.extensionToDeployerMappingMap = extensionToDeployerMappingMap;
     }
 
     public void setDirectoryToExtensionMappingMap(HashMap directoryToExtensionMappingMap)
{

Modified: webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?view=diff&rev=528544&r1=528543&r2=528544
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
(original)
+++ webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
Fri Apr 13 09:16:50 2007
@@ -251,6 +251,11 @@
 
     /**
      * This guy will create a AxisService using java reflection
+     * @param axisService the target AxisService
+     * @param axisConfig the in-scope AxisConfiguration
+     * @param excludeOperations a List of Strings (or null), each containing a method to
exclude
+     * @param nonRpcMethods a List of Strings (or null), each containing a non-rpc method
name
+     * @throws Exception if a problem occurs
      */
     public static void fillAxisService(AxisService axisService,
                                        AxisConfiguration axisConfig,
@@ -334,7 +339,7 @@
                 // no need to expose , private and protected methods
                 continue;
             }
-            if (excludeOperations.contains(jmethod.getSimpleName())) {
+            if (excludeOperations != null && excludeOperations.contains(jmethod.getSimpleName()))
{
                 continue;
             }
             String opName = jmethod.getSimpleName();

Modified: webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=528544&r1=528543&r2=528544
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/AxisService.java
(original)
+++ webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/AxisService.java
Fri Apr 13 09:16:50 2007
@@ -790,6 +790,25 @@
         return addNameSpaces(index);
     }
 
+
+    /**
+     * Release the list of schema objects.
+     * <P>
+     * In some environments, this can provide significant relief
+     * of memory consumption in the java heap, as long as the 
+     * need for the schema list has completed.
+     */
+    public void releaseSchemaList() {
+        if (schemaList != null) {
+            // release the schema list 
+            schemaList.clear();
+        }
+
+        if (log.isDebugEnabled()) {
+            log.debug("releaseSchemaList: schema list has been released."); 
+        }
+    }
+
     private XmlSchema addNameSpaces(int i) {
         XmlSchema schema = (XmlSchema) schemaList.get(i);
         NamespaceMap map = (NamespaceMap) nameSpacesMap.clone();

Modified: webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?view=diff&rev=528544&r1=528543&r2=528544
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
(original)
+++ webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
Fri Apr 13 09:16:50 2007
@@ -48,6 +48,8 @@
 import javax.wsdl.WSDLException;
 import javax.wsdl.extensions.ExtensibilityElement;
 import javax.wsdl.extensions.UnknownExtensibilityElement;
+import javax.wsdl.extensions.mime.MIMEMultipartRelated;
+import javax.wsdl.extensions.mime.MIMEPart;
 import javax.wsdl.extensions.http.HTTPAddress;
 import javax.wsdl.extensions.http.HTTPBinding;
 import javax.wsdl.extensions.http.HTTPOperation;
@@ -1545,7 +1547,39 @@
                     throw new WSDLProcessingException("Encoded use is not supported");
                 }
                 partsList = soapBody.getParts();
+            } else if (extElement instanceof MIMEMultipartRelated) {
+                MIMEMultipartRelated minMimeMultipartRelated = (MIMEMultipartRelated) extElement;
+                List mimePartsList = minMimeMultipartRelated.getMIMEParts();
+                MIMEPart mimePart = null;
+                Object object;
+                List mimePartElements;
+                ExtensibilityElement mimePartExtensibilityElement;
+                for (Iterator mimePartsIter = mimePartsList.iterator(); mimePartsIter.hasNext();)
{
+                    object = mimePartsIter.next();
+                    if (object instanceof MIMEPart) {
+                        mimePart = (MIMEPart) object;
+                        mimePartElements = mimePart.getExtensibilityElements();
+                        for (Iterator mimePartElementsIter = mimePartElements.iterator();
mimePartElementsIter.hasNext();)
+                        {
+                            mimePartExtensibilityElement = (ExtensibilityElement) mimePartElementsIter.next();
+                            if (mimePartExtensibilityElement instanceof SOAPBody) {
+                                SOAPBody soapBody = (SOAPBody) mimePartExtensibilityElement;
+                                if ((soapBody.getUse() != null) && (soapBody.getUse().equals(ENCODED_USE)))
{
+                                    throw new WSDLProcessingException("Encoded use is not
supported");
+            }
+                                partsList = soapBody.getParts();
+                            } else if (mimePartExtensibilityElement instanceof SOAP12Body)
{
+                                SOAP12Body soapBody = (SOAP12Body) mimePartExtensibilityElement;
+                                if ((soapBody.getUse() != null) && (soapBody.getUse().equals(ENCODED_USE)))
{
+                                    throw new WSDLProcessingException("Encoded use is not
supported");
+                                }
+                                partsList = soapBody.getParts();
+                            }
+                        }
+                    }
+                }
             }
+
         }
         return partsList;
     }

Modified: webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/transport/mail/MailTransportSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/transport/mail/MailTransportSender.java?view=diff&rev=528544&r1=528543&r2=528544
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/transport/mail/MailTransportSender.java
(original)
+++ webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/transport/mail/MailTransportSender.java
Fri Apr 13 09:16:50 2007
@@ -115,7 +115,6 @@
     private PasswordAuthentication passwordAuthentication;
 
     private ByteArrayOutputStream byteArrayOutputStream;
-    // assosiation with OMOutputFormat
 
     private final static String NAME = "MailTransportSender";
 

Modified: webservices/axis2/branches/java/1_2/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java?view=diff&rev=528544&r1=528543&r2=528544
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
(original)
+++ webservices/axis2/branches/java/1_2/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
Fri Apr 13 09:16:50 2007
@@ -221,7 +221,6 @@
 
         Iterator attachIter = response.getAttachments();
 
-        int i = 0;
         while (attachIter.hasNext()) {
             AttachmentPart attachment = (AttachmentPart)attachIter.next();
             final Object content = attachment.getDataHandler().getContent();

Modified: webservices/axis2/branches/java/1_2/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java?view=diff&rev=528544&r1=528543&r2=528544
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java
(original)
+++ webservices/axis2/branches/java/1_2/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java
Fri Apr 13 09:16:50 2007
@@ -86,8 +86,8 @@
             throws Exception {
         File file = new File(repository);
         if (!file.exists()) {
-            throw new Exception("repository directory "
-                    + file.getAbsolutePath() + " does not exists");
+            throw new Exception("repository directory " + file.getAbsolutePath() +
+                    " does not exist");
         }
         return ConfigurationContextFactory
                 .createConfigurationContextFromFileSystem(file.getAbsolutePath(), null);



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message