Attachment #122578 for bug #260911

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

View | Details | Raw Unified | Return to bug 260911
Collapse All | Expand All




 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.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.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)",

Lines 12-19 Link Here

(-)META-INF/MANIFEST.MF (-2 / +2 lines)
12	org.eclipse.wst.ws.internal.parser.plugin;x-internal:=true,	12	org.eclipse.wst.ws.internal.parser.plugin;x-internal:=true,
13	org.eclipse.wst.ws.internal.parser.wsil;x-internal:=true,	13	org.eclipse.wst.ws.internal.parser.wsil;x-internal:=true,
14	org.eclipse.wst.ws.parser	14	org.eclipse.wst.ws.parser
15	Require-Bundle: org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",	15	Require-Bundle: org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
16	javax.wsdl;bundle-version="[1.4.0,1.5.0)",	16	javax.wsdl;bundle-version="[1.5.0,1.6.0)",
17	org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",	17	org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
18	org.apache.wsil4j;bundle-version="[1.0.0,1.1.0)",	18	org.apache.wsil4j;bundle-version="[1.0.0,1.1.0)",
19	org.uddi4j;bundle-version="[2.0.4,2.1.0)",	19	org.uddi4j;bundle-version="[2.0.4,2.1.0)",

Lines 31-36 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
31	org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",	31	org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
32	org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",	32	org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
33	org.eclipse.wst.ws.ui;bundle-version="[1.1.0,1.2.0)",	33	org.eclipse.wst.ws.ui;bundle-version="[1.1.0,1.2.0)",
34	org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)"	34	org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)"
35	Eclipse-LazyStart: true	35	Eclipse-LazyStart: true
36	Bundle-RequiredExecutionEnvironment: J2SE-1.4	36	Bundle-RequiredExecutionEnvironment: J2SE-1.4

Lines 23-30 Link Here

(-)META-INF/MANIFEST.MF (-2 / +2 lines)
23	org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)",	23	org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)",
24	org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",	24	org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
25	org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",	25	org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
26	org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",	26	org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
27	javax.wsdl;bundle-version="[1.4.0,1.5.0)",	27	javax.wsdl;bundle-version="[1.5.0,1.6.0)",
28	org.apache.wsil4j;bundle-version="[1.0.0,1.1.0)",	28	org.apache.wsil4j;bundle-version="[1.0.0,1.1.0)",
29	org.uddi4j;bundle-version="[2.0.4,2.1.0)",	29	org.uddi4j;bundle-version="[2.0.4,2.1.0)",
30	org.apache.axis;bundle-version="[1.4.0,2.0.0)",	30	org.apache.axis;bundle-version="[1.4.0,2.0.0)",

Lines 31-37 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
31	org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",	31	org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
32	org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",	32	org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
33	org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",	33	org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
34	org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",	34	org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
35	org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",	35	org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
36	org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",	36	org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
37	org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",	37	org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.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.web;bundle-version="[1.1.0,1.2.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.2.0,1.3.0)"
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.5




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;

          }
          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);
        }
      }
      
    }
  }





 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.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.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)",

Return to bug 260911

Lines 52-58 Link Here

(-)META-INF/MANIFEST.MF (-2 / +2 lines)
52	org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",	52	org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
53	org.eclipse.wst.server.core;bundle-version="[1.1.0,2.0.0)",	53	org.eclipse.wst.server.core;bundle-version="[1.1.0,2.0.0)",
54	org.eclipse.wst.server.ui;bundle-version="[1.0.102,2.0.0)",	54	org.eclipse.wst.server.ui;bundle-version="[1.0.102,2.0.0)",
55	org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",	55	org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
56	org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",	56	org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
57	org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",	57	org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
58	org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",	58	org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
Lines 64-70 Link Here
64	org.eclipse.jst.j2ee.webservice.ui;bundle-version="[1.1.0,1.2.0)",	64	org.eclipse.jst.j2ee.webservice.ui;bundle-version="[1.1.0,1.2.0)",
65	org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",	65	org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
66	org.eclipse.wst.ws.ui;bundle-version="[1.1.0,1.2.0)",	66	org.eclipse.wst.ws.ui;bundle-version="[1.1.0,1.2.0)",
67	javax.wsdl;bundle-version="[1.4.0,1.5.0)",	67	javax.wsdl;bundle-version="[1.5.0,1.6.0)",
68	org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",	68	org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
69	org.eclipse.wst.wsdl.validation;bundle-version="[1.1.0,1.2.0)",	69	org.eclipse.wst.wsdl.validation;bundle-version="[1.1.0,1.2.0)",
70	org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)",	70	org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)",

Lines 19-25 Link Here

(-)META-INF/MANIFEST.MF (-2 / +2 lines)
19	Require-Bundle: org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",	19	Require-Bundle: org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
20	org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)",	20	org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)",
21	org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",	21	org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
22	org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",	22	org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
23	org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",	23	org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
24	org.eclipse.wst.ws.explorer;bundle-version="[1.0.101,1.1.0)",	24	org.eclipse.wst.ws.explorer;bundle-version="[1.0.101,1.1.0)",
25	org.eclipse.jst.ws;bundle-version="[1.0.101,1.1.0)",	25	org.eclipse.jst.ws;bundle-version="[1.0.101,1.1.0)",
Lines 39-45 Link Here
39	org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",	39	org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
40	org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",	40	org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
41	org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",	41	org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
42	javax.wsdl;bundle-version="[1.4.0,1.5.0)",	42	javax.wsdl;bundle-version="[1.5.0,1.6.0)",
43	org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",	43	org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
44	org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",	44	org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
45	org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",	45	org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",

Lines 34-45 Link Here

(-)META-INF/MANIFEST.MF (-2 / +2 lines)
34	org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",	34	org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
35	org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)",	35	org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)",
36	org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",	36	org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
37	org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",	37	org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
38	org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",	38	org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
39	org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",	39	org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
40	org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",	40	org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
41	org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",	41	org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
42	javax.wsdl;bundle-version="[1.4.0,1.5.0)",	42	javax.wsdl;bundle-version="[1.5.0,1.6.0)",
43	org.apache.axis;bundle-version="[1.4.0,1.5.0)",	43	org.apache.axis;bundle-version="[1.4.0,1.5.0)",
44	org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",	44	org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
45	org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",	45	org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",

Lines 36-41 Link Here

(-)src/org/eclipse/wst/ws/internal/util/WSDLCopier.java (+3 lines)
36	import javax.wsdl.WSDLException;	36	import javax.wsdl.WSDLException;
37	import javax.wsdl.extensions.ExtensibilityElement;	37	import javax.wsdl.extensions.ExtensibilityElement;
38	import javax.wsdl.extensions.UnknownExtensibilityElement;	38	import javax.wsdl.extensions.UnknownExtensibilityElement;
		39	import javax.wsdl.extensions.schema.Schema;
39	import javax.wsdl.factory.WSDLFactory;	40	import javax.wsdl.factory.WSDLFactory;
40	import javax.wsdl.xml.WSDLWriter;	41	import javax.wsdl.xml.WSDLWriter;
41	import javax.xml.transform.OutputKeys;	42	import javax.xml.transform.OutputKeys;
Lines 371-376 Link Here
371	element = ((UnknownExtensibilityElement) extElement).getElement();	372	element = ((UnknownExtensibilityElement) extElement).getElement();
372	else if (extElement instanceof XSDSchemaExtensibilityElement)	373	else if (extElement instanceof XSDSchemaExtensibilityElement)
373	element = ((XSDSchemaExtensibilityElement) extElement).getElement();	374	element = ((XSDSchemaExtensibilityElement) extElement).getElement();
		375	else if (extElement instanceof Schema)
		376	element = ((Schema) extElement).getElement();
374	else	377	else
375	continue;	378	continue;
376		379

Lines 28-33 Link Here

(-)src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java (+17 lines)
28	import javax.wsdl.WSDLException;	28	import javax.wsdl.WSDLException;
29	import javax.wsdl.extensions.ExtensibilityElement;	29	import javax.wsdl.extensions.ExtensibilityElement;
30	import javax.wsdl.extensions.UnknownExtensibilityElement;	30	import javax.wsdl.extensions.UnknownExtensibilityElement;
		31	import javax.wsdl.extensions.schema.Schema;
31	import javax.wsdl.factory.WSDLFactory;	32	import javax.wsdl.factory.WSDLFactory;
32	import javax.wsdl.xml.WSDLWriter;	33	import javax.wsdl.xml.WSDLWriter;
33	import javax.xml.transform.OutputKeys;	34	import javax.xml.transform.OutputKeys;
Lines 202-208 Link Here
202	}	203	}
203	copyXMLSchema(env, xsdSchema, baseURI, destURI);	204	copyXMLSchema(env, xsdSchema, baseURI, destURI);
204	}	205	}
		206	if (extElement instanceof Schema)
		207	{
		208	Schema schemaElement = (Schema)extElement;
		209	XSDSchema xsdSchema = null;
		210	try
		211	{
		212	xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement());
		213	}
		214	catch (Throwable t)
		215	{
		216	// ignore any extensibility elements that cannot be parsed into a
		217	// XSDSchema instance
		218	}
		219	copyXMLSchema(env, xsdSchema, baseURI, destURI);
		220	}
205	}	221	}
		222
206	}	223	}
207	}	224	}
208		225