Attachment #118352 for bug #206365

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

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




import java.io.File;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import org.netbeans.MockEvents;
import org.netbeans.MockModuleInstaller;
import org.netbeans.Module;
import org.netbeans.ModuleManager;
import org.openide.modules.Dependency;

/**
 *

            File j2 = changeManifest(new File(jars, "depends-on-simple-module.jar"), mfBar);
            Module m1 = mgr.create(j1, null, false, false, false);
            Module m2 = mgr.create(j2, null, false, false, false);
            assertProvidesRequires(m2, "org.bar", "org.foo");
            HashSet<Module> b = new HashSet<Module>(Arrays.asList(m1, m2));
            mgr.enable(b);
            both = b;

        }
    }

    private static void assertProvidesRequires(Module m, String provides, String requires) {
        List<String> p = Arrays.asList(m.getProvides());
        assertTrue("Bundles provide their packages: " + p, p.contains(provides));
        
        for (Dependency d : m.getDependencies()) {
            if (d.getType() == Dependency.TYPE_RECOMMENDS) {
                if (requires.equals(d.getName())) {
                    return;
                }
            }
        }
        fail("Module " + m + " does not require " + requires);
    }

}

Lines 45-54 Link Here

(-)a/core.netigso/test/unit/src/org/netbeans/core/netigso/NetigsoOSGiCanRequestTest.java (+18 lines)
45	import java.io.File;	45	import java.io.File;
46	import java.util.Arrays;	46	import java.util.Arrays;
47	import java.util.HashSet;	47	import java.util.HashSet;
		48	import java.util.List;
48	import org.netbeans.MockEvents;	49	import org.netbeans.MockEvents;
49	import org.netbeans.MockModuleInstaller;	50	import org.netbeans.MockModuleInstaller;
50	import org.netbeans.Module;	51	import org.netbeans.Module;
51	import org.netbeans.ModuleManager;	52	import org.netbeans.ModuleManager;
		53	import org.openide.modules.Dependency;
52		54
53	/**	55	/**
54	*	56	*
Lines 78-83 Link Here
78	File j2 = changeManifest(new File(jars, "depends-on-simple-module.jar"), mfBar);	80	File j2 = changeManifest(new File(jars, "depends-on-simple-module.jar"), mfBar);
79	Module m1 = mgr.create(j1, null, false, false, false);	81	Module m1 = mgr.create(j1, null, false, false, false);
80	Module m2 = mgr.create(j2, null, false, false, false);	82	Module m2 = mgr.create(j2, null, false, false, false);
		83
		84	assertProvidesRequires(m2, "org.bar", "org.foo");
		85
81	HashSet<Module> b = new HashSet<Module>(Arrays.asList(m1, m2));	86	HashSet<Module> b = new HashSet<Module>(Arrays.asList(m1, m2));
82	mgr.enable(b);	87	mgr.enable(b);
83	both = b;	88	both = b;
Lines 93-97 Link Here
93	mgr.mutexPrivileged().exitWriteAccess();	98	mgr.mutexPrivileged().exitWriteAccess();
94	}	99	}
95	}	100	}
		101	private static void assertProvidesRequires(Module m, String provides, String requires) {
		102	List<String> p = Arrays.asList(m.getProvides());
		103	assertTrue("Bundles provide their packages: " + p, p.contains(provides));
		104
		105	for (Dependency d : m.getDependencies()) {
		106	if (d.getType() == Dependency.TYPE_MODULE) {
		107	if (requires.equals(d.getName())) {
		108	return;
		109	}
		110	}
		111	}
		112	fail("Module " + m + " does not require " + requires);
		113	}
96		114
97	}	115	}




            String bld = attr.getValue("OpenIDE-Module-Build-Version"); // NOI18N
            buildVersion = bld == null ? implVersion : bld;
            
            this.provides = computeProvides(forModule, attr, verifyCNBs, false);

            // Exports
            String exportsS = attr.getValue("OpenIDE-Module-Public-Packages"); // NOI18N

        this.buildVersion = bld == null ? implVersion : bld;
        this.friendNames = Collections.emptySet();
        this.publicPackages = null;
        this.provides = computeProvides(m, mf.getMainAttributes(), false, true);
        this.dependencies = computeImported(mf.getMainAttributes());
        this.coveredPackages = new HashSet<String>();
    }
    

        Module.PackageExport.write(dos, publicPackages);
    }

    private Dependency[] computeImported(Attributes attr) {
        String pkgs = attr.getValue("Import-Package"); // NOI18N
        List<Dependency> arr = null;
        if (pkgs != null) {
            arr = new ArrayList<Dependency>();
            StringTokenizer tok = createTokenizer(pkgs); // NOI18N
            while (tok.hasMoreElements()) {
                String dep = beforeSemicolon(tok);
                arr.addAll(Dependency.create(Dependency.TYPE_RECOMMENDS, dep));
            }
        }
        String recomm = attr.getValue("Require-Bundle"); // NOI18N
        if (recomm != null) {
            if (arr == null) {
                arr = new ArrayList<Dependency>();
            }
            StringTokenizer tok = createTokenizer(recomm); // NOI18N
            while (tok.hasMoreElements()) {
                String dep = beforeSemicolon(tok);
                arr.addAll(Dependency.create(Dependency.TYPE_MODULE, dep));
            }
        }
        return arr == null ? null : arr.toArray(new Dependency[0]);
    }

    private static StringTokenizer createTokenizer(String osgiDep) {
        for (;;) {
            int first = osgiDep.indexOf('"');
            if (first == -1) {
                break;
            }
            int second = osgiDep.indexOf('"', first + 1);
            if (second == -1) {
                break;
            }
            osgiDep = osgiDep.substring(0, first - 1) + osgiDep.substring(second + 1);
        }
        
        return new StringTokenizer(osgiDep, ",");
    }

    private static String beforeSemicolon(StringTokenizer tok) {
        String dep = tok.nextToken().trim();
        int semicolon = dep.indexOf(';');
        if (semicolon >= 0) {
            dep = dep.substring(0, semicolon);
        }
        return dep;
    }
    
    private String[] computeExported(boolean useOSGi, String[] addTo, Attributes attr) {
        if (!useOSGi) {
            return addTo;
        }
        String pkgs = attr.getValue("Export-Package"); // NOI18N
        if (pkgs == null) {
            return addTo;
        }
        List<String> arr = new ArrayList<String>(Arrays.asList(addTo));
        StringTokenizer tok = createTokenizer(pkgs); // NOI18N
        while (tok.hasMoreElements()) {
            arr.add(beforeSemicolon(tok));
        }
        return arr.toArray(new String[0]);
    }

    private String[] computeProvides(
        Module forModule, Attributes attr, boolean verifyCNBs, boolean useOSGi
    ) throws InvalidException, IllegalArgumentException {
        String[] arr;
        // Token provides
        String providesS = attr.getValue("OpenIDE-Module-Provides"); // NOI18N

                arr = l.toArray (arr);
            }
        }
        return computeExported(useOSGi, arr, attr);
    }
    
    /**

Return to bug 206365

Lines 130-136 Link Here

(-)a/o.n.bootstrap/src/org/netbeans/ModuleData.java (-5 / +73 lines)
130	String bld = attr.getValue("OpenIDE-Module-Build-Version"); // NOI18N	130	String bld = attr.getValue("OpenIDE-Module-Build-Version"); // NOI18N
131	buildVersion = bld == null ? implVersion : bld;	131	buildVersion = bld == null ? implVersion : bld;
132		132
133	this.provides = computeProvides(forModule, attr, verifyCNBs);	133	this.provides = computeProvides(forModule, attr, verifyCNBs, false);
134		134
135	// Exports	135	// Exports
136	String exportsS = attr.getValue("OpenIDE-Module-Public-Packages"); // NOI18N	136	String exportsS = attr.getValue("OpenIDE-Module-Public-Packages"); // NOI18N
Lines 237-244 Link Here
237	this.buildVersion = bld == null ? implVersion : bld;	237	this.buildVersion = bld == null ? implVersion : bld;
238	this.friendNames = Collections.emptySet();	238	this.friendNames = Collections.emptySet();
239	this.publicPackages = null;	239	this.publicPackages = null;
240	this.provides = computeProvides(m, mf.getMainAttributes(), false);	240	this.provides = computeProvides(m, mf.getMainAttributes(), false, true);
241	this.dependencies = null;	241	this.dependencies = computeImported(mf.getMainAttributes());
242	this.coveredPackages = new HashSet<String>();	242	this.coveredPackages = new HashSet<String>();
243	}	243	}
244		244
Lines 274-280 Link Here
274	Module.PackageExport.write(dos, publicPackages);	274	Module.PackageExport.write(dos, publicPackages);
275	}	275	}
276		276
277	private String[] computeProvides(Module forModule, Attributes attr, boolean verifyCNBs) throws InvalidException, IllegalArgumentException {	277	private Dependency[] computeImported(Attributes attr) {
		278	String pkgs = attr.getValue("Import-Package"); // NOI18N
		279	List<Dependency> arr = null;
		280	if (pkgs != null) {
		281	arr = new ArrayList<Dependency>();
		282	StringTokenizer tok = createTokenizer(pkgs); // NOI18N
		283	while (tok.hasMoreElements()) {
		284	String dep = beforeSemicolon(tok);
		285	arr.addAll(Dependency.create(Dependency.TYPE_RECOMMENDS, dep));
		286	}
		287	}
		288	String recomm = attr.getValue("Require-Bundle"); // NOI18N
		289	if (recomm != null) {
		290	if (arr == null) {
		291	arr = new ArrayList<Dependency>();
		292	}
		293	StringTokenizer tok = createTokenizer(recomm); // NOI18N
		294	while (tok.hasMoreElements()) {
		295	String dep = beforeSemicolon(tok);
		296	arr.addAll(Dependency.create(Dependency.TYPE_MODULE, dep));
		297	}
		298	}
		299	return arr == null ? null : arr.toArray(new Dependency[0]);
		300	}
		301
		302	private static StringTokenizer createTokenizer(String osgiDep) {
		303	for (;;) {
		304	int first = osgiDep.indexOf('"');
		305	if (first == -1) {
		306	break;
		307	}
		308	int second = osgiDep.indexOf('"', first + 1);
		309	if (second == -1) {
		310	break;
		311	}
		312	osgiDep = osgiDep.substring(0, first - 1) + osgiDep.substring(second + 1);
		313	}
		314
		315	return new StringTokenizer(osgiDep, ",");
		316	}
		317
		318	private static String beforeSemicolon(StringTokenizer tok) {
		319	String dep = tok.nextToken().trim();
		320	int semicolon = dep.indexOf(';');
		321	if (semicolon >= 0) {
		322	dep = dep.substring(0, semicolon);
		323	}
		324	return dep;
		325	}
		326
		327	private String[] computeExported(boolean useOSGi, String[] addTo, Attributes attr) {
		328	if (!useOSGi) {
		329	return addTo;
		330	}
		331	String pkgs = attr.getValue("Export-Package"); // NOI18N
		332	if (pkgs == null) {
		333	return addTo;
		334	}
		335	List<String> arr = new ArrayList<String>(Arrays.asList(addTo));
		336	StringTokenizer tok = createTokenizer(pkgs); // NOI18N
		337	while (tok.hasMoreElements()) {
		338	arr.add(beforeSemicolon(tok));
		339	}
		340	return arr.toArray(new String[0]);
		341	}
342
343	private String[] computeProvides(
344	Module forModule, Attributes attr, boolean verifyCNBs, boolean useOSGi
345	) throws InvalidException, IllegalArgumentException {
278	String[] arr;	346	String[] arr;
279	// Token provides	347	// Token provides
280	String providesS = attr.getValue("OpenIDE-Module-Provides"); // NOI18N	348	String providesS = attr.getValue("OpenIDE-Module-Provides"); // NOI18N
Lines 309-315 Link Here
309	arr = l.toArray (arr);	377	arr = l.toArray (arr);
310	}	378	}
311	}	379	}
312	return arr;	380	return computeExported(useOSGi, arr, attr);
313	}	381	}
314		382
315	/**	383	/**