svn commit: r1003028 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java

2010-09-30 Thread scheu 
Author: scheu
Date: Thu Sep 30 12:08:09 2010
New Revision: 1003028

URL: http://svn.apache.org/viewvc?rev=1003028&view=rev
Log:
AXIS2-4803
Fixed containsClasses method

Modified:

axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java?rev=1003028&r1=1003027&r2=1003028&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java
 Thu Sep 30 12:08:09 2010
@@ -936,15 +936,32 @@ public class JAXBUtils {
  */
 private static boolean containsClasses(JAXBContext context, List 
classRefs) {
 String text = context.toString();
-
 text = text.replace('\n', ' ');
 text = text.replace('\t', ' ');
 text = text.replace('\r', ' ');
+text = text.replace('<', ' ');
+text = text.replace('[', ' ');
+text = text.replace(']', ' ');
 
 for (String classRef: classRefs) {
-if (!classRef.endsWith(".ObjectFactory")) {
+// Strip off generic and array chars
+int index = classRef.indexOf('<');
+if (index > 0) {
+classRef = classRef.substring(0, index);
+}
+index = classRef.indexOf('[');
+if (index > 0) {
+classRef = classRef.substring(0, index);
+}
+
+if (classRef.length() > 0 ||
+classRef.endsWith(".ObjectFactory") ||
+classRef.startsWith("java.util.") ||
+classRef.startsWith("java.lang.")) {
+// skip these
+} else {
 String search = " " + classRef + " ";
-if (text.contains(search)) {
+if (!text.contains(search)) {   
 if (log.isDebugEnabled()) {
 log.debug("The context does not contain " + classRef + 
" " + context);
 }

svn commit: r1003032 - /axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java

2010-09-30 Thread isurues 
Author: isurues
Date: Thu Sep 30 12:20:20 2010
New Revision: 1003032

URL: http://svn.apache.org/viewvc?rev=1003032&view=rev
Log:
Setting an ExtensionRegistry into WSDLReader instance to properly indicate that 
the needed return type for the wsaw:Action extension attribute is a String..

Modified:

axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java

Modified: 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java?rev=1003032&r1=1003031&r2=1003032&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
 Thu Sep 30 12:20:20 2010
@@ -20,6 +20,7 @@
 package org.apache.axis2.wsdl.codegen;
 
 import org.apache.axis2.AxisFault;
+import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.description.WSDL11ToAllAxisServicesBuilder;
 import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
 import org.apache.axis2.description.WSDL20ToAllAxisServicesBuilder;
@@ -37,6 +38,10 @@ import org.apache.commons.logging.LogFac
 
 import javax.wsdl.Definition;
 import javax.wsdl.WSDLException;
+import javax.wsdl.Output;
+import javax.wsdl.Input;
+import javax.wsdl.extensions.AttributeExtensible;
+import javax.wsdl.extensions.ExtensionRegistry;
 import javax.wsdl.factory.WSDLFactory;
 import javax.wsdl.xml.WSDLReader;
 import javax.xml.namespace.QName;
@@ -285,6 +290,16 @@ public class CodeGenerationEngine {
 
 WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
 reader.setFeature("javax.wsdl.importDocuments", true);
+
+ExtensionRegistry extReg = 
WSDLFactory.newInstance().newPopulatedExtensionRegistry();
+extReg.registerExtensionAttributeType(Input.class,
+new QName(AddressingConstants.Final.WSAW_NAMESPACE, 
AddressingConstants.WSA_ACTION),
+AttributeExtensible.STRING_TYPE);
+extReg.registerExtensionAttributeType(Output.class,
+new QName(AddressingConstants.Final.WSAW_NAMESPACE, 
AddressingConstants.WSA_ACTION),
+AttributeExtensible.STRING_TYPE);
+reader.setExtensionRegistry(extReg);
+
 return reader.readWSDL(uri);
 
 }

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

2010-09-30 Thread isurues 
Author: isurues
Date: Thu Sep 30 12:21:15 2010
New Revision: 1003033

URL: http://svn.apache.org/viewvc?rev=1003033&view=rev
Log:
reverting the workaround

Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java?rev=1003033&r1=1003032&r2=1003033&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
 Thu Sep 30 12:21:15 2010
@@ -45,7 +45,7 @@ public interface Java2WSDLConstants {
 
 String HTTP_NAMESPACE = "http://schemas.xmlsoap.org/wsdl/http/";;
 String MIME_NAMESPACE = "http://schemas.xmlsoap.org/wsdl/mime/";;
-String HTTP_PREFIX = "http1";
+String HTTP_PREFIX = "http";
 String MIME_PREFIX = "mime";
 String URN_PREFIX = "urn";
 String COLON_SEPARATOR = ":";