Attachment #63686 for bug #150385

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




import java.net.URL;
import java.util.Map;

import org.apache.muse.tools.generator.projectizer.Axis2Projectizer;
import org.apache.muse.tools.generator.projectizer.Axis2ProjectizerConstants;
import org.apache.muse.tools.generator.projectizer.J2EEAxis2Projectizer;
import org.apache.muse.tools.generator.util.ConfigurationData;
import org.apache.muse.tools.generator.util.ServicesDescriptorHelper;
import org.apache.muse.util.FileUtils;

/**
 * Construct the projectizer for code generation
 */
public class EclipseAxis2Projectizer extends J2EEAxis2Projectizer {
	
	private static final String[] LIB_BUNDLE_IDS = { 
		"org.apache.muse.api", //$NON-NLS-1$

		//this should be done in some cleaner way
		//
		
		url = Platform.getBundle(MODULE_BUNDLE_IDS[0]).getEntry("/lib/muse-platform-axis2-2.2.0.jar");
		url = FileLocator.toFileURL(url);

		File libSource = toFile(url);			

Lines 15-22 Link Here

(-)META-INF/MANIFEST.MF (-4 / +4 lines)
15	org.w3c.dom	15	org.w3c.dom
16	Require-Bundle: org.apache.muse.core,	16	Require-Bundle: org.apache.muse.core,
17	org.apache.muse.util.all	17	org.apache.muse.util.all
18	Export-Package: org.apache.muse.core.platform.osgi;version="2.1.0",	18	Export-Package: org.apache.muse.core.platform.osgi;version="2.2.0",
19	org.apache.muse.core.platform.osgi.descriptor;version="2.1.0",	19	org.apache.muse.core.platform.osgi.descriptor;version="2.2.0",
20	org.apache.muse.core.platform.osgi.routing;version="2.1.0",	20	org.apache.muse.core.platform.osgi.routing;version="2.2.0",
21	org.apache.muse.core.platform.osgi.util;version="2.1.0"	21	org.apache.muse.core.platform.osgi.util;version="2.2.0"
22	Bundle-ClassPath: bin	22	Bundle-ClassPath: bin





		String namespaceURI = mrt.getNamespace();

		Document[] wsdlFragments = (Document[])wsdlFiles.toArray(new Document[wsdlFiles.size()]);
		javax.wsdl.Definition def = WsdlMerge.merge(namespaceURI, wsdlFragments,
 				address);

		return _writer.getDocument(def);
	}

			Element cleanDocument = WsdlUtils.removeSchemaReferences(document.getDocumentElement());
			cleanDocument = WsdlUtils.removeWsdlReferences(cleanDocument);
			
			wsdls.add(cleanDocument.getOwnerDocument());
		}
		
		return wsdls;

Lines 25-30 Link Here

(-)src/org/eclipse/tptp/wsdm/tooling/codegen/mrt/provisional/DescriptorHelper.java (+13 lines)
25		25
26	import org.apache.muse.core.descriptor.DescriptorConstants;	26	import org.apache.muse.core.descriptor.DescriptorConstants;
27	import org.apache.muse.util.xml.XmlUtils;	27	import org.apache.muse.util.xml.XmlUtils;
		28	import org.apache.muse.ws.resource.metadata.MetadataDescriptor;
		29	import org.apache.muse.ws.resource.metadata.OpenMetadataDescriptor;
28	import org.eclipse.core.resources.IFile;	30	import org.eclipse.core.resources.IFile;
29	import org.eclipse.core.resources.IWorkspace;	31	import org.eclipse.core.resources.IWorkspace;
30	import org.eclipse.core.resources.IWorkspaceRoot;	32	import org.eclipse.core.resources.IWorkspaceRoot;
Lines 480-484 Link Here
480	for(int i = 0 ; i < axis2files.length ; i++ )	482	for(int i = 0 ; i < axis2files.length ; i++ )
481	additionalJarFiles.add(new File(serverLocation + File.separator + axis2files[i]));	483	additionalJarFiles.add(new File(serverLocation + File.separator + axis2files[i]));
482	_jarFiles = (File[]) additionalJarFiles.toArray(new File[additionalJarFiles.size()]);	484	_jarFiles = (File[]) additionalJarFiles.toArray(new File[additionalJarFiles.size()]);
		485	}
		486
		487	public MetadataDescriptor[] getMergedRMDs()
		488	{
		489	Element[] resourceTypes = XmlUtils.findInSubTree(_descriptorDocument
		490	.getDocumentElement(), DescriptorConstants.RESOURCE_TYPE_QNAME);
		491	int mrtCount = resourceTypes.length;
		492	MetadataDescriptor[] mergedRMDs = new MetadataDescriptor[mrtCount];
		493	for(int i=0;i<mrtCount;i++)
		494	mergedRMDs[i] = OpenMetadataDescriptor.getInstance();
		495	return mergedRMDs;
483	}	496	}
484	}	497	}

Lines 21-26 Link Here

(-)src/org/eclipse/tptp/wsdm/tooling/codegen/mrt/provisional/NewProjectWizard.java (+5 lines)
21	import org.apache.muse.tools.generator.synthesizer.ServerSynthesizer;	21	import org.apache.muse.tools.generator.synthesizer.ServerSynthesizer;
22	import org.apache.muse.tools.generator.synthesizer.Synthesizer;	22	import org.apache.muse.tools.generator.synthesizer.Synthesizer;
23	import org.apache.muse.tools.generator.util.ConfigurationData;	23	import org.apache.muse.tools.generator.util.ConfigurationData;
		24	import org.apache.muse.ws.resource.metadata.MetadataDescriptor;
24	import org.eclipse.core.resources.IWorkspaceRoot;	25	import org.eclipse.core.resources.IWorkspaceRoot;
25	import org.eclipse.core.resources.ResourcesPlugin;	26	import org.eclipse.core.resources.ResourcesPlugin;
26	import org.eclipse.core.runtime.ILog;	27	import org.eclipse.core.runtime.ILog;
Lines 76-81 Link Here
76	private CodeGenerationDelegate _codeGenerationDelegate;	77	private CodeGenerationDelegate _codeGenerationDelegate;
77		78
78	private Document[] _mergedWsdlDocuments;	79	private Document[] _mergedWsdlDocuments;
		80
		81	private MetadataDescriptor[] _mergedRMDs;
79		82
80	private DescriptorHelper _helper;	83	private DescriptorHelper _helper;
81		84
Lines 179-184 Link Here
179	{	182	{
180	monitor.subTask(Messages.CODE_GEN_STEP2);	183	monitor.subTask(Messages.CODE_GEN_STEP2);
181	_mergedWsdlDocuments = _helper.getWsdlDocuments(_baseAddress);	184	_mergedWsdlDocuments = _helper.getWsdlDocuments(_baseAddress);
		185	_mergedRMDs = _helper.getMergedRMDs();
182	monitor.worked(1);	186	monitor.worked(1);
183	}	187	}
184	catch (Exception e)	188	catch (Exception e)
Lines 289-294 Link Here
289	getFile(_projectName));	293	getFile(_projectName));
290	data.addParameter(ConfigurationData.WSDL_DOCUMENT_LIST,	294	data.addParameter(ConfigurationData.WSDL_DOCUMENT_LIST,
291	_mergedWsdlDocuments);	295	_mergedWsdlDocuments);
		296	data.addParameter(ConfigurationData.METADATA_DESCRIPTOR_LIST, _mergedRMDs);
292		297
293	// check if the analyzer is null, if it is then default to the	298	// check if the analyzer is null, if it is then default to the
294	// SimpleAnalyzer	299	// SimpleAnalyzer




<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry exported="true" kind="lib" path="lib/muse-wsdm-muws-adv-impl-2.2.0.jar"/>
	<classpathentry exported="true" kind="lib" path="lib/muse-wsdm-muws-impl-2.2.0.jar"/>
	<classpathentry exported="true" kind="lib" path="lib/muse-wsdm-wef-impl-2.2.0.jar"/>
	<classpathentry exported="true" kind="lib" path="lib/muse-wsn-impl-2.2.0.jar"/>
	<classpathentry exported="true" kind="lib" path="lib/muse-wsrf-impl-2.2.0.jar"/>
	<classpathentry exported="true" kind="lib" path="lib/muse-wsrf-rmd-2.2.0.jar"/>
	<classpathentry exported="true" kind="lib" path="lib/muse-wsx-impl-2.2.0.jar"/>
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
	<classpathentry kind="output" path="bin"/>

Lines 13-23 Link Here

(-)build.properties (-8 / +8 lines)
13	bin.includes = META-INF/,\	13	bin.includes = META-INF/,\
14	lib/,\	14	lib/,\
15	plugin.properties,\	15	plugin.properties,\
16	lib/muse-wsdm-muws-adv-impl-2.1.0.jar,\	16	about.html,\
17	lib/muse-wsdm-muws-impl-2.1.0.jar,\	17	lib/muse-wsdm-muws-adv-impl-2.2.0.jar,\
18	lib/muse-wsdm-wef-impl-2.1.0.jar,\	18	lib/muse-wsdm-muws-impl-2.2.0.jar,\
19	lib/muse-wsn-impl-2.1.0.jar,\	19	lib/muse-wsdm-wef-impl-2.2.0.jar,\
20	lib/muse-wsrf-impl-2.1.0.jar,\	20	lib/muse-wsn-impl-2.2.0.jar,\
21	lib/muse-wsrf-rmd-2.1.0.jar,\	21	lib/muse-wsrf-impl-2.2.0.jar,\
22	lib/muse-wsx-impl-2.1.0.jar,\	22	lib/muse-wsrf-rmd-2.2.0.jar,\
23	about.html	23	lib/muse-wsx-impl-2.2.0.jar




Require-Bundle: org.apache.muse.api;visibility:=reexport,
 org.apache.muse.core;visibility:=reexport,
 org.w3c.dom
Bundle-ClassPath: lib/muse-wsdm-muws-adv-impl-2.2.0.jar,
 lib/muse-wsdm-muws-impl-2.2.0.jar,
 lib/muse-wsdm-wef-impl-2.2.0.jar,
 lib/muse-wsn-impl-2.2.0.jar,
 lib/muse-wsrf-impl-2.2.0.jar,
 lib/muse-wsrf-rmd-2.2.0.jar,
 lib/muse-wsx-impl-2.2.0.jar
Export-Package: org.apache.muse.ws.dm.muws.adv.impl,
 org.apache.muse.ws.dm.muws.events.impl,
 org.apache.muse.ws.dm.muws.impl,




import java.util.jar.Manifest;

import org.apache.muse.tools.generator.projectizer.Axis2ProjectizerConstants;
import org.apache.muse.tools.generator.projectizer.OsgiAxis2Projectizer;
import org.apache.muse.tools.generator.projectizer.OsgiProjectizerConstants;
import org.apache.muse.tools.generator.util.ConfigurationData;
import org.apache.muse.tools.generator.util.ConfigurationDataDescriptor;

import org.eclipse.tptp.wsdm.tooling.internal.util.PluginProjectHelper;
import org.w3c.dom.Document;

public class EclipseOsgiProjectizer extends OsgiAxis2Projectizer {
	
	private static final String BUNDLE_CLASSPATH_ATTR = "Bundle-ClassPath";
	

		
		File routerEntriesDir = new File(_targetDirectory,OsgiProjectizerConstants.ROUTER_ENTRIES_DIR);
		
		createManifest(_targetDirectory, EclipseOsgiProjectizerConstants.OSGI_MANIFEST_FILE_RESOURCE, EclipseOsgiProjectizerConstants.OSGI_MANIFEST_FILE, (String)getSymbolicName());				
		
		for(int i=0; i < _capabilitiesList.length; i++) {
			Map capabilities = _capabilitiesList[i];

		Object[] filler = { getSymbolicName() };
		String newActivator = loadString(activatorTemplateIS, filler);
		
		String activatorFileName = (String) getSymbolicName();
		activatorFileName = activatorFileName.replaceAll("\\.", "\\\\") + ".java"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
		
		File activatorFile = new File(srcDir, activatorFileName);

Lines 4-11 Link Here

(-)META-INF/MANIFEST.MF (-2 / +2 lines)
4	Bundle-SymbolicName: org.apache.muse.utils	4	Bundle-SymbolicName: org.apache.muse.utils
5	Bundle-Version: 2.0.0.qualifier	5	Bundle-Version: 2.0.0.qualifier
6	Bundle-Localization: plugin	6	Bundle-Localization: plugin
7	Bundle-ClassPath: lib/muse-util-2.1.0.jar,	7	Bundle-ClassPath: lib/muse-util-2.2.0.jar,
8	lib/muse-util-xml-2.1.0.jar	8	lib/muse-util-xml-2.2.0.jar
9	Export-Package: org.apache.muse.util,	9	Export-Package: org.apache.muse.util,
10	org.apache.muse.util.messages,	10	org.apache.muse.util.messages,
11	org.apache.muse.util.uuid,	11	org.apache.muse.util.uuid,

Lines 1-7 Link Here

(-).classpath (-2 / +2 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>	2	<classpath>
3	<classpathentry exported="true" kind="lib" path="lib/muse-util-2.1.0.jar" sourcepath="C:/cygwin/home/Andrew Eberbach/Workspaces/muse2.1/muse-util/src"/>	3	<classpathentry exported="true" kind="lib" path="lib/muse-util-2.2.0.jar"/>
4	<classpathentry exported="true" kind="lib" path="lib/muse-util-xml-2.1.0.jar"/>	4	<classpathentry exported="true" kind="lib" path="lib/muse-util-xml-2.2.0.jar"/>
5	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>	5	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
6	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>	6	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
7	<classpathentry kind="output" path="bin"/>	7	<classpathentry kind="output" path="bin"/>

Lines 12-17 Link Here

(-)build.properties (-2 / +2 lines)
12	output.. = bin/	12	output.. = bin/
13	bin.includes = META-INF/,\	13	bin.includes = META-INF/,\
14	plugin.properties,\	14	plugin.properties,\
15	lib/muse-util-xml-2.1.0.jar,\
16	about.html,\	15	about.html,\
17	lib/muse-util-2.1.0.jar	16	lib/muse-util-2.2.0.jar,\
		17	lib/muse-util-xml-2.2.0.jar

Lines 1-11 Link Here

(-).classpath (-6 / +6 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>	2	<classpath>
3	<classpathentry exported="true" kind="lib" path="lib/muse-wsdm-muws-adv-api-2.1.0.jar"/>	3	<classpathentry exported="true" kind="lib" path="lib/muse-wsdm-muws-adv-api-2.2.0.jar"/>
4	<classpathentry exported="true" kind="lib" path="lib/muse-wsdm-muws-api-2.1.0.jar"/>	4	<classpathentry exported="true" kind="lib" path="lib/muse-wsdm-muws-api-2.2.0.jar"/>
5	<classpathentry exported="true" kind="lib" path="lib/muse-wsdm-wef-api-2.1.0.jar"/>	5	<classpathentry exported="true" kind="lib" path="lib/muse-wsdm-wef-api-2.2.0.jar"/>
6	<classpathentry exported="true" kind="lib" path="lib/muse-wsn-api-2.1.0.jar"/>	6	<classpathentry exported="true" kind="lib" path="lib/muse-wsn-api-2.2.0.jar"/>
7	<classpathentry exported="true" kind="lib" path="lib/muse-wsrf-api-2.1.0.jar"/>	7	<classpathentry exported="true" kind="lib" path="lib/muse-wsrf-api-2.2.0.jar"/>
8	<classpathentry exported="true" kind="lib" path="lib/muse-wsx-api-2.1.0.jar"/>	8	<classpathentry exported="true" kind="lib" path="lib/muse-wsx-api-2.2.0.jar"/>
9	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>	9	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
10	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>	10	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
11	<classpathentry kind="output" path=""/>	11	<classpathentry kind="output" path=""/>




bin.includes = META-INF/,\
               lib/,\
               plugin.properties,\
               lib/muse-wsdm-muws-adv-api-2.1.0.jar,\
               lib/muse-wsdm-muws-api-2.1.0.jar,\
               lib/muse-wsdm-wef-api-2.1.0.jar,\
               lib/muse-wsn-api-2.1.0.jar,\
               lib/muse-wsrf-api-2.1.0.jar,\
               lib/muse-wsx-api-2.1.0.jar,\
               about.html,\
               resources/,\
               lib/muse-wsdm-muws-adv-api-2.2.0.jar,\
               lib/muse-wsdm-muws-api-2.2.0.jar,\
               lib/muse-wsdm-wef-api-2.2.0.jar,\
               lib/muse-wsn-api-2.2.0.jar,\
               lib/muse-wsrf-api-2.2.0.jar,\
               lib/muse-wsx-api-2.2.0.jar





Bundle-SymbolicName: org.apache.muse.api
Bundle-Version: 2.0.0.qualifier
Bundle-Localization: plugin
Bundle-ClassPath: .,
 lib/muse-wsdm-muws-adv-api-2.2.0.jar,
 lib/muse-wsdm-muws-api-2.2.0.jar,
 lib/muse-wsdm-wef-api-2.2.0.jar,
 lib/muse-wsn-api-2.2.0.jar,
 lib/muse-wsrf-api-2.2.0.jar,
 lib/muse-wsx-api-2.2.0.jar
Export-Package: org.apache.muse.ws.dm.muws,
 org.apache.muse.ws.dm.muws.adv,
 org.apache.muse.ws.dm.muws.events,

Lines 10-15 Link Here

(-)META-INF/MANIFEST.MF (-2 / +2 lines)
10	javax.xml.soap,	10	javax.xml.soap,
11	org.osgi.framework;version="1.3.0",	11	org.osgi.framework;version="1.3.0",
12	org.osgi.service.http;version="1.2.0"	12	org.osgi.service.http;version="1.2.0"
13	Export-Package: org.apache.muse.osgi.soa.core;version="2.1.0",	13	Export-Package: org.apache.muse.osgi.soa.core;version="2.2.0",
14	org.apache.muse.osgi.soa.core.web;version="2.1.0"	14	org.apache.muse.osgi.soa.core.web;version="2.2.0"
15	Require-Bundle: org.w3c.dom	15	Require-Bundle: org.w3c.dom

Lines 4-11 Link Here

(-)META-INF/MANIFEST.MF (-2 / +2 lines)
4	Bundle-SymbolicName: org.apache.muse.core	4	Bundle-SymbolicName: org.apache.muse.core
5	Bundle-Version: 2.0.0.qualifier	5	Bundle-Version: 2.0.0.qualifier
6	Bundle-Localization: plugin	6	Bundle-Localization: plugin
7	Bundle-ClassPath: lib/muse-core-2.1.0.jar,	7	Bundle-ClassPath: lib/muse-core-2.2.0.jar,
8	lib/muse-wsa-soap-2.1.0.jar,	8	lib/muse-wsa-soap-2.2.0.jar,
9	lib/wsdl4j-1.6.1.jar	9	lib/wsdl4j-1.6.1.jar
10	Export-Package: com.ibm.wsdl,	10	Export-Package: com.ibm.wsdl,
11	com.ibm.wsdl.extensions,	11	com.ibm.wsdl.extensions,

Lines 1-7 Link Here

(-).classpath (-2 / +2 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>	2	<classpath>
3	<classpathentry exported="true" kind="lib" path="lib/muse-core-2.1.0.jar"/>	3	<classpathentry exported="true" kind="lib" path="lib/muse-core-2.2.0.jar"/>
4	<classpathentry exported="true" kind="lib" path="lib/muse-wsa-soap-2.1.0.jar"/>	4	<classpathentry exported="true" kind="lib" path="lib/muse-wsa-soap-2.2.0.jar"/>
5	<classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.1.jar"/>	5	<classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.1.jar"/>
6	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>	6	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
7	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>	7	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

Lines 17-23 Link Here

(-)build.properties (-4 / +4 lines)
17	about.mappings,\	17	about.mappings,\
18	about.properties,\	18	about.properties,\
19	eclipse32.png,\	19	eclipse32.png,\
20	lib/muse-core-2.1.0.jar,\	20	about.html,\
21	lib/muse-wsa-soap-2.1.0.jar,\	21	lib/muse-core-2.2.0.jar,\
22	lib/wsdl4j-1.6.1.jar,\	22	lib/muse-wsa-soap-2.2.0.jar,\
23	about.html	23	lib/wsdl4j-1.6.1.jar

Lines 1-9 Link Here

(-).classpath (-3 / +3 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>	2	<classpath>
3	<classpathentry kind="src" path="src"/>	3	<classpathentry kind="src" path="src"/>
4	<classpathentry exported="true" kind="lib" path="lib/muse-tools-2.1.0.jar"/>	4	<classpathentry exported="true" kind="lib" path="lib/muse-tools-2.2.0.jar"/>
5	<classpathentry exported="true" kind="lib" path="lib/muse-util-2.1.0.jar"/>	5	<classpathentry exported="true" kind="lib" path="lib/muse-util-2.2.0.jar"/>
6	<classpathentry exported="true" kind="lib" path="lib/muse-util-xml-2.1.0.jar"/>	6	<classpathentry exported="true" kind="lib" path="lib/muse-util-xml-2.2.0.jar"/>
7	<classpathentry exported="true" kind="lib" path="runtime/tools.jar"/>	7	<classpathentry exported="true" kind="lib" path="runtime/tools.jar"/>
8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>	8	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
9	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>	9	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>




               lib/,\
               plugin.properties,\
               artifacts/,\
               lib/muse-tools-2.1.0.jar,\
               lib/muse-util-2.1.0.jar,\
               lib/muse-util-xml-2.1.0.jar,\
               runtime/tools.jar,\
               modules/,\
               about.html,\
               lib/muse-tools-2.2.0.jar,\
               lib/muse-util-2.2.0.jar,\
               lib/muse-util-xml-2.2.0.jar


Lines 18-26 Link Here

(-)META-INF/MANIFEST.MF (-3 / +3 lines)
18	Require-Bundle: org.apache.muse.impl,	18	Require-Bundle: org.apache.muse.impl,
19	org.eclipse.core.runtime,	19	org.eclipse.core.runtime,
20	org.w3c.dom	20	org.w3c.dom
21	Bundle-ClassPath: lib/muse-tools-2.1.0.jar,	21	Bundle-ClassPath: lib/muse-tools-2.2.0.jar,
22	lib/muse-util-2.1.0.jar,	22	lib/muse-util-2.2.0.jar,
23	lib/muse-util-xml-2.1.0.jar,	23	lib/muse-util-xml-2.2.0.jar,
24	runtime/tools.jar	24	runtime/tools.jar
25	Bundle-Vendor: %plugin.provider	25	Bundle-Vendor: %plugin.provider
26	Eclipse-LazyStart: true	26	Eclipse-LazyStart: true

Return to bug 150385

Lines 339-346 Link Here

(-)src/org/eclipse/tptp/wsdm/tooling/wizard/mrt/internal/NewMrtWizard.java (-3 / +4 lines)
339		339
340	String namespaceURI = mrt.getNamespace();	340	String namespaceURI = mrt.getNamespace();
341		341
342	javax.wsdl.Definition def = WsdlMerge.merge(namespaceURI, wsdlFiles,	342	Document[] wsdlFragments = (Document[])wsdlFiles.toArray(new Document[wsdlFiles.size()]);
343	address);	343	javax.wsdl.Definition def = WsdlMerge.merge(namespaceURI, wsdlFragments,
		344	address);
344		345
345	return _writer.getDocument(def);	346	return _writer.getDocument(def);
346	}	347	}
Lines 395-401 Link Here
395	Element cleanDocument = WsdlUtils.removeSchemaReferences(document.getDocumentElement());	396	Element cleanDocument = WsdlUtils.removeSchemaReferences(document.getDocumentElement());
396	cleanDocument = WsdlUtils.removeWsdlReferences(cleanDocument);	397	cleanDocument = WsdlUtils.removeWsdlReferences(cleanDocument);
397		398
398	wsdls.add(_reader.readWSDL((String)null, cleanDocument));	399	wsdls.add(cleanDocument.getOwnerDocument());
399	}	400	}
400		401
401	return wsdls;	402	return wsdls;

Lines 18-25 Link Here

(-)src/org/eclipse/tptp/wsdm/tooling/internal/projectizer/EclipseAxis2Projectizer.java (-3 / +3 lines)
18	import java.net.URL;	18	import java.net.URL;
19	import java.util.Map;	19	import java.util.Map;
20		20
21	import org.apache.muse.tools.generator.projectizer.Axis2Projectizer;
22	import org.apache.muse.tools.generator.projectizer.Axis2ProjectizerConstants;	21	import org.apache.muse.tools.generator.projectizer.Axis2ProjectizerConstants;
		22	import org.apache.muse.tools.generator.projectizer.J2EEAxis2Projectizer;
23	import org.apache.muse.tools.generator.util.ConfigurationData;	23	import org.apache.muse.tools.generator.util.ConfigurationData;
24	import org.apache.muse.tools.generator.util.ServicesDescriptorHelper;	24	import org.apache.muse.tools.generator.util.ServicesDescriptorHelper;
25	import org.apache.muse.util.FileUtils;	25	import org.apache.muse.util.FileUtils;
Lines 36-42 Link Here
36	/**	36	/**
37	* Construct the projectizer for code generation	37	* Construct the projectizer for code generation
38	*/	38	*/
39	public class EclipseAxis2Projectizer extends Axis2Projectizer {	39	public class EclipseAxis2Projectizer extends J2EEAxis2Projectizer {
40		40
41	private static final String[] LIB_BUNDLE_IDS = {	41	private static final String[] LIB_BUNDLE_IDS = {
42	"org.apache.muse.api", //$NON-NLS-1$	42	"org.apache.muse.api", //$NON-NLS-1$
Lines 182-188 Link Here
182	//this should be done in some cleaner way	182	//this should be done in some cleaner way
183	//	183	//
184		184
185	url = Platform.getBundle(MODULE_BUNDLE_IDS[0]).getEntry("/lib/muse-platform-axis2-2.1.0.jar");	185	url = Platform.getBundle(MODULE_BUNDLE_IDS[0]).getEntry("/lib/muse-platform-axis2-2.2.0.jar");
186	url = FileLocator.toFileURL(url);	186	url = FileLocator.toFileURL(url);
187		187
188	File libSource = toFile(url);	188	File libSource = toFile(url);

Lines 1-12 Link Here

(-).classpath (-7 / +7 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>	2	<classpath>
3	<classpathentry exported="true" kind="lib" path="lib/muse-wsdm-muws-adv-impl-2.1.0.jar"/>	3	<classpathentry exported="true" kind="lib" path="lib/muse-wsdm-muws-adv-impl-2.2.0.jar"/>
4	<classpathentry exported="true" kind="lib" path="lib/muse-wsdm-muws-impl-2.1.0.jar"/>	4	<classpathentry exported="true" kind="lib" path="lib/muse-wsdm-muws-impl-2.2.0.jar"/>
5	<classpathentry exported="true" kind="lib" path="lib/muse-wsdm-wef-impl-2.1.0.jar"/>	5	<classpathentry exported="true" kind="lib" path="lib/muse-wsdm-wef-impl-2.2.0.jar"/>
6	<classpathentry exported="true" kind="lib" path="lib/muse-wsn-impl-2.1.0.jar"/>	6	<classpathentry exported="true" kind="lib" path="lib/muse-wsn-impl-2.2.0.jar"/>
7	<classpathentry exported="true" kind="lib" path="lib/muse-wsrf-impl-2.1.0.jar"/>	7	<classpathentry exported="true" kind="lib" path="lib/muse-wsrf-impl-2.2.0.jar"/>
8	<classpathentry exported="true" kind="lib" path="lib/muse-wsrf-rmd-2.1.0.jar"/>	8	<classpathentry exported="true" kind="lib" path="lib/muse-wsrf-rmd-2.2.0.jar"/>
9	<classpathentry exported="true" kind="lib" path="lib/muse-wsx-impl-2.1.0.jar"/>	9	<classpathentry exported="true" kind="lib" path="lib/muse-wsx-impl-2.2.0.jar"/>
10	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>	10	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
11	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>	11	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
12	<classpathentry kind="output" path="bin"/>	12	<classpathentry kind="output" path="bin"/>

Lines 7-19 Link Here

(-)META-INF/MANIFEST.MF (-7 / +7 lines)
7	Require-Bundle: org.apache.muse.api;visibility:=reexport,	7	Require-Bundle: org.apache.muse.api;visibility:=reexport,
8	org.apache.muse.core;visibility:=reexport,	8	org.apache.muse.core;visibility:=reexport,
9	org.w3c.dom	9	org.w3c.dom
10	Bundle-ClassPath: lib/muse-wsdm-muws-adv-impl-2.1.0.jar,	10	Bundle-ClassPath: lib/muse-wsdm-muws-adv-impl-2.2.0.jar,
11	lib/muse-wsdm-muws-impl-2.1.0.jar,	11	lib/muse-wsdm-muws-impl-2.2.0.jar,
12	lib/muse-wsdm-wef-impl-2.1.0.jar,	12	lib/muse-wsdm-wef-impl-2.2.0.jar,
13	lib/muse-wsn-impl-2.1.0.jar,	13	lib/muse-wsn-impl-2.2.0.jar,
14	lib/muse-wsrf-impl-2.1.0.jar,	14	lib/muse-wsrf-impl-2.2.0.jar,
15	lib/muse-wsrf-rmd-2.1.0.jar,	15	lib/muse-wsrf-rmd-2.2.0.jar,
16	lib/muse-wsx-impl-2.1.0.jar	16	lib/muse-wsx-impl-2.2.0.jar
17	Export-Package: org.apache.muse.ws.dm.muws.adv.impl,	17	Export-Package: org.apache.muse.ws.dm.muws.adv.impl,
18	org.apache.muse.ws.dm.muws.events.impl,	18	org.apache.muse.ws.dm.muws.events.impl,
19	org.apache.muse.ws.dm.muws.impl,	19	org.apache.muse.ws.dm.muws.impl,

Lines 22-28 Link Here

(-)src/org/eclipse/tptp/wsdm/tooling/internal/projectizer/EclipseOsgiProjectizer.java (-4 / +4 lines)
22	import java.util.jar.Manifest;	22	import java.util.jar.Manifest;
23		23
24	import org.apache.muse.tools.generator.projectizer.Axis2ProjectizerConstants;	24	import org.apache.muse.tools.generator.projectizer.Axis2ProjectizerConstants;
25	import org.apache.muse.tools.generator.projectizer.OsgiProjectizer;	25	import org.apache.muse.tools.generator.projectizer.OsgiAxis2Projectizer;
26	import org.apache.muse.tools.generator.projectizer.OsgiProjectizerConstants;	26	import org.apache.muse.tools.generator.projectizer.OsgiProjectizerConstants;
27	import org.apache.muse.tools.generator.util.ConfigurationData;	27	import org.apache.muse.tools.generator.util.ConfigurationData;
28	import org.apache.muse.tools.generator.util.ConfigurationDataDescriptor;	28	import org.apache.muse.tools.generator.util.ConfigurationDataDescriptor;
Lines 32-38 Link Here
32	import org.eclipse.tptp.wsdm.tooling.internal.util.PluginProjectHelper;	32	import org.eclipse.tptp.wsdm.tooling.internal.util.PluginProjectHelper;
33	import org.w3c.dom.Document;	33	import org.w3c.dom.Document;
34		34
35	public class EclipseOsgiProjectizer extends OsgiProjectizer {	35	public class EclipseOsgiProjectizer extends OsgiAxis2Projectizer {
36		36
37	private static final String BUNDLE_CLASSPATH_ATTR = "Bundle-ClassPath";	37	private static final String BUNDLE_CLASSPATH_ATTR = "Bundle-ClassPath";
38		38
Lines 65-71 Link Here
65		65
66	File routerEntriesDir = new File(_targetDirectory,OsgiProjectizerConstants.ROUTER_ENTRIES_DIR);	66	File routerEntriesDir = new File(_targetDirectory,OsgiProjectizerConstants.ROUTER_ENTRIES_DIR);
67		67
68	createManifest(_targetDirectory, EclipseOsgiProjectizerConstants.OSGI_MANIFEST_FILE_RESOURCE, EclipseOsgiProjectizerConstants.OSGI_MANIFEST_FILE, getActivatorName());	68	createManifest(_targetDirectory, EclipseOsgiProjectizerConstants.OSGI_MANIFEST_FILE_RESOURCE, EclipseOsgiProjectizerConstants.OSGI_MANIFEST_FILE, (String)getSymbolicName());
69		69
70	for(int i=0; i < _capabilitiesList.length; i++) {	70	for(int i=0; i < _capabilitiesList.length; i++) {
71	Map capabilities = _capabilitiesList[i];	71	Map capabilities = _capabilitiesList[i];
Lines 170-176 Link Here
170	Object[] filler = { getSymbolicName() };	170	Object[] filler = { getSymbolicName() };
171	String newActivator = loadString(activatorTemplateIS, filler);	171	String newActivator = loadString(activatorTemplateIS, filler);
172		172
173	String activatorFileName = getActivatorName();	173	String activatorFileName = (String) getSymbolicName();
174	activatorFileName = activatorFileName.replaceAll("\\.", "\\\\") + ".java"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$	174	activatorFileName = activatorFileName.replaceAll("\\.", "\\\\") + ".java"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
175		175
176	File activatorFile = new File(srcDir, activatorFileName);	176	File activatorFile = new File(srcDir, activatorFileName);

Lines 12-23 Link Here

(-)build.properties (-7 / +7 lines)
12	bin.includes = META-INF/,\	12	bin.includes = META-INF/,\
13	lib/,\	13	lib/,\
14	plugin.properties,\	14	plugin.properties,\
15	lib/muse-wsdm-muws-adv-api-2.1.0.jar,\
16	lib/muse-wsdm-muws-api-2.1.0.jar,\
17	lib/muse-wsdm-wef-api-2.1.0.jar,\
18	lib/muse-wsn-api-2.1.0.jar,\
19	lib/muse-wsrf-api-2.1.0.jar,\
20	lib/muse-wsx-api-2.1.0.jar,\
21	about.html,\	15	about.html,\
22	resources/	16	resources/,\
		17	lib/muse-wsdm-muws-adv-api-2.2.0.jar,\
		18	lib/muse-wsdm-muws-api-2.2.0.jar,\
		19	lib/muse-wsdm-wef-api-2.2.0.jar,\
		20	lib/muse-wsn-api-2.2.0.jar,\
		21	lib/muse-wsrf-api-2.2.0.jar,\
		22	lib/muse-wsx-api-2.2.0.jar
23		23

Lines 4-15 Link Here

(-)META-INF/MANIFEST.MF (-6 / +7 lines)
4	Bundle-SymbolicName: org.apache.muse.api	4	Bundle-SymbolicName: org.apache.muse.api
5	Bundle-Version: 2.0.0.qualifier	5	Bundle-Version: 2.0.0.qualifier
6	Bundle-Localization: plugin	6	Bundle-Localization: plugin
7	Bundle-ClassPath: ., lib/muse-wsdm-muws-adv-api-2.1.0.jar,	7	Bundle-ClassPath: .,
8	lib/muse-wsdm-muws-api-2.1.0.jar,	8	lib/muse-wsdm-muws-adv-api-2.2.0.jar,
9	lib/muse-wsdm-wef-api-2.1.0.jar,	9	lib/muse-wsdm-muws-api-2.2.0.jar,
10	lib/muse-wsn-api-2.1.0.jar,	10	lib/muse-wsdm-wef-api-2.2.0.jar,
11	lib/muse-wsrf-api-2.1.0.jar,	11	lib/muse-wsn-api-2.2.0.jar,
12	lib/muse-wsx-api-2.1.0.jar	12	lib/muse-wsrf-api-2.2.0.jar,
		13	lib/muse-wsx-api-2.2.0.jar
13	Export-Package: org.apache.muse.ws.dm.muws,	14	Export-Package: org.apache.muse.ws.dm.muws,
14	org.apache.muse.ws.dm.muws.adv,	15	org.apache.muse.ws.dm.muws.adv,
15	org.apache.muse.ws.dm.muws.events,	16	org.apache.muse.ws.dm.muws.events,