You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/09/01 22:40:23 UTC

svn commit: r691052 - in /tuscany/java/sca/modules: interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/ interface-wsdl/src/main/java/org/apache/tuscany/sc...

Author: jsdelfino
Date: Mon Sep  1 13:40:23 2008
New Revision: 691052

URL: http://svn.apache.org/viewvc?rev=691052&view=rev
Log:
Enable interface-wsdl to work with older WSDL4J implementations like wsdl4j 1.4 (as well as the latest wsdl4j 1.6.x). That's what's included in some application servers like WebSphere 6.1 for example, and 1.4 doesn't have WSDLElement or extension attributes.

Modified:
    tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
    tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
    tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
    tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java

Modified: tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java?rev=691052&r1=691051&r2=691052&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java (original)
+++ tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java Mon Sep  1 13:40:23 2008
@@ -128,8 +128,12 @@
             wsdlExtensionRegistry.registerDeserializer(Types.class, schema, deserializer);
         }
         // ---- Policy WSDL Extensions
-        wsdlExtensionRegistry.registerExtensionAttributeType(PortType.class, Q_POLICY_ATTRIBUTE_EXTENSION, AttributeExtensible.LIST_OF_QNAMES_TYPE);
-        wsdlExtensionRegistry.registerExtensionAttributeType(Operation.class, Q_POLICY_END_CONVERSATION_ATTRIBUTE_EXTENSION, AttributeExtensible.STRING_TYPE);
+        try {
+            wsdlExtensionRegistry.registerExtensionAttributeType(PortType.class, Q_POLICY_ATTRIBUTE_EXTENSION, AttributeExtensible.LIST_OF_QNAMES_TYPE);
+            wsdlExtensionRegistry.registerExtensionAttributeType(Operation.class, Q_POLICY_END_CONVERSATION_ATTRIBUTE_EXTENSION, AttributeExtensible.STRING_TYPE);
+        } catch (NoSuchMethodError e) {
+            // That method does not exist on older WSDL4J levels
+        }
         
         // ---- BPEL additions
         serializer = new BPELExtensionHandler();

Modified: tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java?rev=691052&r1=691051&r2=691052&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java (original)
+++ tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java Mon Sep  1 13:40:23 2008
@@ -19,14 +19,15 @@
 
 package org.apache.tuscany.sca.interfacedef.wsdl;
 
+import java.io.Serializable;
+
 import javax.wsdl.Definition;
-import javax.wsdl.WSDLElement;
 
 /**
  * Model for objects in a WSDL definition
  * @version $Rev$ $Date$
  */
-public interface WSDLObject<T extends WSDLElement> {
+public interface WSDLObject<T extends Serializable> {
     /**
      * Get the owning definition where the element is declared
      * @return The owning definition

Modified: tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java?rev=691052&r1=691051&r2=691052&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java (original)
+++ tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java Mon Sep  1 13:40:23 2008
@@ -85,7 +85,13 @@
     }
     
     private void processIntents(WSDLInterface wsdlInterface, PortType portType) {
-        Object o =  portType.getExtensionAttribute(POLICY_REQUIRES);
+        Object o;
+        try {
+            o =  portType.getExtensionAttribute(POLICY_REQUIRES);
+        } catch (NoSuchMethodError e) {
+            // That method does not exist on older WSDL4J levels
+            o = null;
+        }
         if(o != null && o instanceof Vector) {
             Vector<QName> policyAttributes = (Vector<QName>) o;
             
@@ -113,7 +119,13 @@
     private boolean isConversational(PortType portType) {
         boolean conversational = false;
         
-        Object o =  portType.getExtensionAttribute(POLICY_REQUIRES);
+        Object o;
+        try {
+            o =  portType.getExtensionAttribute(POLICY_REQUIRES);
+        } catch (NoSuchMethodError e) {
+            // That method does not exist on older WSDL4J levels
+            o =null;
+        }
         if(o != null && o instanceof Vector) {
             Vector<QName> policyAttributes = (Vector<QName>) o;
             
@@ -129,7 +141,13 @@
     private boolean isEndConversation(javax.wsdl.Operation operation) {
         boolean endConversation = false;
         
-        Object o =  operation.getExtensionAttribute(POLICY_END_CONVERSATION);
+        Object o;
+        try {
+            o =  operation.getExtensionAttribute(POLICY_END_CONVERSATION);
+        } catch (NoSuchMethodError e) {
+            // That method does not exist on older WSDL4J levels
+            o = null;
+        }
         if(o != null && o instanceof String) {
             endConversation = Boolean.valueOf((String)o);            
         }

Modified: tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java?rev=691052&r1=691051&r2=691052&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java (original)
+++ tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java Mon Sep  1 13:40:23 2008
@@ -19,15 +19,16 @@
 
 package org.apache.tuscany.sca.interfacedef.wsdl.impl;
 
+import java.io.Serializable;
+
 import javax.wsdl.Definition;
-import javax.wsdl.WSDLElement;
 
 import org.apache.tuscany.sca.interfacedef.wsdl.WSDLObject;
 
 /**
  * @version $Rev$ $Date$
  */
-public class WSDLObjectImpl<T extends WSDLElement> implements WSDLObject<T> {
+public class WSDLObjectImpl<T extends Serializable> implements WSDLObject<T> {
     private Definition definition;
     private T element;