Attachment #132476 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.ui.tests.jarexport;


	}

	private static void assertAntScriptCopy(String archiveName, IPath antScriptLocation, String[] filesets, String[] zipfilesets) throws Exception {
		String subfolderName= archiveName.replaceFirst("^(.*)[.]jar$", "$1_lib"); //$NON-NLS-1$//$NON-NLS-2$
			
		String projectNameValue= "Create Runnable Jar for Project TestSetupProject"; //$NON-NLS-1$
		projectNameValue+= " with libraries in sub-folder"; //$NON-NLS-1$


		assertEquals("create_run_jar", xmlProject.getAttribute("default")); //$NON-NLS-1$ //$NON-NLS-2$
		assertEquals(projectNameValue, xmlProject.getAttribute("name")); //$NON-NLS-1$

		Element xmlProperty= (Element)xmlProject.getElementsByTagName("property").item(2); //$NON-NLS-1$
		assertTrue("actual: " + xmlProperty.getAttribute("name"), xmlProperty.getAttribute("name").equals("destname")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
		assertTrue("actual: " + xmlProperty.getAttribute("value"), archiveName.equals(xmlProperty.getAttribute("value") + ".jar")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

		Element xmlTarget= (Element)xmlProject.getElementsByTagName("target").item(0); //$NON-NLS-1$
		assertEquals("create_run_jar", xmlTarget.getAttribute("name")); //$NON-NLS-1$//$NON-NLS-2$

		Element xmlJar= (Element)xmlTarget.getElementsByTagName("jar").item(0); //$NON-NLS-1$
		assertTrue("actual: " + xmlJar.getAttribute("destfile"), xmlJar.getAttribute("destfile").endsWith("${destjar}")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

		Element xmlManifest= (Element)xmlJar.getElementsByTagName("manifest").item(0); //$NON-NLS-1$


		assertEquals(filesets.length, xmlFilesets.getLength());

		for (int i= 0; i < xmlFilesets.getLength(); i++) {
			String dir= ((Element)xmlFilesets.item(i)).getAttribute("dir").replace('\\', '/'); //$NON-NLS-1$
			boolean found= false;
			for (int j= 0; j < filesets.length; j++) {
				if (dir.endsWith(filesets[j])) {

		}

		Element xmlDelete= (Element)xmlTarget.getElementsByTagName("delete").item(0); //$NON-NLS-1$
		assertTrue("actual: " + xmlDelete.getAttribute("dir"), xmlDelete.getAttribute("dir").equals("${subdir}")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 

		Element xmlMkdir= (Element)xmlTarget.getElementsByTagName("mkdir").item(0); //$NON-NLS-1$
		assertTrue("actual: " + xmlMkdir.getAttribute("dir"), xmlMkdir.getAttribute("dir").equals("${subdir}")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 

		NodeList xmlCopies= xmlTarget.getElementsByTagName("copy"); //$NON-NLS-1$
		assertEquals(zipfilesets.length, xmlCopies.getLength());

		assertEquals("create_run_jar", xmlProject.getAttribute("default")); //$NON-NLS-1$ //$NON-NLS-2$
		assertEquals(projectNameValue, xmlProject.getAttribute("name")); //$NON-NLS-1$

		Element xmlProperty= (Element)xmlProject.getElementsByTagName("property").item(2); //$NON-NLS-1$
		assertTrue("actual: " + xmlProperty.getAttribute("name"), xmlProperty.getAttribute("name").equals("destname")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
		assertTrue("actual: " + xmlProperty.getAttribute("value"), archiveName.equals(xmlProperty.getAttribute("value") + ".jar")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

		Element xmlTarget= (Element)xmlProject.getElementsByTagName("target").item(0); //$NON-NLS-1$
		assertEquals("create_run_jar", xmlTarget.getAttribute("name")); //$NON-NLS-1$//$NON-NLS-2$

		Element xmlJar= (Element)xmlTarget.getElementsByTagName("jar").item(0); //$NON-NLS-1$
		assertTrue("actual: " + xmlJar.getAttribute("destfile"), xmlJar.getAttribute("destfile").endsWith("${destjar}")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

		Element xmlManifest= (Element)xmlJar.getElementsByTagName("manifest").item(0); //$NON-NLS-1$


		assertEquals(zipfilesets.length + 1, xmlZipfilesets.getLength());

		for (int i= 0; i < xmlFilesets.getLength(); i++) {
			String dir= ((Element)xmlFilesets.item(i)).getAttribute("dir").replace('\\', '/'); //$NON-NLS-1$
			boolean found= false;
			for (int j= 0; j < filesets.length; j++) {
				if (dir.endsWith(filesets[j])) {

		assertEquals("create_run_jar", xmlProject.getAttribute("default")); //$NON-NLS-1$ //$NON-NLS-2$
		assertEquals(projectNameValue, xmlProject.getAttribute("name")); //$NON-NLS-1$

		Element xmlProperty= (Element)xmlProject.getElementsByTagName("property").item(2); //$NON-NLS-1$
		assertTrue("actual: " + xmlProperty.getAttribute("name"), xmlProperty.getAttribute("name").equals("destname")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
		assertTrue("actual: " + xmlProperty.getAttribute("value"), archiveName.equals(xmlProperty.getAttribute("value") + ".jar")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

		Element xmlTarget= (Element)xmlProject.getElementsByTagName("target").item(0); //$NON-NLS-1$
		assertEquals("create_run_jar", xmlTarget.getAttribute("name")); //$NON-NLS-1$//$NON-NLS-2$

		Element xmlJar= (Element)xmlTarget.getElementsByTagName("jar").item(0); //$NON-NLS-1$
		assertTrue("actual: " + xmlJar.getAttribute("destfile"), xmlJar.getAttribute("destfile").equals("${destjar}")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
		assertEquals("mergewithoutmain", xmlJar.getAttribute("filesetmanifest")); //$NON-NLS-1$ //$NON-NLS-2$

		Element xmlManifest= (Element)xmlJar.getElementsByTagName("manifest").item(0); //$NON-NLS-1$

		assertEquals(zipfilesets.length, xmlZipfilesets.getLength());

		for (int i= 0; i < xmlFilesets.getLength(); i++) {
			String dir= ((Element)xmlFilesets.item(i)).getAttribute("dir").replace('\\', '/'); //$NON-NLS-1$
			boolean found= false;
			for (int j= 0; j < filesets.length; j++) {
				if (dir.endsWith(filesets[j])) {

		for (int i= 0; i < xmlZipfilesets.getLength(); i++) {
			String excludes= ((Element)xmlZipfilesets.item(i)).getAttribute("excludes"); //$NON-NLS-1$
			assertEquals("META-INF/*.SF", excludes); //$NON-NLS-1$
			String src= ((Element)xmlZipfilesets.item(i)).getAttribute("src").replace('\\', '/'); //$NON-NLS-1$
			boolean found= false;
			for (int j= 0; j < zipfilesets.length; j++) {
				if (src.endsWith(zipfilesets[j])) {

Return to bug 269201

Lines 14-19 Link Here

(-)ui/org/eclipse/jdt/ui/tests/jarexport/FatJarExportTests.java (-11 / +22 lines)
14	* Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 219530 [jar application] add Jar-in-Jar ClassLoader option	14	* Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 219530 [jar application] add Jar-in-Jar ClassLoader option
15	* 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	15	* 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
16	* Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 262763 [jar exporter] remove Built-By attribute in ANT files from Fat JAR Exporter	16	* Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 262763 [jar exporter] remove Built-By attribute in ANT files from Fat JAR Exporter
		17	* 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
17	*******************************************************************************/	18	*******************************************************************************/
18	package org.eclipse.jdt.ui.tests.jarexport;	19	package org.eclipse.jdt.ui.tests.jarexport;
19		20
Lines 469-476 Link Here
469	}	470	}
470		471
471	private static void assertAntScriptCopy(String archiveName, IPath antScriptLocation, String[] filesets, String[] zipfilesets) throws Exception {	472	private static void assertAntScriptCopy(String archiveName, IPath antScriptLocation, String[] filesets, String[] zipfilesets) throws Exception {
472	String subfolderName= archiveName.replaceFirst("^(.*)[.]jar$", "$1_lib"); //$NON-NLS-1$//$NON-NLS-2$
473
474	String projectNameValue= "Create Runnable Jar for Project TestSetupProject"; //$NON-NLS-1$	473	String projectNameValue= "Create Runnable Jar for Project TestSetupProject"; //$NON-NLS-1$
475	projectNameValue+= " with libraries in sub-folder"; //$NON-NLS-1$	474	projectNameValue+= " with libraries in sub-folder"; //$NON-NLS-1$
476		475
Lines 479-489 Link Here
479	assertEquals("create_run_jar", xmlProject.getAttribute("default")); //$NON-NLS-1$ //$NON-NLS-2$	478	assertEquals("create_run_jar", xmlProject.getAttribute("default")); //$NON-NLS-1$ //$NON-NLS-2$
480	assertEquals(projectNameValue, xmlProject.getAttribute("name")); //$NON-NLS-1$	479	assertEquals(projectNameValue, xmlProject.getAttribute("name")); //$NON-NLS-1$
481		480
		481	Element xmlProperty= (Element)xmlProject.getElementsByTagName("property").item(2); //$NON-NLS-1$
		482	assertTrue("actual: " + xmlProperty.getAttribute("name"), xmlProperty.getAttribute("name").equals("destname")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
		483	assertTrue("actual: " + xmlProperty.getAttribute("value"), archiveName.equals(xmlProperty.getAttribute("value") + ".jar")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
		484
482	Element xmlTarget= (Element)xmlProject.getElementsByTagName("target").item(0); //$NON-NLS-1$	485	Element xmlTarget= (Element)xmlProject.getElementsByTagName("target").item(0); //$NON-NLS-1$
483	assertEquals("create_run_jar", xmlTarget.getAttribute("name")); //$NON-NLS-1$//$NON-NLS-2$	486	assertEquals("create_run_jar", xmlTarget.getAttribute("name")); //$NON-NLS-1$//$NON-NLS-2$
484		487
485	Element xmlJar= (Element)xmlTarget.getElementsByTagName("jar").item(0); //$NON-NLS-1$	488	Element xmlJar= (Element)xmlTarget.getElementsByTagName("jar").item(0); //$NON-NLS-1$
486	assertTrue("actual: " + xmlJar.getAttribute("destfile"), xmlJar.getAttribute("destfile").endsWith(archiveName)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$	489	assertTrue("actual: " + xmlJar.getAttribute("destfile"), xmlJar.getAttribute("destfile").endsWith("${destjar}")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
487		490
488	Element xmlManifest= (Element)xmlJar.getElementsByTagName("manifest").item(0); //$NON-NLS-1$	491	Element xmlManifest= (Element)xmlJar.getElementsByTagName("manifest").item(0); //$NON-NLS-1$
489		492
Lines 499-505 Link Here
499	assertEquals(filesets.length, xmlFilesets.getLength());	502	assertEquals(filesets.length, xmlFilesets.getLength());
500		503
501	for (int i= 0; i < xmlFilesets.getLength(); i++) {	504	for (int i= 0; i < xmlFilesets.getLength(); i++) {
502	String dir= ((Element)xmlFilesets.item(i)).getAttribute("dir"); //$NON-NLS-1$	505	String dir= ((Element)xmlFilesets.item(i)).getAttribute("dir").replace('\\', '/'); //$NON-NLS-1$
503	boolean found= false;	506	boolean found= false;
504	for (int j= 0; j < filesets.length; j++) {	507	for (int j= 0; j < filesets.length; j++) {
505	if (dir.endsWith(filesets[j])) {	508	if (dir.endsWith(filesets[j])) {
Lines 511-520 Link Here
511	}	514	}
512		515
513	Element xmlDelete= (Element)xmlTarget.getElementsByTagName("delete").item(0); //$NON-NLS-1$	516	Element xmlDelete= (Element)xmlTarget.getElementsByTagName("delete").item(0); //$NON-NLS-1$
514	assertTrue("actual: " + xmlDelete.getAttribute("dir"), xmlDelete.getAttribute("dir").endsWith(subfolderName)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$	517	assertTrue("actual: " + xmlDelete.getAttribute("dir"), xmlDelete.getAttribute("dir").equals("${subdir}")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
515		518
516	Element xmlMkdir= (Element)xmlTarget.getElementsByTagName("mkdir").item(0); //$NON-NLS-1$	519	Element xmlMkdir= (Element)xmlTarget.getElementsByTagName("mkdir").item(0); //$NON-NLS-1$
517	assertTrue("actual: " + xmlMkdir.getAttribute("dir"), xmlMkdir.getAttribute("dir").endsWith(subfolderName)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$	520	assertTrue("actual: " + xmlMkdir.getAttribute("dir"), xmlMkdir.getAttribute("dir").equals("${subdir}")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
518		521
519	NodeList xmlCopies= xmlTarget.getElementsByTagName("copy"); //$NON-NLS-1$	522	NodeList xmlCopies= xmlTarget.getElementsByTagName("copy"); //$NON-NLS-1$
520	assertEquals(zipfilesets.length, xmlCopies.getLength());	523	assertEquals(zipfilesets.length, xmlCopies.getLength());
Lines 543-553 Link Here
543	assertEquals("create_run_jar", xmlProject.getAttribute("default")); //$NON-NLS-1$ //$NON-NLS-2$	546	assertEquals("create_run_jar", xmlProject.getAttribute("default")); //$NON-NLS-1$ //$NON-NLS-2$
544	assertEquals(projectNameValue, xmlProject.getAttribute("name")); //$NON-NLS-1$	547	assertEquals(projectNameValue, xmlProject.getAttribute("name")); //$NON-NLS-1$
545		548
		549	Element xmlProperty= (Element)xmlProject.getElementsByTagName("property").item(2); //$NON-NLS-1$
		550	assertTrue("actual: " + xmlProperty.getAttribute("name"), xmlProperty.getAttribute("name").equals("destname")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
		551	assertTrue("actual: " + xmlProperty.getAttribute("value"), archiveName.equals(xmlProperty.getAttribute("value") + ".jar")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
		552
546	Element xmlTarget= (Element)xmlProject.getElementsByTagName("target").item(0); //$NON-NLS-1$	553	Element xmlTarget= (Element)xmlProject.getElementsByTagName("target").item(0); //$NON-NLS-1$
547	assertEquals("create_run_jar", xmlTarget.getAttribute("name")); //$NON-NLS-1$//$NON-NLS-2$	554	assertEquals("create_run_jar", xmlTarget.getAttribute("name")); //$NON-NLS-1$//$NON-NLS-2$
548		555
549	Element xmlJar= (Element)xmlTarget.getElementsByTagName("jar").item(0); //$NON-NLS-1$	556	Element xmlJar= (Element)xmlTarget.getElementsByTagName("jar").item(0); //$NON-NLS-1$
550	assertTrue("actual: " + xmlJar.getAttribute("destfile"), xmlJar.getAttribute("destfile").endsWith(archiveName)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$	557	assertTrue("actual: " + xmlJar.getAttribute("destfile"), xmlJar.getAttribute("destfile").endsWith("${destjar}")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
551		558
552	Element xmlManifest= (Element)xmlJar.getElementsByTagName("manifest").item(0); //$NON-NLS-1$	559	Element xmlManifest= (Element)xmlJar.getElementsByTagName("manifest").item(0); //$NON-NLS-1$
553		560
Lines 574-580 Link Here
574	assertEquals(zipfilesets.length + 1, xmlZipfilesets.getLength());	581	assertEquals(zipfilesets.length + 1, xmlZipfilesets.getLength());
575		582
576	for (int i= 0; i < xmlFilesets.getLength(); i++) {	583	for (int i= 0; i < xmlFilesets.getLength(); i++) {
577	String dir= ((Element)xmlFilesets.item(i)).getAttribute("dir"); //$NON-NLS-1$	584	String dir= ((Element)xmlFilesets.item(i)).getAttribute("dir").replace('\\', '/'); //$NON-NLS-1$
578	boolean found= false;	585	boolean found= false;
579	for (int j= 0; j < filesets.length; j++) {	586	for (int j= 0; j < filesets.length; j++) {
580	if (dir.endsWith(filesets[j])) {	587	if (dir.endsWith(filesets[j])) {
Lines 610-620 Link Here
610	assertEquals("create_run_jar", xmlProject.getAttribute("default")); //$NON-NLS-1$ //$NON-NLS-2$	617	assertEquals("create_run_jar", xmlProject.getAttribute("default")); //$NON-NLS-1$ //$NON-NLS-2$
611	assertEquals(projectNameValue, xmlProject.getAttribute("name")); //$NON-NLS-1$	618	assertEquals(projectNameValue, xmlProject.getAttribute("name")); //$NON-NLS-1$
612		619
		620	Element xmlProperty= (Element)xmlProject.getElementsByTagName("property").item(2); //$NON-NLS-1$
		621	assertTrue("actual: " + xmlProperty.getAttribute("name"), xmlProperty.getAttribute("name").equals("destname")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
		622	assertTrue("actual: " + xmlProperty.getAttribute("value"), archiveName.equals(xmlProperty.getAttribute("value") + ".jar")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
		623
613	Element xmlTarget= (Element)xmlProject.getElementsByTagName("target").item(0); //$NON-NLS-1$	624	Element xmlTarget= (Element)xmlProject.getElementsByTagName("target").item(0); //$NON-NLS-1$
614	assertEquals("create_run_jar", xmlTarget.getAttribute("name")); //$NON-NLS-1$//$NON-NLS-2$	625	assertEquals("create_run_jar", xmlTarget.getAttribute("name")); //$NON-NLS-1$//$NON-NLS-2$
615		626
616	Element xmlJar= (Element)xmlTarget.getElementsByTagName("jar").item(0); //$NON-NLS-1$	627	Element xmlJar= (Element)xmlTarget.getElementsByTagName("jar").item(0); //$NON-NLS-1$
617	assertTrue("actual: " + xmlJar.getAttribute("destfile"), xmlJar.getAttribute("destfile").endsWith(archiveName)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$	628	assertTrue("actual: " + xmlJar.getAttribute("destfile"), xmlJar.getAttribute("destfile").equals("${destjar}")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
618	assertEquals("mergewithoutmain", xmlJar.getAttribute("filesetmanifest")); //$NON-NLS-1$ //$NON-NLS-2$	629	assertEquals("mergewithoutmain", xmlJar.getAttribute("filesetmanifest")); //$NON-NLS-1$ //$NON-NLS-2$
619		630
620	Element xmlManifest= (Element)xmlJar.getElementsByTagName("manifest").item(0); //$NON-NLS-1$	631	Element xmlManifest= (Element)xmlJar.getElementsByTagName("manifest").item(0); //$NON-NLS-1$
Lines 634-640 Link Here
634	assertEquals(zipfilesets.length, xmlZipfilesets.getLength());	645	assertEquals(zipfilesets.length, xmlZipfilesets.getLength());
635		646
636	for (int i= 0; i < xmlFilesets.getLength(); i++) {	647	for (int i= 0; i < xmlFilesets.getLength(); i++) {
637	String dir= ((Element)xmlFilesets.item(i)).getAttribute("dir"); //$NON-NLS-1$	648	String dir= ((Element)xmlFilesets.item(i)).getAttribute("dir").replace('\\', '/'); //$NON-NLS-1$
638	boolean found= false;	649	boolean found= false;
639	for (int j= 0; j < filesets.length; j++) {	650	for (int j= 0; j < filesets.length; j++) {
640	if (dir.endsWith(filesets[j])) {	651	if (dir.endsWith(filesets[j])) {
Lines 648-654 Link Here
648	for (int i= 0; i < xmlZipfilesets.getLength(); i++) {	659	for (int i= 0; i < xmlZipfilesets.getLength(); i++) {
649	String excludes= ((Element)xmlZipfilesets.item(i)).getAttribute("excludes"); //$NON-NLS-1$	660	String excludes= ((Element)xmlZipfilesets.item(i)).getAttribute("excludes"); //$NON-NLS-1$
650	assertEquals("META-INF/*.SF", excludes); //$NON-NLS-1$	661	assertEquals("META-INF/*.SF", excludes); //$NON-NLS-1$
651	String src= ((Element)xmlZipfilesets.item(i)).getAttribute("src"); //$NON-NLS-1$	662	String src= ((Element)xmlZipfilesets.item(i)).getAttribute("src").replace('\\', '/'); //$NON-NLS-1$
652	boolean found= false;	663	boolean found= false;
653	for (int j= 0; j < zipfilesets.length; j++) {	664	for (int j= 0; j < zipfilesets.length; j++) {
654	if (src.endsWith(zipfilesets[j])) {	665	if (src.endsWith(zipfilesets[j])) {