svn commit: r1340949 - in /axis/axis2/java/core/trunk/modules: jaxws/src/org/apache/axis2/jaxws/framework/ jaxws/test/org/apache/axis2/jaxws/framework/ kernel/src/org/apache/axis2/deployment/
Author: sagara
Date: Mon May 21 09:23:24 2012
New Revision: 1340949
URL: http://svn.apache.org/viewvc?rev=1340949&view=rev
Log:
Further improvements on AXIS2-5322.
* Added test casees.
* Added headers
* Few improvements.
Added:
axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/framework/
axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/framework/JAXWSServiceBuilderExtensionTest.java
(with props)
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployerSupport.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSServiceBuilderExtension.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/AbstractServiceBuilderExtension.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilderExtension.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/WSDLServiceBuilderExtension.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployerSupport.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployerSupport.java?rev=1340949&r1=1340948&r2=1340949&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployerSupport.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployerSupport.java
Mon May 21 09:23:24 2012
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.axis2.jaxws.framework;
import java.net.URL;
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSServiceBuilderExtension.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSServiceBuilderExtension.java?rev=1340949&r1=1340948&r2=1340949&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSServiceBuilderExtension.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSServiceBuilderExtension.java
Mon May 21 09:23:24 2012
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.axis2.jaxws.framework;
import java.net.MalformedURLException;
@@ -124,13 +143,7 @@ public class JAXWSServiceBuilderExtensio
// if only one present.
return checkMessageReceivers(metaDataEle);
} else if
(DeploymentConstants.TAG_SERVICE_GROUP.equals(metaDataEle.getLocalName())) {
-// if present.
-OMElement groupMrs = metaDataEle.getFirstChildWithName(new
QName(
-DeploymentConstants.TAG_MESSAGE_RECEIVERS));
-// check MRs direct under .
-if (groupMrs != null && !checkMessageReceivers(metaDataEle)) {
-return false;
-}
+// if present.
for (Iterator serviceItr = metaDataEle
svn commit: r1340970 - in /axis/axis2/java/core/trunk/modules: jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/LegacyExceptionUtil.java metadata/src/org/apache/axis2/jaxws/i18n/resource.propertie
Author: sagara
Date: Mon May 21 11:17:54 2012
New Revision: 1340970
URL: http://svn.apache.org/viewvc?rev=1340970&view=rev
Log:
Applied patch for AXIS2-5323.
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/LegacyExceptionUtil.java
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/LegacyExceptionUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/LegacyExceptionUtil.java?rev=1340970&r1=1340969&r2=1340970&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/LegacyExceptionUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/LegacyExceptionUtil.java
Mon May 21 11:17:54 2012
@@ -31,7 +31,10 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import javax.xml.ws.WebServiceException;
+
import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
@@ -70,11 +73,17 @@ class LegacyExceptionUtil {
private static Set ignore = new HashSet();
static {
-// Per Chap 3.7 rule 3, ignore these properties on the exception
-ignore.add("localizedMessage");
-ignore.add("stackTrace");
-ignore.add("class");
-ignore.add("cause");
+// Per Chap 3.7 rule 3, ignore these properties from
java.lang.Throwable hierarchy except the message property
+try {
+for (PropertyDescriptor pd :
Introspector.getBeanInfo(Throwable.class).getPropertyDescriptors()) {
+if (pd.getName().equals("message")) {
+continue;
+}
+ignore.add(pd.getName());
+}
+} catch (IntrospectionException e) {
+
log.error(Messages.getMessage("faultProcessingExcludedExceptionProperties",
e.getMessage()), e);
+}
}
/** Static class. Constructor is intentionally private */
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties?rev=1340970&r1=1340969&r2=1340970&view=diff
==
---
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties
(original)
+++
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties
Mon May 21 11:17:54 2012
@@ -306,4 +306,5 @@ axisEndpointReferenceFactoryErr2=Cannot
dispatchInvalidTypeWithMode=Unsupported Dispatch Type: Dispatch type
javax.xml.soap.SOAPMessage cannot be used with messages in Payload mode.
serviceDelegateConstruct2=An attempt was made to construct the ServiceDelegate
object with the {0} service and with WebServicesFeatures, but there are no
standard features defined for service creation in the current specification.
MethodRetrieverWarning1=Public method {0} will be exposed as a Web Service
operation per JAX-WS 2.2 tooling rules. If you intend to expose only operations
that have @WebMethod annotation, set the manifest property ''LegacyWebmethod:
true'' or set a JVM property ''jaxws.runtime.legacyWebMethod=true''.
-generateWSDLNonSoap11=This implementation does not contain a WSDL definition
and is not a SOAP 1.1 based binding. Per the JAXWS specification, a WSDL
definition cannot be generated for this implementation. The implementation
class name is {0}
\ No newline at end of file
+generateWSDLNonSoap11=This implementation does not contain a WSDL definition
and is not a SOAP 1.1 based binding. Per the JAXWS specification, a WSDL
definition cannot be generated for this implementation. The implementation
class name is {0}
+faultProcessingExcludedExceptionProperties=Excluded exception properties
processing failed. The reported error is: {0}.
\ No newline at end of file
svn commit: r1340971 - in /axis/axis2/java/core/branches/1_6: ./ modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/LegacyExceptionUtil.java modules/metadata/src/org/apache/axis2/jaxws/i18n/
Author: sagara
Date: Mon May 21 11:28:00 2012
New Revision: 1340971
URL: http://svn.apache.org/viewvc?rev=1340971&view=rev
Log:
Merged r1340970 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/LegacyExceptionUtil.java
axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties
Propchange: axis/axis2/java/core/branches/1_6/
--
Merged /axis/axis2/java/core/trunk:r1340970
Modified:
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/LegacyExceptionUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/LegacyExceptionUtil.java?rev=1340971&r1=1340970&r2=1340971&view=diff
==
---
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/LegacyExceptionUtil.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/LegacyExceptionUtil.java
Mon May 21 11:28:00 2012
@@ -31,7 +31,10 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import javax.xml.ws.WebServiceException;
+
import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
@@ -70,11 +73,17 @@ class LegacyExceptionUtil {
private static Set ignore = new HashSet();
static {
-// Per Chap 3.7 rule 3, ignore these properties on the exception
-ignore.add("localizedMessage");
-ignore.add("stackTrace");
-ignore.add("class");
-ignore.add("cause");
+// Per Chap 3.7 rule 3, ignore these properties from
java.lang.Throwable hierarchy except the message property
+try {
+for (PropertyDescriptor pd :
Introspector.getBeanInfo(Throwable.class).getPropertyDescriptors()) {
+if (pd.getName().equals("message")) {
+continue;
+}
+ignore.add(pd.getName());
+}
+} catch (IntrospectionException e) {
+
log.error(Messages.getMessage("faultProcessingExcludedExceptionProperties",
e.getMessage()), e);
+}
}
/** Static class. Constructor is intentionally private */
Modified:
axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties?rev=1340971&r1=1340970&r2=1340971&view=diff
==
---
axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties
(original)
+++
axis/axis2/java/core/branches/1_6/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties
Mon May 21 11:28:00 2012
@@ -306,4 +306,5 @@ axisEndpointReferenceFactoryErr2=Cannot
dispatchInvalidTypeWithMode=Unsupported Dispatch Type: Dispatch type
javax.xml.soap.SOAPMessage cannot be used with messages in Payload mode.
serviceDelegateConstruct2=An attempt was made to construct the ServiceDelegate
object with the {0} service and with WebServicesFeatures, but there are no
standard features defined for service creation in the current specification.
MethodRetrieverWarning1=Public method {0} will be exposed as a Web Service
operation per JAX-WS 2.2 tooling rules. If you intend to expose only operations
that have @WebMethod annotation, set the manifest property ''LegacyWebmethod:
true'' or set a JVM property ''jaxws.runtime.legacyWebMethod=true''.
-generateWSDLNonSoap11=This implementation does not contain a WSDL definition
and is not a SOAP 1.1 based binding. Per the JAXWS specification, a WSDL
definition cannot be generated for this implementation. The implementation
class name is {0}
\ No newline at end of file
+generateWSDLNonSoap11=This implementation does not contain a WSDL definition
and is not a SOAP 1.1 based binding. Per the JAXWS specification, a WSDL
definition cannot be generated for this implementation. The implementation
class name is {0}
+faultProcessingExcludedExceptionProperties=Excluded exception properties
processing failed. The reported error is: {0}.
\ No newline at end of file
svn commit: r1340985 - in /axis/axis2/java/core/branches/AXIS2-4318: ./ modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
Author: sagara
Date: Mon May 21 12:14:14 2012
New Revision: 1340985
URL: http://svn.apache.org/viewvc?rev=1340985&view=rev
Log:
Applied latest patch.
Modified:
axis/axis2/java/core/branches/AXIS2-4318/ (props changed)
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
Propchange: axis/axis2/java/core/branches/AXIS2-4318/
--
Merged /axis/axis2/java/core/trunk:r1324778
Modified:
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java?rev=1340985&r1=1340984&r2=1340985&view=diff
==
---
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
(original)
+++
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
Mon May 21 12:14:14 2012
@@ -58,6 +58,8 @@ import org.apache.http.client.methods.Ht
import org.apache.http.client.params.AuthPolicy;
import org.apache.http.client.params.ClientPNames;
import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.conn.params.ConnManagerPNames;
+import org.apache.http.conn.params.ConnPerRouteBean;
import org.apache.http.conn.scheme.PlainSocketFactory;
import org.apache.http.conn.scheme.Scheme;
import org.apache.http.conn.scheme.SchemeRegistry;
@@ -318,21 +320,21 @@ public class HTTPSenderImpl extends HTTP
int statusCode = response.getStatusLine().getStatusCode();
HTTPStatusCodeFamily family = getHTTPStatusCodeFamily(statusCode);
log.trace("Handling response - " + statusCode);
-if (HTTPStatusCodeFamily.SUCCESSFUL.equals(family)) {
+if (statusCode == HttpStatus.SC_ACCEPTED) {
+/*
+* When an HTTP 202 Accepted code has been received, this will be
+* the case of an execution of an in-only operation. In such a
+* scenario, the HTTP response headers should be returned, i.e.
+* session cookies.
+*/
+obtainHTTPHeaderInformation(response, msgContext);
+
+} else if (HTTPStatusCodeFamily.SUCCESSFUL.equals(family)) {
// Save the HttpMethod so that we can release the connection when
// cleaning up
// TODO : Do we need to save the http method
//msgContext.setProperty(HTTPConstants.HTTP_METHOD, method);
-
processResponse(response, msgContext);
-} else if (statusCode == HttpStatus.SC_ACCEPTED) {
-/*
- * When an HTTP 202 Accepted code has been received, this will be
- * the case of an execution of an in-only operation. In such a
- * scenario, the HTTP response headers should be returned, i.e.
- * session cookies.
- */
-obtainHTTPHeaderInformation(response.getEntity(), msgContext);
} else if (statusCode == HttpStatus.SC_INTERNAL_SERVER_ERROR
|| statusCode == HttpStatus.SC_BAD_REQUEST) {
@@ -813,7 +815,11 @@ public class HTTPSenderImpl extends HTTP
schemeRegistry.register(
new Scheme("https",
SSLSocketFactory.getSocketFactory(), 443));
-connManager = new ThreadSafeClientConnManager(new
BasicHttpParams(),
+HttpParams params = new BasicHttpParams();
+
params.setParameter(ConnManagerPNames.MAX_TOTAL_CONNECTIONS, 30);
+
params.setParameter(ConnManagerPNames.MAX_CONNECTIONS_PER_ROUTE,
+new ConnPerRouteBean(30));
+connManager = new ThreadSafeClientConnManager(params,
schemeRegistry);
configContext.setProperty(
HTTPConstants.MULTITHREAD_HTTP_CONNECTION_MANAGER, connManager);
@@ -824,7 +830,9 @@ public class HTTPSenderImpl extends HTTP
* Create a new instance of HttpClient since the way it is used
here
* it's not fully thread-safe.
*/
-httpClient = new DefaultHttpClient(connManager, null);
+HttpParams clientParams = new BasicHttpParams();
+clientParams.setParameter(CoreProtocolPNames.HTTP_ELEMENT_CHARSET,
"UTF-8");
+httpClient = new DefaultHttpClient(connManager, clientParams);
//We don't need to set timeout for connection manager, since we
are
svn commit: r1341003 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
Author: sagara
Date: Mon May 21 13:03:44 2012
New Revision: 1341003
URL: http://svn.apache.org/viewvc?rev=1341003&view=rev
Log:
Removed star imports.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java?rev=1341003&r1=1341002&r2=1341003&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
Mon May 21 13:03:44 2012
@@ -30,12 +30,30 @@ import org.apache.axis2.description.Para
import org.apache.axis2.description.java2wsdl.bytecode.MethodTable;
import org.apache.axis2.jaxrs.JAXRSModel;
import org.apache.axis2.jaxrs.JAXRSUtils;
-import org.apache.axis2.jsr181.*;
+import org.apache.axis2.jsr181.JSR181Helper;
+import org.apache.axis2.jsr181.WebMethodAnnotation;
+import org.apache.axis2.jsr181.WebParamAnnotation;
+import org.apache.axis2.jsr181.WebResultAnnotation;
+import org.apache.axis2.jsr181.WebServiceAnnotation;
import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.commons.schema.*;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaAny;
+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.XmlSchemaEnumerationFacet;
+import org.apache.ws.commons.schema.XmlSchemaForm;
+import org.apache.ws.commons.schema.XmlSchemaImport;
+import org.apache.ws.commons.schema.XmlSchemaObject;
+import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.XmlSchemaSimpleType;
+import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
+import org.apache.ws.commons.schema.XmlSchemaType;
import org.apache.ws.commons.schema.utils.NamespaceMap;
import org.apache.ws.commons.schema.utils.NamespacePrefixList;
import org.w3c.dom.Document;
@@ -46,10 +64,27 @@ import javax.xml.parsers.DocumentBuilder
import java.beans.BeanInfo;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
import java.lang.annotation.Annotation;
-import java.lang.reflect.*;
-import java.util.*;
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
public class DefaultSchemaGenerator implements Java2WSDLConstants,
SchemaGenerator {
@@ -94,9 +129,9 @@ public class DefaultSchemaGenerator impl
protected String elementFormDefault = null;
-protected ArrayList excludeMethods = new ArrayList();
+protected List excludeMethods = new ArrayList();
-protected ArrayList extraClasses = null;
+protected List extraClasses = null;
protected boolean useWSDLTypesNamespace = false;
@@ -295,7 +330,7 @@ public class DefaultSchemaGenerator impl
// since we do not support overload
-HashMap uniqueMethods = new
LinkedHashMap();
+Map uniqueMethods = new LinkedHashMap();
XmlSchemaComplexType methodSchemaType;
XmlSchemaSequence sequence = null;
@@ -1607,7 +1642,7 @@ public class DefaultSchemaGenerator impl
}
}
-public ArrayList getExtraClasses() {
+public List getExtraClasses() {
if (extraClasses == null) {
extraClasses = new ArrayList();
}
svn commit: r1341090 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
Author: azeez
Date: Mon May 21 16:10:57 2012
New Revision: 1341090
URL: http://svn.apache.org/viewvc?rev=1341090&view=rev
Log:
Wrong error "axis2.xml no found" was shown when locked parameters are trying to
be overridden
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java?rev=1341090&r1=1341089&r2=1341090&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
Mon May 21 16:10:57 2012
@@ -553,8 +553,7 @@ public class DescriptionBuilder implemen
if ((parent != null)
&& parent.isParameterLocked(parameter.getName())) {
throw new DeploymentException(Messages.getMessage(
-DeploymentErrorMsgs.CONFIG_NOT_FOUND, parameter
-.getName()));
+DeploymentErrorMsgs.PARAMETER_LOCKED,
parameter.getName()));
} else {
parameter.setLocked(true);
}
