Attachment #277760 for bug #545033

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

Added Link Here

(-)a/ajde.core/testdata/IgnoreJava9JarElements/.gitignore (+2 lines)
1	.gradle
2	build

Added Link Here

(-)a/ajde.core/testdata/IgnoreJava9JarElements/README (+2 lines)
1	Generates a modular, multi-release JAR. To regenerate, run `gradle jar`. The output
2	is `build/libs/IgnoreJava9JarElements.jar`.




/*******************************************************************************
 * Copyright (c) 2019 Contributors
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *******************************************************************************/

apply plugin: 'java-library'

if (!JavaVersion.current().isJava11Compatible()) {
   throw new GradleException("Run with with JDK 11 or newer.")
}

sourceSets {
   java11 {
      java {
       srcDirs = ['src/main/java11']
      }
   }
   moduleInfo {
      java {
         srcDirs = ['src/main/module-info']
      }
   }
}

compileJava {
   sourceCompatibility = 8
   targetCompatibility = 8
}

compileJava11Java {
   sourceCompatibility = 11
   targetCompatibility = 11
}

compileModuleInfoJava {
   sourceCompatibility = 11
   targetCompatibility = 11
}

jar {
   into('META-INF/versions/11') {
      from sourceSets.java11.output
   }
   into('') {
      from sourceSets.moduleInfo.output
   }
   manifest.attributes(
      'Multi-Release': 'true',
      'Main-Class': 'org.aspectj.JdkSpecific'
   )
}




/*******************************************************************************
 * Copyright (c) 2019 Contributors
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *******************************************************************************/

package org.aspectj;

public class JdkSpecific {
     public static void main(String... args) {
         System.out.println("This is the Java 8 version of the class.");
     }
}




/*******************************************************************************
 * Copyright (c) 2019 Contributors
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *******************************************************************************/

package org.aspectj;

public class JdkSpecific {
     public static void main(String... args) {
         System.out.println("This is the Java 11 version of the class.");
     }
}

Added Link Here

(-)a/ajde.core/testdata/IgnoreJava9JarElements/src/main/module-info/module-info.java (+11 lines)
1	/*******************************************************************************
2	* Copyright (c) 2019 Contributors
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*******************************************************************************/
8
9	module org.aspectj.java9plusjar {
10
11	}




/*******************************************************************************
 * Copyright (c) 2019 Contributors
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *******************************************************************************/
package org.aspectj.ajde.core.tests;

import java.io.File;
import java.io.IOException;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Set;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.jar.Manifest;

import org.aspectj.ajde.core.AjdeCoreTestCase;
import org.aspectj.ajde.core.TestCompilerConfiguration;
import org.aspectj.ajde.core.TestMessageHandler;

public class IgnoreJava9JarElements extends AjdeCoreTestCase {

    public static final String injarName = "build/libs/IgnoreJava9JarElements.jar";
    public static final String outjarName = "outjar.jar";

    private TestMessageHandler handler;
    private TestCompilerConfiguration compilerConfig;

    protected void setUp() throws Exception {
        super.setUp();
        initialiseProject("IgnoreJava9JarElements");
        handler = (TestMessageHandler) getCompiler().getMessageHandler();
        compilerConfig = (TestCompilerConfiguration) getCompiler()
                .getCompilerConfiguration();
    }

    protected void tearDown() throws Exception {
        super.tearDown();
        handler = null;
        compilerConfig = null;
    }

    public void testWeave() {
        Set<File> injars = new HashSet<File>();
        injars.add(openFile(injarName));
        compilerConfig.setInpath(injars);
        Set<File> aspectpath = new HashSet<File>();
        compilerConfig.setAspectPath(aspectpath);
        File outjar = openFile(outjarName);
        compilerConfig.setOutjar(outjar.getAbsolutePath());
        doBuild(true);
        assertTrue("Expected no compiler errors or warnings but found "
                + handler.getMessages(), handler.getMessages().isEmpty());
        compareManifests(openFile(injarName), openFile(outjarName));
    }

    private void compareManifests(File inFile, File outFile) {

        try {
            JarFile inJar = new JarFile(inFile);
            Manifest inManifest = inJar.getManifest();
            inJar.close();
            JarFile outJar = new JarFile(outFile);
            Manifest outManifest = outJar.getManifest();
            outJar.close();
            assertTrue("The manifests in '" + inFile.getCanonicalPath()
                    + "' and '" + outFile.getCanonicalPath()
                    + "' sould be the same", inManifest.equals(outManifest));
        } catch (IOException ex) {
            fail(ex.toString());
        }
    }

}





					while (entries.hasMoreElements()) {
						JarEntry entry = (JarEntry) entries.nextElement();
						String filename = entry.getName();
						String filenameLowercase = filename.toLowerCase();

						// Ignore class files that Java 8 won't understand (multi-release and module-info)
						if (filenameLowercase.startsWith("meta-inf")
								|| filenameLowercase.endsWith("module-info.class")) {
							continue;
						}

						InputStream inStream = inJar.getInputStream(entry);

						byte[] bytes = FileUtil.readAsByteArray(inStream);
						String filename = entry.getName();
						// System.out.println("? addJarFile() filename='" + filename
						// + "'");
						UnwovenClassFile classFile = new UnwovenClassFile(new File(outDir, filename).getAbsolutePath(), bytes);

						if (filenameLowercase.endsWith(".class")) {
							ReferenceType type = this.addClassFile(classFile, false);
							StringBuffer sb = new StringBuffer();
							sb.append(inFile.getAbsolutePath());

Return to bug 545033

Lines 391-405 public class BcelWeaver { Link Here

(-)a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java (-2 / +10 lines)
391		391
392	while (entries.hasMoreElements()) {	392	while (entries.hasMoreElements()) {
393	JarEntry entry = (JarEntry) entries.nextElement();	393	JarEntry entry = (JarEntry) entries.nextElement();
		394	String filename = entry.getName();
		395	String filenameLowercase = filename.toLowerCase();
		396
		397	// Ignore class files that Java 8 won't understand (multi-release and module-info)
		398	if (filenameLowercase.startsWith("meta-inf")
		399	\|\| filenameLowercase.endsWith("module-info.class")) {
		400	continue;
		401	}
		402
394	InputStream inStream = inJar.getInputStream(entry);	403	InputStream inStream = inJar.getInputStream(entry);
395		404
396	byte[] bytes = FileUtil.readAsByteArray(inStream);	405	byte[] bytes = FileUtil.readAsByteArray(inStream);
397	String filename = entry.getName();
398	// System.out.println("? addJarFile() filename='" + filename	406	// System.out.println("? addJarFile() filename='" + filename
399	// + "'");	407	// + "'");
400	UnwovenClassFile classFile = new UnwovenClassFile(new File(outDir, filename).getAbsolutePath(), bytes);	408	UnwovenClassFile classFile = new UnwovenClassFile(new File(outDir, filename).getAbsolutePath(), bytes);
401		409
402	if (filename.endsWith(".class")) {	410	if (filenameLowercase.endsWith(".class")) {
403	ReferenceType type = this.addClassFile(classFile, false);	411	ReferenceType type = this.addClassFile(classFile, false);
404	StringBuffer sb = new StringBuffer();	412	StringBuffer sb = new StringBuffer();
405	sb.append(inFile.getAbsolutePath());	413	sb.append(inFile.getAbsolutePath());

Added Link Here

(-)a/ajde.core/testsrc/org/aspectj/ajde/core/tests/IgnoreJava9JarElements.java (+76 lines)
1	/*******************************************************************************
2	* Copyright (c) 2019 Contributors
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*******************************************************************************/
8	package org.aspectj.ajde.core.tests;
9
10	import java.io.File;
11	import java.io.IOException;
12	import java.util.Enumeration;
13	import java.util.HashSet;
14	import java.util.Set;
15	import java.util.jar.JarEntry;
16	import java.util.jar.JarFile;
17	import java.util.jar.Manifest;
18
19	import org.aspectj.ajde.core.AjdeCoreTestCase;
20	import org.aspectj.ajde.core.TestCompilerConfiguration;
21	import org.aspectj.ajde.core.TestMessageHandler;
22
23	public class IgnoreJava9JarElements extends AjdeCoreTestCase {
24
25	public static final String injarName = "build/libs/IgnoreJava9JarElements.jar";
26	public static final String outjarName = "outjar.jar";
27
28	private TestMessageHandler handler;
29	private TestCompilerConfiguration compilerConfig;
30
31	protected void setUp() throws Exception {
32	super.setUp();
33	initialiseProject("IgnoreJava9JarElements");
34	handler = (TestMessageHandler) getCompiler().getMessageHandler();
35	compilerConfig = (TestCompilerConfiguration) getCompiler()
36	.getCompilerConfiguration();
37	}
38
39	protected void tearDown() throws Exception {
40	super.tearDown();
41	handler = null;
42	compilerConfig = null;
43	}
44
45	public void testWeave() {
46	Set<File> injars = new HashSet<File>();
47	injars.add(openFile(injarName));
48	compilerConfig.setInpath(injars);
49	Set<File> aspectpath = new HashSet<File>();
50	compilerConfig.setAspectPath(aspectpath);
51	File outjar = openFile(outjarName);
52	compilerConfig.setOutjar(outjar.getAbsolutePath());
53	doBuild(true);
54	assertTrue("Expected no compiler errors or warnings but found "
55	+ handler.getMessages(), handler.getMessages().isEmpty());
56	compareManifests(openFile(injarName), openFile(outjarName));
57	}
58
59	private void compareManifests(File inFile, File outFile) {
60
61	try {
62	JarFile inJar = new JarFile(inFile);
63	Manifest inManifest = inJar.getManifest();
64	inJar.close();
65	JarFile outJar = new JarFile(outFile);
66	Manifest outManifest = outJar.getManifest();
67	outJar.close();
68	assertTrue("The manifests in '" + inFile.getCanonicalPath()
69	+ "' and '" + outFile.getCanonicalPath()
70	+ "' sould be the same", inManifest.equals(outManifest));
71	} catch (IOException ex) {
72	fail(ex.toString());
73	}
74	}
75
76	}