# HG changeset patch # User Jaroslav Tulach # Date 1416776361 -3600 # Node ID 1d850aa501bbc7baf6c8ae8cc745ed620c9f0941 # Parent 86e61729f754479c86154e55fed525d24a433d6f Recognizes NetBeans manifest tags diff -r 86e61729f754 -r 1d850aa501bb pom.xml --- a/pom.xml Sun Nov 23 21:55:46 2014 +0100 +++ b/pom.xml Sun Nov 23 21:59:21 2014 +0100 @@ -177,6 +177,11 @@ ${netbeans.version} + org.netbeans.modules + org-netbeans-libs-javacimpl + ${netbeans.version} + + org.netbeans.api org-netbeans-spi-java-hints ${netbeans.version} diff -r 86e61729f754 -r 1d850aa501bb rt/aot-nb-test/pom.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rt/aot-nb-test/pom.xml Sun Nov 23 21:59:21 2014 +0100 @@ -0,0 +1,66 @@ + + + 4.0.0 + + org.apidesign.bck2brwsr + rt + 1.0-SNAPSHOT + + aot-nb-test + Ahead of Time + NetBeans Tags Test + jar + + + org.netbeans.api + org-netbeans-libs-javacapi + + + org.netbeans.modules + org-netbeans-libs-javacimpl + + + org.testng + testng + test + + + org.apidesign.bck2brwsr + vmtest + ${project.version} + test + jar + + + ${project.groupId} + launcher.http + ${project.version} + test + + + org.netbeans.api + org-openide-util-lookup + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.5.1 + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-surefire-plugin + + + brwsr + + + + + + \ No newline at end of file diff -r 86e61729f754 -r 1d850aa501bb rt/aot-nb-test/src/test/java/org/apidesign/bck2brwsr/aot/nb/test/LookupGetTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rt/aot-nb-test/src/test/java/org/apidesign/bck2brwsr/aot/nb/test/LookupGetTest.java Sun Nov 23 21:59:21 2014 +0100 @@ -0,0 +1,38 @@ +/** + * Back 2 Browser Bytecode Translator + * Copyright (C) 2012 Jaroslav Tulach + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. Look for COPYING file in the top folder. + * If not, see http://opensource.org/licenses/GPL-2.0. + */ +package org.apidesign.bck2brwsr.aot.nb.test; + +import org.apidesign.bck2brwsr.vmtest.Compare; +import org.apidesign.bck2brwsr.vmtest.VMTest; +import org.openide.util.Lookup; +import org.testng.annotations.Factory; + +/** + * + * @author Jaroslav Tulach + */ +public class LookupGetTest { + + @Compare public boolean getDefault() { + return Lookup.getDefault() != null; + } + + @Factory public static Object[] create() { + return VMTest.create(LookupGetTest.class); + } +} diff -r 86e61729f754 -r 1d850aa501bb rt/aot/pom.xml --- a/rt/aot/pom.xml Sun Nov 23 21:55:46 2014 +0100 +++ b/rt/aot/pom.xml Sun Nov 23 21:59:21 2014 +0100 @@ -33,5 +33,11 @@ 1.6.1 jar + + org.testng + testng + 6.8.1 + test + diff -r 86e61729f754 -r 1d850aa501bb rt/aot/src/main/java/org/apidesign/bck2brwsr/aot/Bck2BrwsrJars.java --- a/rt/aot/src/main/java/org/apidesign/bck2brwsr/aot/Bck2BrwsrJars.java Sun Nov 23 21:55:46 2014 +0100 +++ b/rt/aot/src/main/java/org/apidesign/bck2brwsr/aot/Bck2BrwsrJars.java Sun Nov 23 21:59:21 2014 +0100 @@ -187,6 +187,16 @@ break; } } + return; + } + exp = mainAttr.getValue("OpenIDE-Module-Public-Packages"); + if (exp != null) { + for (String def : exp.split(",")) { + def = def.trim(); + if (def.endsWith(".*")) { + keep.add(def.substring(0, def.length() - 1).replace('.', '/')); + } + } } } diff -r 86e61729f754 -r 1d850aa501bb rt/aot/src/test/java/org/apidesign/bck2brwsr/aot/ExportPublicPackagesTest.java --- a/rt/aot/src/test/java/org/apidesign/bck2brwsr/aot/ExportPublicPackagesTest.java Sun Nov 23 21:55:46 2014 +0100 +++ b/rt/aot/src/test/java/org/apidesign/bck2brwsr/aot/ExportPublicPackagesTest.java Sun Nov 23 21:59:21 2014 +0100 @@ -66,8 +66,22 @@ Set keep = new TreeSet<>(); Bck2BrwsrJars.exportPublicPackages(attr, keep); - assertEquals(keep.size(), 7, "Two: " + keep); + assertEquals(keep.size(), 7, "Seven: " + keep); assertEquals(keep.toString(), "[org/eclipse/mylyn/commons/core/, org/eclipse/mylyn/commons/core/io/, org/eclipse/mylyn/commons/core/net/, org/eclipse/mylyn/commons/core/operations/, org/eclipse/mylyn/commons/core/storage/, org/eclipse/mylyn/internal/commons/core/, org/eclipse/mylyn/internal/commons/core/operations/]"); } + + @Test public void lookupHeaders() throws Exception { + Attributes attr = new Attributes(); + attr.putValue("OpenIDE-Module-Public-Packages", + "org.openide.util.*, org.openide.util.lookup.*, org.openide.util.lookup.implspi.*" + ); + Set keep = new TreeSet<>(); + Bck2BrwsrJars.exportPublicPackages(attr, keep); + + assertEquals(keep.size(), 3, "Three: " + keep); + assertTrue(keep.contains("org/openide/util/"), "main pkg: " + keep); + assertTrue(keep.contains("org/openide/util/lookup/"), "util pkg: " + keep); + assertTrue(keep.contains("org/openide/util/lookup/implspi/"), "spiimpl pkg: " + keep); + } } diff -r 86e61729f754 -r 1d850aa501bb rt/pom.xml --- a/rt/pom.xml Sun Nov 23 21:55:46 2014 +0100 +++ b/rt/pom.xml Sun Nov 23 21:59:21 2014 +0100 @@ -18,6 +18,7 @@ vm vmtest aot + aot-nb-test