svn commit: r1338132 - in /axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms: JMSConnectionFactory.java ServiceTaskManagerFactory.java

2012-05-14 Thread sagara 
Author: sagara
Date: Mon May 14 10:10:39 2012
New Revision: 1338132

URL: http://svn.apache.org/viewvc?rev=1338132&view=rev
Log:
Applied patch for TRANSPORTS-51. 

Modified:

axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java

axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManagerFactory.java

Modified: 
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java?rev=1338132&r1=1338131&r2=1338132&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java
 Mon May 14 10:10:39 2012
@@ -123,6 +123,8 @@ public class JMSConnectionFactory {
 this.cacheLevel = JMSConstants.CACHE_CONSUMER;
 } else if ("producer".equals(val)) {
 this.cacheLevel = JMSConstants.CACHE_PRODUCER;
+} else if ("consumer".equals(val)) {
+this.cacheLevel = JMSConstants.CACHE_CONSUMER;
 } else if (val != null) {
 throw new AxisJMSException("Invalid cache level : " + val + " for 
JMS CF : " + name);
 }

Modified: 
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManagerFactory.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManagerFactory.java?rev=1338132&r1=1338131&r2=1338132&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManagerFactory.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManagerFactory.java
 Mon May 14 10:10:39 2012
@@ -303,6 +303,8 @@ public class ServiceTaskManagerFactory {
 return JMSConstants.CACHE_SESSION;
 } else if ("consumer".equals(val)) {
 return JMSConstants.CACHE_CONSUMER;
+} else if ("producer".equals(val)) {
+return JMSConstants.CACHE_PRODUCER;
 } else if (val != null) {
 throw new AxisJMSException("Invalid cache level : " + val);
 }

svn commit: r1338183 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java

2012-05-14 Thread sagara 
Author: sagara
Date: Mon May 14 13:00:15 2012
New Revision: 1338183

URL: http://svn.apache.org/viewvc?rev=1338183&view=rev
Log:
Fixed AXIS2-4445, added a NullPointer check. 

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=1338183&r1=1338182&r2=1338183&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 14 13:00:15 2012
@@ -682,7 +682,7 @@ public class DefaultSchemaGenerator impl
 for (PropertyDescriptor property : 
beanInfo.getPropertyDescriptors()) {
 String propertyName = property.getName();
 if (!property.getName().equals("class") && 
(property.getPropertyType() != null)) {
-if ((beanExcludeInfo == null) || 
!beanExcludeInfo.isExcludedProperty(propertyName)) {
+if (property.getReadMethod()!= null && ((beanExcludeInfo 
== null) || !beanExcludeInfo.isExcludedProperty(propertyName))) {
 Type genericFieldType = 
property.getReadMethod().getGenericReturnType();
 if(genericFieldType instanceof ParameterizedType){
 ParameterizedType aType = (ParameterizedType) 
genericFieldType;

svn commit: r1338257 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java

2012-05-14 Thread sagara 
Author: sagara
Date: Mon May 14 15:43:28 2012
New Revision: 1338257

URL: http://svn.apache.org/viewvc?rev=1338257&view=rev
Log:
Fixed AXIS2-5263 - Added support for inherited method other than method defined 
in java.lang.Object.   

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=1338257&r1=1338256&r2=1338257&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 14 15:43:28 2012
@@ -276,7 +276,7 @@ public class DefaultSchemaGenerator impl
 service.setName(Utils.getAnnotatedServiceName(serviceClass, 
webservice));
 }
 classModel= JAXRSUtils.getClassModel(serviceClass);
-methods = processMethods(serviceClass.getDeclaredMethods());
+methods = processMethods(serviceClass.getMethods());
 
 for (String extraClassName : getExtraClasses()) {
 Class extraClass = Class.forName(extraClassName, true, 
classLoader);
@@ -300,7 +300,7 @@ public class DefaultSchemaGenerator impl
 XmlSchemaSequence sequence = null;
 
 for (Method jMethod : declaredMethods) {
-if (jMethod.isBridge()) {
+if (jMethod.isBridge() || 
jMethod.getDeclaringClass().getName().equals(Object.class.getName())) {
 continue;
 }