Attachment 122578 Details for Bug 260911 – patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch

260911.patch (text/plain), 14.16 KB, created by Mark Hutchinson

on 2009-01-14 15:25:17 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Hutchinson

Created: 2009-01-14 15:25:17 EST

Size: 14.16 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.ws.consumption.ui
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF,v
>retrieving revision 1.55
>diff -u -r1.55 MANIFEST.MF
>--- META-INF/MANIFEST.MF	26 Nov 2008 16:26:55 -0000	1.55
>+++ META-INF/MANIFEST.MF	14 Jan 2009 20:22:55 -0000
>@@ -52,7 +52,7 @@
>  org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
>  org.eclipse.wst.server.core;bundle-version="[1.1.0,2.0.0)",
>  org.eclipse.wst.server.ui;bundle-version="[1.0.102,2.0.0)",
>- org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",
>+ org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
>  org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
>@@ -64,7 +64,7 @@
>  org.eclipse.jst.j2ee.webservice.ui;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.wst.ws.ui;bundle-version="[1.1.0,1.2.0)",
>- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
>+ javax.wsdl;bundle-version="[1.5.0,1.6.0)",
>  org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
>  org.eclipse.wst.wsdl.validation;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)",
>#P org.eclipse.jst.ws.creation.ui
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF,v
>retrieving revision 1.42
>diff -u -r1.42 MANIFEST.MF
>--- META-INF/MANIFEST.MF	30 Sep 2008 19:42:07 -0000	1.42
>+++ META-INF/MANIFEST.MF	14 Jan 2009 20:22:55 -0000
>@@ -19,7 +19,7 @@
> Require-Bundle: org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
>  org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)",
>  org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
>- org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",
>+ org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
>  org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
>  org.eclipse.wst.ws.explorer;bundle-version="[1.0.101,1.1.0)",
>  org.eclipse.jst.ws;bundle-version="[1.0.101,1.1.0)",
>@@ -39,7 +39,7 @@
>  org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
>- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
>+ javax.wsdl;bundle-version="[1.5.0,1.6.0)",
>  org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
>  org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
>#P org.eclipse.jst.ws.axis.consumption.ui
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF,v
>retrieving revision 1.43
>diff -u -r1.43 MANIFEST.MF
>--- META-INF/MANIFEST.MF	30 Sep 2008 19:45:16 -0000	1.43
>+++ META-INF/MANIFEST.MF	14 Jan 2009 20:22:56 -0000
>@@ -34,12 +34,12 @@
>  org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
>  org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)",
>  org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
>- org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",
>+ org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
>  org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
>  org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
>  org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
>- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
>+ javax.wsdl;bundle-version="[1.5.0,1.6.0)",
>  org.apache.axis;bundle-version="[1.4.0,1.5.0)",
>  org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
>#P org.eclipse.wst.ws
>Index: src/org/eclipse/wst/ws/internal/util/WSDLCopier.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/util/WSDLCopier.java,v
>retrieving revision 1.6
>diff -u -r1.6 WSDLCopier.java
>--- src/org/eclipse/wst/ws/internal/util/WSDLCopier.java	8 May 2008 18:00:20 -0000	1.6
>+++ src/org/eclipse/wst/ws/internal/util/WSDLCopier.java	14 Jan 2009 20:22:56 -0000
>@@ -36,6 +36,7 @@
> import javax.wsdl.WSDLException;
> import javax.wsdl.extensions.ExtensibilityElement;
> import javax.wsdl.extensions.UnknownExtensibilityElement;
>+import javax.wsdl.extensions.schema.Schema;
> import javax.wsdl.factory.WSDLFactory;
> import javax.wsdl.xml.WSDLWriter;
> import javax.xml.transform.OutputKeys;
>@@ -371,6 +372,8 @@
>     			element = ((UnknownExtensibilityElement) extElement).getElement();
>    			else if (extElement instanceof XSDSchemaExtensibilityElement)
>    				element = ((XSDSchemaExtensibilityElement) extElement).getElement();
>+   			else if (extElement instanceof Schema)
>+   				element = ((Schema) extElement).getElement();
>    			else
>    				continue;
>     			    			
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.ws/META-INF/MANIFEST.MF,v
>retrieving revision 1.42
>diff -u -r1.42 MANIFEST.MF
>--- META-INF/MANIFEST.MF	7 Jan 2009 21:50:38 -0000	1.42
>+++ META-INF/MANIFEST.MF	14 Jan 2009 20:22:56 -0000
>@@ -38,7 +38,7 @@
>  org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
>  org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
>  org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
>- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
>+ javax.wsdl;bundle-version="[1.5.0,1.6.0)",
>  org.apache.wsil4j;bundle-version="[1.0.0,1.1.0)",
>  org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
>  org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
>@@ -49,7 +49,7 @@
>  org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
>  org.eclipse.xsd;bundle-version="[2.3.0,3.0.0)",
>  org.eclipse.wst.common.uriresolver;bundle-version="[1.1.301,1.2.0)",
>- org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",
>+ org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
>  org.eclipse.wst.ws.service.policy;bundle-version="[1.0.0,2.0.0)",
>  org.eclipse.core.expressions;bundle-version="[3.3.0,4.0.0)"
> Eclipse-LazyStart: true
>#P org.eclipse.wst.ws.parser
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF,v
>retrieving revision 1.23
>diff -u -r1.23 MANIFEST.MF
>--- META-INF/MANIFEST.MF	17 Sep 2008 14:05:08 -0000	1.23
>+++ META-INF/MANIFEST.MF	14 Jan 2009 20:22:56 -0000
>@@ -12,8 +12,8 @@
>  org.eclipse.wst.ws.internal.parser.plugin;x-internal:=true,
>  org.eclipse.wst.ws.internal.parser.wsil;x-internal:=true,
>  org.eclipse.wst.ws.parser
>-Require-Bundle: org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",
>- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
>+Require-Bundle: org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
>+ javax.wsdl;bundle-version="[1.5.0,1.6.0)",
>  org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
>  org.apache.wsil4j;bundle-version="[1.0.0,1.1.0)",
>  org.uddi4j;bundle-version="[2.0.4,2.1.0)",
>#P org.eclipse.jst.ws.ui
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF,v
>retrieving revision 1.30
>diff -u -r1.30 MANIFEST.MF
>--- META-INF/MANIFEST.MF	31 Mar 2008 20:40:42 -0000	1.30
>+++ META-INF/MANIFEST.MF	14 Jan 2009 20:22:57 -0000
>@@ -31,6 +31,6 @@
>  org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
>  org.eclipse.wst.ws.ui;bundle-version="[1.1.0,1.2.0)",
>- org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)"
>+ org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)"
> Eclipse-LazyStart: true
> Bundle-RequiredExecutionEnvironment: J2SE-1.4
>#P org.eclipse.wst.ws.explorer
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF,v
>retrieving revision 1.54
>diff -u -r1.54 MANIFEST.MF
>--- META-INF/MANIFEST.MF	6 Nov 2008 22:49:43 -0000	1.54
>+++ META-INF/MANIFEST.MF	14 Jan 2009 20:22:57 -0000
>@@ -23,8 +23,8 @@
>  org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)",
>  org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
>  org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
>- org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",
>- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
>+ org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
>+ javax.wsdl;bundle-version="[1.5.0,1.6.0)",
>  org.apache.wsil4j;bundle-version="[1.0.0,1.1.0)",
>  org.uddi4j;bundle-version="[2.0.4,2.1.0)",
>  org.apache.axis;bundle-version="[1.4.0,2.0.0)",
>#P org.eclipse.jst.ws
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws/META-INF/MANIFEST.MF,v
>retrieving revision 1.41
>diff -u -r1.41 MANIFEST.MF
>--- META-INF/MANIFEST.MF	2 Oct 2008 04:46:31 -0000	1.41
>+++ META-INF/MANIFEST.MF	14 Jan 2009 20:22:57 -0000
>@@ -31,7 +31,7 @@
>  org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
>  org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
>  org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
>- org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",
>+ org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
>  org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
>#P org.eclipse.jst.ws.axis.creation.ui
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF,v
>retrieving revision 1.43
>diff -u -r1.43 MANIFEST.MF
>--- META-INF/MANIFEST.MF	20 Nov 2008 03:59:14 -0000	1.43
>+++ META-INF/MANIFEST.MF	14 Jan 2009 20:22:58 -0000
>@@ -38,13 +38,13 @@
>  org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
>- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
>+ javax.wsdl;bundle-version="[1.5.0,1.6.0)",
>  org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
>  org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
>  org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
>  org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
>- org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)"
>+ org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)"
> Eclipse-LazyStart: true
> Bundle-RequiredExecutionEnvironment: J2SE-1.5
>#P org.eclipse.jst.ws.consumption
>Index: src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java,v
>retrieving revision 1.15
>diff -u -r1.15 CopyWSDLCommand.java
>--- src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java	14 Dec 2006 04:26:08 -0000	1.15
>+++ src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java	14 Jan 2009 20:22:59 -0000
>@@ -28,6 +28,7 @@
> import javax.wsdl.WSDLException;
> import javax.wsdl.extensions.ExtensibilityElement;
> import javax.wsdl.extensions.UnknownExtensibilityElement;
>+import javax.wsdl.extensions.schema.Schema;
> import javax.wsdl.factory.WSDLFactory;
> import javax.wsdl.xml.WSDLWriter;
> import javax.xml.transform.OutputKeys;
>@@ -202,7 +203,23 @@
>           }
>           copyXMLSchema(env, xsdSchema, baseURI, destURI);
>         }
>+        if (extElement instanceof Schema)
>+        {
>+          Schema schemaElement = (Schema)extElement;
>+          XSDSchema xsdSchema = null;
>+          try
>+          {
>+            xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement());
>+          }
>+          catch (Throwable t)
>+          {
>+            // ignore any extensibility elements that cannot be parsed into a
>+            // XSDSchema instance
>+          }
>+          copyXMLSchema(env, xsdSchema, baseURI, destURI);
>+        }
>       }
>+      
>     }
>   }
> 
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF,v
>retrieving revision 1.51
>diff -u -r1.51 MANIFEST.MF
>--- META-INF/MANIFEST.MF	26 Nov 2008 16:26:05 -0000	1.51
>+++ META-INF/MANIFEST.MF	14 Jan 2009 20:22:59 -0000
>@@ -43,14 +43,14 @@
>  org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
>  org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
>  org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
>- org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",
>+ org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
>  org.eclipse.wst.internet.monitor.core;bundle-version="[1.0.102,1.1.0)",
>  org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
>- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
>+ javax.wsdl;bundle-version="[1.5.0,1.6.0)",
>  org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
>  org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
>  org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",

Actions: View | Diff

Attachments on bug 260911: 122578