Attachment 91518 Details for Bug 220257 – fix for missing Class-Path entry

[patch] fix for missing Class-Path entry

fix2_classpath_compress.txt (text/plain), 10.29 KB, created by Ferenc Hechler

on 2008-03-04 10:23:41 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ferenc Hechler

Created: 2008-03-04 10:23:41 EST

Size: 10.29 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.ui.tests
>Index: ui/org/eclipse/jdt/ui/tests/jarexport/FatJarExportTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/jarexport/FatJarExportTests.java,v
>retrieving revision 1.2
>diff -u -r1.2 FatJarExportTests.java
>--- ui/org/eclipse/jdt/ui/tests/jarexport/FatJarExportTests.java	22 Feb 2008 10:33:51 -0000	1.2
>+++ ui/org/eclipse/jdt/ui/tests/jarexport/FatJarExportTests.java	4 Mar 2008 15:22:22 -0000
>@@ -9,6 +9,7 @@
>  *     IBM Corporation - initial API and implementation
>  *     Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 83258 [jar exporter] Deploy java application as executable jar
>  *     Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 213638 [jar exporter] create ANT build file for current settings
>+ *     Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 220257 [jar application] ANT build file does not create Class-Path Entry in Manifest
>  *******************************************************************************/
> package org.eclipse.jdt.ui.tests.jarexport;
> 
>@@ -146,9 +147,9 @@
> 		return buf.toString();
> 	}
> 
>-	private static JarPackageData createAndRunFatJar(IJavaProject project, String testName) throws Exception, CoreException {
>+	private static JarPackageData createAndRunFatJar(IJavaProject project, String testName, boolean compressJar) throws Exception, CoreException {
> 		// create jar and check contents
>-		JarPackageData data= assertFatJarExport(project, testName);
>+		JarPackageData data= assertFatJarExport(project, testName, compressJar);
> 
> 		// run newly generated jar and check stdout
> 		String stdout= runJar(project, data.getJarLocation().toOSString());
>@@ -161,7 +162,7 @@
> 		return data;
> 	}
> 
>-	private static JarPackageData assertFatJarExport(IJavaProject project, String testName) throws Exception {
>+	private static JarPackageData assertFatJarExport(IJavaProject project, String testName, boolean compressJar) throws Exception {
> 		//create class files
> 		ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, null);
> 
>@@ -176,6 +177,9 @@
> 		//create data
> 		JarPackageData data= createJarPackageData(project, testName);
> 
>+		// set compression
>+		data.setCompress(compressJar);
>+
> 		//create archive
> 		ZipFile generatedArchive= createArchive(data);
> 
>@@ -358,6 +362,10 @@
> 		assertEquals("Main-Class", xmlAttribute2.getAttribute("name"));
> 		assertEquals("org.eclipse.jdt.ui.test.Main", xmlAttribute2.getAttribute("value"));
> 
>+		Element xmlAttribute3= (Element) xmlManifest.getElementsByTagName("attribute").item(2);
>+		assertEquals("Class-Path", xmlAttribute3.getAttribute("name"));
>+		assertEquals(".", xmlAttribute3.getAttribute("value"));
>+
> 		NodeList xmlFilesets = xmlJar.getElementsByTagName("fileset");
> 		assertEquals(filesets.length, xmlFilesets.getLength());		
> 
>@@ -418,7 +426,7 @@
> 		try {
> 			pack.createCompilationUnit("Foo.java", getFooContent(), true, null);
> 
>-			JarPackageData data= createAndRunFatJar(fProject, getName());
>+			JarPackageData data= createAndRunFatJar(fProject, getName(), true);
> 			assertAntScript(data, antScriptLocation(getName()),
> 					new String[] { "TestSetupProject/bin" }, 
> 					new String[] { "rtstubs15.jar" });
>@@ -434,7 +442,7 @@
> 			IPackageFragment pack= root.createPackageFragment("mylib", true, null);
> 			pack.createCompilationUnit("Foo.java", getFooContent(), true, null);
> 
>-			JarPackageData data= createAndRunFatJar(fProject, getName());
>+			JarPackageData data= createAndRunFatJar(fProject, getName(), true);
> 			assertAntScript(data, antScriptLocation(getName()),
> 					new String[] { "TestSetupProject/bin", "TestSetupProject/otherout" },
> 					new String[] { "rtstubs15.jar" });
>@@ -450,7 +458,7 @@
> 			IPackageFragment pack= root.createPackageFragment("mylib", true, null);
> 			pack.createCompilationUnit("Foo.java", getFooContent(), true, null);
> 
>-			JarPackageData data= createAndRunFatJar(fProject, getName());
>+			JarPackageData data= createAndRunFatJar(fProject, getName(), true);
> 			assertAntScript(data, antScriptLocation(getName()),
> 					new String[]{"TestSetupProject/bin"}, 
> 					new String[]{"rtstubs15.jar"});
>@@ -470,7 +478,7 @@
> 
> 			JavaProjectHelper.addRequiredProject(fProject, otherProject);
> 
>-			JarPackageData data= createAndRunFatJar(fProject, getName());
>+			JarPackageData data= createAndRunFatJar(fProject, getName(), true);
> 			assertAntScript(data, antScriptLocation(getName()), 
> 					new String[]{"TestSetupProject/bin", "OtherProject/bin"}, 
> 					new String[]{"rtstubs15.jar"});
>@@ -485,7 +493,21 @@
> 		IPackageFragmentRoot root= JavaProjectHelper.addLibraryWithImport(fProject, Path.fromOSString(lib.getPath()), null, null);
> 
> 		try {
>-			JarPackageData data= createAndRunFatJar(fProject, getName());
>+			JarPackageData data= createAndRunFatJar(fProject, getName(), true);
>+			assertAntScript(data, antScriptLocation(getName()), 
>+					new String[]{"TestSetupProject/bin"}, 
>+					new String[]{"rtstubs15.jar", "TestSetupProject/mylib_stdout.jar"});
>+		} finally {
>+			JavaProjectHelper.removeFromClasspath(fProject, root.getPath());
>+		}
>+	}
>+
>+	public void testExportInternalLib_UncompressedJar() throws Exception {
>+		File lib= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.MYLIB_STDOUT);
>+		IPackageFragmentRoot root= JavaProjectHelper.addLibraryWithImport(fProject, Path.fromOSString(lib.getPath()), null, null);
>+
>+		try {
>+			JarPackageData data= createAndRunFatJar(fProject, getName(), false);
> 			assertAntScript(data, antScriptLocation(getName()), 
> 					new String[]{"TestSetupProject/bin"}, 
> 					new String[]{"rtstubs15.jar", "TestSetupProject/mylib_stdout.jar"});
>@@ -499,7 +521,7 @@
> 		IPackageFragmentRoot root= JavaProjectHelper.addLibrary(fProject, Path.fromOSString(lib.getPath()));
> 
> 		try {
>-			JarPackageData data= createAndRunFatJar(fProject, getName());
>+			JarPackageData data= createAndRunFatJar(fProject, getName(), true);
> 			assertAntScript(data, antScriptLocation(getName()), 
> 					new String[]{"TestSetupProject/bin"}, 
> 					new String[]{"rtstubs15.jar", "testresources/mylib_stdout.jar"});
>@@ -513,7 +535,7 @@
> 
> 		IPackageFragmentRoot root= JavaProjectHelper.addClassFolderWithImport(fProject, "cf", null, null, lib);
> 		try {
>-			JarPackageData data= createAndRunFatJar(fProject, getName());
>+			JarPackageData data= createAndRunFatJar(fProject, getName(), true);
> 			assertAntScript(data, antScriptLocation(getName()), 
> 					new String[]{"TestSetupProject/bin", "TestSetupProject/cf"}, 
> 					new String[]{"rtstubs15.jar"});
>@@ -528,7 +550,7 @@
> 
> 		JavaProjectHelper.addVariableEntry(fProject, new Path("MYLIB"), null, null);
> 		try {
>-			JarPackageData data= createAndRunFatJar(fProject, getName());
>+			JarPackageData data= createAndRunFatJar(fProject, getName(), true);
> 			assertAntScript(data, antScriptLocation(getName()), 
> 					new String[]{"TestSetupProject/bin"}, 
> 					new String[]{"rtstubs15.jar", "testresources/mylib_stdout.jar"});
>@@ -542,7 +564,7 @@
> 		IPackageFragmentRoot root= JavaProjectHelper.addLibraryWithImport(fProject, Path.fromOSString(lib.getPath()), null, null);
> 
> 		try {
>-			JarPackageData data= createAndRunFatJar(fProject, getName());
>+			JarPackageData data= createAndRunFatJar(fProject, getName(), true);
> 			assertAntScript(data, antScriptLocation(getName()), 
> 					new String[]{"TestSetupProject/bin"}, 
> 					new String[]{"rtstubs15.jar", "TestSetupProject/mylib_sig.jar"});
>#P org.eclipse.jdt.ui
>Index: ui/org/eclipse/jdt/internal/ui/jarpackagerfat/JarWriter4.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackagerfat/JarWriter4.java,v
>retrieving revision 1.1
>diff -u -r1.1 JarWriter4.java
>--- ui/org/eclipse/jdt/internal/ui/jarpackagerfat/JarWriter4.java	26 Nov 2007 13:57:10 -0000	1.1
>+++ ui/org/eclipse/jdt/internal/ui/jarpackagerfat/JarWriter4.java	4 Mar 2008 15:22:25 -0000
>@@ -8,6 +8,7 @@
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>  *     Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 83258 [jar exporter] Deploy java application as executable jar
>+ *     Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 220257 [jar application] ANT build file does not create Class-Path Entry in Manifest
>  *******************************************************************************/
> package org.eclipse.jdt.internal.ui.jarpackagerfat;
> 
>@@ -45,7 +46,7 @@
> 		else {
> 			newEntry.setMethod(ZipEntry.STORED);
> 			newEntry.setSize(zipEntry.getSize());
>-			newEntry.setCompressedSize(zipEntry.getCrc());
>+			newEntry.setCrc(zipEntry.getCrc());
> 		}
> 
> 		long lastModified= System.currentTimeMillis();
>Index: ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarAntExporter.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarAntExporter.java,v
>retrieving revision 1.1
>diff -u -r1.1 FatJarAntExporter.java
>--- ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarAntExporter.java	22 Feb 2008 10:33:54 -0000	1.1
>+++ ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarAntExporter.java	4 Mar 2008 15:22:25 -0000
>@@ -8,6 +8,7 @@
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>  *     Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 213638 [jar exporter] create ANT build file for current settings
>+ *     Ferenc Hechler, ferenc_hechler@users.sourceforge.net - 220257 [jar application] ANT build file does not create Class-Path Entry in Manifest
>  *******************************************************************************/
> package org.eclipse.jdt.internal.ui.jarpackagerfat;
> 
>@@ -234,6 +235,11 @@
> 		attribute.setAttribute("value", mainClass); //$NON-NLS-1$ 
> 		manifest.appendChild(attribute);
> 
>+		attribute= document.createElement("attribute"); //$NON-NLS-1$
>+		attribute.setAttribute("name", "Class-Path"); //$NON-NLS-1$ //$NON-NLS-2$s 
>+		attribute.setAttribute("value", "."); //$NON-NLS-1$ //$NON-NLS-2$ 
>+		manifest.appendChild(attribute);
>+
> 		for (int i= 0; i < sourceInfos.length; i++) {
> 			SourceInfo sourceInfo= sourceInfos[i];
> 			if (sourceInfo.isJar) {

Actions: View | Diff

Attachments on bug 220257: 90673 | 91518