Attachment #94862 for bug #136595

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




import org.openide.util.Lookup;
import org.openide.util.lookup.Lookups;
import org.openide.util.lookup.ProxyLookup;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Comment;
import org.w3c.dom.Document;
import org.w3c.dom.Element;

            if (web == null) {
                return null;
            }
            List<Element> webModules = XMLUtil.findSubElements(web);
            List<FileObject> roots = new ArrayList<FileObject>();
            for (Element webModulesEl : webModules) {
                assert webModulesEl.getLocalName().equals("web-module") : webModulesEl; // NOI18N

        }
        
        private File getFile(Element parent, String fileElName, Project proj, PropertyEvaluator evaluator) {
            Element el = XMLUtil.findElement(parent, fileElName, WebProjectNature.NS_WEB_2);
            return Util.resolveFile(evaluator, FileUtil.toFile(proj.getProjectDirectory()), XMLUtil.findText(el));
        }
        
    }




        // See corresponding schema.
        
        Element data = Util.getPrimaryConfigurationData(helper);
        Element properties = XMLUtil.findElement(data, "properties", Util.NAMESPACE); // NOI18N
        if (properties != null) {
            Iterator<Element> propertiesIt = XMLUtil.findSubElements(properties).iterator();
            while (propertiesIt.hasNext()) {
                Element el = (Element) propertiesIt.next();
                Element nue = script.getOwnerDocument().createElement("property"); // NOI18N
                if (el.getLocalName().equals("property")) { // NOI18N
                    String name = el.getAttribute("name"); // NOI18N
                    assert name != null;
                    String text = XMLUtil.findText(el);
                    assert text != null;
                    nue.setAttribute("name", name); // NOI18N
                    nue.setAttribute("value", text); // NOI18N
                } else if (el.getLocalName().equals("property-file")) { // NOI18N
                    String text = XMLUtil.findText(el);
                    assert text != null;
                    nue.setAttribute("file", text); // NOI18N
                } else {

        // XXX cannot use FreeformProjectGenerator since that is currently not a public support SPI from ant/freeform
        // XXX should this try to find an existing binding? probably not, since it is assumed that if there was one, we would never get here to begin with
        Element data = Util.getPrimaryConfigurationData(helper);
        Element ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE); // NOI18N
        if (ideActions == null) {
            // Probably won't happen, since generator produces it always.
            // Not trivial to just add it now, since order is significant in the schema. (FPG deals with these things.)

        } else {
            // Add a context menu item, since it applies to the project as a whole.
            // Assume there is already a <context-menu> defined, which is quite likely.
            Element view = XMLUtil.findElement(data, "view", Util.NAMESPACE); // NOI18N
            if (view != null) {
                Element contextMenu = XMLUtil.findElement(view, "context-menu", Util.NAMESPACE); // NOI18N
                if (contextMenu != null) {
                    Element ideAction = doc.createElementNS(Util.NAMESPACE, "ide-action"); // NOI18N
                    ideAction.setAttribute("name", command); // NOI18N

    private String findSourceFolders(String type) {
        StringBuffer result = new StringBuffer();
        Element data = Util.getPrimaryConfigurationData(helper);
        Element foldersEl = XMLUtil.findElement(data, "folders", Util.NAMESPACE); // NOI18N
        if (foldersEl != null) {
            for (Iterator i = XMLUtil.findSubElements(foldersEl).iterator(); i.hasNext();) {
                Element sourceFolderEl = (Element)i.next();
                Element typeEl = XMLUtil.findElement(sourceFolderEl , "type", Util.NAMESPACE); // NOI18N
                if (typeEl == null || !XMLUtil.findText(typeEl).equals(type))
                    continue;
                Element locationEl = XMLUtil.findElement(sourceFolderEl , "location", Util.NAMESPACE); // NOI18N
                if (locationEl == null)
                    continue;
                String location = XMLUtil.findText(locationEl);
                if (result.length() > 0)
                    result.append(":"); // NOI18N
                result.append(location);

    
    private String findContextPath() {
        Element data = aux.getConfigurationFragment(WebProjectNature.EL_WEB, WebProjectNature.NS_WEB_2, true); // NOI18N
        Element webModulEl = XMLUtil.findElement(data, "web-module", WebProjectNature.NS_WEB_2); // NOI18N
        if (webModulEl == null)
            return null;
        Element contextPathEl = XMLUtil.findElement(webModulEl, "context-path", WebProjectNature.NS_WEB_2); // NOI18N
        if (contextPathEl == null)
            return null;
        return XMLUtil.findText(contextPathEl);
    }
    
}




import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.api.project.SourceGroup;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.modules.j2ee.dd.spi.MetadataUnit;
import org.netbeans.modules.j2ee.dd.spi.web.WebAppMetadataModelFactory;
import org.netbeans.modules.web.api.webmodule.WebModule;

import org.netbeans.spi.project.support.ant.PropertyEvaluator;
import org.netbeans.spi.project.support.ant.PropertyUtils;
import org.openide.util.Mutex;
import org.openide.xml.XMLUtil;

/**
 * Web module implementation on top of freeform project.

        if (web == null) {
            return mods;
        }
        List<Element> webModules = XMLUtil.findSubElements(web);
        Iterator it = webModules.iterator();
        while (it.hasNext()) {
            Element webModulesEl = (Element)it.next();
            assert webModulesEl.getLocalName().equals("web-module") : webModulesEl;
            FileObject docRootFO = getFile (webModulesEl, "doc-root"); //NOI18N
            Element j2eeSpecEl = XMLUtil.findElement (webModulesEl, "j2ee-spec-level", WebProjectNature.NS_WEB_2);
            String j2eeSpec = j2eeSpecEl == null ? null : evaluator.evaluate (XMLUtil.findText (j2eeSpecEl));
            Element contextPathEl = XMLUtil.findElement (webModulesEl, "context-path", WebProjectNature.NS_WEB_2);
            String contextPathText = contextPathEl == null ? null : XMLUtil.findText (contextPathEl);
            String contextPath = contextPathText == null ? null : evaluator.evaluate (contextPathText);
            Element classpathEl = XMLUtil.findElement (webModulesEl, "classpath", WebProjectNature.NS_WEB_2);
            FileObject [] sources = getSources ();
            ClassPath cp = classpathEl == null ? null : createClasspath (classpathEl, sources);
            Element webInfEl = XMLUtil.findElement (webModulesEl, "web-inf", WebProjectNature.NS_WEB_2);
            FileObject webInf = null;
            if (webInfEl != null) {
                webInf = getFile (webModulesEl, "web-inf"); //NOI18N

    }
    
    private FileObject getFile (Element parent, String fileElName) {
        Element el = XMLUtil.findElement (parent, fileElName, WebProjectNature.NS_WEB_2);
        String fname = XMLUtil.findText (el);
        if (fname == null) {
            // empty element => cannot find fileobject
            return null;

     */
    private ClassPath createClasspath(Element classpathEl, FileObject[] sources) {
//        System.out.println("creating classpath for " + classpathEl);
        String cp = XMLUtil.findText(classpathEl);
        if (cp == null) {
            cp = "";
        }




import org.netbeans.modules.web.api.webmodule.WebProjectConstants;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.openide.filesystems.FileObject;
import org.openide.util.NbBundle;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;


        Element data = Util.getPrimaryConfigurationData(helper);
        Document doc = data.getOwnerDocument();
        Element foldersEl = XMLUtil.findElement(data, "folders", Util.NAMESPACE); // NOI18N
        if (foldersEl == null) {
            foldersEl = doc.createElementNS(Util.NAMESPACE, "folders"); // NOI18N
            XMLUtil.appendChildElement(data, foldersEl, rootElementsOrder);
        } else {
            List l = XMLUtil.findSubElements(foldersEl);
            for (int i = 0; i < l.size(); i++) {
                Element e = (Element) l.get(i);
                Element te = XMLUtil.findElement(e, "type", Util.NAMESPACE);
                if (te != null && XMLUtil.findText(te).equals(folderType)) {
                    foldersEl.removeChild(e);
                    break;
                }
            }
        }
        
        Element viewEl = XMLUtil.findElement(data, "view", Util.NAMESPACE); // NOI18N
        if (viewEl == null) {
            viewEl = doc.createElementNS(Util.NAMESPACE, "view"); // NOI18N
            XMLUtil.appendChildElement(data, viewEl, rootElementsOrder);
        }
        Element itemsEl = XMLUtil.findElement(viewEl, "items", Util.NAMESPACE); // NOI18N
        if (itemsEl == null) {
            itemsEl = doc.createElementNS(Util.NAMESPACE, "items"); // NOI18N
            XMLUtil.appendChildElement(viewEl, itemsEl, viewElementsOrder);
        } else {
            List l = XMLUtil.findSubElements(itemsEl);
            for (int i = 0; i < l.size(); i++) {
                Element e = (Element) l.get(i);
                if (e.hasAttribute("style")) {
                    if (e.getAttribute("style").equals("tree")) {
                        // #110173
                        Element labelElement = XMLUtil.findElement(e, "label", Util.NAMESPACE);
                        if (labelElement != null && label.equals(XMLUtil.findText(labelElement))) {
                            itemsEl.removeChild(e);
                            break;
                        }

            el = doc.createElementNS(Util.NAMESPACE, "location"); // NOI18N
            el.appendChild(doc.createTextNode(path));
            sourceFolderEl.appendChild(el);
            XMLUtil.appendChildElement(foldersEl, sourceFolderEl, folderElementsOrder);
            
            sourceFolderEl = doc.createElementNS(Util.NAMESPACE, "source-folder"); // NOI18N
            sourceFolderEl.setAttribute("style", "tree"); // NOI18N

                    insertWebInfElement(itemsEl, firstNode, sourceFolderEl);
                }
            } else {
                XMLUtil.appendChildElement(itemsEl, sourceFolderEl, viewItemElementsOrder);
            }
        }
        Util.putPrimaryConfigurationData(helper, data);

        if (secondNode != null) {
            itemsEl.insertBefore(sourceFolderEl, secondNode);
        } else {
            XMLUtil.appendChildElement(itemsEl, sourceFolderEl, viewItemElementsOrder);
        }
    }
    

                return list;
            }
        }
        List<Element> wms = XMLUtil.findSubElements(data);
        Iterator<Element> it = wms.iterator();
        while (it.hasNext()) {
            Element wmEl = it.next();
            WebModule wm = new WebModule();
            Iterator it2 = XMLUtil.findSubElements(wmEl).iterator();
            while (it2.hasNext()) {
                Element el = (Element)it2.next();
                if (el.getLocalName().equals("doc-root")) { // NOI18N
                    wm.docRoot = XMLUtil.findText(el);
                    continue;
                }
                if (el.getLocalName().equals("classpath")) { // NOI18N
                    wm.classpath = XMLUtil.findText(el);
                    continue;
                }
                if (el.getLocalName().equals("context-path")) { // NOI18N
                    wm.contextPath = XMLUtil.findText(el);
                    continue;
                }
                if (el.getLocalName().equals("j2ee-spec-level")) { // NOI18N
                    wm.j2eeSpecLevel = XMLUtil.findText(el);
                    continue;
                }
                if (el.getLocalName().equals("web-inf")) { // NOI18N
                    wm.webInf = XMLUtil.findText(el);
                }
            }
            list.add(wm);

        }
        
        Document doc = data.getOwnerDocument();
        List<Element> wms = XMLUtil.findSubElements(data);
        Iterator<Element> it = wms.iterator();
        while (it.hasNext()) {
            Element wmEl = it.next();

Return to bug 136595

Lines 71-76 Link Here

(-)a/web.freeform/src/org/netbeans/modules/web/freeform/LookupProviderImpl.java (-3 / +4 lines)
71	import org.openide.util.Lookup;	71	import org.openide.util.Lookup;
72	import org.openide.util.lookup.Lookups;	72	import org.openide.util.lookup.Lookups;
73	import org.openide.util.lookup.ProxyLookup;	73	import org.openide.util.lookup.ProxyLookup;
		74	import org.openide.xml.XMLUtil;
74	import org.w3c.dom.Comment;	75	import org.w3c.dom.Comment;
75	import org.w3c.dom.Document;	76	import org.w3c.dom.Document;
76	import org.w3c.dom.Element;	77	import org.w3c.dom.Element;
Lines 288-294 Link Here
288	if (web == null) {	289	if (web == null) {
289	return null;	290	return null;
290	}	291	}
291	List<Element> webModules = Util.findSubElements(web);	292	List<Element> webModules = XMLUtil.findSubElements(web);
292	List<FileObject> roots = new ArrayList<FileObject>();	293	List<FileObject> roots = new ArrayList<FileObject>();
293	for (Element webModulesEl : webModules) {	294	for (Element webModulesEl : webModules) {
294	assert webModulesEl.getLocalName().equals("web-module") : webModulesEl; // NOI18N	295	assert webModulesEl.getLocalName().equals("web-module") : webModulesEl; // NOI18N
Lines 298-305 Link Here
298	}	299	}
299		300
300	private File getFile(Element parent, String fileElName, Project proj, PropertyEvaluator evaluator) {	301	private File getFile(Element parent, String fileElName, Project proj, PropertyEvaluator evaluator) {
301	Element el = Util.findElement(parent, fileElName, WebProjectNature.NS_WEB_2);	302	Element el = XMLUtil.findElement(parent, fileElName, WebProjectNature.NS_WEB_2);
302	return Util.resolveFile(evaluator, FileUtil.toFile(proj.getProjectDirectory()), Util.findText(el));	303	return Util.resolveFile(evaluator, FileUtil.toFile(proj.getProjectDirectory()), XMLUtil.findText(el));
303	}	304	}
304		305
305	}	306	}

Lines 266-286 Link Here

(-)a/web.freeform/src/org/netbeans/modules/web/freeform/WebFreeFormActionProvider.java (-16 / +16 lines)
266	// See corresponding schema.	266	// See corresponding schema.
267		267
268	Element data = Util.getPrimaryConfigurationData(helper);	268	Element data = Util.getPrimaryConfigurationData(helper);
269	Element properties = Util.findElement(data, "properties", Util.NAMESPACE); // NOI18N	269	Element properties = XMLUtil.findElement(data, "properties", Util.NAMESPACE); // NOI18N
270	if (properties != null) {	270	if (properties != null) {
271	Iterator/<Element>/ propertiesIt = Util.findSubElements(properties).iterator();	271	Iterator<Element> propertiesIt = XMLUtil.findSubElements(properties).iterator();
272	while (propertiesIt.hasNext()) {	272	while (propertiesIt.hasNext()) {
273	Element el = (Element) propertiesIt.next();	273	Element el = (Element) propertiesIt.next();
274	Element nue = script.getOwnerDocument().createElement("property"); // NOI18N	274	Element nue = script.getOwnerDocument().createElement("property"); // NOI18N
275	if (el.getLocalName().equals("property")) { // NOI18N	275	if (el.getLocalName().equals("property")) { // NOI18N
276	String name = el.getAttribute("name"); // NOI18N	276	String name = el.getAttribute("name"); // NOI18N
277	assert name != null;	277	assert name != null;
278	String text = Util.findText(el);	278	String text = XMLUtil.findText(el);
279	assert text != null;	279	assert text != null;
280	nue.setAttribute("name", name); // NOI18N	280	nue.setAttribute("name", name); // NOI18N
281	nue.setAttribute("value", text); // NOI18N	281	nue.setAttribute("value", text); // NOI18N
282	} else if (el.getLocalName().equals("property-file")) { // NOI18N	282	} else if (el.getLocalName().equals("property-file")) { // NOI18N
283	String text = Util.findText(el);	283	String text = XMLUtil.findText(el);
284	assert text != null;	284	assert text != null;
285	nue.setAttribute("file", text); // NOI18N	285	nue.setAttribute("file", text); // NOI18N
286	} else {	286	} else {
Lines 460-466 Link Here
460	// XXX cannot use FreeformProjectGenerator since that is currently not a public support SPI from ant/freeform	460	// XXX cannot use FreeformProjectGenerator since that is currently not a public support SPI from ant/freeform
461	// XXX should this try to find an existing binding? probably not, since it is assumed that if there was one, we would never get here to begin with	461	// XXX should this try to find an existing binding? probably not, since it is assumed that if there was one, we would never get here to begin with
462	Element data = Util.getPrimaryConfigurationData(helper);	462	Element data = Util.getPrimaryConfigurationData(helper);
463	Element ideActions = Util.findElement(data, "ide-actions", Util.NAMESPACE); // NOI18N	463	Element ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE); // NOI18N
464	if (ideActions == null) {	464	if (ideActions == null) {
465	// Probably won't happen, since generator produces it always.	465	// Probably won't happen, since generator produces it always.
466	// Not trivial to just add it now, since order is significant in the schema. (FPG deals with these things.)	466	// Not trivial to just add it now, since order is significant in the schema. (FPG deals with these things.)
Lines 506-514 Link Here
506	} else {	506	} else {
507	// Add a context menu item, since it applies to the project as a whole.	507	// Add a context menu item, since it applies to the project as a whole.
508	// Assume there is already a <context-menu> defined, which is quite likely.	508	// Assume there is already a <context-menu> defined, which is quite likely.
509	Element view = Util.findElement(data, "view", Util.NAMESPACE); // NOI18N	509	Element view = XMLUtil.findElement(data, "view", Util.NAMESPACE); // NOI18N
510	if (view != null) {	510	if (view != null) {
511	Element contextMenu = Util.findElement(view, "context-menu", Util.NAMESPACE); // NOI18N	511	Element contextMenu = XMLUtil.findElement(view, "context-menu", Util.NAMESPACE); // NOI18N
512	if (contextMenu != null) {	512	if (contextMenu != null) {
513	Element ideAction = doc.createElementNS(Util.NAMESPACE, "ide-action"); // NOI18N	513	Element ideAction = doc.createElementNS(Util.NAMESPACE, "ide-action"); // NOI18N
514	ideAction.setAttribute("name", command); // NOI18N	514	ideAction.setAttribute("name", command); // NOI18N
Lines 684-700 Link Here
684	private String findSourceFolders(String type) {	684	private String findSourceFolders(String type) {
685	StringBuffer result = new StringBuffer();	685	StringBuffer result = new StringBuffer();
686	Element data = Util.getPrimaryConfigurationData(helper);	686	Element data = Util.getPrimaryConfigurationData(helper);
687	Element foldersEl = Util.findElement(data, "folders", Util.NAMESPACE); // NOI18N	687	Element foldersEl = XMLUtil.findElement(data, "folders", Util.NAMESPACE); // NOI18N
688	if (foldersEl != null) {	688	if (foldersEl != null) {
689	for (Iterator i = Util.findSubElements(foldersEl).iterator(); i.hasNext();) {	689	for (Iterator i = XMLUtil.findSubElements(foldersEl).iterator(); i.hasNext();) {
690	Element sourceFolderEl = (Element)i.next();	690	Element sourceFolderEl = (Element)i.next();
691	Element typeEl = Util.findElement(sourceFolderEl , "type", Util.NAMESPACE); // NOI18N	691	Element typeEl = XMLUtil.findElement(sourceFolderEl , "type", Util.NAMESPACE); // NOI18N
692	if (typeEl == null \|\| !Util.findText(typeEl).equals(type))	692	if (typeEl == null \|\| !XMLUtil.findText(typeEl).equals(type))
693	continue;	693	continue;
694	Element locationEl = Util.findElement(sourceFolderEl , "location", Util.NAMESPACE); // NOI18N	694	Element locationEl = XMLUtil.findElement(sourceFolderEl , "location", Util.NAMESPACE); // NOI18N
695	if (locationEl == null)	695	if (locationEl == null)
696	continue;	696	continue;
697	String location = Util.findText(locationEl);	697	String location = XMLUtil.findText(locationEl);
698	if (result.length() > 0)	698	if (result.length() > 0)
699	result.append(":"); // NOI18N	699	result.append(":"); // NOI18N
700	result.append(location);	700	result.append(location);
Lines 705-717 Link Here
705		705
706	private String findContextPath() {	706	private String findContextPath() {
707	Element data = aux.getConfigurationFragment(WebProjectNature.EL_WEB, WebProjectNature.NS_WEB_2, true); // NOI18N	707	Element data = aux.getConfigurationFragment(WebProjectNature.EL_WEB, WebProjectNature.NS_WEB_2, true); // NOI18N
708	Element webModulEl = Util.findElement(data, "web-module", WebProjectNature.NS_WEB_2); // NOI18N	708	Element webModulEl = XMLUtil.findElement(data, "web-module", WebProjectNature.NS_WEB_2); // NOI18N
709	if (webModulEl == null)	709	if (webModulEl == null)
710	return null;	710	return null;
711	Element contextPathEl = Util.findElement(webModulEl, "context-path", WebProjectNature.NS_WEB_2); // NOI18N	711	Element contextPathEl = XMLUtil.findElement(webModulEl, "context-path", WebProjectNature.NS_WEB_2); // NOI18N
712	if (contextPathEl == null)	712	if (contextPathEl == null)
713	return null;	713	return null;
714	return Util.findText(contextPathEl);	714	return XMLUtil.findText(contextPathEl);
715	}	715	}
716		716
717	}	717	}

Lines 48-55 Link Here

(-)a/web.freeform/src/org/netbeans/modules/web/freeform/WebProjectGenerator.java (-24 / +24 lines)
48	import org.netbeans.modules.web.api.webmodule.WebProjectConstants;	48	import org.netbeans.modules.web.api.webmodule.WebProjectConstants;
49	import org.netbeans.spi.project.AuxiliaryConfiguration;	49	import org.netbeans.spi.project.AuxiliaryConfiguration;
50	import org.netbeans.spi.project.support.ant.AntProjectHelper;	50	import org.netbeans.spi.project.support.ant.AntProjectHelper;
51	import org.openide.filesystems.FileObject;
52	import org.openide.util.NbBundle;	51	import org.openide.util.NbBundle;
		52	import org.openide.xml.XMLUtil;
53	import org.w3c.dom.Document;	53	import org.w3c.dom.Document;
54	import org.w3c.dom.Element;	54	import org.w3c.dom.Element;
55	import org.w3c.dom.Node;	55	import org.w3c.dom.Node;
Lines 102-141 Link Here
102		102
103	Element data = Util.getPrimaryConfigurationData(helper);	103	Element data = Util.getPrimaryConfigurationData(helper);
104	Document doc = data.getOwnerDocument();	104	Document doc = data.getOwnerDocument();
105	Element foldersEl = Util.findElement(data, "folders", Util.NAMESPACE); // NOI18N	105	Element foldersEl = XMLUtil.findElement(data, "folders", Util.NAMESPACE); // NOI18N
106	if (foldersEl == null) {	106	if (foldersEl == null) {
107	foldersEl = doc.createElementNS(Util.NAMESPACE, "folders"); // NOI18N	107	foldersEl = doc.createElementNS(Util.NAMESPACE, "folders"); // NOI18N
108	Util.appendChildElement(data, foldersEl, rootElementsOrder);	108	XMLUtil.appendChildElement(data, foldersEl, rootElementsOrder);
109	} else {	109	} else {
110	List l = Util.findSubElements(foldersEl);	110	List l = XMLUtil.findSubElements(foldersEl);
111	for (int i = 0; i < l.size(); i++) {	111	for (int i = 0; i < l.size(); i++) {
112	Element e = (Element) l.get(i);	112	Element e = (Element) l.get(i);
113	Element te = Util.findElement(e, "type", Util.NAMESPACE);	113	Element te = XMLUtil.findElement(e, "type", Util.NAMESPACE);
114	if (te != null && Util.findText(te).equals(folderType)) {	114	if (te != null && XMLUtil.findText(te).equals(folderType)) {
115	foldersEl.removeChild(e);	115	foldersEl.removeChild(e);
116	break;	116	break;
117	}	117	}
118	}	118	}
119	}	119	}
120		120
121	Element viewEl = Util.findElement(data, "view", Util.NAMESPACE); // NOI18N	121	Element viewEl = XMLUtil.findElement(data, "view", Util.NAMESPACE); // NOI18N
122	if (viewEl == null) {	122	if (viewEl == null) {
123	viewEl = doc.createElementNS(Util.NAMESPACE, "view"); // NOI18N	123	viewEl = doc.createElementNS(Util.NAMESPACE, "view"); // NOI18N
124	Util.appendChildElement(data, viewEl, rootElementsOrder);	124	XMLUtil.appendChildElement(data, viewEl, rootElementsOrder);
125	}	125	}
126	Element itemsEl = Util.findElement(viewEl, "items", Util.NAMESPACE); // NOI18N	126	Element itemsEl = XMLUtil.findElement(viewEl, "items", Util.NAMESPACE); // NOI18N
127	if (itemsEl == null) {	127	if (itemsEl == null) {
128	itemsEl = doc.createElementNS(Util.NAMESPACE, "items"); // NOI18N	128	itemsEl = doc.createElementNS(Util.NAMESPACE, "items"); // NOI18N
129	Util.appendChildElement(viewEl, itemsEl, viewElementsOrder);	129	XMLUtil.appendChildElement(viewEl, itemsEl, viewElementsOrder);
130	} else {	130	} else {
131	List l = Util.findSubElements(itemsEl);	131	List l = XMLUtil.findSubElements(itemsEl);
132	for (int i = 0; i < l.size(); i++) {	132	for (int i = 0; i < l.size(); i++) {
133	Element e = (Element) l.get(i);	133	Element e = (Element) l.get(i);
134	if (e.hasAttribute("style")) {	134	if (e.hasAttribute("style")) {
135	if (e.getAttribute("style").equals("tree")) {	135	if (e.getAttribute("style").equals("tree")) {
136	// #110173	136	// #110173
137	Element labelElement = Util.findElement(e, "label", Util.NAMESPACE);	137	Element labelElement = XMLUtil.findElement(e, "label", Util.NAMESPACE);
138	if (labelElement != null && label.equals(Util.findText(labelElement))) {	138	if (labelElement != null && label.equals(XMLUtil.findText(labelElement))) {
139	itemsEl.removeChild(e);	139	itemsEl.removeChild(e);
140	break;	140	break;
141	}	141	}
Lines 159-165 Link Here
159	el = doc.createElementNS(Util.NAMESPACE, "location"); // NOI18N	159	el = doc.createElementNS(Util.NAMESPACE, "location"); // NOI18N
160	el.appendChild(doc.createTextNode(path));	160	el.appendChild(doc.createTextNode(path));
161	sourceFolderEl.appendChild(el);	161	sourceFolderEl.appendChild(el);
162	Util.appendChildElement(foldersEl, sourceFolderEl, folderElementsOrder);	162	XMLUtil.appendChildElement(foldersEl, sourceFolderEl, folderElementsOrder);
163		163
164	sourceFolderEl = doc.createElementNS(Util.NAMESPACE, "source-folder"); // NOI18N	164	sourceFolderEl = doc.createElementNS(Util.NAMESPACE, "source-folder"); // NOI18N
165	sourceFolderEl.setAttribute("style", "tree"); // NOI18N	165	sourceFolderEl.setAttribute("style", "tree"); // NOI18N
Lines 177-183 Link Here
177	insertWebInfElement(itemsEl, firstNode, sourceFolderEl);	177	insertWebInfElement(itemsEl, firstNode, sourceFolderEl);
178	}	178	}
179	} else {	179	} else {
180	Util.appendChildElement(itemsEl, sourceFolderEl, viewItemElementsOrder);	180	XMLUtil.appendChildElement(itemsEl, sourceFolderEl, viewItemElementsOrder);
181	}	181	}
182	}	182	}
183	Util.putPrimaryConfigurationData(helper, data);	183	Util.putPrimaryConfigurationData(helper, data);
Lines 192-198 Link Here
192	if (secondNode != null) {	192	if (secondNode != null) {
193	itemsEl.insertBefore(sourceFolderEl, secondNode);	193	itemsEl.insertBefore(sourceFolderEl, secondNode);
194	} else {	194	} else {
195	Util.appendChildElement(itemsEl, sourceFolderEl, viewItemElementsOrder);	195	XMLUtil.appendChildElement(itemsEl, sourceFolderEl, viewItemElementsOrder);
196	}	196	}
197	}	197	}
198		198
Lines 213-244 Link Here
213	return list;	213	return list;
214	}	214	}
215	}	215	}
216	List<Element> wms = Util.findSubElements(data);	216	List<Element> wms = XMLUtil.findSubElements(data);
217	Iterator<Element> it = wms.iterator();	217	Iterator<Element> it = wms.iterator();
218	while (it.hasNext()) {	218	while (it.hasNext()) {
219	Element wmEl = it.next();	219	Element wmEl = it.next();
220	WebModule wm = new WebModule();	220	WebModule wm = new WebModule();
221	Iterator it2 = Util.findSubElements(wmEl).iterator();	221	Iterator it2 = XMLUtil.findSubElements(wmEl).iterator();
222	while (it2.hasNext()) {	222	while (it2.hasNext()) {
223	Element el = (Element)it2.next();	223	Element el = (Element)it2.next();
224	if (el.getLocalName().equals("doc-root")) { // NOI18N	224	if (el.getLocalName().equals("doc-root")) { // NOI18N
225	wm.docRoot = Util.findText(el);	225	wm.docRoot = XMLUtil.findText(el);
226	continue;	226	continue;
227	}	227	}
228	if (el.getLocalName().equals("classpath")) { // NOI18N	228	if (el.getLocalName().equals("classpath")) { // NOI18N
229	wm.classpath = Util.findText(el);	229	wm.classpath = XMLUtil.findText(el);
230	continue;	230	continue;
231	}	231	}
232	if (el.getLocalName().equals("context-path")) { // NOI18N	232	if (el.getLocalName().equals("context-path")) { // NOI18N
233	wm.contextPath = Util.findText(el);	233	wm.contextPath = XMLUtil.findText(el);
234	continue;	234	continue;
235	}	235	}
236	if (el.getLocalName().equals("j2ee-spec-level")) { // NOI18N	236	if (el.getLocalName().equals("j2ee-spec-level")) { // NOI18N
237	wm.j2eeSpecLevel = Util.findText(el);	237	wm.j2eeSpecLevel = XMLUtil.findText(el);
238	continue;	238	continue;
239	}	239	}
240	if (el.getLocalName().equals("web-inf")) { // NOI18N	240	if (el.getLocalName().equals("web-inf")) { // NOI18N
241	wm.webInf = Util.findText(el);	241	wm.webInf = XMLUtil.findText(el);
242	}	242	}
243	}	243	}
244	list.add(wm);	244	list.add(wm);
Lines 295-301 Link Here
295	}	295	}
296		296
297	Document doc = data.getOwnerDocument();	297	Document doc = data.getOwnerDocument();
298	List<Element> wms = Util.findSubElements(data);	298	List<Element> wms = XMLUtil.findSubElements(data);
299	Iterator<Element> it = wms.iterator();	299	Iterator<Element> it = wms.iterator();
300	while (it.hasNext()) {	300	while (it.hasNext()) {
301	Element wmEl = it.next();	301	Element wmEl = it.next();

Lines 70-76 Link Here

(-)a/web.freeform/src/org/netbeans/modules/web/freeform/WebModules.java (-11 / +11 lines)
70	import org.netbeans.api.project.ProjectManager;	70	import org.netbeans.api.project.ProjectManager;
71	import org.netbeans.api.project.ProjectUtils;	71	import org.netbeans.api.project.ProjectUtils;
72	import org.netbeans.api.project.SourceGroup;	72	import org.netbeans.api.project.SourceGroup;
73	import org.netbeans.modules.ant.freeform.spi.support.Util;
74	import org.netbeans.modules.j2ee.dd.spi.MetadataUnit;	73	import org.netbeans.modules.j2ee.dd.spi.MetadataUnit;
75	import org.netbeans.modules.j2ee.dd.spi.web.WebAppMetadataModelFactory;	74	import org.netbeans.modules.j2ee.dd.spi.web.WebAppMetadataModelFactory;
76	import org.netbeans.modules.web.api.webmodule.WebModule;	75	import org.netbeans.modules.web.api.webmodule.WebModule;
Lines 85-90 Link Here
85	import org.netbeans.spi.project.support.ant.PropertyEvaluator;	84	import org.netbeans.spi.project.support.ant.PropertyEvaluator;
86	import org.netbeans.spi.project.support.ant.PropertyUtils;	85	import org.netbeans.spi.project.support.ant.PropertyUtils;
87	import org.openide.util.Mutex;	86	import org.openide.util.Mutex;
		87	import org.openide.xml.XMLUtil;
88		88
89	/**	89	/**
90	* Web module implementation on top of freeform project.	90	* Web module implementation on top of freeform project.
Lines 171-191 Link Here
171	if (web == null) {	171	if (web == null) {
172	return mods;	172	return mods;
173	}	173	}
174	List/<Element>/ webModules = Util.findSubElements(web);	174	List<Element> webModules = XMLUtil.findSubElements(web);
175	Iterator it = webModules.iterator();	175	Iterator it = webModules.iterator();
176	while (it.hasNext()) {	176	while (it.hasNext()) {
177	Element webModulesEl = (Element)it.next();	177	Element webModulesEl = (Element)it.next();
178	assert webModulesEl.getLocalName().equals("web-module") : webModulesEl;	178	assert webModulesEl.getLocalName().equals("web-module") : webModulesEl;
179	FileObject docRootFO = getFile (webModulesEl, "doc-root"); //NOI18N	179	FileObject docRootFO = getFile (webModulesEl, "doc-root"); //NOI18N
180	Element j2eeSpecEl = Util.findElement (webModulesEl, "j2ee-spec-level", WebProjectNature.NS_WEB_2);	180	Element j2eeSpecEl = XMLUtil.findElement (webModulesEl, "j2ee-spec-level", WebProjectNature.NS_WEB_2);
181	String j2eeSpec = j2eeSpecEl == null ? null : evaluator.evaluate (Util.findText (j2eeSpecEl));	181	String j2eeSpec = j2eeSpecEl == null ? null : evaluator.evaluate (XMLUtil.findText (j2eeSpecEl));
182	Element contextPathEl = Util.findElement (webModulesEl, "context-path", WebProjectNature.NS_WEB_2);	182	Element contextPathEl = XMLUtil.findElement (webModulesEl, "context-path", WebProjectNature.NS_WEB_2);
183	String contextPathText = contextPathEl == null ? null : Util.findText (contextPathEl);	183	String contextPathText = contextPathEl == null ? null : XMLUtil.findText (contextPathEl);
184	String contextPath = contextPathText == null ? null : evaluator.evaluate (contextPathText);	184	String contextPath = contextPathText == null ? null : evaluator.evaluate (contextPathText);
185	Element classpathEl = Util.findElement (webModulesEl, "classpath", WebProjectNature.NS_WEB_2);	185	Element classpathEl = XMLUtil.findElement (webModulesEl, "classpath", WebProjectNature.NS_WEB_2);
186	FileObject [] sources = getSources ();	186	FileObject [] sources = getSources ();
187	ClassPath cp = classpathEl == null ? null : createClasspath (classpathEl, sources);	187	ClassPath cp = classpathEl == null ? null : createClasspath (classpathEl, sources);
188	Element webInfEl = Util.findElement (webModulesEl, "web-inf", WebProjectNature.NS_WEB_2);	188	Element webInfEl = XMLUtil.findElement (webModulesEl, "web-inf", WebProjectNature.NS_WEB_2);
189	FileObject webInf = null;	189	FileObject webInf = null;
190	if (webInfEl != null) {	190	if (webInfEl != null) {
191	webInf = getFile (webModulesEl, "web-inf"); //NOI18N	191	webInf = getFile (webModulesEl, "web-inf"); //NOI18N
Lines 196-203 Link Here
196	}	196	}
197		197
198	private FileObject getFile (Element parent, String fileElName) {	198	private FileObject getFile (Element parent, String fileElName) {
199	Element el = Util.findElement (parent, fileElName, WebProjectNature.NS_WEB_2);	199	Element el = XMLUtil.findElement (parent, fileElName, WebProjectNature.NS_WEB_2);
200	String fname = Util.findText (el);	200	String fname = XMLUtil.findText (el);
201	if (fname == null) {	201	if (fname == null) {
202	// empty element => cannot find fileobject	202	// empty element => cannot find fileobject
203	return null;	203	return null;
Lines 240-246 Link Here
240	*/	240	*/
241	private ClassPath createClasspath(Element classpathEl, FileObject[] sources) {	241	private ClassPath createClasspath(Element classpathEl, FileObject[] sources) {
242	// System.out.println("creating classpath for " + classpathEl);	242	// System.out.println("creating classpath for " + classpathEl);
243	String cp = Util.findText(classpathEl);	243	String cp = XMLUtil.findText(classpathEl);
244	if (cp == null) {	244	if (cp == null) {
245	cp = "";	245	cp = "";
246	}	246	}