Attachment #31501 for bug #34699

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 34699
Collapse All | Expand All

Lines 5-12 Link Here

(-)ant/manifest.mf (-2 / +1 lines)
5	OpenIDE-Module-Install: org/apache/tools/ant/module/AntModule.class	5	OpenIDE-Module-Install: org/apache/tools/ant/module/AntModule.class
6	OpenIDE-Module-Layer: org/apache/tools/ant/module/resources/AntModuleLayer.xml	6	OpenIDE-Module-Layer: org/apache/tools/ant/module/resources/AntModuleLayer.xml
7	OpenIDE-Module-Requires:	7	OpenIDE-Module-Requires:
8	org.openide.execution.ExecutionEngine,	8	org.openide.execution.ExecutionEngine
9	org.openide.windows.IOProvider
10		9
11	Name: org/apache/tools/ant/module/loader/AntProjectDataLoader.class	10	Name: org/apache/tools/ant/module/loader/AntProjectDataLoader.class
12	OpenIDE-Module-Class: Loader	11	OpenIDE-Module-Class: Loader

Lines 132-138 Link Here

(-)ant/nbproject/project.xml (-1 / +1 lines)
132	<build-prerequisite/>	132	<build-prerequisite/>
133	<compile-dependency/>	133	<compile-dependency/>
134	<run-dependency>	134	<run-dependency>
135	<specification-version>1.5</specification-version>	135	<specification-version>1.11</specification-version>
136	</run-dependency>	136	</run-dependency>
137	</dependency>	137	</dependency>
138	<dependency>	138	<dependency>

Lines 1-6 Link Here

(-)contrib/docbook/manifest.mf (-1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.docbook	2	OpenIDE-Module: org.netbeans.modules.docbook
3	OpenIDE-Module-Requires: org.openide.windows.IOProvider
4	OpenIDE-Module-Java-Dependencies: Java > 1.4	3	OpenIDE-Module-Java-Dependencies: Java > 1.4
5	OpenIDE-Module-Specification-Version: 1.4	4	OpenIDE-Module-Specification-Version: 1.4
6	OpenIDE-Module-Layer: org/netbeans/modules/docbook/layer.xml	5	OpenIDE-Module-Layer: org/netbeans/modules/docbook/layer.xml

Lines 81-87 Link Here

(-)contrib/docbook/nbproject/project.xml (-1 / +1 lines)
81	<build-prerequisite/>	81	<build-prerequisite/>
82	<compile-dependency/>	82	<compile-dependency/>
83	<run-dependency>	83	<run-dependency>
84	<specification-version>1.0</specification-version>	84	<specification-version>1.11</specification-version>
85	</run-dependency>	85	</run-dependency>
86	</dependency>	86	</dependency>
87	<dependency>	87	<dependency>

Lines 393-398 Link Here

(-)core/bootstrap/src/org/netbeans/Module.java (+1 lines)
393	dependencies.addAll(Dependency.create(Dependency.TYPE_PACKAGE, pkgdeps)); // NOI18N	393	dependencies.addAll(Dependency.create(Dependency.TYPE_PACKAGE, pkgdeps)); // NOI18N
394	}	394	}
395	dependencies.addAll(Dependency.create(Dependency.TYPE_REQUIRES, attr.getValue("OpenIDE-Module-Requires"))); // NOI18N	395	dependencies.addAll(Dependency.create(Dependency.TYPE_REQUIRES, attr.getValue("OpenIDE-Module-Requires"))); // NOI18N
		396	dependencies.addAll(Dependency.create(Dependency.TYPE_NEEDS, attr.getValue("OpenIDE-Module-Needs"))); // NOI18N
396	// Permit the concrete installer to make some changes:	397	// Permit the concrete installer to make some changes:
397	mgr.refineDependencies(this, dependencies);	398	mgr.refineDependencies(this, dependencies);
398	dependenciesA = dependencies.toArray(new Dependency[dependencies.size()]);	399	dependenciesA = dependencies.toArray(new Dependency[dependencies.size()]);




                if (! other.isEnabled()) {
                    maybeAddToEnableList(willEnable, mightEnable, other, false);
                }
            } else if (dep.getType() == Dependency.TYPE_REQUIRES || dep.getType() == Dependency.TYPE_NEEDS) {
                String token = dep.getName();
                Set<Module> providers = providersOf.get(token);
                if (providers == null) throw new IllegalStateException("Should have found a provider of: " + token); // NOI18N

                        // No need to scan the rest of its dependencies.
                        break;
                    }
                } else if (dep.getType() == Dependency.TYPE_REQUIRES || dep.getType() == Dependency.TYPE_NEEDS) {
                    if (m.provides(dep.getName())) {
                        // Careful. There may be some third module still enabled which
                        // provides this same token too.

        // where moduleProblems are used are write-mutex only and so do not have
        // to worry about contention.
        synchronized (moduleProblems) {
            Set<Union2<Dependency,InvalidException>> result;
            ArrayList<NeedsCheck> check = new ArrayList<NeedsCheck>();
            result = _missingDependencies(probed, check);
            LOOP: while (result.isEmpty()) {
                for (NeedsCheck needs : check) {
                    String token = needs.dep.getName();
                    Set<Module> providers = providersOf.get(token);
                    if (providers == null) {
                        // Nobody provides it. This dep failed.
                        result.add(Union2.<Dependency,InvalidException>createFirst(needs.dep));
                    } else {
                        // We have some possible providers. Check that at least one is good.
                        boolean foundOne = false;
                        Set<Module> possibleModules = new HashSet<Module>();
                        for (Module other : providers) {
                            if (other.isEnabled()) {
                                foundOne = true;
                                break LOOP;
                            }
                        }
                        if (!foundOne) {
                            for (Module m : providers) {
                                ArrayList<NeedsCheck> arr = new ArrayList<NeedsCheck>();
                                if (!_missingDependencies(m, arr).isEmpty()) {
                                    continue;
                                }
                                
                                if (!arr.isEmpty()) {
                                    check.addAll(arr);
                                    // restart the check
                                    continue LOOP;
                                }
                            }
                            
                        }
                    }
                }
                break LOOP;
            }
            return result;
        }
    }
    
    private static class NeedsCheck {
        public final Module module;
        public final Dependency dep;
        
        public NeedsCheck(Module m, Dependency d) {
            this.module = m;
            this.dep = d;
        }
    }
    
    private Set<Union2<Dependency,InvalidException>> _missingDependencies(Module probed, Collection<NeedsCheck> nonOrderingCheck) {
            Set<Union2<Dependency,InvalidException>> probs = moduleProblems.get(probed);
            if (probs == null) {
                probs = new HashSet<Union2<Dependency,InvalidException>>(8);

                        if (! other.isEnabled()) {
                            // Need to make sure the other one is not missing anything either.
                            // Nor that it depends (directly on indirectly) on this one.
                            if (! _missingDependencies(other, nonOrderingCheck).isEmpty()) {
                                // This is a little subtle. Either the other module had real
                                // problems, in which case our dependency on it is not legit.
                                // Or, the other actually depends cyclically on this one. In

                                if (other.isEnabled()) {
                                    foundOne = true;
                                } else {
                                    if (_missingDependencies(other, nonOrderingCheck).isEmpty()) {
                                        // See comment above for regular module deps
                                        // re. use of PROBING_IN_PROCESS.
                                        foundOne = true;

                                probs.add(Union2.<Dependency,InvalidException>createFirst(dep));
                            }
                        }
                    } else if (dep.getType() == Dependency.TYPE_NEEDS) {
                        nonOrderingCheck.add(new NeedsCheck(probed, dep));
                    } else {
                        assert dep.getType() == Dependency.TYPE_JAVA;
                        // Java dependency. Fixed for whole VM session, safe to check once and keep.

Lines 4-8 Link Here

(-)core/execution/manifest.mf (-1 lines)
4	OpenIDE-Module-Layer: org/netbeans/core/execution/resources/layer.xml	4	OpenIDE-Module-Layer: org/netbeans/core/execution/resources/layer.xml
5	OpenIDE-Module-Install: org/netbeans/core/execution/Install.class	5	OpenIDE-Module-Install: org/netbeans/core/execution/Install.class
6	OpenIDE-Module-Provides: org.openide.execution.ExecutionEngine	6	OpenIDE-Module-Provides: org.openide.execution.ExecutionEngine
7	OpenIDE-Module-Requires: org.openide.windows.IOProvider
8		7

Lines 88-94 Link Here

(-)core/execution/nbproject/project.xml (-1 / +1 lines)
88	<build-prerequisite/>	88	<build-prerequisite/>
89	<compile-dependency/>	89	<compile-dependency/>
90	<run-dependency>	90	<run-dependency>
91	<specification-version>1.0</specification-version>	91	<specification-version>1.11</specification-version>
92	</run-dependency>	92	</run-dependency>
93	</dependency>	93	</dependency>
94	<dependency>	94	<dependency>




            <code-name-base>org.netbeans.core.output</code-name-base>
            <module-dependencies>
                <dependency>
                    <code-name-base>org.netbeans.lib.terminalemulator</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.0</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.actions</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.compat</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.dialogs</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.io</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.11</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.nodes</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.options</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.windows</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
            </module-dependencies>




            <code-name-base>org.netbeans.core.output2</code-name-base>
            <module-dependencies>
                <dependency>
                    <code-name-base>org.openide.actions</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.io</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.11</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.options</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.windows</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
            </module-dependencies>

Lines 192-197 Link Here

(-)core/startup/src/org/netbeans/core/startup/AutomaticDependencies.java (+3 lines)
192	case Dependency.TYPE_REQUIRES:	192	case Dependency.TYPE_REQUIRES:
193	tokDeps.put(d.getName(), d);	193	tokDeps.put(d.getName(), d);
194	break;	194	break;
		195	case Dependency.TYPE_NEEDS:
		196	tokDeps.put(d.getName(), d);
		197	break;
195	case Dependency.TYPE_JAVA:	198	case Dependency.TYPE_JAVA:
196	// ignored	199	// ignored
197	break;	200	break;

Lines 106-111 Link Here

(-)core/startup/src/org/netbeans/core/startup/NbProblemDisplayer.java (+1 lines)
106	}	106	}
107	}	107	}
108	case Dependency.TYPE_REQUIRES:	108	case Dependency.TYPE_REQUIRES:
		109	case Dependency.TYPE_NEEDS:
109	polite = (String)m.getLocalizedAttribute("OpenIDE-Module-Requires-Message"); // NOI18N	110	polite = (String)m.getLocalizedAttribute("OpenIDE-Module-Requires-Message"); // NOI18N
110	if (polite != null) {	111	if (polite != null) {
111	return polite;	112	return polite;




import org.openide.util.Lookup;
import org.openide.util.LookupEvent;
import org.openide.util.LookupListener;
import org.openide.util.TopologicalSortException;
import org.openide.util.Utilities;

/** Test the module manager as well as the Module class.

            assertEquals(4, toEnable.size());
            assertTrue(toEnable.get(0) != m2);
            assertTrue(toEnable.get(0) != m3);
        } finally {
            mgr.mutexPrivileged().exitWriteAccess();
        }
    }
    
    public void testSimpleProvNeeds() throws Exception {
        doSimpleProvNeeds(false);
    }
    
    public void testSimpleProvNeedsReversed() throws Exception {
        doSimpleProvNeeds(true);
    }
    
    private void doSimpleProvNeeds(boolean reverseOrder) throws Exception {
        FakeModuleInstaller installer = new FakeModuleInstaller();
        FakeEvents ev = new FakeEvents();
        ModuleManager mgr = new ModuleManager(installer, ev);
        mgr.mutexPrivileged().enterWriteAccess();
        try {
            Module m1 = mgr.create(new File(jars, "prov-foo-depends-needs_foo.jar"), null, false, false, false);
            Module m2 = mgr.create(new File(jars, "needs-foo.jar"), null, false, false, false);
            assertEquals(Collections.singletonList("foo"), Arrays.asList(m1.getProvides()));
            assertEquals(Collections.EMPTY_LIST, Arrays.asList(m2.getProvides()));
            assertEquals(1, m1.getDependencies().size());
            assertEquals(Dependency.create(Dependency.TYPE_NEEDS, "foo"), m2.getDependencies());
            Map<String,Module> modulesByName = new HashMap<String,Module>();
            modulesByName.put(m1.getCodeNameBase(), m1);
            modulesByName.put(m2.getCodeNameBase(), m2);
            Map<String,Set<Module>> providersOf = new HashMap<String,Set<Module>>();
            providersOf.put("foo", Collections.singleton(m1));
            List<Module> m1m2 = Arrays.asList(new Module[] {m1, m2});
            List<Module> m2m1 = Arrays.asList(new Module[] {m2, m1});
            Map<Module,List<Module>> deps = Util.moduleDependencies(m1m2, modulesByName, providersOf);
            assertEquals(Collections.singletonList(m2), deps.get(m1));
/*            assertEquals(Collections.singletonList(m1), deps.get(m2));
            
            try {
                Utilities.topologicalSort(m1m2, deps);
            } catch (TopologicalSortException ex) {
                Set[] arr = ex.unsortableSets();
                assertEquals("One unsortable set", 1, arr.length);
                assertEquals("It contains two elements", 2, arr[0].size());
                assertTrue("m1 is there", arr[0].contains(m1));
                assertTrue("m2 is there", arr[0].contains(m2));
            }*/
            Set<Module> m1PlusM2 = new LinkedHashSet<Module>();
            if (reverseOrder) {
                m1PlusM2.add(m2);
                m1PlusM2.add(m1);
            } else {
                m1PlusM2.add(m1);
                m1PlusM2.add(m2);
            }
            List<Module> toEnable = mgr.simulateEnable(m1PlusM2);
            assertEquals("correct result of simulateEnable", Arrays.asList(new Module[] {m2, m1}), toEnable);
            toEnable = mgr.simulateEnable(Collections.singleton(m1));
            assertEquals("correct result of simulateEnable #2", Arrays.asList(new Module[] {m2, m1}), toEnable);
            toEnable = mgr.simulateEnable(Collections.singleton(m2));
            assertEquals("correct result of simulateEnable #3", Arrays.asList(new Module[] {m2, m1}), toEnable);
            mgr.enable(m1PlusM2);
            assertEquals(Arrays.asList(new String[] {
                "prepare",
                "prepare",
                "load"
            }), installer.actions);
            assertEquals(Arrays.asList(new Object[] {
                m2,
                m1,
                Arrays.asList(new Module[] {m2, m1})
            }), installer.args);
            Class testclazz = Class.forName("org.prov_foo.Clazz", true, m1.getClassLoader());
            try {
                Class.forName("org.prov_foo.Clazz", true, m2.getClassLoader());
                fail("Should not be able to access classes due to prov-req deps only");
            } catch (ClassNotFoundException cnfe) {
                // OK, good.
            }
            installer.clear();
            List<Module> toDisable = mgr.simulateDisable(Collections.singleton(m1));
            assertEquals("correct result of simulateDisable", Arrays.asList(new Module[] {m1, m2}), toDisable);
            toDisable = mgr.simulateDisable(m1PlusM2);
            assertEquals("correct result of simulateDisable #2", Arrays.asList(new Module[] {m1, m2}), toDisable);
            mgr.disable(m1PlusM2);
            assertFalse(m1.isEnabled());
            assertFalse(m2.isEnabled());
            assertEquals(Arrays.asList(new String[] {
                "unload",
                "dispose",
                "dispose"
            }), installer.actions);
            assertEquals(Arrays.asList(new Object[] {
                Arrays.asList(new Module[] {m1, m2}),
                m1,
                m2
            }), installer.args);
        } finally {
            mgr.mutexPrivileged().exitWriteAccess();
        }

Lines 152-157 Link Here

(-)core/startup/test/unit/src/org/netbeans/core/startup/build.xml (+5 lines)
152	<jar jarfile="jars/dep-on-relvertest-3-4.jar" manifest="jars/dep-on-relvertest-3-4.mf"/>	152	<jar jarfile="jars/dep-on-relvertest-3-4.jar" manifest="jars/dep-on-relvertest-3-4.mf"/>
153	<jar jarfile="jars/dep-on-relvertest-some.jar" manifest="jars/dep-on-relvertest-some.mf"/>	153	<jar jarfile="jars/dep-on-relvertest-some.jar" manifest="jars/dep-on-relvertest-some.mf"/>
154	<jar jarfile="jars/depends-on-simple-module-2.jar" manifest="jars/depends-on-simple-module-2.mf"/>	154	<jar jarfile="jars/depends-on-simple-module-2.jar" manifest="jars/depends-on-simple-module-2.mf"/>
		155	<jar jarfile="jars/needs-foo.jar" manifest="jars/needs-foo.mf"/>
		156	<antcall target="create-jar">
		157	<param name="name" value="prov-foo-depends-needs_foo"/>
		158	<param name="sourcedir" value="jars/prov-foo"/>
		159	</antcall>
155	<antcall target="create-jar">	160	<antcall target="create-jar">
156	<param name="name" value="api-mod-export-all"/>	161	<param name="name" value="api-mod-export-all"/>
157	<param name="sourcedir" value="jars/exposes-api"/>	162	<param name="sourcedir" value="jars/exposes-api"/>

Lines 3-8 Link Here

(-)db/manifest.mf (-1 / +1 lines)
3	OpenIDE-Module-Install: org/netbeans/modules/db/DatabaseModule.class	3	OpenIDE-Module-Install: org/netbeans/modules/db/DatabaseModule.class
4	OpenIDE-Module-Implementation-Version: 3	4	OpenIDE-Module-Implementation-Version: 3
5	OpenIDE-Module-Layer: org/netbeans/modules/db/resources/mf-layer.xml	5	OpenIDE-Module-Layer: org/netbeans/modules/db/resources/mf-layer.xml
6	OpenIDE-Module-Requires: org.netbeans.api.javahelp.Help, org.openide.windows.IOProvider	6	OpenIDE-Module-Requires: org.netbeans.api.javahelp.Help
7	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/db/resources/Bundle.properties	7	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/db/resources/Bundle.properties
8		8

Lines 72-78 Link Here

(-)db/nbproject/project.xml (-1 / +1 lines)
72	<build-prerequisite/>	72	<build-prerequisite/>
73	<compile-dependency/>	73	<compile-dependency/>
74	<run-dependency>	74	<run-dependency>
75	<specification-version>1.7</specification-version>	75	<specification-version>1.11</specification-version>
76	</run-dependency>	76	</run-dependency>
77	</dependency>	77	</dependency>
78	<dependency>	78	<dependency>




  REQUIRES org.openide.text (platform)
  REQUIRES org.openide.util (platform)
  REQUIRES org.openide.windows (platform)
  REQUIRES org.netbeans.core.output2/1 (platform)
MODULE org.jdesktop.layout/1 (platform)
  REQUIRES org.openide.modules.ModuleFormat1
MODULE org.netbeans.api.debugger/1 (ide)

  REQUIRES org.openide.nodes (platform)
  REQUIRES org.openide.util (platform)
  REQUIRES org.openide.windows (platform)
  REQUIRES org.netbeans.core.output2/1 (platform)
MODULE org.netbeans.core.ide/1 (ide)
  REQUIRES org.netbeans.core/2 (platform)
  REQUIRES org.netbeans.core.ui/1 (platform)

  REQUIRES org.openide.text (platform)
  REQUIRES org.openide.util (platform)
  REQUIRES org.openide.windows (platform)
  REQUIRES org.netbeans.core.output2/1 (platform)
MODULE org.netbeans.modules.db/0 (ide)
  REQUIRES org.jdesktop.layout/1 (platform)
  REQUIRES org.netbeans.modules.javahelp/1 (platform)

  REQUIRES org.openide.options (platform)
  REQUIRES org.openide.util (platform)
  REQUIRES org.openide.windows (platform)
  REQUIRES org.netbeans.core.output2/1 (platform)
MODULE org.netbeans.modules.db.core (ide)
  REQUIRES org.netbeans.api.progress/1 (platform)
  REQUIRES org.netbeans.modules.db/0 (ide)

  REQUIRES org.openide.text (platform)
  REQUIRES org.openide.util (platform)
  REQUIRES org.openide.windows (platform)
  REQUIRES org.netbeans.core.output2/1 (platform)
  REQUIRES org.openidex.util/3 (ide)
MODULE org.netbeans.modules.utilities.project/1 (ide)
  REQUIRES org.netbeans.modules.projectapi/1 (ide)

  REQUIRES org.openide.modules.ModuleFormat1
  REQUIRES org.openide.text (platform)
  REQUIRES org.openide.util (platform)
  REQUIRES org.netbeans.core.output2/1 (platform)
MODULE org.netbeans.modules.web.jstl11/1 (j2ee)
  REQUIRES org.netbeans.modules.web.project (j2ee)
  REQUIRES org.openide.modules.ModuleFormat1

  REQUIRES org.openide.text (platform)
  REQUIRES org.openide.util (platform)
  REQUIRES org.openide.windows (platform)
  REQUIRES org.netbeans.core.output2/1 (platform)
MODULE org.netbeans.modules.xml.multiview/1 (j2ee)
  REQUIRES org.netbeans.core.multiview/1 (platform)
  REQUIRES org.netbeans.modules.xml.core/2 (ide)

Lines 1-5 Link Here

(-)openide/io/manifest.mf (-1 / +2 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.openide.io	2	OpenIDE-Module: org.openide.io
3	OpenIDE-Module-Specification-Version: 1.10	3	OpenIDE-Module-Specification-Version: 1.11
4	OpenIDE-Module-Localizing-Bundle: org/openide/io/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/openide/io/Bundle.properties
		5	OpenIDE-Module-Needs: org.openide.windows.IOProvider
5		6




    <!-- ACTUAL CHANGES BEGIN HERE: -->

<changes>
    <change id="automatic-request-of-io-impl">
      <api name="io"/>
      <summary> No need to require IOProvider token anymore</summary>
      <version major="1" minor="11"/>
      <date day="12" month="7" year="2006"/>
      <author login="jtulach"/>
      <compatibility addition="yes" binary="compatible" semantic="compatible" />
      <description>
        <p>If your module depends on <code>org.openide.io > 1.11</code> or higher
        there is no need to specify that it also requires an implementation of
        the API by use of <code>OpenIDE-Module-Requires: org.openide.windows.IOProvider</code>,
        this token will be requested automatically by the <code>org.openide.io</code>
        module itself.
        </p>
      </description>
      <class package="org.openide.windows" name="IOProvider"/>
      <issue number="34699" />
    </change>

    <change id="allow-to-add-actions-to-toolbar">
      <api name="io"/>
      <summary> Added API to add actions to output's toolbar</summary>




     * instance in lookup, a fallback instance is created which just uses the
     * standard system I/O streams. This is useful for unit tests and perhaps
     * for standalone usage of various libraries.
     * <p>
     * Assuming you want to ensure that a real output window implementation is actually
     * installed and enabled, you must require the token <code>org.openide.windows.IOProvider</code>
     * from the module calling this method.
     * @return the default instance (never null)
     */
    public static IOProvider getDefault() {

     * the output window.  Streams for reading/writing can be accessed via
     * getters on the returned instance.
     *
     * @param name A localised display name for the tab
     * @param newIO if <tt>true</tt>, a new <code>InputOutput</code> is returned, else an existing <code>InputOutput</code> of the same name may be returned
     * @return an <code>InputOutput</code> instance for accessing the new tab
     * @see InputOutput




  	<apidef name="modules">Modules API</apidef>
  </apidefs>
<changes>
    <change id="needs">
        <api name="modules"/>
        <summary>Requires/Provides and Needs</summary>
        <version major="7" minor="1"/>
        <date day="12" month="7" year="2006"/>
        <author login="jtulach"/>
        <compatibility binary="compatible" source="compatible" semantic="compatible" deprecation="no" addition="yes" deletion="no" modification="no"/>
        <description>
            It is possible to require some implementation using
            <code>OpenIDE-Module-Needs: token</code> which is slightly
            less restrictive than usual
            <code>OpenIDE-Module-Requires: token</code> as
            explain in the <a href="@TOP@/org/openide/modules/doc-files/api.html#7.1">documentation</a>.
        </description>
        <class package="org.openide.modules" name="Dependency"/>
    </change>
    <change id="generified">
        <api name="modules"/>
        <summary>Generified Interfaces</summary>

Lines 1-5 Link Here

(-)openide/modules/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.openide.modules	2	OpenIDE-Module: org.openide.modules
3	OpenIDE-Module-Localizing-Bundle: org/openide/modules/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/openide/modules/Bundle.properties
4	OpenIDE-Module-Specification-Version: 7.0	4	OpenIDE-Module-Specification-Version: 7.1
5		5

Lines 47-52 Link Here

(-)openide/modules/src/org/openide/modules/Dependency.java (+12 lines)
47	*/	47	*/
48	public final static int TYPE_REQUIRES = 5;	48	public final static int TYPE_REQUIRES = 5;
49		49
		50	/** Dependency on a token, but without need to have token provider be initialised sooner.
		51	* @see ModuleInfo#getProvides
		52	* @since 7.1
		53	*/
		54	public final static int TYPE_NEEDS = 6;
		55
50	/** Comparison by specification version. */	56	/** Comparison by specification version. */
51	public final static int COMPARE_SPEC = 1;	57	public final static int COMPARE_SPEC = 1;
52		58
Lines 310-315 Link Here
310	} else if (type == Dependency.TYPE_REQUIRES) {	316	} else if (type == Dependency.TYPE_REQUIRES) {
311	if (comparison != Dependency.COMPARE_ANY) {	317	if (comparison != Dependency.COMPARE_ANY) {
312	throw new IllegalArgumentException("Cannot give a comparison for a token requires dep: " + body); // NOI18N	318	throw new IllegalArgumentException("Cannot give a comparison for a token requires dep: " + body); // NOI18N
		319	}
		320
		321	checkCodeName(name, false);
		322	} else if (type == Dependency.TYPE_NEEDS) {
		323	if (comparison != Dependency.COMPARE_ANY) {
		324	throw new IllegalArgumentException("Cannot give a comparison for a token needs dep: " + body); // NOI18N
313	}	325	}
314		326
315	checkCodeName(name, false);	327	checkCodeName(name, false);

Lines 768-774 Link Here

(-)openide/modules/src/org/openide/modules/doc-files/api.html (-1 / +9 lines)
768	be supplied to the lookup system, though there could be other meanings. A module	768	be supplied to the lookup system, though there could be other meanings. A module
769	may also <em>require</em> one or more tokens. A module which requires some tokens	769	may also <em>require</em> one or more tokens. A module which requires some tokens
770	may only be enabled by the system if for each such token, there is at least one other	770	may only be enabled by the system if for each such token, there is at least one other
771	module which provides that token and is already enabled.	771	module which provides that token and is already enabled.
		772
		773	<a name="7.1"></a>
		774	Since version 7.1 there is also support for <code>OpenIDE-Module-Needs</code>
		775	which is a weaker version of requires as it does not impose any restriction on
		776	the ordering of module. The <code>OpenIDE-Module-Needs</code> is useful for
		777	modules that define some API and require an implementation of it. Just
		778	specify the <q>need</q> for an implementation and make other modules depend
		779	on your module and <code>OpenIDE-Module-Provides</code> the implementation token.
772		780
773	</ol>	781	</ol>
774		782

Lines 2-8 Link Here

(-)platform/samples/minicomposer/manifest.mf (-1 / +1 lines)
2	OpenIDE-Module: org.netbeans.examples.modules.minicomposer	2	OpenIDE-Module: org.netbeans.examples.modules.minicomposer
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/examples/modules/minicomposer/resources/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/examples/modules/minicomposer/resources/Bundle.properties
4	OpenIDE-Module-Specification-Version: 1.2	4	OpenIDE-Module-Specification-Version: 1.2
5	OpenIDE-Module-Requires: org.netbeans.api.javahelp.Help, org.openide.windows.IOProvider	5	OpenIDE-Module-Requires: org.netbeans.api.javahelp.Help
6	OpenIDE-Module-Layer: org/netbeans/examples/modules/minicomposer/resources/layer.xml	6	OpenIDE-Module-Layer: org/netbeans/examples/modules/minicomposer/resources/layer.xml
7		7
8	Name: org/netbeans/examples/modules/minicomposer/ScoreDataLoader.class	8	Name: org/netbeans/examples/modules/minicomposer/ScoreDataLoader.class

Lines 98-104 Link Here

(-)platform/samples/minicomposer/nbproject/project.xml (-1 / +1 lines)
98	<build-prerequisite/>	98	<build-prerequisite/>
99	<compile-dependency/>	99	<compile-dependency/>
100	<run-dependency>	100	<run-dependency>
101	<specification-version>1.0</specification-version>	101	<specification-version>1.11</specification-version>
102	</run-dependency>	102	</run-dependency>
103	</dependency>	103	</dependency>
104	<dependency>	104	<dependency>

Lines 4-10 Link Here

(-)utilities/manifest.mf (-1 / +1 lines)
4	OpenIDE-Module-Specification-Version: 1.22	4	OpenIDE-Module-Specification-Version: 1.22
5	OpenIDE-Module-Install: org/netbeans/modules/utilities/Installer.class	5	OpenIDE-Module-Install: org/netbeans/modules/utilities/Installer.class
6	OpenIDE-Module-Layer: org/netbeans/modules/utilities/Layer.xml	6	OpenIDE-Module-Layer: org/netbeans/modules/utilities/Layer.xml
7	OpenIDE-Module-Requires: org.openide.windows.IOProvider, org.openide.modules.InstalledFileLocator	7	OpenIDE-Module-Requires: org.openide.modules.InstalledFileLocator
8		8
9	Name: org/netbeans/modules/url/URLDataLoader.class	9	Name: org/netbeans/modules/url/URLDataLoader.class
10	OpenIDE-Module-Class: Loader	10	OpenIDE-Module-Class: Loader

Lines 79-85 Link Here

(-)utilities/nbproject/project.xml (-1 / +1 lines)
79	<build-prerequisite/>	79	<build-prerequisite/>
80	<compile-dependency/>	80	<compile-dependency/>
81	<run-dependency>	81	<run-dependency>
82	<specification-version>1.0</specification-version>	82	<specification-version>1.11</specification-version>
83	</run-dependency>	83	</run-dependency>
84	</dependency>	84	</dependency>
85	<dependency>	85	<dependency>

Lines 3-8 Link Here

(-)vcscore/manifest.mf (-1 lines)
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/vcscore/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/vcscore/Bundle.properties
4	OpenIDE-Module-Implementation-Version: 42	4	OpenIDE-Module-Implementation-Version: 42
5	OpenIDE-Module-Layer: org/netbeans/modules/vcscore/resources/mf-layer.xml	5	OpenIDE-Module-Layer: org/netbeans/modules/vcscore/resources/mf-layer.xml
6	OpenIDE-Module-Requires: org.openide.windows.IOProvider
7	OpenIDE-Module-Install: org/netbeans/modules/vcscore/VcsModule.class	6	OpenIDE-Module-Install: org/netbeans/modules/vcscore/VcsModule.class
8		7




            <code-name-base>org.netbeans.modules.vcscore</code-name-base>
            <module-dependencies>
                <dependency>
                    <code-name-base>org.netbeans.modules.masterfs</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.1</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.queries</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.4</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.actions</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.awt</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.compat</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.dialogs</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.execution</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.explorer</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.filesystems</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.io</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.11</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.loaders</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>4.11</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.modules</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.nodes</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.options</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.text</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.windows</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                        <specification-version>1.1</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openidex.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>2-3</release-version>
                        <specification-version>1.4</specification-version>
                    </run-dependency>
                </dependency>
            </module-dependencies>

Lines 1-7 Link Here

(-)vcsgeneric/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.vcs.advanced/1	2	OpenIDE-Module: org.netbeans.modules.vcs.advanced/1
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/vcs/advanced/config/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/vcs/advanced/config/Bundle.properties
4	OpenIDE-Module-Requires: org.openide.windows.IOProvider, org.netbeans.modules.vcscore.javacorebridge, org.netbeans.modules.refactoring.vcs	4	OpenIDE-Module-Requires: org.netbeans.modules.vcscore.javacorebridge, org.netbeans.modules.refactoring.vcs
5	OpenIDE-Module-Layer: org/netbeans/modules/vcs/advanced/config/mf-layer.xml	5	OpenIDE-Module-Layer: org/netbeans/modules/vcs/advanced/config/mf-layer.xml
6	OpenIDE-Module-Install: org/netbeans/modules/vcs/advanced/ModuleLifecycleManager.class	6	OpenIDE-Module-Install: org/netbeans/modules/vcs/advanced/ModuleLifecycleManager.class
7		7




            <code-name-base>org.netbeans.modules.vcs.advanced</code-name-base>
            <module-dependencies>
                <dependency>
                    <code-name-base>org.netbeans.modules.diff</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <implementation-version/>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.queries</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.3</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.vcscore</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <implementation-version/>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.actions</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.awt</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.compat</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.explorer</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.filesystems</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.io</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.11</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.loaders</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>4.11</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.modules</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                        <implementation-version/>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.nodes</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                        <implementation-version/>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.options</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.windows</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                        <specification-version>1.3</specification-version>
                    </run-dependency>
                </dependency>
            </module-dependencies>

Lines 3-7 Link Here

(-)web/jspparser/manifest.mf (-1 lines)
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/jspparser/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/jspparser/Bundle.properties
4	OpenIDE-Module-Layer: org/netbeans/modules/web/jspparser/layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/web/jspparser/layer.xml
5	OpenIDE-Module-Specification-Version: 2.6	5	OpenIDE-Module-Specification-Version: 2.6
6	OpenIDE-Module-Requires: org.openide.windows.IOProvider
7		6

Lines 4-10 Link Here

(-)xml/core/manifest.mf (-1 lines)
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/core/resources/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/core/resources/Bundle.properties
5	OpenIDE-Module-Install: org/netbeans/modules/xml/core/CoreModuleInstall.class	5	OpenIDE-Module-Install: org/netbeans/modules/xml/core/CoreModuleInstall.class
6	OpenIDE-Module-Layer: org/netbeans/modules/xml/core/resources/mf-layer.xml	6	OpenIDE-Module-Layer: org/netbeans/modules/xml/core/resources/mf-layer.xml
7	OpenIDE-Module-Requires: org.openide.windows.IOProvider
8		7
9	Name: org/netbeans/modules/xml/core/XMLDataLoader.class	8	Name: org/netbeans/modules/xml/core/XMLDataLoader.class
10	OpenIDE-Module-Class: Loader	9	OpenIDE-Module-Class: Loader




            <code-name-base>org.netbeans.modules.xml.core</code-name-base>
            <module-dependencies>
                <dependency>
                    <code-name-base>org.netbeans.api.xml</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.10</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.spi.navigator</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.actions</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.awt</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.dialogs</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.filesystems</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.io</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.11</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.loaders</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency/>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.modules</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.nodes</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.options</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.text</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                        <specification-version>1.10</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.windows</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
            </module-dependencies>
            <public-packages>
                <package>org.netbeans.modules.xml.api</package>

Lines 4-10 Link Here

(-)xml/css/manifest.mf (-1 lines)
4	OpenIDE-Module-Install: org/netbeans/modules/css/CSSModuleInstall.class	4	OpenIDE-Module-Install: org/netbeans/modules/css/CSSModuleInstall.class
5	OpenIDE-Module-Layer: org/netbeans/modules/css/resources/mf-layer.xml	5	OpenIDE-Module-Layer: org/netbeans/modules/css/resources/mf-layer.xml
6	OpenIDE-Module-Specification-Version: 1.12	6	OpenIDE-Module-Specification-Version: 1.12
7	OpenIDE-Module-Requires: org.openide.windows.IOProvider
8		7
9	Name: org/netbeans/modules/css/CSSLoader.class	8	Name: org/netbeans/modules/css/CSSLoader.class
10	OpenIDE-Module-Class: Loader	9	OpenIDE-Module-Class: Loader




                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.actions</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.awt</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.filesystems</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.io</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.11</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.loaders</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency/>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.modules</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.nodes</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.options</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.text</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.windows</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
            </module-dependencies>
            <public-packages/>

Return to bug 34699

Lines 1065-1071 Link Here

(-)core/bootstrap/src/org/netbeans/ModuleManager.java (-6 / +58 lines)
1065	if (! other.isEnabled()) {	1065	if (! other.isEnabled()) {
1066	maybeAddToEnableList(willEnable, mightEnable, other, false);	1066	maybeAddToEnableList(willEnable, mightEnable, other, false);
1067	}	1067	}
1068	} else if (dep.getType() == Dependency.TYPE_REQUIRES) {	1068	} else if (dep.getType() == Dependency.TYPE_REQUIRES \|\| dep.getType() == Dependency.TYPE_NEEDS) {
1069	String token = dep.getName();	1069	String token = dep.getName();
1070	Set<Module> providers = providersOf.get(token);	1070	Set<Module> providers = providersOf.get(token);
1071	if (providers == null) throw new IllegalStateException("Should have found a provider of: " + token); // NOI18N	1071	if (providers == null) throw new IllegalStateException("Should have found a provider of: " + token); // NOI18N
Lines 1235-1241 Link Here
1235	// No need to scan the rest of its dependencies.	1235	// No need to scan the rest of its dependencies.
1236	break;	1236	break;
1237	}	1237	}
1238	} else if (dep.getType() == Dependency.TYPE_REQUIRES) {	1238	} else if (dep.getType() == Dependency.TYPE_REQUIRES \|\| dep.getType() == Dependency.TYPE_NEEDS) {
1239	if (m.provides(dep.getName())) {	1239	if (m.provides(dep.getName())) {
1240	// Careful. There may be some third module still enabled which	1240	// Careful. There may be some third module still enabled which
1241	// provides this same token too.	1241	// provides this same token too.
Lines 1309-1318 Link Here
1309	// where moduleProblems are used are write-mutex only and so do not have	1309	// where moduleProblems are used are write-mutex only and so do not have
1310	// to worry about contention.	1310	// to worry about contention.
1311	synchronized (moduleProblems) {	1311	synchronized (moduleProblems) {
1312	return _missingDependencies(probed);	1312	Set<Union2<Dependency,InvalidException>> result;
		1313	ArrayList<NeedsCheck> check = new ArrayList<NeedsCheck>();
		1314	result = _missingDependencies(probed, check);
		1315	LOOP: while (result.isEmpty()) {
		1316	for (NeedsCheck needs : check) {
		1317	String token = needs.dep.getName();
		1318	Set<Module> providers = providersOf.get(token);
		1319	if (providers == null) {
		1320	// Nobody provides it. This dep failed.
		1321	result.add(Union2.<Dependency,InvalidException>createFirst(needs.dep));
		1322	} else {
		1323	// We have some possible providers. Check that at least one is good.
		1324	boolean foundOne = false;
		1325	Set<Module> possibleModules = new HashSet<Module>();
		1326	for (Module other : providers) {
		1327	if (other.isEnabled()) {
		1328	foundOne = true;
		1329	break LOOP;
		1330	}
		1331	}
		1332	if (!foundOne) {
		1333	for (Module m : providers) {
		1334	ArrayList<NeedsCheck> arr = new ArrayList<NeedsCheck>();
		1335	if (!_missingDependencies(m, arr).isEmpty()) {
		1336	continue;
		1337	}
		1338
		1339	if (!arr.isEmpty()) {
		1340	check.addAll(arr);
		1341	// restart the check
		1342	continue LOOP;
		1343	}
		1344	}
		1345
		1346	}
		1347	}
		1348	}
		1349	break LOOP;
		1350	}
		1351	return result;
		1352	}
		1353	}
		1354
		1355	private static class NeedsCheck {
		1356	public final Module module;
		1357	public final Dependency dep;
		1358
		1359	public NeedsCheck(Module m, Dependency d) {
		1360	this.module = m;
		1361	this.dep = d;
1313	}	1362	}
1314	}	1363	}
1315	private Set<Union2<Dependency,InvalidException>> _missingDependencies(Module probed) {	1364
		1365	private Set<Union2<Dependency,InvalidException>> _missingDependencies(Module probed, Collection<NeedsCheck> nonOrderingCheck) {
1316	Set<Union2<Dependency,InvalidException>> probs = moduleProblems.get(probed);	1366	Set<Union2<Dependency,InvalidException>> probs = moduleProblems.get(probed);
1317	if (probs == null) {	1367	if (probs == null) {
1318	probs = new HashSet<Union2<Dependency,InvalidException>>(8);	1368	probs = new HashSet<Union2<Dependency,InvalidException>>(8);
Lines 1382-1388 Link Here
1382	if (! other.isEnabled()) {	1432	if (! other.isEnabled()) {
1383	// Need to make sure the other one is not missing anything either.	1433	// Need to make sure the other one is not missing anything either.
1384	// Nor that it depends (directly on indirectly) on this one.	1434	// Nor that it depends (directly on indirectly) on this one.
1385	if (! _missingDependencies(other).isEmpty()) {	1435	if (! _missingDependencies(other, nonOrderingCheck).isEmpty()) {
1386	// This is a little subtle. Either the other module had real	1436	// This is a little subtle. Either the other module had real
1387	// problems, in which case our dependency on it is not legit.	1437	// problems, in which case our dependency on it is not legit.
1388	// Or, the other actually depends cyclically on this one. In	1438	// Or, the other actually depends cyclically on this one. In
Lines 1416-1422 Link Here
1416	if (other.isEnabled()) {	1466	if (other.isEnabled()) {
1417	foundOne = true;	1467	foundOne = true;
1418	} else {	1468	} else {
1419	if (_missingDependencies(other).isEmpty()) {	1469	if (_missingDependencies(other, nonOrderingCheck).isEmpty()) {
1420	// See comment above for regular module deps	1470	// See comment above for regular module deps
1421	// re. use of PROBING_IN_PROCESS.	1471	// re. use of PROBING_IN_PROCESS.
1422	foundOne = true;	1472	foundOne = true;
Lines 1428-1433 Link Here
1428	probs.add(Union2.<Dependency,InvalidException>createFirst(dep));	1478	probs.add(Union2.<Dependency,InvalidException>createFirst(dep));
1429	}	1479	}
1430	}	1480	}
		1481	} else if (dep.getType() == Dependency.TYPE_NEEDS) {
		1482	nonOrderingCheck.add(new NeedsCheck(probed, dep));
1431	} else {	1483	} else {
1432	assert dep.getType() == Dependency.TYPE_JAVA;	1484	assert dep.getType() == Dependency.TYPE_JAVA;
1433	// Java dependency. Fixed for whole VM session, safe to check once and keep.	1485	// Java dependency. Fixed for whole VM session, safe to check once and keep.

Lines 18-32 Link Here

(-)core/output/nbproject/project.xml (-13 / +13 lines)
18	<code-name-base>org.netbeans.core.output</code-name-base>	18	<code-name-base>org.netbeans.core.output</code-name-base>
19	<module-dependencies>	19	<module-dependencies>
20	<dependency>	20	<dependency>
21	<code-name-base>org.openide.util</code-name-base>	21	<code-name-base>org.netbeans.lib.terminalemulator</code-name-base>
22	<build-prerequisite/>	22	<build-prerequisite/>
23	<compile-dependency/>	23	<compile-dependency/>
24	<run-dependency>	24	<run-dependency>
25	<specification-version>6.2</specification-version>	25	<specification-version>1.0</specification-version>
26	</run-dependency>	26	</run-dependency>
27	</dependency>	27	</dependency>
28	<dependency>	28	<dependency>
29	<code-name-base>org.openide.nodes</code-name-base>	29	<code-name-base>org.openide.actions</code-name-base>
30	<build-prerequisite/>	30	<build-prerequisite/>
31	<compile-dependency/>	31	<compile-dependency/>
32	<run-dependency>	32	<run-dependency>
Lines 42-48 Link Here
42	</run-dependency>	42	</run-dependency>
43	</dependency>	43	</dependency>
44	<dependency>	44	<dependency>
45	<code-name-base>org.openide.dialogs</code-name-base>	45	<code-name-base>org.openide.compat</code-name-base>
46	<build-prerequisite/>	46	<build-prerequisite/>
47	<compile-dependency/>	47	<compile-dependency/>
48	<run-dependency>	48	<run-dependency>
Lines 50-56 Link Here
50	</run-dependency>	50	</run-dependency>
51	</dependency>	51	</dependency>
52	<dependency>	52	<dependency>
53	<code-name-base>org.openide.compat</code-name-base>	53	<code-name-base>org.openide.dialogs</code-name-base>
54	<build-prerequisite/>	54	<build-prerequisite/>
55	<compile-dependency/>	55	<compile-dependency/>
56	<run-dependency>	56	<run-dependency>
Lines 58-72 Link Here
58	</run-dependency>	58	</run-dependency>
59	</dependency>	59	</dependency>
60	<dependency>	60	<dependency>
61	<code-name-base>org.openide.options</code-name-base>	61	<code-name-base>org.openide.io</code-name-base>
62	<build-prerequisite/>	62	<build-prerequisite/>
63	<compile-dependency/>	63	<compile-dependency/>
64	<run-dependency>	64	<run-dependency>
65	<specification-version>6.2</specification-version>	65	<specification-version>1.11</specification-version>
66	</run-dependency>	66	</run-dependency>
67	</dependency>	67	</dependency>
68	<dependency>	68	<dependency>
69	<code-name-base>org.openide.windows</code-name-base>	69	<code-name-base>org.openide.nodes</code-name-base>
70	<build-prerequisite/>	70	<build-prerequisite/>
71	<compile-dependency/>	71	<compile-dependency/>
72	<run-dependency>	72	<run-dependency>
Lines 74-80 Link Here
74	</run-dependency>	74	</run-dependency>
75	</dependency>	75	</dependency>
76	<dependency>	76	<dependency>
77	<code-name-base>org.openide.actions</code-name-base>	77	<code-name-base>org.openide.options</code-name-base>
78	<build-prerequisite/>	78	<build-prerequisite/>
79	<compile-dependency/>	79	<compile-dependency/>
80	<run-dependency>	80	<run-dependency>
Lines 82-100 Link Here
82	</run-dependency>	82	</run-dependency>
83	</dependency>	83	</dependency>
84	<dependency>	84	<dependency>
85	<code-name-base>org.openide.io</code-name-base>	85	<code-name-base>org.openide.util</code-name-base>
86	<build-prerequisite/>	86	<build-prerequisite/>
87	<compile-dependency/>	87	<compile-dependency/>
88	<run-dependency>	88	<run-dependency>
89	<specification-version>1.0</specification-version>	89	<specification-version>6.2</specification-version>
90	</run-dependency>	90	</run-dependency>
91	</dependency>	91	</dependency>
92	<dependency>	92	<dependency>
93	<code-name-base>org.netbeans.lib.terminalemulator</code-name-base>	93	<code-name-base>org.openide.windows</code-name-base>
94	<build-prerequisite/>	94	<build-prerequisite/>
95	<compile-dependency/>	95	<compile-dependency/>
96	<run-dependency>	96	<run-dependency>
97	<specification-version>1.0</specification-version>	97	<specification-version>6.2</specification-version>
98	</run-dependency>	98	</run-dependency>
99	</dependency>	99	</dependency>
100	</module-dependencies>	100	</module-dependencies>

Lines 18-24 Link Here

(-)core/output2/nbproject/project.xml (-7 / +7 lines)
18	<code-name-base>org.netbeans.core.output2</code-name-base>	18	<code-name-base>org.netbeans.core.output2</code-name-base>
19	<module-dependencies>	19	<module-dependencies>
20	<dependency>	20	<dependency>
21	<code-name-base>org.openide.util</code-name-base>	21	<code-name-base>org.openide.actions</code-name-base>
22	<build-prerequisite/>	22	<build-prerequisite/>
23	<compile-dependency/>	23	<compile-dependency/>
24	<run-dependency>	24	<run-dependency>
Lines 34-48 Link Here
34	</run-dependency>	34	</run-dependency>
35	</dependency>	35	</dependency>
36	<dependency>	36	<dependency>
37	<code-name-base>org.openide.options</code-name-base>	37	<code-name-base>org.openide.io</code-name-base>
38	<build-prerequisite/>	38	<build-prerequisite/>
39	<compile-dependency/>	39	<compile-dependency/>
40	<run-dependency>	40	<run-dependency>
41	<specification-version>6.2</specification-version>	41	<specification-version>1.11</specification-version>
42	</run-dependency>	42	</run-dependency>
43	</dependency>	43	</dependency>
44	<dependency>	44	<dependency>
45	<code-name-base>org.openide.windows</code-name-base>	45	<code-name-base>org.openide.options</code-name-base>
46	<build-prerequisite/>	46	<build-prerequisite/>
47	<compile-dependency/>	47	<compile-dependency/>
48	<run-dependency>	48	<run-dependency>
Lines 50-56 Link Here
50	</run-dependency>	50	</run-dependency>
51	</dependency>	51	</dependency>
52	<dependency>	52	<dependency>
53	<code-name-base>org.openide.actions</code-name-base>	53	<code-name-base>org.openide.util</code-name-base>
54	<build-prerequisite/>	54	<build-prerequisite/>
55	<compile-dependency/>	55	<compile-dependency/>
56	<run-dependency>	56	<run-dependency>
Lines 58-68 Link Here
58	</run-dependency>	58	</run-dependency>
59	</dependency>	59	</dependency>
60	<dependency>	60	<dependency>
61	<code-name-base>org.openide.io</code-name-base>	61	<code-name-base>org.openide.windows</code-name-base>
62	<build-prerequisite/>	62	<build-prerequisite/>
63	<compile-dependency/>	63	<compile-dependency/>
64	<run-dependency>	64	<run-dependency>
65	<specification-version>1.5</specification-version>	65	<specification-version>6.2</specification-version>
66	</run-dependency>	66	</run-dependency>
67	</dependency>	67	</dependency>
68	</module-dependencies>	68	</module-dependencies>

Lines 49-54 Link Here

(-)core/startup/test/unit/src/org/netbeans/core/startup/ModuleManagerTest.java (+96 lines)
49	import org.openide.util.Lookup;	49	import org.openide.util.Lookup;
50	import org.openide.util.LookupEvent;	50	import org.openide.util.LookupEvent;
51	import org.openide.util.LookupListener;	51	import org.openide.util.LookupListener;
		52	import org.openide.util.TopologicalSortException;
52	import org.openide.util.Utilities;	53	import org.openide.util.Utilities;
53		54
54	/** Test the module manager as well as the Module class.	55	/** Test the module manager as well as the Module class.
Lines 1018-1023 Link Here
1018	assertEquals(4, toEnable.size());	1019	assertEquals(4, toEnable.size());
1019	assertTrue(toEnable.get(0) != m2);	1020	assertTrue(toEnable.get(0) != m2);
1020	assertTrue(toEnable.get(0) != m3);	1021	assertTrue(toEnable.get(0) != m3);
		1022	} finally {
		1023	mgr.mutexPrivileged().exitWriteAccess();
		1024	}
		1025	}
		1026
		1027	public void testSimpleProvNeeds() throws Exception {
		1028	doSimpleProvNeeds(false);
		1029	}
		1030
		1031	public void testSimpleProvNeedsReversed() throws Exception {
		1032	doSimpleProvNeeds(true);
		1033	}
		1034
		1035	private void doSimpleProvNeeds(boolean reverseOrder) throws Exception {
		1036	FakeModuleInstaller installer = new FakeModuleInstaller();
		1037	FakeEvents ev = new FakeEvents();
		1038	ModuleManager mgr = new ModuleManager(installer, ev);
		1039	mgr.mutexPrivileged().enterWriteAccess();
		1040	try {
		1041	Module m1 = mgr.create(new File(jars, "prov-foo-depends-needs_foo.jar"), null, false, false, false);
		1042	Module m2 = mgr.create(new File(jars, "needs-foo.jar"), null, false, false, false);
		1043	assertEquals(Collections.singletonList("foo"), Arrays.asList(m1.getProvides()));
		1044	assertEquals(Collections.EMPTY_LIST, Arrays.asList(m2.getProvides()));
		1045	assertEquals(1, m1.getDependencies().size());
		1046	assertEquals(Dependency.create(Dependency.TYPE_NEEDS, "foo"), m2.getDependencies());
		1047	Map<String,Module> modulesByName = new HashMap<String,Module>();
		1048	modulesByName.put(m1.getCodeNameBase(), m1);
		1049	modulesByName.put(m2.getCodeNameBase(), m2);
		1050	Map<String,Set<Module>> providersOf = new HashMap<String,Set<Module>>();
		1051	providersOf.put("foo", Collections.singleton(m1));
		1052	List<Module> m1m2 = Arrays.asList(new Module[] {m1, m2});
		1053	List<Module> m2m1 = Arrays.asList(new Module[] {m2, m1});
		1054	Map<Module,List<Module>> deps = Util.moduleDependencies(m1m2, modulesByName, providersOf);
		1055	assertEquals(Collections.singletonList(m2), deps.get(m1));
		1056	/* assertEquals(Collections.singletonList(m1), deps.get(m2));
		1057
		1058	try {
		1059	Utilities.topologicalSort(m1m2, deps);
		1060	} catch (TopologicalSortException ex) {
		1061	Set[] arr = ex.unsortableSets();
		1062	assertEquals("One unsortable set", 1, arr.length);
		1063	assertEquals("It contains two elements", 2, arr[0].size());
		1064	assertTrue("m1 is there", arr[0].contains(m1));
		1065	assertTrue("m2 is there", arr[0].contains(m2));
		1066	}*/
		1067	Set<Module> m1PlusM2 = new LinkedHashSet<Module>();
		1068	if (reverseOrder) {
		1069	m1PlusM2.add(m2);
		1070	m1PlusM2.add(m1);
		1071	} else {
		1072	m1PlusM2.add(m1);
		1073	m1PlusM2.add(m2);
		1074	}
		1075	List<Module> toEnable = mgr.simulateEnable(m1PlusM2);
		1076	assertEquals("correct result of simulateEnable", Arrays.asList(new Module[] {m2, m1}), toEnable);
		1077	toEnable = mgr.simulateEnable(Collections.singleton(m1));
		1078	assertEquals("correct result of simulateEnable #2", Arrays.asList(new Module[] {m2, m1}), toEnable);
		1079	toEnable = mgr.simulateEnable(Collections.singleton(m2));
		1080	assertEquals("correct result of simulateEnable #3", Arrays.asList(new Module[] {m2, m1}), toEnable);
		1081	mgr.enable(m1PlusM2);
		1082	assertEquals(Arrays.asList(new String[] {
		1083	"prepare",
		1084	"prepare",
		1085	"load"
1086	}), installer.actions);
1087	assertEquals(Arrays.asList(new Object[] {
1088	m2,
1089	m1,
1090	Arrays.asList(new Module[] {m2, m1})
1091	}), installer.args);
1092	Class testclazz = Class.forName("org.prov_foo.Clazz", true, m1.getClassLoader());
1093	try {
1094	Class.forName("org.prov_foo.Clazz", true, m2.getClassLoader());
1095	fail("Should not be able to access classes due to prov-req deps only");
1096	} catch (ClassNotFoundException cnfe) {
1097	// OK, good.
1098	}
1099	installer.clear();
1100	List<Module> toDisable = mgr.simulateDisable(Collections.singleton(m1));
1101	assertEquals("correct result of simulateDisable", Arrays.asList(new Module[] {m1, m2}), toDisable);
1102	toDisable = mgr.simulateDisable(m1PlusM2);
1103	assertEquals("correct result of simulateDisable #2", Arrays.asList(new Module[] {m1, m2}), toDisable);
1104	mgr.disable(m1PlusM2);
1105	assertFalse(m1.isEnabled());
1106	assertFalse(m2.isEnabled());
1107	assertEquals(Arrays.asList(new String[] {
1108	"unload",
1109	"dispose",
1110	"dispose"
1111	}), installer.actions);
1112	assertEquals(Arrays.asList(new Object[] {
1113	Arrays.asList(new Module[] {m1, m2}),
1114	m1,
1115	m2
1116	}), installer.args);
1021	} finally {	1117	} finally {
1022	mgr.mutexPrivileged().exitWriteAccess();	1118	mgr.mutexPrivileged().exitWriteAccess();
1023	}	1119	}

Lines 33-39 Link Here

(-)ide/golden/cluster-deps.txt (-2 lines)
33	REQUIRES org.openide.text (platform)	33	REQUIRES org.openide.text (platform)
34	REQUIRES org.openide.util (platform)	34	REQUIRES org.openide.util (platform)
35	REQUIRES org.openide.windows (platform)	35	REQUIRES org.openide.windows (platform)
36	REQUIRES org.netbeans.core.output2/1 (platform)
37	GROUP j2ee	36	GROUP j2ee
38	REQUIRES javax.jmi.model/1 (ide)	37	REQUIRES javax.jmi.model/1 (ide)
39	REQUIRES javax.jmi.reflect/1 (ide)	38	REQUIRES javax.jmi.reflect/1 (ide)
Lines 104-110 Link Here
104	REQUIRES org.openide.util (platform)	103	REQUIRES org.openide.util (platform)
105	REQUIRES org.netbeans.modules.httpserver/2 (ide)	104	REQUIRES org.netbeans.modules.httpserver/2 (ide)
106	REQUIRES org.openide.windows (platform)	105	REQUIRES org.openide.windows (platform)
107	REQUIRES org.netbeans.core.output2/1 (platform)
108	GROUP nb	106	GROUP nb
109	REQUIRES org.netbeans.core.windows/2 (platform)	107	REQUIRES org.netbeans.core.windows/2 (platform)
110	REQUIRES org.netbeans.modules.autoupdate/1 (platform)	108	REQUIRES org.netbeans.modules.autoupdate/1 (platform)

Lines 27-33 Link Here

(-)ide/golden/deps.txt (-7 lines)
27	REQUIRES org.openide.text (platform)	27	REQUIRES org.openide.text (platform)
28	REQUIRES org.openide.util (platform)	28	REQUIRES org.openide.util (platform)
29	REQUIRES org.openide.windows (platform)	29	REQUIRES org.openide.windows (platform)
30	REQUIRES org.netbeans.core.output2/1 (platform)
31	MODULE org.jdesktop.layout/1 (platform)	30	MODULE org.jdesktop.layout/1 (platform)
32	REQUIRES org.openide.modules.ModuleFormat1	31	REQUIRES org.openide.modules.ModuleFormat1
33	MODULE org.netbeans.api.debugger/1 (ide)	32	MODULE org.netbeans.api.debugger/1 (ide)
Lines 113-119 Link Here
113	REQUIRES org.openide.nodes (platform)	112	REQUIRES org.openide.nodes (platform)
114	REQUIRES org.openide.util (platform)	113	REQUIRES org.openide.util (platform)
115	REQUIRES org.openide.windows (platform)	114	REQUIRES org.openide.windows (platform)
116	REQUIRES org.netbeans.core.output2/1 (platform)
117	MODULE org.netbeans.core.ide/1 (ide)	115	MODULE org.netbeans.core.ide/1 (ide)
118	REQUIRES org.netbeans.core/2 (platform)	116	REQUIRES org.netbeans.core/2 (platform)
119	REQUIRES org.netbeans.core.ui/1 (platform)	117	REQUIRES org.netbeans.core.ui/1 (platform)
Lines 388-394 Link Here
388	REQUIRES org.openide.text (platform)	386	REQUIRES org.openide.text (platform)
389	REQUIRES org.openide.util (platform)	387	REQUIRES org.openide.util (platform)
390	REQUIRES org.openide.windows (platform)	388	REQUIRES org.openide.windows (platform)
391	REQUIRES org.netbeans.core.output2/1 (platform)
392	MODULE org.netbeans.modules.db/0 (ide)	389	MODULE org.netbeans.modules.db/0 (ide)
393	REQUIRES org.jdesktop.layout/1 (platform)	390	REQUIRES org.jdesktop.layout/1 (platform)
394	REQUIRES org.netbeans.modules.javahelp/1 (platform)	391	REQUIRES org.netbeans.modules.javahelp/1 (platform)
Lines 405-411 Link Here
405	REQUIRES org.openide.options (platform)	402	REQUIRES org.openide.options (platform)
406	REQUIRES org.openide.util (platform)	403	REQUIRES org.openide.util (platform)
407	REQUIRES org.openide.windows (platform)	404	REQUIRES org.openide.windows (platform)
408	REQUIRES org.netbeans.core.output2/1 (platform)
409	MODULE org.netbeans.modules.db.core (ide)	405	MODULE org.netbeans.modules.db.core (ide)
410	REQUIRES org.netbeans.api.progress/1 (platform)	406	REQUIRES org.netbeans.api.progress/1 (platform)
411	REQUIRES org.netbeans.modules.db/0 (ide)	407	REQUIRES org.netbeans.modules.db/0 (ide)
Lines 1922-1928 Link Here
1922	REQUIRES org.openide.text (platform)	1918	REQUIRES org.openide.text (platform)
1923	REQUIRES org.openide.util (platform)	1919	REQUIRES org.openide.util (platform)
1924	REQUIRES org.openide.windows (platform)	1920	REQUIRES org.openide.windows (platform)
1925	REQUIRES org.netbeans.core.output2/1 (platform)
1926	REQUIRES org.openidex.util/3 (ide)	1921	REQUIRES org.openidex.util/3 (ide)
1927	MODULE org.netbeans.modules.utilities.project/1 (ide)	1922	MODULE org.netbeans.modules.utilities.project/1 (ide)
1928	REQUIRES org.netbeans.modules.projectapi/1 (ide)	1923	REQUIRES org.netbeans.modules.projectapi/1 (ide)
Lines 2121-2127 Link Here
2121	REQUIRES org.openide.modules.ModuleFormat1	2116	REQUIRES org.openide.modules.ModuleFormat1
2122	REQUIRES org.openide.text (platform)	2117	REQUIRES org.openide.text (platform)
2123	REQUIRES org.openide.util (platform)	2118	REQUIRES org.openide.util (platform)
2124	REQUIRES org.netbeans.core.output2/1 (platform)
2125	MODULE org.netbeans.modules.web.jstl11/1 (j2ee)	2119	MODULE org.netbeans.modules.web.jstl11/1 (j2ee)
2126	REQUIRES org.netbeans.modules.web.project (j2ee)	2120	REQUIRES org.netbeans.modules.web.project (j2ee)
2127	REQUIRES org.openide.modules.ModuleFormat1	2121	REQUIRES org.openide.modules.ModuleFormat1
Lines 2355-2361 Link Here
2355	REQUIRES org.openide.text (platform)	2349	REQUIRES org.openide.text (platform)
2356	REQUIRES org.openide.util (platform)	2350	REQUIRES org.openide.util (platform)
2357	REQUIRES org.openide.windows (platform)	2351	REQUIRES org.openide.windows (platform)
2358	REQUIRES org.netbeans.core.output2/1 (platform)
2359	MODULE org.netbeans.modules.xml.multiview/1 (j2ee)	2352	MODULE org.netbeans.modules.xml.multiview/1 (j2ee)
2360	REQUIRES org.netbeans.core.multiview/1 (platform)	2353	REQUIRES org.netbeans.core.multiview/1 (platform)
2361	REQUIRES org.netbeans.modules.xml.core/2 (ide)	2354	REQUIRES org.netbeans.modules.xml.core/2 (ide)

Lines 75-80 Link Here

(-)openide/io/api/doc/changes/changes.xml (+19 lines)
75	<!-- ACTUAL CHANGES BEGIN HERE: -->	75	<!-- ACTUAL CHANGES BEGIN HERE: -->
76		76
77	<changes>	77	<changes>
		78	<change id="automatic-request-of-io-impl">
		79	<api name="io"/>
		80	<summary> No need to require IOProvider token anymore</summary>
		81	<version major="1" minor="11"/>
		82	<date day="12" month="7" year="2006"/>
		83	<author login="jtulach"/>
		84	<compatibility addition="yes" binary="compatible" semantic="compatible" />
		85	<description>
		86	<p>If your module depends on <code>org.openide.io > 1.11</code> or higher
		87	there is no need to specify that it also requires an implementation of
		88	the API by use of <code>OpenIDE-Module-Requires: org.openide.windows.IOProvider</code>,
		89	this token will be requested automatically by the <code>org.openide.io</code>
		90	module itself.
		91	</p>
		92	</description>
		93	<class package="org.openide.windows" name="IOProvider"/>
		94	<issue number="34699" />
		95	</change>
		96
78	<change id="allow-to-add-actions-to-toolbar">	97	<change id="allow-to-add-actions-to-toolbar">
79	<api name="io"/>	98	<api name="io"/>
80	<summary> Added API to add actions to output's toolbar</summary>	99	<summary> Added API to add actions to output's toolbar</summary>

Lines 39-48 Link Here

(-)openide/io/src/org/openide/windows/IOProvider.java (-5 / +1 lines)
39	* instance in lookup, a fallback instance is created which just uses the	39	* instance in lookup, a fallback instance is created which just uses the
40	* standard system I/O streams. This is useful for unit tests and perhaps	40	* standard system I/O streams. This is useful for unit tests and perhaps
41	* for standalone usage of various libraries.	41	* for standalone usage of various libraries.
42	* <p>
43	* Assuming you want to ensure that a real output window implementation is actually
44	* installed and enabled, you must require the token <code>org.openide.windows.IOProvider</code>
45	* from the module calling this method.
46	* @return the default instance (never null)	42	* @return the default instance (never null)
47	*/	43	*/
48	public static IOProvider getDefault() {	44	public static IOProvider getDefault() {
Lines 61-67 Link Here
61	* the output window. Streams for reading/writing can be accessed via	57	* the output window. Streams for reading/writing can be accessed via
62	* getters on the returned instance.	58	* getters on the returned instance.
63	*	59	*
64	* @param name A localized display name for the tab	60	* @param name A localised display name for the tab
65	* @param newIO if <tt>true</tt>, a new <code>InputOutput</code> is returned, else an existing <code>InputOutput</code> of the same name may be returned	61	* @param newIO if <tt>true</tt>, a new <code>InputOutput</code> is returned, else an existing <code>InputOutput</code> of the same name may be returned
66	* @return an <code>InputOutput</code> instance for accessing the new tab	62	* @return an <code>InputOutput</code> instance for accessing the new tab
67	* @see InputOutput	63	* @see InputOutput

Lines 18-23 Link Here

(-)openide/modules/apichanges.xml (+16 lines)
18	<apidef name="modules">Modules API</apidef>	18	<apidef name="modules">Modules API</apidef>
19	</apidefs>	19	</apidefs>
20	<changes>	20	<changes>
		21	<change id="needs">
		22	<api name="modules"/>
		23	<summary>Requires/Provides and Needs</summary>
		24	<version major="7" minor="1"/>
		25	<date day="12" month="7" year="2006"/>
		26	<author login="jtulach"/>
		27	<compatibility binary="compatible" source="compatible" semantic="compatible" deprecation="no" addition="yes" deletion="no" modification="no"/>
		28	<description>
		29	It is possible to require some implementation using
		30	<code>OpenIDE-Module-Needs: token</code> which is slightly
		31	less restrictive than usual
		32	<code>OpenIDE-Module-Requires: token</code> as
		33	explain in the <a href="@TOP@/org/openide/modules/doc-files/api.html#7.1">documentation</a>.
		34	</description>
		35	<class package="org.openide.modules" name="Dependency"/>
		36	</change>
21	<change id="generified">	37	<change id="generified">
22	<api name="modules"/>	38	<api name="modules"/>
23	<summary>Generified Interfaces</summary>	39	<summary>Generified Interfaces</summary>

Lines 18-40 Link Here

(-)vcscore/nbproject/project.xml (-31 / +31 lines)
18	<code-name-base>org.netbeans.modules.vcscore</code-name-base>	18	<code-name-base>org.netbeans.modules.vcscore</code-name-base>
19	<module-dependencies>	19	<module-dependencies>
20	<dependency>	20	<dependency>
21	<code-name-base>org.openide.filesystems</code-name-base>	21	<code-name-base>org.netbeans.modules.masterfs</code-name-base>
22	<build-prerequisite/>	22	<build-prerequisite/>
23	<compile-dependency/>	23	<compile-dependency/>
24	<run-dependency>	24	<run-dependency>
25	<specification-version>6.2</specification-version>	25	<release-version>1</release-version>
		26	<specification-version>1.1</specification-version>
26	</run-dependency>	27	</run-dependency>
27	</dependency>	28	</dependency>
28	<dependency>	29	<dependency>
29	<code-name-base>org.openide.util</code-name-base>	30	<code-name-base>org.netbeans.modules.queries</code-name-base>
30	<build-prerequisite/>	31	<build-prerequisite/>
31	<compile-dependency/>	32	<compile-dependency/>
32	<run-dependency>	33	<run-dependency>
33	<specification-version>6.2</specification-version>	34	<release-version>1</release-version>
		35	<specification-version>1.4</specification-version>
34	</run-dependency>	36	</run-dependency>
35	</dependency>	37	</dependency>
36	<dependency>	38	<dependency>
37	<code-name-base>org.openide.modules</code-name-base>	39	<code-name-base>org.openide.actions</code-name-base>
38	<build-prerequisite/>	40	<build-prerequisite/>
39	<compile-dependency/>	41	<compile-dependency/>
40	<run-dependency>	42	<run-dependency>
Lines 42-48 Link Here
42	</run-dependency>	44	</run-dependency>
43	</dependency>	45	</dependency>
44	<dependency>	46	<dependency>
45	<code-name-base>org.openide.nodes</code-name-base>	47	<code-name-base>org.openide.awt</code-name-base>
46	<build-prerequisite/>	48	<build-prerequisite/>
47	<compile-dependency/>	49	<compile-dependency/>
48	<run-dependency>	50	<run-dependency>
Lines 50-56 Link Here
50	</run-dependency>	52	</run-dependency>
51	</dependency>	53	</dependency>
52	<dependency>	54	<dependency>
53	<code-name-base>org.openide.explorer</code-name-base>	55	<code-name-base>org.openide.compat</code-name-base>
54	<build-prerequisite/>	56	<build-prerequisite/>
55	<compile-dependency/>	57	<compile-dependency/>
56	<run-dependency>	58	<run-dependency>
Lines 58-64 Link Here
58	</run-dependency>	60	</run-dependency>
59	</dependency>	61	</dependency>
60	<dependency>	62	<dependency>
61	<code-name-base>org.openide.awt</code-name-base>	63	<code-name-base>org.openide.dialogs</code-name-base>
62	<build-prerequisite/>	64	<build-prerequisite/>
63	<compile-dependency/>	65	<compile-dependency/>
64	<run-dependency>	66	<run-dependency>
Lines 66-80 Link Here
66	</run-dependency>	68	</run-dependency>
67	</dependency>	69	</dependency>
68	<dependency>	70	<dependency>
69	<code-name-base>org.openide.dialogs</code-name-base>	71	<code-name-base>org.openide.execution</code-name-base>
70	<build-prerequisite/>	72	<build-prerequisite/>
71	<compile-dependency/>	73	<compile-dependency/>
72	<run-dependency>	74	<run-dependency>
73	<specification-version>6.2</specification-version>	75	<specification-version>1.2</specification-version>
74	</run-dependency>	76	</run-dependency>
75	</dependency>	77	</dependency>
76	<dependency>	78	<dependency>
77	<code-name-base>org.openide.compat</code-name-base>	79	<code-name-base>org.openide.explorer</code-name-base>
78	<build-prerequisite/>	80	<build-prerequisite/>
79	<compile-dependency/>	81	<compile-dependency/>
80	<run-dependency>	82	<run-dependency>
Lines 82-88 Link Here
82	</run-dependency>	84	</run-dependency>
83	</dependency>	85	</dependency>
84	<dependency>	86	<dependency>
85	<code-name-base>org.openide.options</code-name-base>	87	<code-name-base>org.openide.filesystems</code-name-base>
86	<build-prerequisite/>	88	<build-prerequisite/>
87	<compile-dependency/>	89	<compile-dependency/>
88	<run-dependency>	90	<run-dependency>
Lines 90-112 Link Here
90	</run-dependency>	92	</run-dependency>
91	</dependency>	93	</dependency>
92	<dependency>	94	<dependency>
93	<code-name-base>org.openide.windows</code-name-base>	95	<code-name-base>org.openide.io</code-name-base>
94	<build-prerequisite/>	96	<build-prerequisite/>
95	<compile-dependency/>	97	<compile-dependency/>
96	<run-dependency>	98	<run-dependency>
97	<specification-version>6.2</specification-version>	99	<specification-version>1.11</specification-version>
98	</run-dependency>	100	</run-dependency>
99	</dependency>	101	</dependency>
100	<dependency>	102	<dependency>
101	<code-name-base>org.openide.text</code-name-base>	103	<code-name-base>org.openide.loaders</code-name-base>
102	<build-prerequisite/>	104	<build-prerequisite/>
103	<compile-dependency/>	105	<compile-dependency/>
104	<run-dependency>	106	<run-dependency>
105	<specification-version>6.2</specification-version>	107	<specification-version>4.11</specification-version>
106	</run-dependency>	108	</run-dependency>
107	</dependency>	109	</dependency>
108	<dependency>	110	<dependency>
109	<code-name-base>org.openide.actions</code-name-base>	111	<code-name-base>org.openide.modules</code-name-base>
110	<build-prerequisite/>	112	<build-prerequisite/>
111	<compile-dependency/>	113	<compile-dependency/>
112	<run-dependency>	114	<run-dependency>
Lines 114-166 Link Here
114	</run-dependency>	116	</run-dependency>
115	</dependency>	117	</dependency>
116	<dependency>	118	<dependency>
117	<code-name-base>org.openide.execution</code-name-base>	119	<code-name-base>org.openide.nodes</code-name-base>
118	<build-prerequisite/>	120	<build-prerequisite/>
119	<compile-dependency/>	121	<compile-dependency/>
120	<run-dependency>	122	<run-dependency>
121	<specification-version>1.2</specification-version>	123	<specification-version>6.2</specification-version>
122	</run-dependency>	124	</run-dependency>
123	</dependency>	125	</dependency>
124	<dependency>	126	<dependency>
125	<code-name-base>org.openide.io</code-name-base>	127	<code-name-base>org.openide.options</code-name-base>
126	<build-prerequisite/>	128	<build-prerequisite/>
127	<compile-dependency/>	129	<compile-dependency/>
128	<run-dependency>	130	<run-dependency>
129	<specification-version>1.0</specification-version>	131	<specification-version>6.2</specification-version>
130	</run-dependency>	132	</run-dependency>
131	</dependency>	133	</dependency>
132	<dependency>	134	<dependency>
133	<code-name-base>org.openide.loaders</code-name-base>	135	<code-name-base>org.openide.text</code-name-base>
134	<build-prerequisite/>	136	<build-prerequisite/>
135	<compile-dependency/>	137	<compile-dependency/>
136	<run-dependency>	138	<run-dependency>
137	<specification-version>4.11</specification-version>	139	<specification-version>6.2</specification-version>
138	</run-dependency>	140	</run-dependency>
139	</dependency>	141	</dependency>
140	<dependency>	142	<dependency>
141	<code-name-base>org.openidex.util</code-name-base>	143	<code-name-base>org.openide.util</code-name-base>
142	<build-prerequisite/>	144	<build-prerequisite/>
143	<compile-dependency/>	145	<compile-dependency/>
144	<run-dependency>	146	<run-dependency>
145	<release-version>2-3</release-version>	147	<specification-version>6.2</specification-version>
146	</run-dependency>	148	</run-dependency>
147	</dependency>	149	</dependency>
148	<dependency>	150	<dependency>
149	<code-name-base>org.netbeans.modules.masterfs</code-name-base>	151	<code-name-base>org.openide.windows</code-name-base>
150	<build-prerequisite/>	152	<build-prerequisite/>
151	<compile-dependency/>	153	<compile-dependency/>
152	<run-dependency>	154	<run-dependency>
153	<release-version>1</release-version>	155	<specification-version>6.2</specification-version>
154	<specification-version>1.1</specification-version>
155	</run-dependency>	156	</run-dependency>
156	</dependency>	157	</dependency>
157	<dependency>	158	<dependency>
158	<code-name-base>org.netbeans.modules.queries</code-name-base>	159	<code-name-base>org.openidex.util</code-name-base>
159	<build-prerequisite/>	160	<build-prerequisite/>
160	<compile-dependency/>	161	<compile-dependency/>
161	<run-dependency>	162	<run-dependency>
162	<release-version>1</release-version>	163	<release-version>2-3</release-version>
163	<specification-version>1.4</specification-version>
164	</run-dependency>	164	</run-dependency>
165	</dependency>	165	</dependency>
166	</module-dependencies>	166	</module-dependencies>

Lines 18-48 Link Here

(-)vcsgeneric/nbproject/project.xml (-28 / +28 lines)
18	<code-name-base>org.netbeans.modules.vcs.advanced</code-name-base>	18	<code-name-base>org.netbeans.modules.vcs.advanced</code-name-base>
19	<module-dependencies>	19	<module-dependencies>
20	<dependency>	20	<dependency>
21	<code-name-base>org.openide.filesystems</code-name-base>	21	<code-name-base>org.netbeans.modules.diff</code-name-base>
22	<build-prerequisite/>	22	<build-prerequisite/>
23	<compile-dependency/>	23	<compile-dependency/>
24	<run-dependency>	24	<run-dependency>
25	<specification-version>6.2</specification-version>	25	<release-version>1</release-version>
		26	<implementation-version/>
26	</run-dependency>	27	</run-dependency>
27	</dependency>	28	</dependency>
28	<dependency>	29	<dependency>
29	<code-name-base>org.openide.util</code-name-base>	30	<code-name-base>org.netbeans.modules.queries</code-name-base>
30	<build-prerequisite/>	31	<build-prerequisite/>
31	<compile-dependency/>	32	<compile-dependency/>
32	<run-dependency>	33	<run-dependency>
33	<specification-version>6.2</specification-version>	34	<release-version>1</release-version>
		35	<specification-version>1.3</specification-version>
34	</run-dependency>	36	</run-dependency>
35	</dependency>	37	</dependency>
36	<dependency>	38	<dependency>
37	<code-name-base>org.openide.modules</code-name-base>	39	<code-name-base>org.netbeans.modules.vcscore</code-name-base>
38	<build-prerequisite/>	40	<build-prerequisite/>
39	<compile-dependency/>	41	<compile-dependency/>
40	<run-dependency>	42	<run-dependency>
41	<specification-version>6.2</specification-version>	43	<release-version>1</release-version>
		44	<implementation-version/>
42	</run-dependency>	45	</run-dependency>
43	</dependency>	46	</dependency>
44	<dependency>	47	<dependency>
45	<code-name-base>org.openide.nodes</code-name-base>	48	<code-name-base>org.openide.actions</code-name-base>
46	<build-prerequisite/>	49	<build-prerequisite/>
47	<compile-dependency/>	50	<compile-dependency/>
48	<run-dependency>	51	<run-dependency>
Lines 50-56 Link Here
50	</run-dependency>	53	</run-dependency>
51	</dependency>	54	</dependency>
52	<dependency>	55	<dependency>
53	<code-name-base>org.openide.explorer</code-name-base>	56	<code-name-base>org.openide.awt</code-name-base>
54	<build-prerequisite/>	57	<build-prerequisite/>
55	<compile-dependency/>	58	<compile-dependency/>
56	<run-dependency>	59	<run-dependency>
Lines 58-64 Link Here
58	</run-dependency>	61	</run-dependency>
59	</dependency>	62	</dependency>
60	<dependency>	63	<dependency>
61	<code-name-base>org.openide.awt</code-name-base>	64	<code-name-base>org.openide.compat</code-name-base>
62	<build-prerequisite/>	65	<build-prerequisite/>
63	<compile-dependency/>	66	<compile-dependency/>
64	<run-dependency>	67	<run-dependency>
Lines 74-80 Link Here
74	</run-dependency>	77	</run-dependency>
75	</dependency>	78	</dependency>
76	<dependency>	79	<dependency>
77	<code-name-base>org.openide.compat</code-name-base>	80	<code-name-base>org.openide.explorer</code-name-base>
78	<build-prerequisite/>	81	<build-prerequisite/>
79	<compile-dependency/>	82	<compile-dependency/>
80	<run-dependency>	83	<run-dependency>
Lines 82-88 Link Here
82	</run-dependency>	85	</run-dependency>
83	</dependency>	86	</dependency>
84	<dependency>	87	<dependency>
85	<code-name-base>org.openide.options</code-name-base>	88	<code-name-base>org.openide.filesystems</code-name-base>
86	<build-prerequisite/>	89	<build-prerequisite/>
87	<compile-dependency/>	90	<compile-dependency/>
88	<run-dependency>	91	<run-dependency>
Lines 90-151 Link Here
90	</run-dependency>	93	</run-dependency>
91	</dependency>	94	</dependency>
92	<dependency>	95	<dependency>
93	<code-name-base>org.openide.windows</code-name-base>	96	<code-name-base>org.openide.io</code-name-base>
94	<build-prerequisite/>	97	<build-prerequisite/>
95	<compile-dependency/>	98	<compile-dependency/>
96	<run-dependency>	99	<run-dependency>
97	<specification-version>6.2</specification-version>	100	<specification-version>1.11</specification-version>
98	</run-dependency>	101	</run-dependency>
99	</dependency>	102	</dependency>
100	<dependency>	103	<dependency>
101	<code-name-base>org.openide.actions</code-name-base>	104	<code-name-base>org.openide.loaders</code-name-base>
102	<build-prerequisite/>	105	<build-prerequisite/>
103	<compile-dependency/>	106	<compile-dependency/>
104	<run-dependency>	107	<run-dependency>
105	<specification-version>6.2</specification-version>	108	<specification-version>4.11</specification-version>
106	</run-dependency>	109	</run-dependency>
107	</dependency>	110	</dependency>
108	<dependency>	111	<dependency>
109	<code-name-base>org.netbeans.modules.vcscore</code-name-base>	112	<code-name-base>org.openide.modules</code-name-base>
110	<build-prerequisite/>	113	<build-prerequisite/>
111	<compile-dependency/>	114	<compile-dependency/>
112	<run-dependency>	115	<run-dependency>
113	<release-version>1</release-version>	116	<specification-version>6.2</specification-version>
114	<implementation-version/>
115	</run-dependency>	117	</run-dependency>
116	</dependency>	118	</dependency>
117	<dependency>	119	<dependency>
118	<code-name-base>org.netbeans.modules.diff</code-name-base>	120	<code-name-base>org.openide.nodes</code-name-base>
119	<build-prerequisite/>	121	<build-prerequisite/>
120	<compile-dependency/>	122	<compile-dependency/>
121	<run-dependency>	123	<run-dependency>
122	<release-version>1</release-version>	124	<specification-version>6.2</specification-version>
123	<implementation-version/>
124	</run-dependency>	125	</run-dependency>
125	</dependency>	126	</dependency>
126	<dependency>	127	<dependency>
127	<code-name-base>org.openide.io</code-name-base>	128	<code-name-base>org.openide.options</code-name-base>
128	<build-prerequisite/>	129	<build-prerequisite/>
129	<compile-dependency/>	130	<compile-dependency/>
130	<run-dependency>	131	<run-dependency>
131	<specification-version>1.0</specification-version>	132	<specification-version>6.2</specification-version>
132	</run-dependency>	133	</run-dependency>
133	</dependency>	134	</dependency>
134	<dependency>	135	<dependency>
135	<code-name-base>org.openide.loaders</code-name-base>	136	<code-name-base>org.openide.util</code-name-base>
136	<build-prerequisite/>	137	<build-prerequisite/>
137	<compile-dependency/>	138	<compile-dependency/>
138	<run-dependency>	139	<run-dependency>
139	<specification-version>4.11</specification-version>	140	<specification-version>6.2</specification-version>
140	</run-dependency>	141	</run-dependency>
141	</dependency>	142	</dependency>
142	<dependency>	143	<dependency>
143	<code-name-base>org.netbeans.modules.queries</code-name-base>	144	<code-name-base>org.openide.windows</code-name-base>
144	<build-prerequisite/>	145	<build-prerequisite/>
145	<compile-dependency/>	146	<compile-dependency/>
146	<run-dependency>	147	<run-dependency>
147	<release-version>1</release-version>	148	<specification-version>6.2</specification-version>
148	<specification-version>1.3</specification-version>
149	</run-dependency>	149	</run-dependency>
150	</dependency>	150	</dependency>
151	</module-dependencies>	151	</module-dependencies>

Lines 18-38 Link Here

(-)xml/core/nbproject/project.xml (-25 / +25 lines)
18	<code-name-base>org.netbeans.modules.xml.core</code-name-base>	18	<code-name-base>org.netbeans.modules.xml.core</code-name-base>
19	<module-dependencies>	19	<module-dependencies>
20	<dependency>	20	<dependency>
21	<code-name-base>org.openide.loaders</code-name-base>	21	<code-name-base>org.netbeans.api.xml</code-name-base>
22	<build-prerequisite/>	22	<build-prerequisite/>
23	<compile-dependency/>	23	<compile-dependency/>
24	<run-dependency/>	24	<run-dependency>
		25	<release-version>1</release-version>
		26	<specification-version>1.10</specification-version>
		27	</run-dependency>
25	</dependency>	28	</dependency>
26	<dependency>	29	<dependency>
27	<code-name-base>org.openide.filesystems</code-name-base>	30	<code-name-base>org.netbeans.spi.navigator</code-name-base>
28	<build-prerequisite/>	31	<build-prerequisite/>
29	<compile-dependency/>	32	<compile-dependency/>
30	<run-dependency>	33	<run-dependency>
31	<specification-version>6.2</specification-version>	34	<release-version>1</release-version>
32	</run-dependency>	35	</run-dependency>
33	</dependency>	36	</dependency>
34	<dependency>	37	<dependency>
35	<code-name-base>org.openide.util</code-name-base>	38	<code-name-base>org.openide.actions</code-name-base>
36	<build-prerequisite/>	39	<build-prerequisite/>
37	<compile-dependency/>	40	<compile-dependency/>
38	<run-dependency>	41	<run-dependency>
Lines 40-46 Link Here
40	</run-dependency>	43	</run-dependency>
41	</dependency>	44	</dependency>
42	<dependency>	45	<dependency>
43	<code-name-base>org.openide.modules</code-name-base>	46	<code-name-base>org.openide.awt</code-name-base>
44	<build-prerequisite/>	47	<build-prerequisite/>
45	<compile-dependency/>	48	<compile-dependency/>
46	<run-dependency>	49	<run-dependency>
Lines 48-54 Link Here
48	</run-dependency>	51	</run-dependency>
49	</dependency>	52	</dependency>
50	<dependency>	53	<dependency>
51	<code-name-base>org.openide.nodes</code-name-base>	54	<code-name-base>org.openide.dialogs</code-name-base>
52	<build-prerequisite/>	55	<build-prerequisite/>
53	<compile-dependency/>	56	<compile-dependency/>
54	<run-dependency>	57	<run-dependency>
Lines 56-62 Link Here
56	</run-dependency>	59	</run-dependency>
57	</dependency>	60	</dependency>
58	<dependency>	61	<dependency>
59	<code-name-base>org.openide.awt</code-name-base>	62	<code-name-base>org.openide.filesystems</code-name-base>
60	<build-prerequisite/>	63	<build-prerequisite/>
61	<compile-dependency/>	64	<compile-dependency/>
62	<run-dependency>	65	<run-dependency>
Lines 64-86 Link Here
64	</run-dependency>	67	</run-dependency>
65	</dependency>	68	</dependency>
66	<dependency>	69	<dependency>
67	<code-name-base>org.openide.dialogs</code-name-base>	70	<code-name-base>org.openide.io</code-name-base>
68	<build-prerequisite/>	71	<build-prerequisite/>
69	<compile-dependency/>	72	<compile-dependency/>
70	<run-dependency>	73	<run-dependency>
71	<specification-version>6.2</specification-version>	74	<specification-version>1.11</specification-version>
72	</run-dependency>	75	</run-dependency>
73	</dependency>	76	</dependency>
74	<dependency>	77	<dependency>
75	<code-name-base>org.openide.options</code-name-base>	78	<code-name-base>org.openide.loaders</code-name-base>
76	<build-prerequisite/>	79	<build-prerequisite/>
77	<compile-dependency/>	80	<compile-dependency/>
78	<run-dependency>	81	<run-dependency/>
79	<specification-version>6.2</specification-version>
80	</run-dependency>
81	</dependency>	82	</dependency>
82	<dependency>	83	<dependency>
83	<code-name-base>org.openide.windows</code-name-base>	84	<code-name-base>org.openide.modules</code-name-base>
84	<build-prerequisite/>	85	<build-prerequisite/>
85	<compile-dependency/>	86	<compile-dependency/>
86	<run-dependency>	87	<run-dependency>
Lines 88-94 Link Here
88	</run-dependency>	89	</run-dependency>
89	</dependency>	90	</dependency>
90	<dependency>	91	<dependency>
91	<code-name-base>org.openide.text</code-name-base>	92	<code-name-base>org.openide.nodes</code-name-base>
92	<build-prerequisite/>	93	<build-prerequisite/>
93	<compile-dependency/>	94	<compile-dependency/>
94	<run-dependency>	95	<run-dependency>
Lines 96-102 Link Here
96	</run-dependency>	97	</run-dependency>
97	</dependency>	98	</dependency>
98	<dependency>	99	<dependency>
99	<code-name-base>org.openide.actions</code-name-base>	100	<code-name-base>org.openide.options</code-name-base>
100	<build-prerequisite/>	101	<build-prerequisite/>
101	<compile-dependency/>	102	<compile-dependency/>
102	<run-dependency>	103	<run-dependency>
Lines 104-133 Link Here
104	</run-dependency>	105	</run-dependency>
105	</dependency>	106	</dependency>
106	<dependency>	107	<dependency>
107	<code-name-base>org.openide.io</code-name-base>	108	<code-name-base>org.openide.text</code-name-base>
108	<build-prerequisite/>	109	<build-prerequisite/>
109	<compile-dependency/>	110	<compile-dependency/>
110	<run-dependency>	111	<run-dependency>
111	<specification-version>1.0</specification-version>	112	<specification-version>6.2</specification-version>
112	</run-dependency>	113	</run-dependency>
113	</dependency>	114	</dependency>
114	<dependency>	115	<dependency>
115	<code-name-base>org.netbeans.api.xml</code-name-base>	116	<code-name-base>org.openide.util</code-name-base>
116	<build-prerequisite/>	117	<build-prerequisite/>
117	<compile-dependency/>	118	<compile-dependency/>
118	<run-dependency>	119	<run-dependency>
119	<release-version>1</release-version>	120	<specification-version>6.2</specification-version>
120	<specification-version>1.10</specification-version>
121	</run-dependency>	121	</run-dependency>
122	</dependency>	122	</dependency>
123	<dependency>	123	<dependency>
124	<code-name-base>org.netbeans.spi.navigator</code-name-base>	124	<code-name-base>org.openide.windows</code-name-base>
125	<build-prerequisite/>	125	<build-prerequisite/>
126	<compile-dependency/>	126	<compile-dependency/>
127	<run-dependency>	127	<run-dependency>
128	<release-version>1</release-version>	128	<specification-version>6.2</specification-version>
129	</run-dependency>	129	</run-dependency>
130	</dependency>	130	</dependency>
131	</module-dependencies>	131	</module-dependencies>
132	<public-packages>	132	<public-packages>
133	<package>org.netbeans.modules.xml.api</package>	133	<package>org.netbeans.modules.xml.api</package>

Lines 35-41 Link Here

(-)xml/css/nbproject/project.xml (-17 / +17 lines)
35	</run-dependency>	35	</run-dependency>
36	</dependency>	36	</dependency>
37	<dependency>	37	<dependency>
38	<code-name-base>org.openide.filesystems</code-name-base>	38	<code-name-base>org.openide.actions</code-name-base>
39	<build-prerequisite/>	39	<build-prerequisite/>
40	<compile-dependency/>	40	<compile-dependency/>
41	<run-dependency>	41	<run-dependency>
Lines 43-49 Link Here
43	</run-dependency>	43	</run-dependency>
44	</dependency>	44	</dependency>
45	<dependency>	45	<dependency>
46	<code-name-base>org.openide.util</code-name-base>	46	<code-name-base>org.openide.awt</code-name-base>
47	<build-prerequisite/>	47	<build-prerequisite/>
48	<compile-dependency/>	48	<compile-dependency/>
49	<run-dependency>	49	<run-dependency>
Lines 51-57 Link Here
51	</run-dependency>	51	</run-dependency>
52	</dependency>	52	</dependency>
53	<dependency>	53	<dependency>
54	<code-name-base>org.openide.modules</code-name-base>	54	<code-name-base>org.openide.filesystems</code-name-base>
55	<build-prerequisite/>	55	<build-prerequisite/>
56	<compile-dependency/>	56	<compile-dependency/>
57	<run-dependency>	57	<run-dependency>
Lines 59-81 Link Here
59	</run-dependency>	59	</run-dependency>
60	</dependency>	60	</dependency>
61	<dependency>	61	<dependency>
62	<code-name-base>org.openide.nodes</code-name-base>	62	<code-name-base>org.openide.io</code-name-base>
63	<build-prerequisite/>	63	<build-prerequisite/>
64	<compile-dependency/>	64	<compile-dependency/>
65	<run-dependency>	65	<run-dependency>
66	<specification-version>6.2</specification-version>	66	<specification-version>1.11</specification-version>
67	</run-dependency>	67	</run-dependency>
68	</dependency>	68	</dependency>
69	<dependency>	69	<dependency>
70	<code-name-base>org.openide.awt</code-name-base>	70	<code-name-base>org.openide.loaders</code-name-base>
71	<build-prerequisite/>	71	<build-prerequisite/>
72	<compile-dependency/>	72	<compile-dependency/>
73	<run-dependency>	73	<run-dependency/>
74	<specification-version>6.2</specification-version>
75	</run-dependency>
76	</dependency>	74	</dependency>
77	<dependency>	75	<dependency>
78	<code-name-base>org.openide.options</code-name-base>	76	<code-name-base>org.openide.modules</code-name-base>
79	<build-prerequisite/>	77	<build-prerequisite/>
80	<compile-dependency/>	78	<compile-dependency/>
81	<run-dependency>	79	<run-dependency>
Lines 83-89 Link Here
83	</run-dependency>	81	</run-dependency>
84	</dependency>	82	</dependency>
85	<dependency>	83	<dependency>
86	<code-name-base>org.openide.windows</code-name-base>	84	<code-name-base>org.openide.nodes</code-name-base>
87	<build-prerequisite/>	85	<build-prerequisite/>
88	<compile-dependency/>	86	<compile-dependency/>
89	<run-dependency>	87	<run-dependency>
Lines 91-97 Link Here
91	</run-dependency>	89	</run-dependency>
92	</dependency>	90	</dependency>
93	<dependency>	91	<dependency>
94	<code-name-base>org.openide.text</code-name-base>	92	<code-name-base>org.openide.options</code-name-base>
95	<build-prerequisite/>	93	<build-prerequisite/>
96	<compile-dependency/>	94	<compile-dependency/>
97	<run-dependency>	95	<run-dependency>
Lines 99-105 Link Here
99	</run-dependency>	97	</run-dependency>
100	</dependency>	98	</dependency>
101	<dependency>	99	<dependency>
102	<code-name-base>org.openide.actions</code-name-base>	100	<code-name-base>org.openide.text</code-name-base>
103	<build-prerequisite/>	101	<build-prerequisite/>
104	<compile-dependency/>	102	<compile-dependency/>
105	<run-dependency>	103	<run-dependency>
Lines 107-124 Link Here
107	</run-dependency>	105	</run-dependency>
108	</dependency>	106	</dependency>
109	<dependency>	107	<dependency>
110	<code-name-base>org.openide.io</code-name-base>	108	<code-name-base>org.openide.util</code-name-base>
111	<build-prerequisite/>	109	<build-prerequisite/>
112	<compile-dependency/>	110	<compile-dependency/>
113	<run-dependency>	111	<run-dependency>
114	<specification-version>1.0</specification-version>	112	<specification-version>6.2</specification-version>
115	</run-dependency>	113	</run-dependency>
116	</dependency>	114	</dependency>
117	<dependency>	115	<dependency>
118	<code-name-base>org.openide.loaders</code-name-base>	116	<code-name-base>org.openide.windows</code-name-base>
119	<build-prerequisite/>	117	<build-prerequisite/>
120	<compile-dependency/>	118	<compile-dependency/>
121	<run-dependency/>	119	<run-dependency>
		120	<specification-version>6.2</specification-version>
		121	</run-dependency>
122	</dependency>	122	</dependency>
123	</module-dependencies>	123	</module-dependencies>
124	<public-packages/>	124	<public-packages/>