Author: aslom
Date: Mon Nov 28 15:16:24 2005
New Revision: 349553
URL: http://svn.apache.org/viewcvs?rev=349553&view=rev
Log:
applied fix for WSIF-75 The current version of org.apache.wsif.schema.Parser
does not work with WSDL4J1.5.1
http://issues.apache.org/jira/browse/WSIF-75
Modified:
webservices/wsif/trunk/java/src/org/apache/wsif/schema/Parser.java
Modified: webservices/wsif/trunk/java/src/org/apache/wsif/schema/Parser.java
URL:
http://svn.apache.org/viewcvs/webservices/wsif/trunk/java/src/org/apache/wsif/schema/Parser.java?rev=349553&r1=349552&r2=349553&view=diff
==============================================================================
--- webservices/wsif/trunk/java/src/org/apache/wsif/schema/Parser.java
(original)
+++ webservices/wsif/trunk/java/src/org/apache/wsif/schema/Parser.java Mon Nov
28 15:16:24 2005
@@ -508,10 +508,22 @@
if(!(nextEl instanceof UnknownExtensibilityElement)) {
continue;
}
- UnknownExtensibilityElement typesElement =
- (UnknownExtensibilityElement) nextEl;
+// UnknownExtensibilityElement typesElement =
+// (UnknownExtensibilityElement) nextEl;
+
+ //Element schemaEl = typesElement.getElement();
+ Element schemaEl;
+
+ if(nextEl instanceof javax.wsdl.extensions.schema.Schema) {
+ javax.wsdl.extensions.schema.Schema typesElement =
(javax.wsdl.extensions.schema.Schema)nextEl;
+ schemaEl = typesElement.getElement();
+ } else if (nextEl instanceof UnknownExtensibilityElement) {
+ UnknownExtensibilityElement typesElement =
(UnknownExtensibilityElement) nextEl;
+ schemaEl = typesElement.getElement();
+ } else {
+ continue;
+ }
- Element schemaEl = typesElement.getElement();
if (QNameUtils.matches(schema2001, schemaEl)
|| QNameUtils.matches(schema2000, schemaEl)
|| QNameUtils.matches(schema1999, schemaEl)) {