Index: antsrc/org/netbeans/nbbuild/FixTestDependencies.java
===================================================================
RCS file: /cvs/nbbuild/antsrc/org/netbeans/nbbuild/FixTestDependencies.java,v
retrieving revision 1.2
diff -u -r1.2 FixTestDependencies.java
--- antsrc/org/netbeans/nbbuild/FixTestDependencies.java 18 Jul 2006 20:17:43 -0000 1.2
+++ antsrc/org/netbeans/nbbuild/FixTestDependencies.java 21 Jul 2006 11:55:13 -0000
@@ -75,105 +75,118 @@
prjFis.close();
}
String xml = new String(xmlBytes);
- int projectType = ParseProjectXml.TYPE_NB_ORG;
- if (xml.contains("")) {
- projectType = ParseProjectXml.TYPE_SUITE;
- } else if (xml.contains("")) {
- projectType = ParseProjectXml.TYPE_NB_ORG;
- }
- //grrr
- int typeStart = xml.indexOf("");
- int typeEnd = xml.indexOf("");
- if (typeStart <= 0 || typeEnd <= 0 || typeEnd <= typeStart) {
- throw new BuildException("Parsing of project.xml failed.");
+ String oldXsd = "")) {
+ projectType = ParseProjectXml.TYPE_SUITE;
+ } else if (xml.contains("")) {
+ projectType = ParseProjectXml.TYPE_NB_ORG;
+ }
+ //grrr
+ int typeStart = xml.indexOf("");
+ int typeEnd = xml.indexOf("");
+ if (typeStart <= 0 || typeEnd <= 0 || typeEnd <= typeStart) {
+ throw new BuildException("Parsing of project.xml failed.");
+ }
+ cnb = xml.substring(typeStart + "".length(), typeEnd).trim();
+ if (cnb.length() <= 0) {
+ throw new BuildException("Invalid codename base:" + cnb);
+ }
+ // test if project.xml contains test-deps
+ if (xml.contains("")) {
+ // yes -> exit
+ log(" already exists.");
+ log("update only schema version");
+ PrintStream ps = new PrintStream(projectXmlFile);
+ ps.print(xml);
+ ps.close();
+ return ;
+ }
+ // no :
+ // scan for all modules
+ ModuleListParser listParser;
+ listParser = new ModuleListParser(getProject().getProperties(), projectType, getProject());
+ Set/**/ entries = listParser.findAll();
+ Set/**/ allCnbs = getCNBsFromEntries(entries);
+ // read properties
+
+ // remove modules and test from properties and put it to project.xml
+
+ // unittest
+ //
+ Set/**/ compileCNB = new HashSet();
+ Set/**/ compileTestCNB = new HashSet();
+ Set/**/ runtimeCNB = new HashSet();
+ Set/**/ runtimeTestCNB = new HashSet();
+
+ Properties projectProperties = getTestProperties();
+ readCodeNameBases(compileCNB,compileTestCNB,projectProperties,"test.unit.cp",allCnbs,entries);
+ readCodeNameBases(compileCNB,compileTestCNB,projectProperties,"test.unit.cp.extra",allCnbs,entries);
+
+ readCodeNameBases(runtimeCNB,runtimeTestCNB,projectProperties,"test.unit.run.cp",allCnbs,entries);
+ readCodeNameBases(runtimeCNB,runtimeTestCNB,projectProperties,"test.unit.run.cp.extra",allCnbs,entries);
+
+ updateProperties(projectProperties,new String[]{"test.unit.cp","test.unit.cp.extra","test.unit.run.cp","test.unit.run.cp.extra"});
+
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("\n \n");
+ buffer.append(" \n");
+ buffer.append(" unit\n");
+ addDependency(buffer,cnb,true,true,false);
+
+ runtimeCNB.removeAll(compileCNB);
+ //compileCNB.removeAll(runtimeCNB);
+ compileCNB.addAll(compileTestCNB);
+ runtimeTestCNB.removeAll(compileTestCNB);
+ runtimeCNB.addAll(runtimeTestCNB);
+ addDependencies(buffer,compileCNB,compileTestCNB,true,false);
+ addDependencies(buffer,runtimeCNB,runtimeTestCNB,false,false);
+ buffer.append(" \n");
+
+ // qa functional tests
+ compileCNB.clear();
+ runtimeCNB.clear();
+ compileTestCNB.clear();
+ runtimeTestCNB.clear();
+
+ buffer.append(" \n");
+ buffer.append(" qa-functional\n");
+
+ readCodeNameBases(compileCNB,compileTestCNB,projectProperties,"test.qa-functional.cp",allCnbs,entries);
+ readCodeNameBases(compileCNB,compileTestCNB,projectProperties,"test.qa-functional.cp.extra",allCnbs,entries);
+
+ readCodeNameBases(runtimeCNB,runtimeTestCNB,projectProperties,"test.qa-functional.runtime.cp",allCnbs,entries);
+ readCodeNameBases(runtimeCNB,runtimeTestCNB,projectProperties,"test.qa-functional.runtime.extra",allCnbs,entries);
+
+ addDependencies(buffer,compileCNB,compileTestCNB,true,false);
+ addDependencies(buffer,runtimeCNB,runtimeTestCNB,false,false);
+ buffer.append(" \n");
+ buffer.append(" \n");
+ updateProperties(projectProperties,new String[]{"test.qa-functional.cp","test.qa-functional.cp","test.qa-functional.runtime.cp","test.qa-functional.runtime.extra"});
+
+ // merge project properties
+ String MODULE_DEP_END = "";
+ int moduleDepEnd = xml.indexOf(MODULE_DEP_END);
+ if (moduleDepEnd == -1) {
+ throw new BuildException("No module dependency found.");
+ }
+ moduleDepEnd += MODULE_DEP_END.length();
+ StringBuffer resultXml = new StringBuffer();
+ resultXml.append(xml.substring(0,moduleDepEnd));
+ resultXml.append(buffer);
+ resultXml.append(xml.substring(moduleDepEnd + 1, xml.length()));
+
+ PrintStream ps = new PrintStream(projectXmlFile);
+ ps.print(resultXml);
+ ps.close();
}
- cnb = xml.substring(typeStart + "".length(), typeEnd).trim();
- if (cnb.length() <= 0) {
- throw new BuildException("Invalid codename base:" + cnb);
- }
- // test if project.xml contains test-deps
- if (xml.contains("")) {
- // yes -> exit
- log(" already exists.");
- return ;
- }
- // no :
- // scan for all modules
- ModuleListParser listParser;
- listParser = new ModuleListParser(getProject().getProperties(), projectType, getProject());
- Set/**/ entries = listParser.findAll();
- Set/**/ allCnbs = getCNBsFromEntries(entries);
- // read properties
-
- // remove modules and test from properties and put it to project.xml
-
- // unittest
- //
- Set/**/ compileCNB = new HashSet();
- Set/**/ compileTestCNB = new HashSet();
- Set/**/ runtimeCNB = new HashSet();
- Set/**/ runtimeTestCNB = new HashSet();
-
- Properties projectProperties = getTestProperties();
- readCodeNameBases(compileCNB,compileTestCNB,projectProperties,"test.unit.cp",allCnbs,entries);
- readCodeNameBases(compileCNB,compileTestCNB,projectProperties,"test.unit.cp.extra",allCnbs,entries);
-
- readCodeNameBases(runtimeCNB,runtimeTestCNB,projectProperties,"test.unit.run.cp",allCnbs,entries);
- readCodeNameBases(runtimeCNB,runtimeTestCNB,projectProperties,"test.unit.run.cp.extra",allCnbs,entries);
-
- updateProperties(projectProperties,new String[]{"test.unit.cp","test.unit.cp.extra","test.unit.run.cp","test.unit.run.cp.extra"});
-
- StringBuffer buffer = new StringBuffer();
- buffer.append("\n \n");
- buffer.append(" \n");
- buffer.append(" unit\n");
- addDependency(buffer,cnb,true,true,false);
-
- runtimeCNB.removeAll(compileCNB);
- //compileCNB.removeAll(runtimeCNB);
- compileCNB.addAll(compileTestCNB);
- runtimeTestCNB.removeAll(compileTestCNB);
- runtimeCNB.addAll(runtimeTestCNB);
- addDependencies(buffer,compileCNB,compileTestCNB,true,false);
- addDependencies(buffer,runtimeCNB,runtimeTestCNB,false,false);
- buffer.append(" \n");
-
- // qa functional tests
- compileCNB.clear();
- runtimeCNB.clear();
- compileTestCNB.clear();
- runtimeTestCNB.clear();
-
- buffer.append(" \n");
- buffer.append(" qa-functional\n");
-
- readCodeNameBases(compileCNB,compileTestCNB,projectProperties,"test.qa-functional.cp",allCnbs,entries);
- readCodeNameBases(compileCNB,compileTestCNB,projectProperties,"test.qa-functional.cp.extra",allCnbs,entries);
-
- readCodeNameBases(runtimeCNB,runtimeTestCNB,projectProperties,"test.qa-functional.runtime.cp",allCnbs,entries);
- readCodeNameBases(runtimeCNB,runtimeTestCNB,projectProperties,"test.qa-functional.runtime.extra",allCnbs,entries);
-
- addDependencies(buffer,compileCNB,compileTestCNB,true,false);
- addDependencies(buffer,runtimeCNB,runtimeTestCNB,false,false);
- buffer.append(" \n");
- buffer.append(" \n");
- updateProperties(projectProperties,new String[]{"test.qa-functional.cp","test.qa-functional.cp","test.qa-functional.runtime.cp","test.qa-functional.runtime.extra"});
-
- // merge project properties
- String MODULE_DEP_END = "";
- int moduleDepEnd = xml.indexOf(MODULE_DEP_END);
- if (moduleDepEnd == -1) {
- throw new BuildException("No module dependency found.");
- }
- moduleDepEnd += MODULE_DEP_END.length();
- StringBuffer resultXml = new StringBuffer();
- resultXml.append(xml.substring(0,moduleDepEnd));
- resultXml.append(buffer);
- resultXml.append(xml.substring(moduleDepEnd + 1, xml.length()));
-
- PrintStream ps = new PrintStream(projectXmlFile);
- ps.print(resultXml);
- ps.close();
} catch (IOException ex) {
throw new BuildException(ex);
@@ -236,6 +249,8 @@
if (newProp.length() > 0) {
newProp.append(":");
}
+ // windows platform
+ token = token.replace(File.separatorChar,'/');
newProp.append(token);
}
}
Index: antsrc/org/netbeans/nbbuild/ModuleListParser.java
===================================================================
RCS file: /cvs/nbbuild/antsrc/org/netbeans/nbbuild/ModuleListParser.java,v
retrieving revision 1.34
diff -u -r1.34 ModuleListParser.java
--- antsrc/org/netbeans/nbbuild/ModuleListParser.java 21 Jul 2006 08:48:09 -0000 1.34
+++ antsrc/org/netbeans/nbbuild/ModuleListParser.java 21 Jul 2006 11:55:16 -0000
@@ -179,14 +179,14 @@
return false;
}
Element configEl = XMLUtil.findElement(doc.getDocumentElement(), "configuration", ParseProjectXml.PROJECT_NS);
- Element dataEl = XMLUtil.findElement(configEl, "data", ParseProjectXml.NBM_NS);
+ Element dataEl = ParseProjectXml.findNBMElement(configEl, "data");
if (dataEl == null) {
if (project != null) {
- project.log(projectxml.toString() + ": warning: module claims to be a NBM project but is missing ; maybe an old NB 4.[01] project?", Project.MSG_WARN);
+ project.log(projectxml.toString() + ": warning: module claims to be a NBM project but is missing ; maybe an old NB 4.[01] project?", Project.MSG_WARN);
}
return false;
}
- Element cnbEl = XMLUtil.findElement(dataEl, "code-name-base", ParseProjectXml.NBM_NS);
+ Element cnbEl = ParseProjectXml.findNBMElement(dataEl, "code-name-base");
String cnb = XMLUtil.findText(cnbEl);
// Clumsy but the best way I know of to evaluate properties.
Project fakeproj = new Project();
@@ -294,7 +294,7 @@
if (!ext.getLocalName().equals("class-path-extension")) {
continue;
}
- Element binaryOrigin = XMLUtil.findElement(ext, "binary-origin", ParseProjectXml.NBM_NS);
+ Element binaryOrigin = ParseProjectXml.findNBMElement(ext, "binary-origin");
File origBin = null;
if (binaryOrigin != null) {
String reltext = XMLUtil.findText(binaryOrigin);
@@ -310,7 +310,7 @@
File resultBin = null;
if (origBin == null || !origBin.exists()) {
- Element runtimeRelativePath = XMLUtil.findElement(ext, "runtime-relative-path", ParseProjectXml.NBM_NS);
+ Element runtimeRelativePath = ParseProjectXml.findNBMElement(ext, "runtime-relative-path");
if (runtimeRelativePath == null) {
throw new IOException("Have malformed in " + projectxml);
}
@@ -329,20 +329,20 @@
}
List/**/ prereqs = new ArrayList();
List/**/ rundeps = new ArrayList();
- Element depsEl = XMLUtil.findElement(dataEl, "module-dependencies", ParseProjectXml.NBM_NS);
+ Element depsEl = ParseProjectXml.findNBMElement(dataEl, "module-dependencies");
if (depsEl == null) {
throw new IOException("Malformed project file " + projectxml);
}
Iterator deps = XMLUtil.findSubElements(depsEl).iterator();
while (deps.hasNext()) {
Element dep = (Element) deps.next();
- Element cnbEl2 = XMLUtil.findElement(dep, "code-name-base", ParseProjectXml.NBM_NS);
+ Element cnbEl2 = ParseProjectXml.findNBMElement(dep, "code-name-base");
if (cnbEl2 == null) {
throw new IOException("Malformed project file " + projectxml);
}
String cnb2 = XMLUtil.findText(cnbEl2);
rundeps.add(cnb2);
- if (XMLUtil.findElement(dep, "build-prerequisite", ParseProjectXml.NBM_NS) == null) {
+ if (ParseProjectXml.findNBMElement(dep, "build-prerequisite") == null) {
continue;
}
prereqs.add(cnb2);
Index: antsrc/org/netbeans/nbbuild/ParseProjectXml.java
===================================================================
RCS file: /cvs/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java,v
retrieving revision 1.43
diff -u -r1.43 ParseProjectXml.java
--- antsrc/org/netbeans/nbbuild/ParseProjectXml.java 21 Jul 2006 08:48:08 -0000 1.43
+++ antsrc/org/netbeans/nbbuild/ParseProjectXml.java 21 Jul 2006 11:55:21 -0000
@@ -60,7 +60,9 @@
public final class ParseProjectXml extends Task {
static final String PROJECT_NS = "http://www.netbeans.org/ns/project/1";
- static final String NBM_NS = "http://www.netbeans.org/ns/nb-module-project/2";
+// static final String NBM_NS = "http://www.netbeans.org/ns/nb-module-project/2";
+ static final String NBM_NS2 = "http://www.netbeans.org/ns/nb-module-project/2";
+ static final String NBM_NS3 = "http://www.netbeans.org/ns/nb-module-project/3";
static final int TYPE_NB_ORG = 0;
static final int TYPE_SUITE = 1;
@@ -462,7 +464,7 @@
if (c == null) {
throw new BuildException("No ", getLocation());
}
- Element d = XMLUtil.findElement(c, "data", NBM_NS);
+ Element d = findNBMElement(c, "data");
if (d == null) {
throw new BuildException("No in " + getProjectFile(), getLocation());
}
@@ -481,9 +483,9 @@
private PublicPackage[] getPublicPackages(Document d) throws BuildException {
Element cfg = getConfig(d);
- Element pp = XMLUtil.findElement(cfg, "public-packages", NBM_NS);
+ Element pp = findNBMElement(cfg, "public-packages");
if (pp == null) {
- pp = XMLUtil.findElement(cfg, "friend-packages", NBM_NS);
+ pp = findNBMElement(cfg, "friend-packages");
}
if (pp == null) {
throw new BuildException("No ", getLocation());
@@ -515,7 +517,7 @@
private String[] getFriends(Document d) throws BuildException {
Element cfg = getConfig(d);
- Element pp = XMLUtil.findElement(cfg, "friend-packages", NBM_NS);
+ Element pp = findNBMElement(cfg, "friend-packages");
if (pp == null) {
return null;
}
@@ -661,7 +663,7 @@
private Dep[] getDeps(Document pDoc, ModuleListParser modules) throws BuildException {
Element cfg = getConfig(pDoc);
- Element md = XMLUtil.findElement(cfg, "module-dependencies", NBM_NS);
+ Element md = findNBMElement(cfg, "module-dependencies");
if (md == null) {
throw new BuildException("No ", getLocation());
}
@@ -671,7 +673,7 @@
while (it.hasNext()) {
Element dep = (Element)it.next();
Dep d = new Dep(modules);
- Element cnb = XMLUtil.findElement(dep, "code-name-base", NBM_NS);
+ Element cnb = findNBMElement(dep, "code-name-base");
if (cnb == null) {
throw new BuildException("No ", getLocation());
}
@@ -680,10 +682,10 @@
throw new BuildException("No text in ", getLocation());
}
d.codenamebase = t;
- Element rd = XMLUtil.findElement(dep, "run-dependency", NBM_NS);
+ Element rd = findNBMElement(dep, "run-dependency");
if (rd != null) {
d.run = true;
- Element rv = XMLUtil.findElement(rd, "release-version", NBM_NS);
+ Element rv = findNBMElement(rd, "release-version");
if (rv != null) {
t = XMLUtil.findText(rv);
if (t == null) {
@@ -691,7 +693,7 @@
}
d.release = t;
}
- Element sv = XMLUtil.findElement(rd, "specification-version", NBM_NS);
+ Element sv = findNBMElement(rd, "specification-version");
if (sv != null) {
t = XMLUtil.findText(sv);
if (t == null) {
@@ -699,12 +701,12 @@
}
d.spec = t;
}
- Element iv = XMLUtil.findElement(rd, "implementation-version", NBM_NS);
+ Element iv = findNBMElement(rd, "implementation-version");
if (iv != null) {
d.impl = true;
}
}
- d.compile = XMLUtil.findElement(dep, "compile-dependency", NBM_NS) != null;
+ d.compile = findNBMElement(dep, "compile-dependency") != null;
deps.add(d);
}
return (Dep[])deps.toArray(new Dep[deps.size()]);
@@ -712,7 +714,7 @@
private String getCodeNameBase(Document d) throws BuildException {
Element data = getConfig(d);
- Element name = XMLUtil.findElement(data, "code-name-base", NBM_NS);
+ Element name = findNBMElement(data, "code-name-base");
if (name == null) {
throw new BuildException("No ", getLocation());
}
@@ -725,9 +727,9 @@
private int getModuleType(Document d) throws BuildException {
Element data = getConfig(d);
- if (XMLUtil.findElement(data, "suite-component", NBM_NS) != null) {
+ if (findNBMElement(data, "suite-component") != null) {
return TYPE_SUITE;
- } else if (XMLUtil.findElement(data, "standalone", NBM_NS) != null) {
+ } else if (findNBMElement(data, "standalone") != null) {
return TYPE_STANDALONE;
} else {
return TYPE_NB_ORG;
@@ -991,7 +993,7 @@
if (!ext.getLocalName().equals("class-path-extension")) {
continue;
}
- Element runtimeRelativePath = XMLUtil.findElement(ext, "runtime-relative-path", NBM_NS);
+ Element runtimeRelativePath = findNBMElement(ext, "runtime-relative-path");
if (runtimeRelativePath == null) {
throw new BuildException("Have malformed in " + getProjectFile(), getLocation());
}
@@ -1094,7 +1096,7 @@
assert modules != null;
Element cfg = getConfig(pDoc);
List testDepsList = new ArrayList();
- Element pp = XMLUtil.findElement(cfg, "test-dependencies", NBM_NS);
+ Element pp = findNBMElement(cfg, "test-dependencies");
if (pp != null) {
for (Iterator depssIt = XMLUtil.findSubElements(pp).iterator(); depssIt.hasNext();) {
Element depssEl = (Element) depssIt.next();
@@ -1108,10 +1110,10 @@
Element el = (Element) depsIt.next();
if (el.getTagName().equals("test-dependency")) {
// parse test dep
- boolean test = (XMLUtil.findElement(el,"test",NBM_NS) != null);;
+ boolean test = (findNBMElement(el,"test") != null);;
String cnb = findTextOrNull(el,"code-name-base");
- boolean recursive = (XMLUtil.findElement(el,"recursive",NBM_NS) != null);
- boolean compile = (XMLUtil.findElement(el,"compile-dependency",NBM_NS) != null);
+ boolean recursive = (findNBMElement(el,"recursive") != null);
+ boolean compile = (findNBMElement(el,"compile-dependency") != null);
testDeps.addDepenency(new TestDep(cnb,
modules,
recursive,
@@ -1128,10 +1130,19 @@
return testDepss;
}
private static String findTextOrNull(Element parentElement,String elementName) {
- Element el = XMLUtil.findElement(parentElement,elementName,NBM_NS);
+ Element el = findNBMElement(parentElement,elementName);
return (el == null) ? null :
XMLUtil.findText(el);
+ }
+ private static String NBM_NS_CACHE = NBM_NS3;
+ static Element findNBMElement(Element el,String name) {
+ Element retEl = XMLUtil.findElement(el,name,NBM_NS_CACHE) ;
+ if (retEl == null) {
+ NBM_NS_CACHE = (NBM_NS_CACHE == NBM_NS3) ? NBM_NS2 :NBM_NS3;
+ retEl = XMLUtil.findElement(el,name,NBM_NS_CACHE) ;
+ }
+ return retEl;
}
}
Index: antsrc/org/netbeans/nbbuild/SortSuiteModules.java
===================================================================
RCS file: /cvs/nbbuild/antsrc/org/netbeans/nbbuild/SortSuiteModules.java,v
retrieving revision 1.3
diff -u -r1.3 SortSuiteModules.java
--- antsrc/org/netbeans/nbbuild/SortSuiteModules.java 30 Jun 2006 21:07:43 -0000 1.3
+++ antsrc/org/netbeans/nbbuild/SortSuiteModules.java 21 Jul 2006 11:55:22 -0000
@@ -89,28 +89,28 @@
if (config == null) {
throw new BuildException("Malformed project file " + projectXml, getLocation());
}
- Element data = XMLUtil.findElement(config, "data", ParseProjectXml.NBM_NS);
+ Element data = ParseProjectXml.findNBMElement(config, "data");
if (data == null) {
throw new BuildException("Malformed project file " + projectXml, getLocation());
}
- Element cnbEl = XMLUtil.findElement(data, "code-name-base", ParseProjectXml.NBM_NS);
+ Element cnbEl = ParseProjectXml.findNBMElement(data, "code-name-base");
if (cnbEl == null) {
throw new BuildException("Malformed project file " + projectXml, getLocation());
}
String cnb = XMLUtil.findText(cnbEl);
basedirsByCNB.put(cnb, d);
List/**/ deps = new LinkedList();
- Element depsEl = XMLUtil.findElement(data, "module-dependencies", ParseProjectXml.NBM_NS);
+ Element depsEl = ParseProjectXml.findNBMElement(data, "module-dependencies");
if (depsEl == null) {
throw new BuildException("Malformed project file " + projectXml, getLocation());
}
Iterator it = XMLUtil.findSubElements(depsEl).iterator();
while (it.hasNext()) {
Element dep = (Element) it.next();
- if (XMLUtil.findElement(dep, "build-prerequisite", ParseProjectXml.NBM_NS) == null) {
+ if (ParseProjectXml.findNBMElement(dep, "build-prerequisite") == null) {
continue;
}
- Element cnbEl2 = XMLUtil.findElement(dep, "code-name-base", ParseProjectXml.NBM_NS);
+ Element cnbEl2 = ParseProjectXml.findNBMElement(dep, "code-name-base");
if (cnbEl2 == null) {
throw new BuildException("Malformed project file " + projectXml, getLocation());
}
Index: test/unit/src/org/netbeans/nbbuild/FixTestDependenciesProject2.xml
===================================================================
RCS file: test/unit/src/org/netbeans/nbbuild/FixTestDependenciesProject2.xml
diff -N test/unit/src/org/netbeans/nbbuild/FixTestDependenciesProject2.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/unit/src/org/netbeans/nbbuild/FixTestDependenciesProject2.xml 21 Jul 2006 11:55:24 -0000
@@ -0,0 +1,327 @@
+
+
+
+ org.netbeans.modules.apisupport.project
+
+
+ org.netbeans.modules.java.j2seproject
+
+
+ javax.jmi.reflect
+
+
+
+ 1
+
+
+
+ org.apache.tools.ant.module
+
+
+
+ 3
+ 3.12
+
+
+
+ org.netbeans.api.java
+
+
+
+ 1
+
+
+
+ org.netbeans.api.mdr
+
+
+
+ 1
+
+
+
+ org.netbeans.jmi.javamodel
+
+
+
+ 2
+ 1.16
+
+
+
+ org.netbeans.modules.ant.browsetask
+
+
+
+ org.netbeans.modules.debugger.jpda.ant
+
+
+
+ org.netbeans.modules.java.platform
+
+
+
+ 1
+
+
+
+ org.netbeans.modules.java.project
+
+
+
+ 1
+
+
+
+ org.netbeans.modules.javacore
+
+
+
+ 1
+
+
+
+ org.netbeans.modules.jmiutils
+
+
+
+ 1
+
+
+
+ org.netbeans.modules.junit
+
+ 2
+
+
+
+ org.netbeans.modules.project.ant
+
+
+
+ 1
+ 1.8
+
+
+
+ org.netbeans.modules.project.libraries
+
+
+
+ 1
+
+
+
+ org.netbeans.modules.projectapi
+
+
+
+ 1
+ 1.6
+
+
+
+ org.netbeans.modules.projectuiapi
+
+
+
+ 1
+
+
+
+ org.netbeans.modules.queries
+
+
+
+ 1
+
+
+
+ org.openide.actions
+
+
+
+ 6.2
+
+
+
+ org.openide.awt
+
+
+
+ 6.2
+
+
+
+ org.openide.dialogs
+
+
+
+ 6.2
+
+
+
+ org.openide.execution
+
+
+
+ 1.2
+
+
+
+ org.openide.filesystems
+
+
+
+ 6.2
+
+
+
+ org.openide.loaders
+
+
+
+
+
+ org.openide.modules
+
+
+
+ 6.2
+
+
+
+ org.openide.nodes
+
+
+
+ 6.5
+
+
+
+ org.openide.options
+
+
+
+ 6.2
+
+
+
+ org.openide.src
+
+
+
+
+
+ org.openide.util
+
+
+
+ 6.2
+
+
+
+ org.openide.windows
+
+
+
+ 6.2
+
+
+
+ org.netbeans.modules.websvc.clientapi
+
+
+
+ 1.2
+
+
+
+
+
+ unit
+
+ org.netbeans.modules.java.j2seproject
+
+
+
+
+ org.openide.io
+
+
+
+ org.netbeans.modules.projectapi
+
+
+
+
+ org.openide.compat
+
+
+ org.netbeans.core
+
+
+ org.openide.loaders
+
+
+ org.netbeans.modules.masterfs
+
+
+ org.netbeans.api.progress
+
+
+ org.openide.options
+
+
+ org.openide.explorer
+
+
+ org.openide.dialogs
+
+
+ org.openide.nodes
+
+
+ org.openide.text
+
+
+ org.openide.awt
+
+
+ org.openide.util
+
+
+ org.openide.actions
+
+
+ org.openide.modules
+
+
+ org.openide.filesystems
+
+
+
+ qa-functional
+
+
+
+
+
+
Index: test/unit/src/org/netbeans/nbbuild/FixTestDependenciesProjectPass.xml
===================================================================
RCS file: /cvs/nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependenciesProjectPass.xml,v
retrieving revision 1.3
diff -u -r1.3 FixTestDependenciesProjectPass.xml
--- test/unit/src/org/netbeans/nbbuild/FixTestDependenciesProjectPass.xml 20 Jul 2006 07:54:51 -0000 1.3
+++ test/unit/src/org/netbeans/nbbuild/FixTestDependenciesProjectPass.xml 21 Jul 2006 11:55:27 -0000
@@ -20,7 +20,7 @@
org.netbeans.modules.apisupport.project
-
+
org.netbeans.modules.java.j2seproject
Index: test/unit/src/org/netbeans/nbbuild/FixTestDependenciesTest.java
===================================================================
RCS file: /cvs/nbbuild/test/unit/src/org/netbeans/nbbuild/FixTestDependenciesTest.java,v
retrieving revision 1.2
diff -u -r1.2 FixTestDependenciesTest.java
--- test/unit/src/org/netbeans/nbbuild/FixTestDependenciesTest.java 18 Jul 2006 20:17:39 -0000 1.2
+++ test/unit/src/org/netbeans/nbbuild/FixTestDependenciesTest.java 21 Jul 2006 11:55:28 -0000
@@ -52,15 +52,20 @@
public void testSimple() throws IOException, Exception {
File prjFile = copyFile("FixTestDependenciesProject.xml");
File propertiesFile = copyFile("FixTestDependencies.properties");
+ doFixProjectXml(propertiesFile, prjFile);
+ doFixProjectXml(propertiesFile, copyFile("FixTestDependenciesProject2.xml"));
- PublicPackagesInProjectizedXMLTest.
- execute ("FixTestDependenciesTest.xml", new String[] {"-verbose",
- "-Dtest.project.xml=" + prjFile.getPath(),
- "-Dtest.properties.file=" + propertiesFile.getPath()});
-
- assertFile(copyFile("FixTestDependenciesProjectPass.xml"),prjFile);
- assertFile(copyFile("FixTestDependenciesPass.properties"),propertiesFile);
-
+ }
+
+ private void doFixProjectXml(final File propertiesFile, final File prjFile) throws Exception, IOException {
+
+ PublicPackagesInProjectizedXMLTest.
+ execute ("FixTestDependenciesTest.xml", new String[] {"-verbose",
+ "-Dtest.project.xml=" + prjFile.getPath(),
+ "-Dtest.properties.file=" + propertiesFile.getPath()});
+
+ assertFile(copyFile("FixTestDependenciesProjectPass.xml"),prjFile);
+ assertFile(copyFile("FixTestDependenciesPass.properties"),propertiesFile);
}
private File copyFile(String resourceName) throws IOException {