Attachment #132288 for bug #269201

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




 *     Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 219530 [jar application] add Jar-in-Jar ClassLoader option
 *     Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 262766 [jar exporter] ANT file for Jar-in-Jar option contains relative path to jar-rsrc-loader.zip
 *     Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 262763 [jar exporter] remove Built-By attribute in ANT files from Fat JAR Exporter
 *     Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 269201 [jar exporter] ant file produced by Export runnable jar contains absolut paths instead of relative to workspace
 *******************************************************************************/
package org.eclipse.jdt.internal.ui.jarpackagerfat;



	protected void buildANTScript(OutputStream outputStream, String projectName, IPath absJarfile, String mainClass, SourceInfo[] sourceInfos) throws IOException {

		String destDir= makeWorkspaceRelativePath(absJarfile.toFile().getParent());
		String destName= absJarfile.removeFileExtension().toFile().getName();

		DocumentBuilder docBuilder= null;
		DocumentBuilderFactory factory= DocumentBuilderFactory.newInstance();

		project.appendChild(comment);
		document.appendChild(project);

		// <property name="workspace" location="C:/eclipse/workspace-runnableJar" />
		Element property= document.createElement("property"); //$NON-NLS-1$
		property.setAttribute("name", "workspace"); //$NON-NLS-1$ //$NON-NLS-2$
		property.setAttribute("location", getWorkspaceDir()); //$NON-NLS-1$ 
		project.appendChild(property);

		// <property name="destdir" location="c:/xx" />
		property= document.createElement("property"); //$NON-NLS-1$
		property.setAttribute("name", "destdir"); //$NON-NLS-1$ //$NON-NLS-2$
		property.setAttribute("location", destDir); //$NON-NLS-1$ 
		project.appendChild(property);

		// <property name="destname" value="runnableJarOutput" />
		property= document.createElement("property"); //$NON-NLS-1$
		property.setAttribute("name", "destname"); //$NON-NLS-1$ //$NON-NLS-2$
		property.setAttribute("value", destName); //$NON-NLS-1$ 
		project.appendChild(property);

		// <property name="destjar" location="${destdir}/${destname}.jar" />
		property= document.createElement("property"); //$NON-NLS-1$
		property.setAttribute("name", "destjar"); //$NON-NLS-1$ //$NON-NLS-2$
		property.setAttribute("location", "${destdir}" + File.separator + "${destname}.jar"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
		project.appendChild(property);

		Element target= document.createElement("target"); //$NON-NLS-1$
		target.setAttribute("name", "create_run_jar"); //$NON-NLS-1$ //$NON-NLS-2$
		project.appendChild(target);

		// <mkdir dir="${destdir}" />
		Element mkdir= document.createElement("mkdir"); //$NON-NLS-1$
		mkdir.setAttribute("dir", "${destdir}"); //$NON-NLS-1$ //$NON-NLS-2$
		project.appendChild(mkdir);

		Element jar= document.createElement("jar"); //$NON-NLS-1$
		jar.setAttribute("destfile", "${destjar}"); //$NON-NLS-1$ //$NON-NLS-2$s 
		target.appendChild(jar);

		Element manifest= document.createElement("manifest"); //$NON-NLS-1$

			if (sourceInfo.isJar) {
				File jarFile= new File(sourceInfo.absPath);
				Element fileset= document.createElement("zipfileset"); //$NON-NLS-1$
				fileset.setAttribute("dir", makeWorkspaceRelativePath(jarFile.getParent())); //$NON-NLS-1$
				fileset.setAttribute("includes", jarFile.getName()); //$NON-NLS-1$ 
				jar.appendChild(fileset);
			} else {
				Element fileset= document.createElement("fileset"); //$NON-NLS-1$
				fileset.setAttribute("dir", makeWorkspaceRelativePath(sourceInfo.absPath)); //$NON-NLS-1$
				jar.appendChild(fileset);
			}
		}

Lines 10-18 Link Here

(-)ui/org/eclipse/jdt/internal/ui/jarpackagerfat/UnpackFatJarAntExporter.java (-4 / +37 lines)
10	* Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 83258 [jar exporter] Deploy java application as executable jar	10	* Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 83258 [jar exporter] Deploy java application as executable jar
11	* Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 262766 [jar exporter] ANT file for Jar-in-Jar option contains relative path to jar-rsrc-loader.zip	11	* Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 262766 [jar exporter] ANT file for Jar-in-Jar option contains relative path to jar-rsrc-loader.zip
12	* Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 262763 [jar exporter] remove Built-By attribute in ANT files from Fat JAR Exporter	12	* Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 262763 [jar exporter] remove Built-By attribute in ANT files from Fat JAR Exporter
		13	* Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 269201 [jar exporter] ant file produced by Export runnable jar contains absolut paths instead of relative to workspace
13	*******************************************************************************/	14	*******************************************************************************/
14	package org.eclipse.jdt.internal.ui.jarpackagerfat;	15	package org.eclipse.jdt.internal.ui.jarpackagerfat;
15		16
		17	import java.io.File;
16	import java.io.FileOutputStream;	18	import java.io.FileOutputStream;
17	import java.io.IOException;	19	import java.io.IOException;
18	import java.io.OutputStream;	20	import java.io.OutputStream;
Lines 46-52 Link Here
46		48
47	protected void buildANTScript(IPath antScriptLocation, String projectName, IPath absJarfile, String mainClass, SourceInfo[] sourceInfos) throws IOException {	49	protected void buildANTScript(IPath antScriptLocation, String projectName, IPath absJarfile, String mainClass, SourceInfo[] sourceInfos) throws IOException {
48	OutputStream outputStream= new FileOutputStream(antScriptLocation.toFile());	50	OutputStream outputStream= new FileOutputStream(antScriptLocation.toFile());
49	String absJarname= absJarfile.toString();	51
		52	String destDir= makeWorkspaceRelativePath(absJarfile.toFile().getParent());
		53	String destName= absJarfile.removeFileExtension().toFile().getName();
50		54
51	DocumentBuilder docBuilder= null;	55	DocumentBuilder docBuilder= null;
52	DocumentBuilderFactory factory= DocumentBuilderFactory.newInstance();	56	DocumentBuilderFactory factory= DocumentBuilderFactory.newInstance();
Lines 70-81 Link Here
70	project.appendChild(comment);	74	project.appendChild(comment);
71	document.appendChild(project);	75	document.appendChild(project);
72		76
		77	// <property name="workspace" location="C:/eclipse/workspace-runnableJar" />
		78	Element property= document.createElement("property"); //$NON-NLS-1$
		79	property.setAttribute("name", "workspace"); //$NON-NLS-1$ //$NON-NLS-2$
		80	property.setAttribute("location", getWorkspaceDir()); //$NON-NLS-1$
		81	project.appendChild(property);
		82
		83	// <property name="destdir" location="c:/xx" />
		84	property= document.createElement("property"); //$NON-NLS-1$
		85	property.setAttribute("name", "destdir"); //$NON-NLS-1$ //$NON-NLS-2$
		86	property.setAttribute("location", destDir); //$NON-NLS-1$
		87	project.appendChild(property);
		88
		89	// <property name="destname" value="runnableJarOutput" />
		90	property= document.createElement("property"); //$NON-NLS-1$
		91	property.setAttribute("name", "destname"); //$NON-NLS-1$ //$NON-NLS-2$
		92	property.setAttribute("value", destName); //$NON-NLS-1$
		93	project.appendChild(property);
		94
		95	// <property name="destjar" location="${destdir}/${destname}.jar" />
		96	property= document.createElement("property"); //$NON-NLS-1$
		97	property.setAttribute("name", "destjar"); //$NON-NLS-1$ //$NON-NLS-2$
		98	property.setAttribute("location", "${destdir}" + File.separator + "${destname}.jar"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
		99	project.appendChild(property);
		100
73	Element target= document.createElement("target"); //$NON-NLS-1$	101	Element target= document.createElement("target"); //$NON-NLS-1$
74	target.setAttribute("name", "create_run_jar"); //$NON-NLS-1$ //$NON-NLS-2$	102	target.setAttribute("name", "create_run_jar"); //$NON-NLS-1$ //$NON-NLS-2$
75	project.appendChild(target);	103	project.appendChild(target);
76		104
		105	// <mkdir dir="${destdir}" />
		106	Element mkdir= document.createElement("mkdir"); //$NON-NLS-1$
		107	mkdir.setAttribute("dir", "${destdir}"); //$NON-NLS-1$ //$NON-NLS-2$
		108	project.appendChild(mkdir);
		109
77	Element jar= document.createElement("jar"); //$NON-NLS-1$	110	Element jar= document.createElement("jar"); //$NON-NLS-1$
78	jar.setAttribute("destfile", absJarname); //$NON-NLS-1$s	111	jar.setAttribute("destfile", "${destjar}"); //$NON-NLS-1$ //$NON-NLS-2$
79	jar.setAttribute("filesetmanifest", "mergewithoutmain"); //$NON-NLS-1$ //$NON-NLS-2$	112	jar.setAttribute("filesetmanifest", "mergewithoutmain"); //$NON-NLS-1$ //$NON-NLS-2$
80	target.appendChild(jar);	113	target.appendChild(jar);
81		114
Lines 96-107 Link Here
96	SourceInfo sourceInfo= sourceInfos[i];	129	SourceInfo sourceInfo= sourceInfos[i];
97	if (sourceInfo.isJar) {	130	if (sourceInfo.isJar) {
98	Element zipfileset= document.createElement("zipfileset"); //$NON-NLS-1$	131	Element zipfileset= document.createElement("zipfileset"); //$NON-NLS-1$
99	zipfileset.setAttribute("src", sourceInfo.absPath); //$NON-NLS-1$	132	zipfileset.setAttribute("src", makeWorkspaceRelativePath(sourceInfo.absPath)); //$NON-NLS-1$
100	zipfileset.setAttribute("excludes", "META-INF/*.SF"); //$NON-NLS-1$ //$NON-NLS-2$	133	zipfileset.setAttribute("excludes", "META-INF/*.SF"); //$NON-NLS-1$ //$NON-NLS-2$
101	jar.appendChild(zipfileset);	134	jar.appendChild(zipfileset);
102	} else {	135	} else {
103	Element fileset= document.createElement("fileset"); //$NON-NLS-1$	136	Element fileset= document.createElement("fileset"); //$NON-NLS-1$
104	fileset.setAttribute("dir", sourceInfo.absPath); //$NON-NLS-1$	137	fileset.setAttribute("dir", makeWorkspaceRelativePath(sourceInfo.absPath)); //$NON-NLS-1$
105	jar.appendChild(fileset);	138	jar.appendChild(fileset);
106	}	139	}
107	}	140	}




 *     Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 219530 [jar application] add Jar-in-Jar ClassLoader option
 *     Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 262766 [jar exporter] ANT file for Jar-in-Jar option contains relative path to jar-rsrc-loader.zip
 *     Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 262763 [jar exporter] remove Built-By attribute in ANT files from Fat JAR Exporter
 *     Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 269201 [jar exporter] ant file produced by Export runnable jar contains absolut paths instead of relative to workspace
 *******************************************************************************/
package org.eclipse.jdt.internal.ui.jarpackagerfat;



	protected void buildANTScript(IPath antScriptLocation, String projectName, IPath absJarfile, String mainClass, SourceInfo[] sourceInfos) throws IOException {
		OutputStream outputStream = new FileOutputStream(antScriptLocation.toFile());

		String destDir= makeWorkspaceRelativePath(absJarfile.toFile().getParent());
		String destName= absJarfile.removeFileExtension().lastSegment();

		DocumentBuilder docBuilder= null;
		DocumentBuilderFactory factory= DocumentBuilderFactory.newInstance();

		project.appendChild(comment);
		document.appendChild(project);

		// <property name="workspace" location="C:/eclipse/workspace-runnableJar" />
		Element property= document.createElement("property"); //$NON-NLS-1$
		property.setAttribute("name", "workspace"); //$NON-NLS-1$ //$NON-NLS-2$
		property.setAttribute("location", getWorkspaceDir()); //$NON-NLS-1$ 
		project.appendChild(property);

		// <property name="destdir" location="c:/xx" />
		property= document.createElement("property"); //$NON-NLS-1$
		property.setAttribute("name", "destdir"); //$NON-NLS-1$ //$NON-NLS-2$
		property.setAttribute("location", destDir); //$NON-NLS-1$ 
		project.appendChild(property);

		// <property name="destname" value="runnableJarOutput" />
		property= document.createElement("property"); //$NON-NLS-1$
		property.setAttribute("name", "destname"); //$NON-NLS-1$ //$NON-NLS-2$
		property.setAttribute("value", destName); //$NON-NLS-1$ 
		project.appendChild(property);

		// <property name="destjar" location="${destdir}/${destname}.jar" />
		property= document.createElement("property"); //$NON-NLS-1$
		property.setAttribute("name", "destjar"); //$NON-NLS-1$ //$NON-NLS-2$
		property.setAttribute("location", "${destdir}" + File.separator + "${destname}.jar"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
		project.appendChild(property);

		// <property name="subdirname" value="${destname}_lib" />
		property= document.createElement("property"); //$NON-NLS-1$
		property.setAttribute("name", "subdirname"); //$NON-NLS-1$ //$NON-NLS-2$
		property.setAttribute("value", "${destname}_lib"); //$NON-NLS-1$ //$NON-NLS-2$ 
		project.appendChild(property);

		// <property name="subdir" location="${destdir}/${subdirname}" />
		property= document.createElement("property"); //$NON-NLS-1$
		property.setAttribute("name", "subdir"); //$NON-NLS-1$ //$NON-NLS-2$
		property.setAttribute("location", "${destdir}" + File.separator + "${subdirname}"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
		project.appendChild(property);

		Element target= document.createElement("target"); //$NON-NLS-1$
		target.setAttribute("name", "create_run_jar"); //$NON-NLS-1$ //$NON-NLS-2$
		project.appendChild(target);

		// <mkdir dir="${destdir}" />
		Element mkdir= document.createElement("mkdir"); //$NON-NLS-1$
		mkdir.setAttribute("dir", "${destdir}"); //$NON-NLS-1$ //$NON-NLS-2$
		project.appendChild(mkdir);

		Element jar= document.createElement("jar"); //$NON-NLS-1$
		jar.setAttribute("destfile", "${destjar}"); //$NON-NLS-1$ //$NON-NLS-2$ 
		target.appendChild(jar);

		Element manifest= document.createElement("manifest"); //$NON-NLS-1$

		for (int i= 0; i < sourceInfos.length; i++) {
			SourceInfo sourceInfo= sourceInfos[i];
			if (sourceInfo.isJar) {
				classPath.append(" ").append("${subdirname}").append("/") //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
						.append(new File(sourceInfo.absPath).getName());
			}
		}

			SourceInfo sourceInfo= sourceInfos[i];
			if (!sourceInfo.isJar) {
				Element fileset= document.createElement("fileset"); //$NON-NLS-1$
				fileset.setAttribute("dir", makeWorkspaceRelativePath(sourceInfo.absPath)); //$NON-NLS-1$
				jar.appendChild(fileset);
			}
		}

		
		Element delete= document.createElement("delete"); //$NON-NLS-1$
		delete.setAttribute("dir", "${subdir}"); //$NON-NLS-1$ //$NON-NLS-2$s 
		target.appendChild(delete);

		mkdir= document.createElement("mkdir"); //$NON-NLS-1$
		mkdir.setAttribute("dir", "${subdir}"); //$NON-NLS-1$ //$NON-NLS-2$s 
		target.appendChild(mkdir);

		// add libraries

			SourceInfo sourceInfo= sourceInfos[i];
			if (sourceInfo.isJar) {
				Element copy= document.createElement("copy"); //$NON-NLS-1$
				copy.setAttribute("file", makeWorkspaceRelativePath(sourceInfo.absPath)); //$NON-NLS-1$
				copy.setAttribute("todir", "${subdir}"); //$NON-NLS-1$ //$NON-NLS-2$
				target.appendChild(copy);
			}
		}

Lines 11-19 Link Here

(-)ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarAntExporter.java (+30 lines)
11	* Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 220257 [jar application] ANT build file does not create Class-Path Entry in Manifest	11	* Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 220257 [jar application] ANT build file does not create Class-Path Entry in Manifest
12	* Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 219530 [jar application] add Jar-in-Jar ClassLoader option	12	* Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 219530 [jar application] add Jar-in-Jar ClassLoader option
13	* Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 262766 [jar exporter] ANT file for Jar-in-Jar option contains relative path to jar-rsrc-loader.zip	13	* Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 262766 [jar exporter] ANT file for Jar-in-Jar option contains relative path to jar-rsrc-loader.zip
		14	* Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 269201 [jar exporter] ant file produced by Export runnable jar contains absolut paths instead of relative to workspace
14	*******************************************************************************/	15	*******************************************************************************/
15	package org.eclipse.jdt.internal.ui.jarpackagerfat;	16	package org.eclipse.jdt.internal.ui.jarpackagerfat;
16		17
		18	import java.io.File;
17	import java.io.FileNotFoundException;	19	import java.io.FileNotFoundException;
18	import java.io.IOException;	20	import java.io.IOException;
19	import java.util.ArrayList;	21	import java.util.ArrayList;
Lines 25-30 Link Here
25	import org.eclipse.core.runtime.Path;	27	import org.eclipse.core.runtime.Path;
26	import org.eclipse.core.runtime.Status;	28	import org.eclipse.core.runtime.Status;
27		29
		30	import org.eclipse.core.resources.ResourcesPlugin;
		31
28	import org.eclipse.debug.core.ILaunchConfiguration;	32	import org.eclipse.debug.core.ILaunchConfiguration;
29		33
30	import org.eclipse.jdt.internal.corext.util.Messages;	34	import org.eclipse.jdt.internal.corext.util.Messages;
Lines 64-69 Link Here
64	private IPath fAbsJarfile;	68	private IPath fAbsJarfile;
65	private IPath fAntScriptLocation;	69	private IPath fAntScriptLocation;
66		70
		71	private String fWorkspaceDir;
		72
67	/**	73	/**
68	* Create an instance of the ANT exporter. An ANT exporter can generate an ANT script	74	* Create an instance of the ANT exporter. An ANT exporter can generate an ANT script
69	* at the given ant script location for the given launch configuration	75	* at the given ant script location for the given launch configuration
Lines 75-80 Link Here
75	fLaunchConfiguration= launchConfiguration;	81	fLaunchConfiguration= launchConfiguration;
76	fAbsJarfile= jarLocation;	82	fAbsJarfile= jarLocation;
77	fAntScriptLocation= antScriptLocation;	83	fAntScriptLocation= antScriptLocation;
		84	try {
		85	fWorkspaceDir= ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile().getCanonicalPath();
		86	} catch (Exception e) {
		87	JavaPlugin.log(e);
		88	fWorkspaceDir= "?"; //$NON-NLS-1$
		89	}
78	}	90	}
79		91
80	/**	92	/**
Lines 164-169 Link Here
164	return result;	176	return result;
165	}	177	}
166		178
		179	protected String getWorkspaceDir() {
		180	return fWorkspaceDir;
		181	}
		182
		183	protected String makeWorkspaceRelativePath(String path) {
		184	String variablePath;
		185	try {
		186	variablePath= new File(path).getCanonicalPath().toString();
		187	if (variablePath.equals(getWorkspaceDir()))
		188	return "${workspace}"; //$NON-NLS-1$
		189	if (variablePath.startsWith(getWorkspaceDir() + File.separator))
		190	return "${workspace}" + variablePath.substring(getWorkspaceDir().length()); //$NON-NLS-1$
		191	} catch (IOException e) {
		192	JavaPlugin.log(e);
		193	}
		194	return path;
		195	}
		196
167	/**	197	/**
168	* Create an ANT script at the given location.	198	* Create an ANT script at the given location.
169	*	199	*

Return to bug 269201