Attachment #96877 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

Lines 160-166 Link Here

(-)a/ant.freeform/nbproject/project.xml (-1 / +1 lines)
160	<build-prerequisite/>	160	<build-prerequisite/>
161	<compile-dependency/>	161	<compile-dependency/>
162	<run-dependency>	162	<run-dependency>
163	<specification-version>8.0</specification-version>	163	<specification-version>8.4</specification-version>
164	</run-dependency>	164	</run-dependency>
165	</dependency>	165	</dependency>
166	<dependency>	166	<dependency>




import javax.swing.JMenuItem;
import javax.swing.JSeparator;
import org.apache.tools.ant.module.api.support.ActionUtils;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.modules.ant.freeform.ui.TargetMappingPanel;
import org.netbeans.modules.ant.freeform.ui.UnboundTargetAlert;
import org.netbeans.spi.project.ActionProvider;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.ui.support.CommonProjectActions;
import org.netbeans.spi.project.ui.support.DefaultProjectOperations;
import org.netbeans.spi.project.ui.support.ProjectSensitiveActions;
import org.openide.DialogDisplayer;
import org.openide.ErrorManager;
import org.openide.NotifyDescriptor;
import org.openide.actions.FindAction;
import org.openide.awt.DynamicMenuContent;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;

import org.openide.util.ContextAwareAction;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.util.Utilities;
import org.openide.util.actions.Presenter;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

    
    public String[] getSupportedActions() {
        Element genldata = project.getPrimaryConfigurationData();
        Element actionsEl = XMLUtil.findElement(genldata, "ide-actions", FreeformProjectType.NS_GENERAL); // NOI18N
        if (actionsEl == null) {
            return new String[0];
        }
        // Use a set, not a list, since when using context you can define one action several times:
        Set<String> names = new LinkedHashSet<String>();
        for (Element actionEl : XMLUtil.findSubElements(actionsEl)) {
            names.add(actionEl.getAttribute("name")); // NOI18N
        }
        // #46886: also always enable all common global actions, in case they should be selected:

        }
        
        Element genldata = project.getPrimaryConfigurationData();
        Element actionsEl = XMLUtil.findElement(genldata, "ide-actions", FreeformProjectType.NS_GENERAL); // NOI18N
        if (actionsEl == null) {
            throw new IllegalArgumentException("No commands supported"); // NOI18N
        }
        boolean foundAction = false;
        for (Element actionEl : XMLUtil.findSubElements(actionsEl)) {
            if (actionEl.getAttribute("name").equals(command)) { // NOI18N
                foundAction = true;
                // XXX perhaps check also existence of script
                Element contextEl = XMLUtil.findElement(actionEl, "context", FreeformProjectType.NS_GENERAL); // NOI18N
                if (contextEl != null) {
                    // Check whether the context contains files all in this folder,
                    // matching the pattern if any, and matching the arity (single/multiple).

                        return true;
                    } else if (!selection.isEmpty()) {
                        // Multiple selection; check arity.
                        Element arityEl = XMLUtil.findElement(contextEl, "arity", FreeformProjectType.NS_GENERAL); // NOI18N
                        assert arityEl != null : "No <arity> in <context> for " + command;
                        if (XMLUtil.findElement(arityEl, "separated-files", FreeformProjectType.NS_GENERAL) != null) { // NOI18N
                            // Supports multiple selection, take it.
                            return true;
                        }

        }
        
        Element genldata = project.getPrimaryConfigurationData();
        Element actionsEl = XMLUtil.findElement(genldata, "ide-actions", FreeformProjectType.NS_GENERAL); // NOI18N
        if (actionsEl == null) {
            throw new IllegalArgumentException("No commands supported"); // NOI18N
        }
        boolean foundAction = false;
        for (Element actionEl : XMLUtil.findSubElements(actionsEl)) {
            if (actionEl.getAttribute("name").equals(command)) { // NOI18N
                foundAction = true;
                runConfiguredAction(project, actionEl, context);

            _files.add(d.getPrimaryFile());
        }
        Collection<? extends FileObject> files = _files;
        Element folderEl = XMLUtil.findElement(contextEl, "folder", FreeformProjectType.NS_GENERAL); // NOI18N
        assert folderEl != null : "Must have <folder> in <context>";
        String rawtext = XMLUtil.findText(folderEl);
        assert rawtext != null : "Must have text contents in <folder>";
        String evaltext = project.evaluator().evaluate(rawtext);
        if (evaltext == null) {

            return Collections.emptyMap();
        }
        Pattern pattern = null;
        Element patternEl = XMLUtil.findElement(contextEl, "pattern", FreeformProjectType.NS_GENERAL); // NOI18N
        if (patternEl != null) {
            String text = XMLUtil.findText(patternEl);
            assert text != null : "Must have text contents in <pattern>";
            try {
                pattern = Pattern.compile(text);

     */
    private static void runConfiguredAction(FreeformProject project, Element actionEl, Lookup context) {
        String script;
        Element scriptEl = XMLUtil.findElement(actionEl, "script", FreeformProjectType.NS_GENERAL); // NOI18N
        if (scriptEl != null) {
            script = XMLUtil.findText(scriptEl);
        } else {
            script = "build.xml"; // NOI18N
        }

            DialogDisplayer.getDefault().notify(nd);
            return;
        }
        List<Element> targets = XMLUtil.findSubElements(actionEl);
        List<String> targetNames = new ArrayList<String>(targets.size());
        for (Element targetEl : targets) {
            if (!targetEl.getLocalName().equals("target")) { // NOI18N
                continue;
            }
            targetNames.add(XMLUtil.findText(targetEl));
        }
        String[] targetNameArray;
        if (!targetNames.isEmpty()) {

            targetNameArray = null;
        }
        Properties props = new Properties();
        Element contextEl = XMLUtil.findElement(actionEl, "context", FreeformProjectType.NS_GENERAL); // NOI18N
        if (contextEl != null) {
            Map<String,FileObject> selection = findSelection(contextEl, context, project);
            if (selection.isEmpty()) {

            String separator = null;
            if (selection.size() > 1) {
                // Find the right separator.
                Element arityEl = XMLUtil.findElement(contextEl, "arity", FreeformProjectType.NS_GENERAL); // NOI18N
                assert arityEl != null : "No <arity> in <context> for " + actionEl.getAttribute("name");
                Element sepFilesEl = XMLUtil.findElement(arityEl, "separated-files", FreeformProjectType.NS_GENERAL); // NOI18N
                if (sepFilesEl == null) {
                    // Only handles single files -> skip it.
                    return;
                }
                separator = XMLUtil.findText(sepFilesEl);
            }
            Element formatEl = XMLUtil.findElement(contextEl, "format", FreeformProjectType.NS_GENERAL); // NOI18N
            assert formatEl != null : "No <format> in <context> for " + actionEl.getAttribute("name");
            String format = XMLUtil.findText(formatEl);
            StringBuffer buf = new StringBuffer();
            Iterator<Map.Entry<String,FileObject>> it = selection.entrySet().iterator();
            while (it.hasNext()) {

                    buf.append(separator);
                }
            }
            Element propEl = XMLUtil.findElement(contextEl, "property", FreeformProjectType.NS_GENERAL); // NOI18N
            assert propEl != null : "No <property> in <context> for " + actionEl.getAttribute("name");
            String prop = XMLUtil.findText(propEl);
            assert prop != null : "Must have text contents in <property>";
            props.setProperty(prop, buf.toString());
        }

            if (!propEl.getLocalName().equals("property")) { // NOI18N
                continue;
            }
            String rawtext = XMLUtil.findText(propEl);
            if (rawtext == null) {
                // Legal to have e.g. <property name="intentionally-left-blank"/>
                rawtext = ""; // NOI18N

    static Action[] contextMenuCustomActions(FreeformProject p) {
        List<Action> actions = new ArrayList<Action>();
        Element genldata = p.getPrimaryConfigurationData();
        Element viewEl = XMLUtil.findElement(genldata, "view", FreeformProjectType.NS_GENERAL); // NOI18N
        if (viewEl != null) {
            Element contextMenuEl = XMLUtil.findElement(viewEl, "context-menu", FreeformProjectType.NS_GENERAL); // NOI18N
            if (contextMenuEl != null) {
                actions.add(null);
                for (Element actionEl : XMLUtil.findSubElements(contextMenuEl)) {
                    if (actionEl.getLocalName().equals("ide-action")) { // NOI18N
                        String cmd = actionEl.getAttribute("name");
                        String displayName;

        
        public boolean isEnabled() {
            String script;
            Element scriptEl = XMLUtil.findElement(actionEl, "script", FreeformProjectType.NS_GENERAL); // NOI18N
            if (scriptEl != null) {
                script = XMLUtil.findText(scriptEl);
            } else {
                script = "build.xml"; // NOI18N
            }

        
        public Object getValue(String key) {
            if (key.equals(Action.NAME)) {
                Element labelEl = XMLUtil.findElement(actionEl, "label", FreeformProjectType.NS_GENERAL); // NOI18N
                return XMLUtil.findText(labelEl);
            } else {
                return super.getValue(key);
            }




import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ant.AntArtifact;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.spi.project.ant.AntArtifactProvider;
import org.netbeans.spi.project.support.ant.PropertyEvaluator;
import org.openide.ErrorManager;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

        List<AntArtifact> artifacts = new ArrayList<AntArtifact>();
        Set<String> ids = new HashSet<String>();
        HashMap<String,FreeformArtifact> uniqueArtifacts = new HashMap<String,FreeformArtifact>();
        for (Element export : XMLUtil.findSubElements(data)) {
            if (!export.getLocalName().equals("export")) { // NOI18N
                continue;
            }

    }
    
    public static URI readArtifactLocation(Element export, PropertyEvaluator eval) {
        Element locEl = XMLUtil.findElement(export, "location", FreeformProjectType.NS_GENERAL); // NOI18N
        assert locEl != null;
        String loc = XMLUtil.findText(locEl);
        assert loc != null;
        String locationResolved = eval.evaluate(loc);
        if (locationResolved == null) {

        }

        public String getType() {
            Element typeEl = XMLUtil.findElement(export, "type", FreeformProjectType.NS_GENERAL); // NOI18N
            assert typeEl != null;
            String type = XMLUtil.findText(typeEl);
            assert type != null;
            return type;
        }

        public String getTargetName() {
            Element targetEl = XMLUtil.findElement(export, "build-target", FreeformProjectType.NS_GENERAL); // NOI18N
            assert targetEl != null;
            String target = XMLUtil.findText(targetEl);
            assert target != null;
            return target;
        }

        public String getCleanTargetName() {
            Element targetEl = XMLUtil.findElement(export, "clean-target", FreeformProjectType.NS_GENERAL); // NOI18N
            if (targetEl != null) {
                String target = XMLUtil.findText(targetEl);
                assert target != null;
                return target;
            } else {
                // Guess based on configured target for 'clean' command, if any.
                String target = null;
                Element genldata = project.getPrimaryConfigurationData();
                Element actionsEl = XMLUtil.findElement(genldata, "ide-actions", FreeformProjectType.NS_GENERAL); // NOI18N
                if (actionsEl != null) {
                    for (Element actionEl : XMLUtil.findSubElements(actionsEl)) {
                        if (actionEl.getAttribute("name").equals("clean")) { // NOI18N
                            for (Element actionTargetEl : XMLUtil.findSubElements(actionEl)) {
                                if (!actionTargetEl.getLocalName().equals("target")) { // NOI18N
                                    continue;
                                }
                                String possibleTarget = XMLUtil.findText(actionTargetEl);
                                assert possibleTarget != null;
                                if (target == null) {
                                    // OK, probably use it (unless there is another target for this command).


        public File getScriptLocation() {
            String loc = null;
            Element scriptEl = XMLUtil.findElement(export, "script", FreeformProjectType.NS_GENERAL); // NOI18N
            if (scriptEl != null) {
                String script = XMLUtil.findText(scriptEl);
                assert script != null;
                loc = project.evaluator().evaluate(script);
            }




import java.util.List;
import java.util.Map;
import java.util.Set;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.spi.project.support.ant.AntProjectEvent;
import org.netbeans.spi.project.support.ant.AntProjectListener;
import org.netbeans.spi.project.support.ant.PropertyEvaluator;

import org.netbeans.spi.project.support.ant.PropertyUtils;
import org.openide.ErrorManager;
import org.openide.util.Parameters;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

        PropertyProvider preprovider = project.helper().getStockPropertyPreprovider();
        List<PropertyProvider> defs = new ArrayList<PropertyProvider>();
        Element genldata = project.getPrimaryConfigurationData();
        Element properties = XMLUtil.findElement(genldata, "properties", FreeformProjectType.NS_GENERAL); // NOI18N
        if (properties != null) {
            for (Element e : XMLUtil.findSubElements(properties)) {
                if (e.getLocalName().equals("property")) { // NOI18N
                    String val = XMLUtil.findText(e);
                    if (val == null) {
                        val = "";
                    }
                    defs.add(PropertyUtils.fixedPropertyProvider(Collections.singletonMap(e.getAttribute("name"), val))); // NOI18N
                } else {
                    assert e.getLocalName().equals("property-file") : e;
                    String fname = XMLUtil.findText(e);
                    if (fname.contains("${")) { // NOI18N
                        // Tricky (#48230): need to listen to changes in the location of the file as well as its contents.
                        PropertyEvaluator intermediate = PropertyUtils.sequentialPropertyEvaluator(preprovider, defs.toArray(new PropertyProvider[defs.size()]));




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

/**
 * Implementation of FileEncodingQuery for Freeform project, its instance can be 

    private void computeEncodingsCache() {
        Map<FileObject,Charset> cache = new HashMap<FileObject,Charset>(3);
        Element data = Util.getPrimaryConfigurationData(helper);
        Element foldersEl = XMLUtil.findElement(data, "folders", Util.NAMESPACE); // NOI18N
        if (foldersEl != null) {
            for (Element sourceFolderEl : XMLUtil.findSubElements(foldersEl)) {
                if (!sourceFolderEl.getLocalName().equals("source-folder")) { // NOI18N
                    continue;
                }
                FileObject srcRoot = null;
                Element locationEl = XMLUtil.findElement(sourceFolderEl, "location", Util.NAMESPACE); // NOI18N
                if (locationEl != null) {
                    String location = evaluator.evaluate(XMLUtil.findText(locationEl));
                    if (location != null) {
                        srcRoot = helper.resolveFileObject(location);
                    }
                }
                Element encodingEl = XMLUtil.findElement(sourceFolderEl, "encoding", Util.NAMESPACE); // NOI18N
                if (encodingEl != null && srcRoot != null) {
                    String encoding = evaluator.evaluate(XMLUtil.findText(encodingEl));
                    Charset charset = null;
                    if (encoding != null) {
                        try {




import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.Icon;
import javax.swing.ImageIcon;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectInformation;
import org.netbeans.api.project.ProjectManager;

import org.openide.util.Lookup;
import org.openide.util.Mutex;
import org.openide.util.lookup.Lookups;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;


            return ProjectManager.mutex().readAccess(new Mutex.Action<String>() {
                public String run() {
                    Element genldata = getPrimaryConfigurationData();
                    Element nameEl = XMLUtil.findElement(genldata, "name", FreeformProjectType.NS_GENERAL); // NOI18N
                    if (nameEl == null) {
                        // Corrupt. Cf. #48267 (cause unknown).
                        return "???"; // NOI18N
                    }
                    return XMLUtil.findText(nameEl);
                }
            });
        }




import org.openide.filesystems.FileStateInvalidException;
import org.openide.filesystems.FileUtil;
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;

        //assert ProjectManager.mutex().isReadAccess() || ProjectManager.mutex().isWriteAccess();
        List<TargetMapping> list = new ArrayList<TargetMapping>();
        Element genldata = Util.getPrimaryConfigurationData(helper);
        Element actionsEl = XMLUtil.findElement(genldata, "ide-actions", FreeformProjectType.NS_GENERAL); // NOI18N
        if (actionsEl == null) {
            return list;
        }
        for (Element actionEl : XMLUtil.findSubElements(actionsEl)) {
            TargetMapping tm = new TargetMapping();
            tm.name = actionEl.getAttribute("name"); // NOI18N
            List<String> targetNames = new ArrayList<String>();
            EditableProperties props = new EditableProperties(false);
            for (Element subEl : XMLUtil.findSubElements(actionEl)) {
                if (subEl.getLocalName().equals("target")) { // NOI18N
                    targetNames.add(XMLUtil.findText(subEl));
                    continue;
                }
                if (subEl.getLocalName().equals("script")) { // NOI18N
                    tm.script = XMLUtil.findText(subEl);
                    continue;
                }
                if (subEl.getLocalName().equals("context")) { // NOI18N
                    TargetMapping.Context ctx = new TargetMapping.Context();
                    for (Element contextSubEl : XMLUtil.findSubElements(subEl)) {
                        if (contextSubEl.getLocalName().equals("property")) { // NOI18N
                            ctx.property = XMLUtil.findText(contextSubEl);
                            continue;
                        }
                        if (contextSubEl.getLocalName().equals("format")) { // NOI18N
                            ctx.format = XMLUtil.findText(contextSubEl);
                            continue;
                        }
                        if (contextSubEl.getLocalName().equals("folder")) { // NOI18N
                            ctx.folder = XMLUtil.findText(contextSubEl);
                            continue;
                        }
                        if (contextSubEl.getLocalName().equals("pattern")) { // NOI18N
                            ctx.pattern = XMLUtil.findText(contextSubEl);
                            continue;
                        }
                        if (contextSubEl.getLocalName().equals("arity")) { // NOI18N
                            Element sepFilesEl = XMLUtil.findElement(contextSubEl, "separated-files", FreeformProjectType.NS_GENERAL); // NOI18N
                            if (sepFilesEl != null) {
                                ctx.separator = XMLUtil.findText(sepFilesEl);
                            }
                            continue;
                        }

    
    private static void readProperty(Element propertyElement, EditableProperties props) {
        String key = propertyElement.getAttribute("name"); // NOI18N
        String value = XMLUtil.findText(propertyElement);
        props.setProperty(key, value);
    }


        //assert ProjectManager.mutex().isWriteAccess();
        Element data = Util.getPrimaryConfigurationData(helper);
        Document doc = data.getOwnerDocument();
        Element actions = XMLUtil.findElement(data, "ide-actions", FreeformProjectType.NS_GENERAL); // NOI18N
        if (actions != null) {
            data.removeChild(actions);
        }

            }
            actions.appendChild(action);
        }
        XMLUtil.appendChildElement(data, actions, rootElementsOrder);
        Util.putPrimaryConfigurationData(helper, data);
    }
    

        //assert ProjectManager.mutex().isWriteAccess();
        Element data = Util.getPrimaryConfigurationData(helper);
        Document doc = data.getOwnerDocument();
        Element viewEl = XMLUtil.findElement(data, "view", FreeformProjectType.NS_GENERAL); // NOI18N
        if (viewEl == null) {
            viewEl = doc.createElementNS(FreeformProjectType.NS_GENERAL, "view"); // NOI18N
            XMLUtil.appendChildElement(data, viewEl, rootElementsOrder);
        }
        Element contextMenuEl = XMLUtil.findElement(viewEl, "context-menu", FreeformProjectType.NS_GENERAL); // NOI18N
        if (contextMenuEl == null) {
            contextMenuEl = doc.createElementNS(FreeformProjectType.NS_GENERAL, "context-menu"); // NOI18N
            XMLUtil.appendChildElement(viewEl, contextMenuEl, viewElementsOrder);
        }
        for (Element ideActionEl : XMLUtil.findSubElements(contextMenuEl)) {
            if (!ideActionEl.getLocalName().equals("ide-action")) { // NOI18N
                continue;
            }

            }
            Element ideAction = doc.createElementNS(FreeformProjectType.NS_GENERAL, "ide-action"); //NOI18N
            ideAction.setAttribute("name", tm.name); // NOI18N
            XMLUtil.appendChildElement(contextMenuEl, ideAction, contextMenuElementsOrder);
        }
        Util.putPrimaryConfigurationData(helper, data);
    }

        //assert ProjectManager.mutex().isReadAccess() || ProjectManager.mutex().isWriteAccess();
        List<CustomTarget> list = new ArrayList<CustomTarget>();
        Element genldata = Util.getPrimaryConfigurationData(helper);
        Element viewEl = XMLUtil.findElement(genldata, "view", FreeformProjectType.NS_GENERAL); // NOI18N
        if (viewEl == null) {
            return list;
        }
        Element contextMenuEl = XMLUtil.findElement(viewEl, "context-menu", FreeformProjectType.NS_GENERAL); // NOI18N
        if (contextMenuEl == null) {
            return list;
        }
        for (Element actionEl : XMLUtil.findSubElements(contextMenuEl)) {
            if (!actionEl.getLocalName().equals("action")) { // NOI18N
                continue;
            }
            CustomTarget ct = new CustomTarget();
            List<String> targetNames = new ArrayList<String>();
            EditableProperties props = new EditableProperties(false);
            for (Element subEl : XMLUtil.findSubElements(actionEl)) {
                if (subEl.getLocalName().equals("target")) { // NOI18N
                    targetNames.add(XMLUtil.findText(subEl));
                    continue;
                }
                if (subEl.getLocalName().equals("script")) { // NOI18N
                    ct.script = XMLUtil.findText(subEl);
                    continue;
                }
                if (subEl.getLocalName().equals("label")) { // NOI18N
                    ct.label = XMLUtil.findText(subEl);
                    continue;
                }
                if (subEl.getLocalName().equals("property")) { // NOI18N

        //assert ProjectManager.mutex().isWriteAccess();
        Element data = Util.getPrimaryConfigurationData(helper);
        Document doc = data.getOwnerDocument();
        Element viewEl = XMLUtil.findElement(data, "view", FreeformProjectType.NS_GENERAL); // NOI18N
        if (viewEl == null) {
            viewEl = doc.createElementNS(FreeformProjectType.NS_GENERAL, "view"); // NOI18N
            XMLUtil.appendChildElement(data, viewEl, rootElementsOrder);
        }
        Element contextMenuEl = XMLUtil.findElement(viewEl, "context-menu", FreeformProjectType.NS_GENERAL); // NOI18N
        if (contextMenuEl == null) {
            contextMenuEl = doc.createElementNS(FreeformProjectType.NS_GENERAL, "context-menu"); // NOI18N
            XMLUtil.appendChildElement(viewEl, contextMenuEl, viewElementsOrder);
        }
        for (Element actionEl : XMLUtil.findSubElements(contextMenuEl)) {
            if (!actionEl.getLocalName().equals("action")) { // NOI18N
                continue;
            }

            if (ct.properties != null) {
                writeProperties(ct.properties, doc, action);
            }
            XMLUtil.appendChildElement(contextMenuEl, action, contextMenuElementsOrder);
        }
        Util.putPrimaryConfigurationData(helper, data);
    }

    private static void putBuildXMLSourceFile(AntProjectHelper helper, String antPath) {
        Element data = Util.getPrimaryConfigurationData(helper);
        Document doc = data.getOwnerDocument();
        Element viewEl = XMLUtil.findElement(data, "view", FreeformProjectType.NS_GENERAL); // NOI18N
        if (viewEl == null) {
            viewEl = doc.createElementNS(FreeformProjectType.NS_GENERAL, "view"); // NOI18N
            XMLUtil.appendChildElement(data, viewEl, rootElementsOrder);
        }
        Element itemsEl = XMLUtil.findElement(viewEl, "items", FreeformProjectType.NS_GENERAL); // NOI18N
        if (itemsEl == null) {
            itemsEl = doc.createElementNS(FreeformProjectType.NS_GENERAL, "items"); // NOI18N
            XMLUtil.appendChildElement(viewEl, itemsEl, viewElementsOrder);
        }
        Element fileEl = doc.createElementNS(FreeformProjectType.NS_GENERAL, "source-file"); // NOI18N
        Element el = doc.createElementNS(FreeformProjectType.NS_GENERAL, "location"); // NOI18N
        el.appendChild(doc.createTextNode(antPath)); // NOI18N
        fileEl.appendChild(el);
        XMLUtil.appendChildElement(itemsEl, fileEl, viewItemElementsOrder);
        Util.putPrimaryConfigurationData(helper, data);
    }





import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.spi.project.CopyOperationImplementation;
import org.netbeans.spi.project.DeleteOperationImplementation;
import org.netbeans.spi.project.MoveOperationImplementation;
import org.netbeans.spi.project.support.ant.PropertyEvaluator;
import org.openide.ErrorManager;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

    
    public List<FileObject> getDataFiles() {
        Element genldata = project.getPrimaryConfigurationData();
        Element foldersEl = XMLUtil.findElement(genldata, "folders", FreeformProjectType.NS_GENERAL); // NOI18N
        List<Element> folders = foldersEl != null ? XMLUtil.findSubElements(foldersEl) : Collections.<Element>emptyList();
        List<FileObject> result = new ArrayList<FileObject>();

        for (Element el : folders) {

    }
    
    private void addFile(Element folder, List<FileObject> result) {
        Element location = XMLUtil.findElement(folder, "location", FreeformProjectType.NS_GENERAL); // NOI18N
        
        if (location == null) {
            return ;
        }
        
        PropertyEvaluator evaluator = project.evaluator();
        String val = evaluator.evaluate(XMLUtil.findText(location));
        
        if (val == null) {
            return ;




import org.openide.filesystems.FileUtil;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;

/**
 *

                    final NodeList exports = root.getElementsByTagNameNS(FreeformProjectType.NS_GENERAL, "export"); //NOI18N
                    for (int i=0; i< exports.getLength(); i++) {
                        final Element export = (Element) exports.item(i);
                        final Element location = XMLUtil.findElement(export, "location", FreeformProjectType.NS_GENERAL);   //NOI18N
                        if (location != null) {
                            final String path = XMLUtil.findText(location);
                            if (path != null) {
                                final File exportedFile = Util.resolveFile(project.evaluator(), FileUtil.toFile(project.getProjectDirectory()), path);
                                if (exportedFile != null) {




import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.project.SourceGroup;
import org.netbeans.api.project.Sources;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.spi.project.support.ant.AntProjectEvent;
import org.netbeans.spi.project.support.ant.AntProjectListener;
import org.netbeans.spi.project.support.ant.SourcesHelper;
import org.openide.util.ChangeSupport;
import org.openide.util.Mutex;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

    private Sources initSources() {
        SourcesHelper h = new SourcesHelper(project, project.helper(), project.evaluator());
        Element genldata = project.getPrimaryConfigurationData();
        Element foldersE = XMLUtil.findElement(genldata, "folders", FreeformProjectType.NS_GENERAL); // NOI18N
        if (foldersE != null) {
            for (Element folderE : XMLUtil.findSubElements(foldersE)) {
                Element locationE = XMLUtil.findElement(folderE, "location", FreeformProjectType.NS_GENERAL); // NOI18N
                String location = XMLUtil.findText(locationE);
                if (folderE.getLocalName().equals("build-folder")) { // NOI18N
                    h.addNonSourceRoot(location);
                } else if (folderE.getLocalName().equals("build-file")) { // NOI18N
                    h.addOwnedFile(location);
                } else {
                    assert folderE.getLocalName().equals("source-folder") : folderE;
                    Element nameE = XMLUtil.findElement(folderE, "label", FreeformProjectType.NS_GENERAL); // NOI18N
                    String name = XMLUtil.findText(nameE);
                    Element typeE = XMLUtil.findElement(folderE, "type", FreeformProjectType.NS_GENERAL); // NOI18N
                    String includes = null;
                    Element includesE = XMLUtil.findElement(folderE, "includes", FreeformProjectType.NS_GENERAL); // NOI18N
                    if (includesE != null) {
                        includes = XMLUtil.findText(includesE);
                    }
                    String excludes = null;
                    Element excludesE = XMLUtil.findElement(folderE, "excludes", FreeformProjectType.NS_GENERAL); // NOI18N
                    if (excludesE != null) {
                        excludes = XMLUtil.findText(excludesE);
                    }
                    if (typeE != null) {
                        String type = XMLUtil.findText(typeE);
                        h.addTypedSourceRoot(location, includes, excludes, type, name, null, null);
                    } else {
                        h.addPrincipalSourceRoot(location, includes, excludes, name, null, null);




import org.openide.loaders.CreateFromTemplateAttributesProvider;
import org.openide.loaders.DataFolder;
import org.openide.loaders.DataObject;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

    
    public Map<String, ?> attributesFor(DataObject template, DataFolder target, String name) {
        Element primData = Util.getPrimaryConfigurationData(helper);
        Element licenseEl = XMLUtil.findElement(primData, "project-license", Util.NAMESPACE); // NOI18N
        Charset charset = encodingQuery.getEncoding(target.getPrimaryFile());
        if (licenseEl == null && charset == null) {
            return null;
        } else {
            Map<String, String> values = new HashMap<String, String>();
            if (licenseEl != null) {
                values.put("license", evaluator.evaluate(XMLUtil.findText(licenseEl))); // NOI18N
            }
            if (charset != null) {
                values.put("encoding", charset.name()); // NOI18N




import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import javax.swing.event.ChangeListener;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.spi.project.SubprojectProvider;
import org.openide.ErrorManager;
import org.openide.filesystems.FileObject;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

     */
    private Set<Project> createSubprojects(Set<Project> subprojects) {
        Element config = project.getPrimaryConfigurationData();
        Element subprjsEl = XMLUtil.findElement(config, "subprojects", FreeformProjectType.NS_GENERAL); // NOI18N
        if (subprjsEl != null) {
            for (Element prjEl : XMLUtil.findSubElements(subprjsEl)) {
                assert prjEl.getLocalName().equals("project") : "Bad element " + prjEl + " in <subprojects> for " + project;
                String rawtext = XMLUtil.findText(prjEl);
                assert rawtext != null : "Need text content for <project> in " + project;
                String evaltext = project.evaluator().evaluate(rawtext);
                if (evaltext == null) {





import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import javax.xml.XMLConstants;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;

import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
import org.w3c.dom.ls.DOMImplementationLS;
import org.w3c.dom.ls.LSSerializer;
import org.xml.sax.SAXException;

    
    private Util() {}
    
    // XXX XML methods copied from ant/project... make a general API of these instead?
    
    /**
     * Search for an XML element in the direct children of a parent.
     * DOM provides a similar method but it does a recursive search
     * which we do not want. It also gives a node list and we want
     * only one result.
     * @param parent a parent element
     * @param name the intended local name
     * @param namespace the intended namespace
     * @return the one child element with that name, or null if none or more than one
     */
    public static Element findElement(Element parent, String name, String namespace) {
        Element result = null;
        NodeList l = parent.getChildNodes();
        for (int i = 0; i < l.getLength(); i++) {
            if (l.item(i).getNodeType() == Node.ELEMENT_NODE) {
                Element el = (Element)l.item(i);
                if (name.equals(el.getLocalName()) && namespace.equals(el.getNamespaceURI())) {
                    if (result == null) {
                        result = el;
                    } else {
                        return null;
                    }
                }
            }
        }
        return result;
    }
    
    /**
     * Extract nested text from an element.
     * Currently does not handle coalescing text nodes, CDATA sections, etc.
     * @param parent a parent element
     * @return the nested text, or null if none was found
     */
    public static String findText(Element parent) {
        NodeList l = parent.getChildNodes();
        for (int i = 0; i < l.getLength(); i++) {
            if (l.item(i).getNodeType() == Node.TEXT_NODE) {
                Text text = (Text)l.item(i);
                return text.getNodeValue();
            }
        }
        return null;
    }
    
    /**
     * Find all direct child elements of an element.
     * More useful than {@link Element#getElementsByTagNameNS} because it does
     * not recurse into recursive child elements.
     * Children which are all-whitespace text nodes are ignored; others cause
     * an exception to be thrown.
     * @param parent a parent element in a DOM tree
     * @return a list of direct child elements (may be empty)
     * @throws IllegalArgumentException if there are non-element children besides whitespace
     */
    public static List<Element> findSubElements(Element parent) throws IllegalArgumentException {
        NodeList l = parent.getChildNodes();
        List<Element> elements = new ArrayList<Element>(l.getLength());
        for (int i = 0; i < l.getLength(); i++) {
            Node n = l.item(i);
            if (n.getNodeType() == Node.ELEMENT_NODE) {
                elements.add((Element)n);
            } else if (n.getNodeType() == Node.TEXT_NODE) {
                String text = ((Text)n).getNodeValue();
                if (text.trim().length() > 0) {
                    throw new IllegalArgumentException("non-ws text encountered in " + parent + ": " + text); // NOI18N
                }
            } else if (n.getNodeType() == Node.COMMENT_NODE) {
                // skip
            } else {
                throw new IllegalArgumentException("unexpected non-element child of " + parent + ": " + n); // NOI18N
            }
        }
        return elements;
    }

    /**
     * Finds AuxiliaryConfiguration for the given project helper. The method
     * finds project associated with the helper and searches 

        }
    }

    /**
     * Append child element to the correct position according to given
     * order.
     * @param parent parent to which the child will be added
     * @param el element to be added
     * @param order order of the elements which must be followed
     */
    public static void appendChildElement(Element parent, Element el, String[] order) {
        Element insertBefore = null;
        List l = Arrays.asList(order);
        int index = l.indexOf(el.getLocalName());
        assert index != -1 : el.getLocalName()+" was not found in "+l; // NOI18N
        Iterator it = Util.findSubElements(parent).iterator();
        while (it.hasNext()) {
            Element e = (Element)it.next();
            int index2 = l.indexOf(e.getLocalName());
            assert index2 != -1 : e.getLocalName()+" was not found in "+l; // NOI18N
            if (index2 > index) {
                insertBefore = e;
                break;
            }
        }
        parent.insertBefore(el, insertBefore);
    }
    
    /**Get the "default" (user-specified) ant script for the given freeform project.
     * Please note that this method may return <code>null</code> if there is no such script.
     *

    }
    
    /**
     * Convert an XML fragment from one namespace to another.
     */
    private static Element translateXML(Element from, String namespace) {
        Element to = from.getOwnerDocument().createElementNS(namespace, from.getLocalName());
        NodeList nl = from.getChildNodes();
        int length = nl.getLength();
        for (int i = 0; i < length; i++) {
            Node node = nl.item(i);
            Node newNode;
            if (node.getNodeType() == Node.ELEMENT_NODE) {
                newNode = translateXML((Element) node, namespace);
            } else {
                newNode = node.cloneNode(true);
            }
            to.appendChild(newNode);
        }
        NamedNodeMap m = from.getAttributes();
        for (int i = 0; i < m.getLength(); i++) {
            Node attr = m.item(i);
            to.setAttribute(attr.getNodeName(), attr.getNodeValue());
        }
        return to;
    }

    /**
     * Namespace of data used in {@link #getPrimaryConfigurationData} and {@link #putPrimaryConfigurationData}.
     * @since org.netbeans.modules.ant.freeform/1 1.15
     */

                if (data != null) {
                    return data;
                } else {
                    return XMLUtil.translateXML(helper.getPrimaryConfigurationData(true), NAMESPACE);
                }
            }
        });

        }
        ProjectManager.mutex().writeAccess(new Mutex.Action<Void>() {
            public Void run() {
                Element dataAs1 = XMLUtil.translateXML(data, FreeformProjectType.NS_GENERAL_1);
                if (SCHEMA_1 == null) {
                    try {
                        SchemaFactory f = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);

        Element dummy1 = doc.createElementNS(FreeformProjectType.NS_GENERAL_1, FreeformProjectType.NAME_SHARED);
        // Make sure it is not invalid.
        dummy1.appendChild(doc.createElementNS(FreeformProjectType.NS_GENERAL_1, "name")). // NOI18N
                appendChild(doc.createTextNode(XMLUtil.findText(XMLUtil.findElement(data, "name", NAMESPACE)))); // NOI18N
        helper.putPrimaryConfigurationData(dummy1, true);
        helper.createAuxiliaryConfiguration().putConfigurationFragment(data, true);
    }




import org.netbeans.api.queries.VisibilityQuery;
import org.netbeans.modules.ant.freeform.FreeformProject;
import org.netbeans.modules.ant.freeform.FreeformProjectType;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.modules.ant.freeform.spi.ProjectNature;
import org.netbeans.spi.project.support.ant.AntProjectEvent;
import org.netbeans.spi.project.support.ant.AntProjectListener;

import org.openide.util.RequestProcessor;
import org.openide.util.actions.SystemAction;
import org.openide.util.lookup.Lookups;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

        
        private void updateKeys(boolean fromListener) {
            Element genldata = p.getPrimaryConfigurationData();
            Element viewEl = XMLUtil.findElement(genldata, "view", FreeformProjectType.NS_GENERAL); // NOI18N
            if (viewEl != null) {
                Element itemsEl = XMLUtil.findElement(viewEl, "items", FreeformProjectType.NS_GENERAL); // NOI18N
                keys = XMLUtil.findSubElements(itemsEl);
            } else {
                keys = Collections.<Element>emptyList();
            }

        
        public Node node(Element itemEl) {
            
            Element locationEl = XMLUtil.findElement(itemEl, "location", FreeformProjectType.NS_GENERAL); // NOI18N
            String location = XMLUtil.findText(locationEl);
            String locationEval = p.evaluator().evaluate(location);
            if (locationEval == null) {
                return null;

                return null;
            }
            String label;
            Element labelEl = XMLUtil.findElement(itemEl, "label", FreeformProjectType.NS_GENERAL); // NOI18N
            if (labelEl != null) {
                label = XMLUtil.findText(labelEl);
            } else {
                label = null;
            }

                    return null;
                }
                String includes = null;
                Element includesEl = XMLUtil.findElement(itemEl, "includes", FreeformProjectType.NS_GENERAL); // NOI18N
                if (includesEl != null) {
                    includes = p.evaluator().evaluate(XMLUtil.findText(includesEl));
                    if (includes.matches("\\$\\{[^}]+\\}")) { // NOI18N
                        // Clearly intended to mean "include everything".
                        includes = null;
                    }
                }
                String excludes = null;
                Element excludesEl = XMLUtil.findElement(itemEl, "excludes", FreeformProjectType.NS_GENERAL); // NOI18N
                if (excludesEl != null) {
                    excludes = p.evaluator().evaluate(XMLUtil.findText(excludesEl));
                }
                String style = itemEl.getAttribute("style"); // NOI18N
                for (ProjectNature nature : Lookup.getDefault().lookupAll(ProjectNature.class)) {




import org.netbeans.api.project.ant.AntArtifactQuery;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;


        //assert ProjectManager.mutex().isWriteAccess();
        Element data = Util.getPrimaryConfigurationData(helper);
        Document doc = data.getOwnerDocument();
        for (Element exportEl : XMLUtil.findSubElements(data)) {
            if (!exportEl.getLocalName().equals("export")) { // NOI18N
                continue;
            }

                el.appendChild(doc.createTextNode(export.cleanTarget)); // NOI18N
                exportEl.appendChild(el);
            }
            Element later = XMLUtil.findElement(data, "view", FreeformProjectType.NS_GENERAL);
            if (later == null) {
                later = XMLUtil.findElement(data, "subprojects", FreeformProjectType.NS_GENERAL);
            }
            data.insertBefore(exportEl, later);
        }




import org.openide.filesystems.FileObject;
import org.openide.modules.ModuleInfo;
import org.openide.util.Lookup;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

        FreeformProjectGenerator.putTargetMappings(helper, mappings);
//        ProjectManager.getDefault().saveAllProjects();
        Element el = Util.getPrimaryConfigurationData(helper);
        el = XMLUtil.findElement(el, "ide-actions", FreeformProjectType.NS_GENERAL);
        assertNotNull("Target mapping were not saved correctly",  el);
        List<Element> subElements = XMLUtil.findSubElements(el);
        assertEquals(2, subElements.size());
        // compare first target mapping
        Element el2 = subElements.get(0);
        assertElement(el2, "action", null, "name", "first-targetName");
        List<Element> l1 = XMLUtil.findSubElements(el2);
        assertEquals(7, l1.size());
        assertElementArray(l1, 
            new String[]{"script", "target", "target", "target", "property", "property", "context"}, 

        el2 = l1.get(5);
        assertElement(el2, "property", "v2", "name", "k2");
        el2 = l1.get(6);
        List<Element> l2 = XMLUtil.findSubElements(el2);
        assertEquals(5, l2.size());
        assertElementArray(l2, 
            new String[]{"property", "folder", "pattern", "format", "arity"}, 
            new String[]{"someProperty1", "someFolder1", "somePattern1", "relative-path", null});
        assertNotNull("have <one-file-only>", XMLUtil.findElement(l2.get(4), "one-file-only", FreeformProjectType.NS_GENERAL));
        // compare second target mapping
        el2 = subElements.get(1);
        assertElement(el2, "action", null, "name", "second-targetName");
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(7, l1.size());
        assertElementArray(l1, 
            new String[]{"script", "target", "target", "target", "property", "property", "context"},

        el2 = l1.get(5);
        assertElement(el2, "property", "second-v2", "name", "second-k2");
        el2 = l1.get(6);
        l2 = XMLUtil.findSubElements(el2);
        assertEquals(4, l2.size());
        assertElementArray(l2, 
            new String[]{"property", "folder", "format", "arity"}, 
            new String[]{"second-someProperty1", "second-someFolder1", "java-name", null});
        Element sepFilesEl = XMLUtil.findElement(l2.get(3), "separated-files", FreeformProjectType.NS_GENERAL);
        assertNotNull("have <separated-files>", sepFilesEl);
        assertEquals("right separator", "someSeparator1", XMLUtil.findText(sepFilesEl));
        ProjectManager.getDefault().saveAllProjects();
            
        // test updating

        FreeformProjectGenerator.putTargetMappings(helper, mappings);
//        ProjectManager.getDefault().saveAllProjects();
        el = Util.getPrimaryConfigurationData(helper);
        el = XMLUtil.findElement(el, "ide-actions", FreeformProjectType.NS_GENERAL);
        assertNotNull("Target mapping were not saved correctly",  el);
        subElements = XMLUtil.findSubElements(el);
        assertEquals(1, subElements.size());
        // compare first target mapping
        el2 = subElements.get(0);
        assertElement(el2, "action", null, "name", "foo");
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(5, l1.size());
        assertElementArray(l1, 
            new String[]{"script", "target", "target", "property", "property"}, 

        FreeformProjectGenerator.putTargetMappings(helper, mappings);
//        ProjectManager.getDefault().saveAllProjects();
        el = Util.getPrimaryConfigurationData(helper);
        el = XMLUtil.findElement(el, "ide-actions", FreeformProjectType.NS_GENERAL);
        assertNotNull("Target mapping were not saved correctly",  el);
        subElements = XMLUtil.findSubElements(el);
        assertEquals(1, subElements.size());
        // compare first target mapping
        el2 = subElements.get(0);
        assertElement(el2, "action", null, "name", "foo");
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(5, l1.size());
        assertElementArray(l1, 
            new String[]{"script", "target", "target", "property", "property"}, 

        FreeformProjectGenerator.putContextMenuAction(helper, mappings);
//        ProjectManager.getDefault().saveAllProjects();
        Element el = Util.getPrimaryConfigurationData(helper);
        el = XMLUtil.findElement(el, "view", FreeformProjectType.NS_GENERAL);
        assertNotNull("Target mapping were not saved correctly",  el);
        el = XMLUtil.findElement(el, "context-menu", FreeformProjectType.NS_GENERAL);
        assertNotNull("Target mapping were not saved correctly",  el);
        List<Element> subElements = XMLUtil.findSubElements(el);
        assertEquals(2, subElements.size());
        assertElementArray(subElements, 
            new String[]{"ide-action", "ide-action"}, 

        FreeformProjectGenerator.putContextMenuAction(helper, mappings);
//        ProjectManager.getDefault().saveAllProjects();
        el = Util.getPrimaryConfigurationData(helper);
        el = XMLUtil.findElement(el, "view", FreeformProjectType.NS_GENERAL);
        assertNotNull("Target mapping were not saved correctly",  el);
        el = XMLUtil.findElement(el, "context-menu", FreeformProjectType.NS_GENERAL);
        assertNotNull("Target mapping were not saved correctly",  el);
        subElements = XMLUtil.findSubElements(el);
        assertEquals(4, subElements.size());
        assertElementArray(subElements, 
            new String[]{"ide-action", "ide-action", "ide-action", "ide-action"},

        FreeformProjectGenerator.putCustomContextMenuActions(helper, customActions);
//        ProjectManager.getDefault().saveAllProjects();
        Element el = Util.getPrimaryConfigurationData(helper);
        el = XMLUtil.findElement(el, "view", FreeformProjectType.NS_GENERAL);
        assertNotNull("Target mapping were not saved correctly",  el);
        el = XMLUtil.findElement(el, "context-menu", FreeformProjectType.NS_GENERAL);
        assertNotNull("Target mapping were not saved correctly",  el);
        List<Element> subElements = XMLUtil.findSubElements(el);
        assertEquals(2, subElements.size());
        assertElementArray(subElements, 
            new String[]{"action", "action"}, 
            new String[]{null, null});
        // compare first custom action
        Element el2 = subElements.get(0);
        List<Element> l1 = XMLUtil.findSubElements(el2);
        assertEquals(6, l1.size());
        assertElementArray(l1, 
            new String[]{"script", "label", "target", "target", "property", "property"}, 

        assertElement(el2, "property", "v2", "name", "k2");
        // compare second custom action
        el2 = subElements.get(1);
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(6, l1.size());
        assertElementArray(l1, 
            new String[]{"script", "label", "target", "target", "property", "property"}, 

        FreeformProjectGenerator.putCustomContextMenuActions(helper, customActions);
//        ProjectManager.getDefault().saveAllProjects();
        el = Util.getPrimaryConfigurationData(helper);
        el = XMLUtil.findElement(el, "view", FreeformProjectType.NS_GENERAL);
        assertNotNull("Target mapping were not saved correctly",  el);
        el = XMLUtil.findElement(el, "context-menu", FreeformProjectType.NS_GENERAL);
        assertNotNull("Target mapping were not saved correctly",  el);
        subElements = XMLUtil.findSubElements(el);
        assertEquals(2, subElements.size());
        assertElementArray(subElements, 
            new String[]{"action", "action"}, 
            new String[]{null, null});
        // compare first custom action
        el2 = subElements.get(0);
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(1, l1.size());
        assertElementArray(l1, 
            new String[]{"label"}, 
            new String[]{"fooLabel"});
        // compare second custom action
        el2 = subElements.get(1);
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(1, l1.size());
        assertElementArray(l1, 
            new String[]{"label"}, 

        String message = "Element "+element+" does not match [name="+expectedName+",value="+expectedValue+"]"; // NOI18N
        assertEquals(message, expectedName, element.getLocalName());
        if (expectedValue != null) {
            assertEquals(message, expectedValue, XMLUtil.findText(element));
        }
    }


            expectedValue+", attr="+expectedAttrName+", attrvalue="+expectedAttrValue+"]"; // NOI18N
        assertEquals(message, expectedName, element.getLocalName());
        if (expectedValue != null) {
            assertEquals(message, expectedValue, XMLUtil.findText(element));
        }
        String val = element.getAttribute(expectedAttrName);
        assertEquals(expectedAttrValue, val);




import org.netbeans.spi.project.support.ant.EditableProperties;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;

        TestCL l = new TestCL();
        s.addChangeListener(l);
        Element data = extsrcroot.getPrimaryConfigurationData();
        Element folders = XMLUtil.findElement(data, "folders", FreeformProjectType.NS_GENERAL);
        assertNotNull("have <folders>", folders);
        List<Element> sourceFolders = XMLUtil.findSubElements(folders);
        assertEquals("have 2 <source-folder>s", 2, sourceFolders.size());
        Element sourceFolder = (Element) sourceFolders.get(1);
        Element location = XMLUtil.findElement(sourceFolder, "location", FreeformProjectType.NS_GENERAL);
        assertNotNull("have <location>", location);
        NodeList nl = location.getChildNodes();
        assertEquals("one child (text)", 1, nl.getLength());

        FileUtil.createData(new File(d, "s/ignored/file"));
        Element data = Util.getPrimaryConfigurationData(helper);
        Document doc = data.getOwnerDocument();
        Element sf = (Element) data.insertBefore(doc.createElementNS(Util.NAMESPACE, "folders"), XMLUtil.findElement(data, "view", Util.NAMESPACE)).
                appendChild(doc.createElementNS(Util.NAMESPACE, "source-folder"));
        sf.appendChild(doc.createElementNS(Util.NAMESPACE, "label")).appendChild(doc.createTextNode("Sources"));
        sf.appendChild(doc.createElementNS(Util.NAMESPACE, "type")).appendChild(doc.createTextNode("stuff"));




import org.netbeans.modules.ant.freeform.FreeformProjectType;
import org.netbeans.modules.ant.freeform.TestBase;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

        assertEquals(null, lastMapping.context);
        // Also check the context menu.
        Element data = prj.getPrimaryConfigurationData();
        Element view = XMLUtil.findElement(data, "view", FreeformProjectType.NS_GENERAL);
        assertNotNull(view);
        Element contextMenu = XMLUtil.findElement(view, "context-menu", FreeformProjectType.NS_GENERAL);
        assertNotNull(contextMenu);
        Set<String> actionNames = new TreeSet<String>();
        for (Element action : XMLUtil.findSubElements(contextMenu)) {
            if (action.getLocalName().equals("ide-action")) {
                actionNames.add(action.getAttribute("name"));
            }




import org.openide.nodes.NodeReorderEvent;
import org.w3c.dom.Document;
import org.openide.util.Lookup;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;


        TestNL l = new TestNL();
        root.addNodeListener(l);
        Element data = extsrcroot.getPrimaryConfigurationData();
        Element view = XMLUtil.findElement(data, "view", FreeformProjectType.NS_GENERAL);
        assertNotNull("have <view>", view);
        Element items = XMLUtil.findElement(view, "items", FreeformProjectType.NS_GENERAL);
        assertNotNull("have <items>", items);
        Element sourceFolder = XMLUtil.findElement(items, "source-folder", FreeformProjectType.NS_GENERAL);
        assertNotNull("have <source-folder>", sourceFolder);
        Element location = XMLUtil.findElement(sourceFolder, "location", FreeformProjectType.NS_GENERAL);
        assertNotNull("have <location>", location);
        NodeList nl = location.getChildNodes();
        assertEquals("one child", 1, nl.getLength());
        location.removeChild(nl.item(0));
        location.appendChild(location.getOwnerDocument().createTextNode("../src2"));
        Element sourceFile =  XMLUtil.findElement(items, "source-file", FreeformProjectType.NS_GENERAL);
        assertNotNull("have <source-file>", sourceFile);
        items.removeChild(sourceFile);
        extsrcroot.putPrimaryConfigurationData(data);

Lines 370-376 Link Here

(-)a/apisupport.project/nbproject/project.xml (-1 / +1 lines)
370	<build-prerequisite/>	370	<build-prerequisite/>
371	<compile-dependency/>	371	<compile-dependency/>
372	<run-dependency>	372	<run-dependency>
373	<specification-version>8.0</specification-version>	373	<specification-version>8.4</specification-version>
374	</run-dependency>	374	</run-dependency>
375	</dependency>	375	</dependency>
376	<dependency>	376	<dependency>




import org.openide.util.RequestProcessor;
import org.openide.util.Utilities;
import org.openide.util.WeakListeners;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

     */
    private String computeModuleClasspath(ModuleList ml) {
        Element data = project.getPrimaryConfigurationData();
        Element moduleDependencies = XMLUtil.findElement(data,
            "module-dependencies", NbModuleProject.NAMESPACE_SHARED); // NOI18N
        assert moduleDependencies != null : "Malformed metadata in " + project;
        StringBuffer cp = new StringBuffer();
        for (Element dep : XMLUtil.findSubElements(moduleDependencies)) {
            if (XMLUtil.findElement(dep, "compile-dependency", // NOI18N
                    NbModuleProject.NAMESPACE_SHARED) == null) {
                continue;
            }
            Element cnbEl = XMLUtil.findElement(dep, "code-name-base", // NOI18N
                NbModuleProject.NAMESPACE_SHARED);
            String cnb = XMLUtil.findText(cnbEl);
            ModuleEntry module = ml.getEntry(cnb);
            if (module == null) {
                Util.err.log(ErrorManager.WARNING, "Warning - could not find dependent module " + cnb + " for " + FileUtil.getFileDisplayName(project.getProjectDirectory()));




import org.openide.util.Exceptions;
import org.openide.util.lookup.AbstractLookup;
import org.openide.util.lookup.InstanceContent;
import org.openide.xml.XMLUtil;

/**
 * A NetBeans module project.

                    .displayName(NbBundle.getMessage(NbModuleProject.class, "LBL_javahelp_packages")).add();
        }
        for (Map.Entry<FileObject,Element> entry : getExtraCompilationUnits().entrySet()) {
            Element pkgrootEl = XMLUtil.findElement(entry.getValue(), "package-root", NbModuleProject.NAMESPACE_SHARED); // NOI18N
            String pkgrootS = XMLUtil.findText(pkgrootEl);
            sourcesHelper.sourceRoot(pkgrootS).type(JavaProjectConstants.SOURCES_TYPE_JAVA)
                    .displayName(/* XXX should schema incl. display name? */entry.getKey().getNameExt()).add();
        }

                AuxiliaryConfiguration ac = helper.createAuxiliaryConfiguration();
                Element data = ac.getConfigurationFragment(NbModuleProject.NAME_SHARED, NbModuleProject.NAMESPACE_SHARED_2, true);
                if (data != null) {
                    return XMLUtil.translateXML(data, NbModuleProject.NAMESPACE_SHARED);
                } else {
                    return helper.getPrimaryConfigurationData(true);
                }

            public Void run() {
                AuxiliaryConfiguration ac = helper.createAuxiliaryConfiguration();
                if (ac.getConfigurationFragment(NbModuleProject.NAME_SHARED, NbModuleProject.NAMESPACE_SHARED_2, true) != null) {
                    ac.putConfigurationFragment(XMLUtil.translateXML(data, NbModuleProject.NAMESPACE_SHARED_2), true);
                } else {
                    helper.putPrimaryConfigurationData(data, true);
                }


    private NbModuleProvider.NbModuleType getModuleType() {
        Element data = getPrimaryConfigurationData();
        if (XMLUtil.findElement(data, "suite-component", NbModuleProject.NAMESPACE_SHARED) != null) { // NOI18N
            return NbModuleProvider.SUITE_COMPONENT;
        } else if (XMLUtil.findElement(data, "standalone", NbModuleProject.NAMESPACE_SHARED) != null) { // NOI18N
            return NbModuleProvider.STANDALONE;
        } else {
            return NbModuleProvider.NETBEANS_ORG;


    public String getCodeNameBase() {
        Element config = getPrimaryConfigurationData();
        Element cnb = XMLUtil.findElement(config, "code-name-base", NbModuleProject.NAMESPACE_SHARED); // NOI18N
        if (cnb != null) {
            return XMLUtil.findText(cnb);
        } else {
            return null;
        }

            return true;
        }
        Element config = getPrimaryConfigurationData();
        Element pubPkgs = XMLUtil.findElement(config, "public-packages", NbModuleProject.NAMESPACE_SHARED); // NOI18N
        if (pubPkgs == null) {
            // Try <friend-packages> too.
            pubPkgs = XMLUtil.findElement(config, "friend-packages", NbModuleProject.NAMESPACE_SHARED); // NOI18N
        }
        return pubPkgs != null && !XMLUtil.findSubElements(pubPkgs).isEmpty();
    }
    
    public List<String> supportedTestTypes() {

    public Map<FileObject,Element> getExtraCompilationUnits() {
        if (extraCompilationUnits == null) {
            extraCompilationUnits = new HashMap<FileObject,Element>();
            for (Element ecu : XMLUtil.findSubElements(getPrimaryConfigurationData())) {
                if (ecu.getLocalName().equals("extra-compilation-unit")) { // NOI18N
                    Element pkgrootEl = XMLUtil.findElement(ecu, "package-root", NbModuleProject.NAMESPACE_SHARED); // NOI18N
                    String pkgrootS = XMLUtil.findText(pkgrootEl);
                    String pkgrootEval = evaluator().evaluate(pkgrootS);
                    FileObject pkgroot = getHelper().resolveFileObject(pkgrootEval);
                    if (pkgroot == null) {




        } else {
            ml = ModuleList.getModuleList(prjDirF);
        }
        for (Element depEl : XMLUtil.findSubElements(moduleDependencies)) {
            Element cnbEl = findElement(depEl, ProjectXMLManager.CODE_NAME_BASE);
            String _cnb = XMLUtil.findText(cnbEl);
            ModuleDependency depToAdd = getModuleDependency(_cnb, ml, depEl);
            if (depToAdd == null) {
                continue;

        Element relVerEl = findElement(runDepEl, ProjectXMLManager.RELEASE_VERSION);
        String relVer = null;
        if (relVerEl != null) {
            relVer = XMLUtil.findText(relVerEl);
        }

        Element specVerEl = findElement(runDepEl, ProjectXMLManager.SPECIFICATION_VERSION);
        String specVer = null;
        if (specVerEl != null) {
            specVer = XMLUtil.findText(specVerEl);
        }

        Element compDepEl = findElement(depEl, ProjectXMLManager.COMPILE_DEPENDENCY);

        } else {
            ml = ModuleList.getModuleList(prjDirF);
        }
        for (Element dep : XMLUtil.findSubElements(moduleDependencies)) {
            Element cnbEl = findElement(dep, ProjectXMLManager.CODE_NAME_BASE);
            String depCnb = XMLUtil.findText(cnbEl);
            if (depCnb.equals(cnb)) {
                return getModuleDependency(cnb, ml, dep);
            }

    public void removeDependency(String cnbToRemove) {
        Element _confData = getConfData();
        Element moduleDependencies = findModuleDependencies(_confData);
        for (Element dep : XMLUtil.findSubElements(moduleDependencies)) {
            Element cnbEl = findElement(dep, ProjectXMLManager.CODE_NAME_BASE);
            String _cnb = XMLUtil.findText(cnbEl);
            if (cnbToRemove.equals(_cnb)) {
                moduleDependencies.removeChild(dep);
            }

    public void removeDependenciesByCNB(Collection<String> cnbsToDelete) {
        Element _confData = getConfData();
        Element moduleDependencies = findModuleDependencies(_confData);
        for (Element dep : XMLUtil.findSubElements(moduleDependencies)) {
            Element cnbEl = findElement(dep, ProjectXMLManager.CODE_NAME_BASE);
            String _cnb = XMLUtil.findText(cnbEl);
            if (cnbsToDelete.remove(_cnb)) {
                moduleDependencies.removeChild(dep);
            }

    public void editDependency(ModuleDependency origDep, ModuleDependency newDep) {
        Element _confData = getConfData();
        Element moduleDependencies = findModuleDependencies(_confData);
        List<Element> currentDeps = XMLUtil.findSubElements(moduleDependencies);
        for (Iterator<Element> it = currentDeps.iterator(); it.hasNext();) {
            Element dep = it.next();
            Element cnbEl = findElement(dep, ProjectXMLManager.CODE_NAME_BASE);
            String _cnb = XMLUtil.findText(cnbEl);
            if (_cnb.equals(origDep.getModuleEntry().getCodeNameBase())) {
                moduleDependencies.removeChild(dep);
                Element nextDep = it.hasNext() ? it.next() : null;

        Element _confData = getConfData();
        Element testModuleDependenciesEl = findTestDependenciesElement(_confData);
        Element testTypeRemoveEl = null;
        for (Element type : XMLUtil.findSubElements(testModuleDependenciesEl)) {
            Element nameEl = findElement(type, TEST_TYPE_NAME);
            String nameOfType = XMLUtil.findText(nameEl);
            if (testType.equals(nameOfType)) {
                testTypeRemoveEl = type;
            }
        }
        //found such a test type
        if (testTypeRemoveEl != null) {
            for (Element el : XMLUtil.findSubElements(testTypeRemoveEl)) {
                Element cnbEl = findElement(el, TEST_DEPENDENCY_CNB);
                if (cnbEl == null) {
                    continue;   //name node, continue
                }
                String _cnb = XMLUtil.findText(cnbEl);
                if (cnbToRemove.equals(_cnb)) {
                    // found test dependency with desired CNB
                    testTypeRemoveEl.removeChild(el);

                }
                Element testTypeEl = null;
                //iterate through test types to determine if testType exist
                for (Element tt : XMLUtil.findSubElements(testModuleDependenciesEl)) {
                    Node nameNode = findElement(tt, "name"); // NOI18N
                    assert nameNode != null : "should be some child with name";
                    //Node nameNode = tt.getFirstChild();

        Map<String, Set<TestModuleDependency>> testDeps = new HashMap<String, Set<TestModuleDependency>>();

        if (testDepsEl != null) {
            for (Element typeEl : XMLUtil.findSubElements(testDepsEl)) {
                Element testTypeEl = findElement(typeEl, TEST_TYPE_NAME);
                String testType = null;
                if (testTypeEl != null) {
                    testType = XMLUtil.findText(testTypeEl);
                }
                if (testType == null) {
                    testType = TestModuleDependency.UNIT; // default variant
                }
                Set<TestModuleDependency> directTestDeps = new TreeSet<TestModuleDependency>();
                for (Element depEl : XMLUtil.findSubElements(typeEl)) {
                    if (depEl.getTagName().equals(TEST_DEPENDENCY)) {
                        // parse test dep
                        Element cnbEl = findElement(depEl, TEST_DEPENDENCY_CNB);
                        boolean test = findElement(depEl, TEST_DEPENDENCY_TEST) != null;
                        String _cnb = null;
                        if (cnbEl != null) {
                            _cnb = XMLUtil.findText(cnbEl);
                        }
                        boolean recursive = findElement(depEl, TEST_DEPENDENCY_RECURSIVE) != null;
                        boolean compile = findElement(depEl, TEST_DEPENDENCY_COMPILE) != null;

            return Collections.unmodifiableMap(cpExtensions);
        }
        Map<String, String> cps = new HashMap<String, String>();
        for (Element cpExtEl : XMLUtil.findSubElements(getConfData())) {
            if (CLASS_PATH_EXTENSION.equals(cpExtEl.getTagName())) {
                Element binOrigEl = findElement(cpExtEl, BINARY_ORIGIN);
                Element runtimePathEl = findElement(cpExtEl, CLASS_PATH_RUNTIME_PATH);
                if (binOrigEl != null && runtimePathEl != null) {
                    cps.put(XMLUtil.findText(runtimePathEl), XMLUtil.findText(binOrigEl));
                }
            }
        }

    public String getCodeNameBase() {
        if (cnb == null) {
            Element cnbEl = findElement(getConfData(), ProjectXMLManager.CODE_NAME_BASE);
            cnb = XMLUtil.findText(cnbEl);
        }
        return cnb;
    }

    }

    private static Element findElement(Element parentEl, String elementName) {
        return XMLUtil.findElement(parentEl, elementName, NbModuleProject.NAMESPACE_SHARED);
    }

    /** Package-private for unit tests only. */

     */
    private static Set<ManifestManager.PackageExport> findAllPackages(Element parent) {
        Set<ManifestManager.PackageExport> packages = new HashSet<ManifestManager.PackageExport>();
        for (Element pkgEl : XMLUtil.findSubElements(parent)) {
            if (PACKAGE.equals(pkgEl.getTagName())) {
                packages.add(new ManifestManager.PackageExport(XMLUtil.findText(pkgEl), false));
            } else if (SUBPACKAGES.equals(pkgEl.getTagName())) {
                packages.add(new ManifestManager.PackageExport(XMLUtil.findText(pkgEl), true));
            }
        }
        return packages;

        Element friendsEl = findFriendsElement(confData);
        if (friendsEl != null) {
            Set<String> friends = new TreeSet<String>();
            for (Element friendEl : XMLUtil.findSubElements(friendsEl)) {
                if (FRIEND.equals(friendEl.getTagName())) {
                    friends.add(XMLUtil.findText(friendEl));
                }
            }
            return friends.toArray(new String[friends.size()]);




    private static final String SFS_VALID_PATH_RE = "(\\p{Alnum}|\\/|_)+"; // NOI18N
    
    // COPIED FROM org.netbeans.modules.project.ant:
    // (**EXCEPT** except for namespace == null support in findElement)
    // (and support for comments in findSubElements)
    
    /**
     * Search for an XML element in the direct children of a parent.
     * DOM provides a similar method but it does a recursive search
     * which we do not want. It also gives a node list and we want
     * only one result.
     * @param parent a parent element
     * @param name the intended local name
     * @param namespace the intended namespace (or null)
     * @return the first child element with that name, or null if none
     */
    public static Element findElement(Element parent, String name, String namespace) {
        NodeList l = parent.getChildNodes();
        for (int i = 0; i < l.getLength(); i++) {
            if (l.item(i).getNodeType() == Node.ELEMENT_NODE) {
                Element el = (Element)l.item(i);
                if ((namespace == null && name.equals(el.getTagName())) ||
                        (namespace != null && name.equals(el.getLocalName()) &&
                        namespace.equals(el.getNamespaceURI()))) {
                    return el;
                }
            }
        }
        return null;
    }
    
    /**
     * Extract nested text from an element.
     * Currently does not handle coalescing text nodes, CDATA sections, etc.
     * @param parent a parent element
     * @return the nested text, or null if none was found
     */
    public static String findText(Element parent) {
        NodeList l = parent.getChildNodes();
        for (int i = 0; i < l.getLength(); i++) {
            if (l.item(i).getNodeType() == Node.TEXT_NODE) {
                Text text = (Text)l.item(i);
                return text.getNodeValue();
            }
        }
        return null;
    }
    
    /**
     * Find all direct child elements of an element.
     * More useful than {@link Element#getElementsByTagNameNS} because it does
     * not recurse into recursive child elements.
     * Children which are all-whitespace text nodes or comments are ignored; others cause
     * an exception to be thrown.
     * @param parent a parent element in a DOM tree
     * @return a list of direct child elements (may be empty)
     * @throws IllegalArgumentException if there are non-element children besides whitespace
     */
    public static List<Element> findSubElements(Element parent) throws IllegalArgumentException {
        NodeList l = parent.getChildNodes();
        List<Element> elements = new ArrayList<Element>(l.getLength());
        for (int i = 0; i < l.getLength(); i++) {
            Node n = l.item(i);
            if (n.getNodeType() == Node.ELEMENT_NODE) {
                elements.add((Element)n);
            } else if (n.getNodeType() == Node.TEXT_NODE) {
                String text = ((Text)n).getNodeValue();
                if (text.trim().length() > 0) {
                    throw new IllegalArgumentException("non-ws text encountered in " + parent + ": " + text); // NOI18N
                }
            } else if (n.getNodeType() == Node.COMMENT_NODE) {
                // OK, ignore
            } else {
                throw new IllegalArgumentException("unexpected non-element child of " + parent + ": " + n); // NOI18N
            }
        }
        return elements;
    }

    /**
     * Convert an XML fragment from one namespace to another.
     */
    public static Element translateXML(Element from, String namespace) {
        Element to = from.getOwnerDocument().createElementNS(namespace, from.getLocalName());
        NodeList nl = from.getChildNodes();
        int length = nl.getLength();
        for (int i = 0; i < length; i++) {
            Node node = nl.item(i);
            Node newNode;
            if (node.getNodeType() == Node.ELEMENT_NODE) {
                newNode = translateXML((Element) node, namespace);
            } else {
                newNode = node.cloneNode(true);
            }
            to.appendChild(newNode);
        }
        NamedNodeMap m = from.getAttributes();
        for (int i = 0; i < m.getLength(); i++) {
            Node attr = m.item(i);
            to.setAttribute(attr.getNodeName(), attr.getNodeValue());
        }
        return to;
    }

    /**
     * Pass to {@link XPath#setNamespaceContext} to bind {@code nbm:} to the /3 namespace.




import org.openide.ErrorManager;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

            if (path != null) {
                String name = path.replace('/', '.');
                Element config = project.getPrimaryConfigurationData();
                Element pubPkgs = XMLUtil.findElement(config, "public-packages", NbModuleProject.NAMESPACE_SHARED); // NOI18N
                if (pubPkgs == null) {
                    // Try <friend-packages> too.
                    pubPkgs = XMLUtil.findElement(config, "friend-packages", NbModuleProject.NAMESPACE_SHARED); // NOI18N
                }
                if (pubPkgs != null) {
                    Iterator it = XMLUtil.findSubElements(pubPkgs).iterator();
                    while (it.hasNext()) {
                        Element pubPkg = (Element) it.next();
                        boolean sub = "subpackages".equals(pubPkg.getLocalName()); // NOI18N
                        String pubPkgS = XMLUtil.findText(pubPkg);
                        if (name.equals(pubPkgS) || (sub && name.startsWith(pubPkgS + '.'))) {
                            return true;
                        }




import org.netbeans.spi.java.classpath.ClassPathProvider;
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
import org.netbeans.modules.apisupport.project.NbModuleProject;
import org.netbeans.modules.apisupport.project.Util;
import org.netbeans.spi.java.classpath.PathResourceImplementation;
import org.netbeans.spi.java.project.classpath.support.ProjectClassPathSupport;
import org.netbeans.spi.project.support.ant.AntProjectEvent;

import org.openide.filesystems.FileStateInvalidException;
import org.openide.filesystems.FileUtil;
import org.openide.util.WeakListeners;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

public final class ClassPathProviderImpl implements ClassPathProvider {

        for (Map.Entry<FileObject,Element> entry : project.getExtraCompilationUnits().entrySet()) {
            final FileObject pkgroot = entry.getKey();
            Element pkgrootEl = entry.getValue();
            Element classpathEl = XMLUtil.findElement(pkgrootEl, "classpath", NbModuleProject.NAMESPACE_SHARED); // NOI18N
            assert classpathEl != null : "no <classpath> in " + pkgrootEl;
            final String classpathS = XMLUtil.findText(classpathEl);
            if (classpathS == null) {
                extraCompilationUnitsCompile.put(pkgroot, ClassPathSupport.createClassPath(new URL[0]));
                extraCompilationUnitsExecute.put(pkgroot, ClassPathSupport.createClassPath(new URL[0]));

                    }
                    public void configurationXmlChanged(AntProjectEvent ev) {
                        Element pkgrootEl = project.getExtraCompilationUnits().get(pkgroot);
                        Element classpathEl = XMLUtil.findElement(pkgrootEl, "classpath", NbModuleProject.NAMESPACE_SHARED); // NOI18N
                        assert classpathEl != null : "no <classpath> in " + pkgrootEl;
                        cpS = XMLUtil.findText(classpathEl);
                        pcs.firePropertyChange(PROP_RESOURCES, null, null);
                    }
                    public void propertiesChanged(AntProjectEvent ev) {}

                extraCompilationUnitsCompile.put(pkgroot, ClassPathFactory.createClassPath(ecuCompile));
                // Add <built-to> dirs and JARs for ClassPath.EXECUTE.
                List<PathResourceImplementation> extraEntries = new ArrayList<PathResourceImplementation>();
                for (Element kid : XMLUtil.findSubElements(pkgrootEl)) {
                    if (!kid.getLocalName().equals("built-to")) { // NOI18N
                        continue;
                    }
                    String rawtext = XMLUtil.findText(kid);
                    assert rawtext != null : "Null content for <built-to> in " + project;
                    String text = project.evaluator().evaluate(rawtext);
                    if (text == null) {




                is.close();
            }
            Element docel = doc.getDocumentElement();
            Element type = XMLUtil.findElement(docel, "type", "http://www.netbeans.org/ns/project/1"); // NOI18N
            String cnb = null;
            if (XMLUtil.findText(type).equals("org.netbeans.modules.apisupport.project")) { // NOI18N
                Element cfg = XMLUtil.findElement(docel, "configuration", "http://www.netbeans.org/ns/project/1"); // NOI18N
                Element data = XMLUtil.findElement(cfg, "data", null); // NOI18N
                if (data != null) {
                    cnb = XMLUtil.findText(XMLUtil.findElement(data, "code-name-base", null)); // NOI18N
                }
            }
            return cnb;




import javax.swing.event.ChangeListener;
import org.netbeans.api.java.queries.SourceForBinaryQuery;
import org.netbeans.modules.apisupport.project.NbModuleProject;
import org.netbeans.modules.apisupport.project.Util;
import org.netbeans.modules.apisupport.project.universe.TestEntry;
import org.netbeans.spi.java.queries.SourceForBinaryQueryImplementation;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

                if (res == null) {
                // Check extra compilation units.
                ECUS: for (Map.Entry<FileObject,Element> entry : project.getExtraCompilationUnits().entrySet()) {
                    for (Element kid : XMLUtil.findSubElements(entry.getValue())) {
                        if (!kid.getLocalName().equals("built-to")) { // NOI18N
                            continue;
                        }
                        String rawtext = XMLUtil.findText(kid);
                        assert rawtext != null : "Null content for <built-to> in " + project;
                        String text = project.evaluator().evaluate(rawtext);
                        if (text == null) {




import org.openide.ErrorManager;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

            return Collections.emptySet();
        }
        Element data = project.getPrimaryConfigurationData();
        Element moduleDependencies = XMLUtil.findElement(data,
            "module-dependencies", NbModuleProject.NAMESPACE_SHARED); // NOI18N
        assert moduleDependencies != null : "Malformed metadata in " + project;
        for (Element dep : XMLUtil.findSubElements(moduleDependencies)) {
            /* Probably better to open runtime deps too. TBD.
            if (XMLUtil.findElement(dep, "build-prerequisite", // NOI18N
                    NbModuleProject.NAMESPACE_SHARED) == null) {
                continue;
            }
             */
            Element cnbEl = XMLUtil.findElement(dep, "code-name-base", // NOI18N
                NbModuleProject.NAMESPACE_SHARED);
            String cnb = XMLUtil.findText(cnbEl);
            ModuleEntry module = ml.getEntry(cnb);
            if (module == null) {
                Util.err.log(ErrorManager.WARNING, "Warning - could not find dependent module " + cnb + " for " + project);

            }
        }
        // #63824: consider also artifacts found in ${cp.extra} and/or <class-path-extension>s
        for (Element cpext : XMLUtil.findSubElements(data)) {
            if (!cpext.getTagName().equals("class-path-extension")) { // NOI18N
                continue;
            }
            Element binorig = XMLUtil.findElement(cpext, "binary-origin", NbModuleProject.NAMESPACE_SHARED); // NOI18N
            if (binorig == null) {
                continue;
            }
            String text = XMLUtil.findText(binorig);
            String eval = project.evaluator().evaluate(text);
            if (eval == null) {
                continue;

Lines 89-94 Link Here

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/suite/SuiteProject.java (-2 / +3 lines)
89	import org.openide.util.Lookup;	89	import org.openide.util.Lookup;
90	import org.openide.util.Mutex;	90	import org.openide.util.Mutex;
91	import org.openide.util.lookup.Lookups;	91	import org.openide.util.lookup.Lookups;
		92	import org.openide.xml.XMLUtil;
92	import org.w3c.dom.Element;	93	import org.w3c.dom.Element;
93		94
94	/**	95	/**
Lines 242-249 Link Here
242	}	243	}
243		244
244	private String getSimpleName() {	245	private String getSimpleName() {
245	Element nameEl = Util.findElement(helper.getPrimaryConfigurationData(true), "name", SuiteProjectType.NAMESPACE_SHARED); // NOI18N	246	Element nameEl = XMLUtil.findElement(helper.getPrimaryConfigurationData(true), "name", SuiteProjectType.NAMESPACE_SHARED); // NOI18N
246	String text = (nameEl != null) ? Util.findText(nameEl) : null;	247	String text = (nameEl != null) ? XMLUtil.findText(nameEl) : null;
247	return (text != null) ? text : "???"; // NOI18N	248	return (text != null) ? text : "???"; // NOI18N
248	}	249	}
249		250




import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.api.annotations.common.NullAllowed;
import org.netbeans.api.project.Project;
import org.netbeans.modules.apisupport.project.Util;
import org.netbeans.modules.apisupport.project.suite.BrandingSupport;
import org.netbeans.modules.apisupport.project.suite.BrandingSupport.BrandedFile;
import org.netbeans.modules.apisupport.project.suite.BrandingSupport.BundleKey;

import org.openide.filesystems.FileUtil;
import org.openide.util.ChangeSupport;
import org.openide.util.NbBundle;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

                res = getProjectDirectoryFile().getName();
            return res;
        }
        Element nameEl = XMLUtil.findElement(suiteProps.getProject().getHelper().getPrimaryConfigurationData(true), "name", SuiteProjectType.NAMESPACE_SHARED); // NOI18N
        String text = (nameEl != null) ? XMLUtil.findText(nameEl) : null;
        return (text != null) ? text : "???"; // NOI18N
    }





            dependencies = new HashSet<Dependency>();
            // Cannot use ProjectXMLManager since we need to report also deps on nonexistent modules.
            Element dataE = project.getPrimaryConfigurationData();
            Element depsE = XMLUtil.findElement(dataE, "module-dependencies", NbModuleProject.NAMESPACE_SHARED); // NOI18N
            assert depsE != null : "Malformed metadata in " + project;
            for (Element dep : XMLUtil.findSubElements(depsE)) {
                Element run = XMLUtil.findElement(dep, "run-dependency", NbModuleProject.NAMESPACE_SHARED); // NOI18N
                if (run == null) {
                    continue;
                }
                String text = XMLUtil.findText(XMLUtil.findElement(dep, "code-name-base", NbModuleProject.NAMESPACE_SHARED)); // NOI18N
                Element relverE = XMLUtil.findElement(run, "release-version", NbModuleProject.NAMESPACE_SHARED); // NOI18N
                if (relverE != null) {
                    text += '/' + XMLUtil.findText(relverE);
                }
                Element specverE = XMLUtil.findElement(run, "specification-version", NbModuleProject.NAMESPACE_SHARED); // NOI18N
                if (specverE != null) {
                    text += " > " + XMLUtil.findText(specverE);
                } else {
                    Element implver = XMLUtil.findElement(run, "implementation-version", NbModuleProject.NAMESPACE_SHARED); // NOI18N
                    if (implver != null) {
                        // Will special-case '*' as an impl version to mean "match anything".
                        text += " = *"; // NOI18N




import org.openide.ErrorManager;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

abstract class AbstractEntryWithSources extends AbstractEntry {

            return new String[0];
        }
        Element data = project.getPrimaryConfigurationData();
        Element moduleDependencies = XMLUtil.findElement(data,
            "module-dependencies", NbModuleProject.NAMESPACE_SHARED); // NOI18N
        assert moduleDependencies != null : "Malformed metadata in " + project;
        for (Element dep : XMLUtil.findSubElements(moduleDependencies)) {
            if (XMLUtil.findElement(dep, "run-dependency", // NOI18N
                    NbModuleProject.NAMESPACE_SHARED) == null) {
                continue;
            }
            Element cnbEl = XMLUtil.findElement(dep, "code-name-base", // NOI18N
                NbModuleProject.NAMESPACE_SHARED);
            String cnb = XMLUtil.findText(cnbEl);
            deps.add(cnb);
        }
        return deps.toArray(new String[deps.size()]);




        if (data == null) {
            throw new IOException("Not an NBM project in " + basedir); // NOI18N
        }
        boolean suiteComponent = XMLUtil.findElement(data, "suite-component", NbModuleProject.NAMESPACE_SHARED) != null; // NOI18N
        boolean standalone = XMLUtil.findElement(data, "standalone", NbModuleProject.NAMESPACE_SHARED) != null; // NOI18N
        assert !(suiteComponent && standalone) : basedir;
        if (suiteComponent) {
            PropertyEvaluator eval = parseProperties(basedir, null, NbModuleType.SUITE_COMPONENT, "irrelevant"); // NOI18N

        }
        assert root != null ^ type != NbModuleType.NETBEANS_ORG;
        assert path != null ^ type != NbModuleType.NETBEANS_ORG;
        String cnb = XMLUtil.findText(XMLUtil.findElement(data, "code-name-base", NbModuleProject.NAMESPACE_SHARED)); // NOI18N
        PropertyEvaluator eval = parseProperties(basedir, root, type, cnb);
        String module = eval.getProperty("module.jar"); // NOI18N
        // Cf. ParseProjectXml.computeClasspath:
        StringBuffer cpextra = new StringBuffer();
        for (Element ext : XMLUtil.findSubElements(data)) {
            if (!ext.getLocalName().equals("class-path-extension")) { // NOI18N
                continue;
            }
            Element binaryOrigin = XMLUtil.findElement(ext, "binary-origin", NbModuleProject.NAMESPACE_SHARED); // NOI18N
            String text;
            if (binaryOrigin != null) {
                text = XMLUtil.findText(binaryOrigin);
            } else {
                Element runtimeRelativePath = XMLUtil.findElement(ext, "runtime-relative-path", NbModuleProject.NAMESPACE_SHARED); // NOI18N
                assert runtimeRelativePath != null : "Malformed <class-path-extension> in " + basedir;
                String reltext = XMLUtil.findText(runtimeRelativePath);
                // XXX assumes that module.jar is not overridden independently of module.jar.dir:
                text = "${cluster}/${module.jar.dir}/" + reltext; // NOI18N
            }

            } catch (SAXException e) {
                throw (IOException) new IOException(e.toString()).initCause(e);
            }
            for (Element moduleVersion : XMLUtil.findSubElements(doc.getDocumentElement())) {
                if (moduleVersion.getTagName().equals("module_version") && moduleVersion.getAttribute("last").equals("true")) { // NOI18N
                    for (Element fileEl : XMLUtil.findSubElements(moduleVersion)) {
                        if (fileEl.getTagName().equals("file")) { // NOI18N
                            String name = fileEl.getAttribute("name"); // NOI18N
                            File f = new File(cluster, name.replace('/', File.separatorChar));

            throw (IOException) new IOException(projectXml + ": " + e.toString()).initCause(e); // NOI18N
        }
        Element docel = doc.getDocumentElement();
        Element type = XMLUtil.findElement(docel, "type", "http://www.netbeans.org/ns/project/1"); // NOI18N
        if (!XMLUtil.findText(type).equals("org.netbeans.modules.apisupport.project")) { // NOI18N
            return null;
        }
        Element cfg = XMLUtil.findElement(docel, "configuration", "http://www.netbeans.org/ns/project/1"); // NOI18N
        Element data = XMLUtil.findElement(cfg, "data", NbModuleProject.NAMESPACE_SHARED); // NOI18N
        if (data != null) {
            return data;
        } else {
            data = XMLUtil.findElement(cfg, "data", NbModuleProject.NAMESPACE_SHARED_2); // NOI18N
            if (data != null) {
                return XMLUtil.translateXML(data, NbModuleProject.NAMESPACE_SHARED);
            } else {
                return null;
            }

Lines 303-310 Link Here

(-)a/apisupport.project/test/unit/src/org/netbeans/modules/apisupport/project/ProjectXMLManagerTest.java (-2 / +2 lines)
303	Document doc = XMLUtil.parse(new InputSource(projectXML.toURI().toString()),	303	Document doc = XMLUtil.parse(new InputSource(projectXML.toURI().toString()),
304	false, true, null, null);	304	false, true, null, null);
305	Element project = doc.getDocumentElement();	305	Element project = doc.getDocumentElement();
306	Element config = Util.findElement(project, "configuration", null); // NOI18N	306	Element config = XMLUtil.findElement(project, "configuration", null); // NOI18N
307	data = Util.findElement(config, "data", NbModuleProject.NAMESPACE_SHARED);	307	data = XMLUtil.findElement(config, "data", NbModuleProject.NAMESPACE_SHARED);
308	} catch (IOException e) {	308	} catch (IOException e) {
309	ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);	309	ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
310	} catch (SAXException e) {	310	} catch (SAXException e) {

Lines 294-300 Link Here

(-)a/j2ee.archive/nbproject/project.xml (-1 / +1 lines)
294	<build-prerequisite/>	294	<build-prerequisite/>
295	<compile-dependency/>	295	<compile-dependency/>
296	<run-dependency>	296	<run-dependency>
297	<specification-version>8.0</specification-version>	297	<specification-version>8.4</specification-version>
298	</run-dependency>	298	</run-dependency>
299	</dependency>	299	</dependency>
300	<dependency>	300	<dependency>




import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.support.ant.EditableProperties;
import org.openide.xml.XMLUtil;


/**

            if (oldRoot != null) {
                Document doc = oldRoot.getOwnerDocument();
                Element newRoot = doc.createElementNS (ArchiveProjectType.PROJECT_CONFIGURATION_NS,DATA); //NOI18N
                XMLUtil.copyDocument (oldRoot, newRoot, ArchiveProjectType.PROJECT_CONFIGURATION_NS);
                Element sourceRoots = doc.createElementNS(ArchiveProjectType.PROJECT_CONFIGURATION_NS,"source-roots");  //NOI18N
                Element root = doc.createElementNS (ArchiveProjectType.PROJECT_CONFIGURATION_NS,"root");   //NOI18N
                root.setAttribute ("id","src.dir");   //NOI18N

                if (oldRoot != null) {
                    Document doc = oldRoot.getOwnerDocument();
                    Element newRoot = doc.createElementNS (ArchiveProjectType.PROJECT_CONFIGURATION_NS,DATA); //NOI18N
                    XMLUtil.copyDocument (oldRoot, newRoot, ArchiveProjectType.PROJECT_CONFIGURATION_NS);
                    cachedElement = updateMinAntVersion (newRoot, doc);
                }
            }

        return cachedProperties;
    }

    private static void copyDocument (Document doc, Element from, Element to) {
        NodeList nl = from.getChildNodes();
        int length = nl.getLength();
        for (int i=0; i< length; i++) {
            Node node = nl.item (i);
            Node newNode = null;
            switch (node.getNodeType()) {
                case Node.ELEMENT_NODE:
                    Element oldElement = (Element) node;
                    newNode = doc.createElementNS(ArchiveProjectType.PROJECT_CONFIGURATION_NS,oldElement.getTagName());
                    NamedNodeMap m = oldElement.getAttributes();
                    Element newElement = (Element) newNode;
                    for (int index = 0; index < m.getLength(); index++) {
                        Node attr = m.item(index);
                          newElement.setAttribute(attr.getNodeName(), attr.getNodeValue());
                    }
                    copyDocument(doc,oldElement,newElement);
                    break;
                case Node.TEXT_NODE:
                    Text oldText = (Text) node;
                    newNode = doc.createTextNode(oldText.getData());
                    break;
                case Node.COMMENT_NODE:
                    Comment oldComment = (Comment) node;
                    newNode = doc.createComment(oldComment.getData());
                    break;
            }
            if (newNode != null) {
                to.appendChild (newNode);
            }
        }
    }
    public static final String MINIMUM_ANT_VERSION = "1.6.5"; // NOI18N
    
    private static Element updateMinAntVersion (final Element root, final Document doc) {

Lines 375-381 Link Here

(-)a/j2ee.clientproject/nbproject/project.xml (-25 / +34 lines)
375	<build-prerequisite/>	375	<build-prerequisite/>
376	<compile-dependency/>	376	<compile-dependency/>
377	<run-dependency>	377	<run-dependency>
378	<specification-version>8.0</specification-version>	378	<specification-version>8.4</specification-version>
379	</run-dependency>	379	</run-dependency>
380	</dependency>	380	</dependency>
381	<dependency>	381	<dependency>
Lines 399-409 Link Here
399	<test-type>	399	<test-type>
400	<name>unit</name>	400	<name>unit</name>
401	<test-dependency>	401	<test-dependency>
		402	<code-name-base>org.netbeans.libs.junit4</code-name-base>
		403	<compile-dependency/>
		404	</test-dependency>
		405	<test-dependency>
402	<code-name-base>org.netbeans.modules.j2ee.clientproject</code-name-base>	406	<code-name-base>org.netbeans.modules.j2ee.clientproject</code-name-base>
403	<recursive/>	407	<recursive/>
404	<compile-dependency/>	408	<compile-dependency/>
405	</test-dependency>	409	</test-dependency>
406	<test-dependency>	410	<test-dependency>
		411	<code-name-base>org.netbeans.modules.j2ee.sun.ddui</code-name-base>
		412	</test-dependency>
		413	<test-dependency>
		414	<code-name-base>org.netbeans.modules.j2eeserver</code-name-base>
		415	<test/>
		416	</test-dependency>
		417	<test-dependency>
		418	<code-name-base>org.netbeans.modules.java.project</code-name-base>
		419	</test-dependency>
		420	<test-dependency>
		421	<code-name-base>org.netbeans.modules.masterfs</code-name-base>
		422	</test-dependency>
		423	<test-dependency>
		424	<code-name-base>org.netbeans.modules.nbjunit</code-name-base>
		425	<recursive/>
		426	<compile-dependency/>
		427	</test-dependency>
		428	<test-dependency>
		429	<code-name-base>org.netbeans.modules.projectui</code-name-base>
		430	<compile-dependency/>
		431	<test/>
		432	</test-dependency>
		433	<test-dependency>
		434	<code-name-base>org.netbeans.modules.websvc.core</code-name-base>
		435	</test-dependency>
		436	<test-dependency>
		437	<code-name-base>org.netbeans.modules.websvc.projectapi</code-name-base>
		438	</test-dependency>
		439	<test-dependency>
407	<code-name-base>org.openide.util</code-name-base>	440	<code-name-base>org.openide.util</code-name-base>
408	<compile-dependency/>	441	<compile-dependency/>
409	<test/>	442	<test/>
Lines 413-442 Link Here
413	<compile-dependency/>	446	<compile-dependency/>
414	<test/>	447	<test/>
415	</test-dependency>	448	</test-dependency>
416	<test-dependency>
417	<code-name-base>org.netbeans.modules.projectui</code-name-base>
418	<compile-dependency/>
419	<test/>
420	</test-dependency>
421	<test-dependency>
422	<code-name-base>org.netbeans.modules.j2eeserver</code-name-base>
423	<test/>
424	</test-dependency>
425	<test-dependency>
426	<code-name-base>org.netbeans.modules.j2ee.sun.ddui</code-name-base>
427	</test-dependency>
428	<test-dependency>
429	<code-name-base>org.netbeans.modules.java.project</code-name-base>
430	</test-dependency>
431	<test-dependency>
432	<code-name-base>org.netbeans.modules.masterfs</code-name-base>
433	</test-dependency>
434	<test-dependency>
435	<code-name-base>org.netbeans.modules.websvc.core</code-name-base>
436	</test-dependency>
437	<test-dependency>
438	<code-name-base>org.netbeans.modules.websvc.projectapi</code-name-base>
439	</test-dependency>
440	</test-type>	449	</test-type>
441	</test-dependencies>	450	</test-dependencies>
442	<friend-packages>	451	<friend-packages>




import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.util.NbBundle;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Comment;
import org.w3c.dom.Document;
import org.w3c.dom.Element;

            if (oldRoot != null) {
                Document doc = oldRoot.getOwnerDocument();
                Element newRoot = doc.createElementNS (AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); //NOI18N
                XMLUtil.copyDocument (oldRoot, newRoot, AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE);
                Element sourceRoots = doc.createElementNS(AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE,"source-roots");  //NOI18N
                Element root = doc.createElementNS (AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE,"root");   //NOI18N
                root.setAttribute ("id","src.dir");   //NOI18N

                if (oldRoot != null) {
                    Document doc = oldRoot.getOwnerDocument();
                    Element newRoot = doc.createElementNS (AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); //NOI18N
                    XMLUtil.copyDocument (oldRoot, newRoot, AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE);
                    cachedElement = updateMinAntVersion (newRoot, doc);
                }
            }

        return cachedProperties;
    }

    private static void copyDocument (Document doc, Element from, Element to) {
        NodeList nl = from.getChildNodes();
        int length = nl.getLength();
        for (int i=0; i< length; i++) {
            Node node = nl.item (i);
            Node newNode = null;
            switch (node.getNodeType()) {
                case Node.ELEMENT_NODE:
                    Element oldElement = (Element) node;
                    newNode = doc.createElementNS(AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE,oldElement.getTagName());
                    NamedNodeMap m = oldElement.getAttributes();
                    Element newElement = (Element) newNode;
                    for (int index = 0; index < m.getLength(); index++) {
                        Node attr = m.item(index);
                          newElement.setAttribute(attr.getNodeName(), attr.getNodeValue());
                    }
                    copyDocument(doc,oldElement,newElement);
                    break;
                case Node.TEXT_NODE:
                    Text oldText = (Text) node;
                    newNode = doc.createTextNode(oldText.getData());
                    break;
                case Node.COMMENT_NODE:
                    Comment oldComment = (Comment) node;
                    newNode = doc.createComment(oldComment.getData());
                    break;
            }
            if (newNode != null) {
                to.appendChild (newNode);
            }
        }
    }
    
    private static Element updateMinAntVersion (final Element root, final Document doc) {
        NodeList list = root.getElementsByTagNameNS (AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE,MINIMUM_ANT_VERSION_ELEMENT);
        if (list.getLength() == 1) {




import org.netbeans.modules.java.api.common.classpath.ClassPathSupport.Item;
import org.netbeans.modules.java.api.common.util.CommonProjectUtils;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;

/**
 *

        for ( int i = 0; i < libs.getLength(); i++ ) {
            Element item = (Element)libs.item( i );
            // appclient is different from other j2ee projects - it stores reference without ${ and }
            String ref = "${"+XMLUtil.findText( item )+"}";
            libraries.add(ref); // NOI18N
            String dirs = item.getAttribute(ATTR_DIRS);
            if (Util.DESTINATION_DIRECTORY_ROOT.equals(dirs) ||

        return libraryElement;
    }
       
    /**
     * Extracts <b>the first</b> nested text from an element.
     * Currently does not handle coalescing text nodes, CDATA sections, etc.
     * @param parent a parent element
     * @return the nested text, or null if none was found
     */
    private static String findText( Element parent ) {
        NodeList l = parent.getChildNodes();
        for ( int i = 0; i < l.getLength(); i++ ) {
            if ( l.item(i).getNodeType() == Node.TEXT_NODE ) {
                Text text = (Text)l.item( i );
                return text.getNodeValue();
            }
        }
        return null;
    }

    public void readAdditionalProperties(List<Item> items, String projectXMLElement) {
        Map<String, String> destination = new HashMap<String, String>();
        List<String> l = getIncludedLibraries(antProjectHelper, projectXMLElement, destination);

Lines 347-353 Link Here

(-)a/j2ee.earproject/nbproject/project.xml (-29 / +38 lines)
347	<build-prerequisite/>	347	<build-prerequisite/>
348	<compile-dependency/>	348	<compile-dependency/>
349	<run-dependency>	349	<run-dependency>
350	<specification-version>8.0</specification-version>	350	<specification-version>8.4</specification-version>
351	</run-dependency>	351	</run-dependency>
352	</dependency>	352	</dependency>
353	<dependency>	353	<dependency>
Lines 363-373 Link Here
363	<test-type>	363	<test-type>
364	<name>unit</name>	364	<name>unit</name>
365	<test-dependency>	365	<test-dependency>
		366	<code-name-base>org.netbeans.libs.junit4</code-name-base>
		367	<compile-dependency/>
		368	</test-dependency>
		369	<test-dependency>
366	<code-name-base>org.netbeans.modules.j2ee.earproject</code-name-base>	370	<code-name-base>org.netbeans.modules.j2ee.earproject</code-name-base>
367	<recursive/>	371	<recursive/>
368	<compile-dependency/>	372	<compile-dependency/>
369	</test-dependency>	373	</test-dependency>
370	<test-dependency>	374	<test-dependency>
		375	<code-name-base>org.netbeans.modules.j2ee.sun.dd</code-name-base>
		376	</test-dependency>
		377	<test-dependency>
		378	<code-name-base>org.netbeans.modules.j2ee.sun.ddui</code-name-base>
		379	</test-dependency>
		380	<test-dependency>
		381	<code-name-base>org.netbeans.modules.j2eeserver</code-name-base>
		382	<test/>
		383	</test-dependency>
		384	<test-dependency>
		385	<code-name-base>org.netbeans.modules.masterfs</code-name-base>
		386	</test-dependency>
		387	<test-dependency>
		388	<code-name-base>org.netbeans.modules.nbjunit</code-name-base>
		389	<recursive/>
		390	<compile-dependency/>
		391	</test-dependency>
		392	<test-dependency>
		393	<code-name-base>org.netbeans.modules.projectui</code-name-base>
		394	<compile-dependency/>
		395	<test/>
		396	</test-dependency>
		397	<test-dependency>
		398	<code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
		399	<compile-dependency/>
		400	</test-dependency>
		401	<test-dependency>
		402	<code-name-base>org.netbeans.modules.web.core</code-name-base>
		403	</test-dependency>
		404	<test-dependency>
		405	<code-name-base>org.netbeans.modules.web.core.syntax</code-name-base>
		406	</test-dependency>
		407	<test-dependency>
371	<code-name-base>org.openide.util</code-name-base>	408	<code-name-base>org.openide.util</code-name-base>
372	<compile-dependency/>	409	<compile-dependency/>
373	<test/>	410	<test/>
Lines 377-410 Link Here
377	<compile-dependency/>	414	<compile-dependency/>
378	<test/>	415	<test/>
379	</test-dependency>	416	</test-dependency>
380	<test-dependency>
381	<code-name-base>org.netbeans.modules.projectui</code-name-base>
382	<compile-dependency/>
383	<test/>
384	</test-dependency>
385	<test-dependency>
386	<code-name-base>org.netbeans.modules.j2eeserver</code-name-base>
387	<test/>
388	</test-dependency>
389	<test-dependency>
390	<code-name-base>org.netbeans.modules.j2ee.sun.dd</code-name-base>
391	</test-dependency>
392	<test-dependency>
393	<code-name-base>org.netbeans.modules.j2ee.sun.ddui</code-name-base>
394	</test-dependency>
395	<test-dependency>
396	<code-name-base>org.netbeans.modules.masterfs</code-name-base>
397	</test-dependency>
398	<test-dependency>
399	<code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
400	<compile-dependency/>
401	</test-dependency>
402	<test-dependency>
403	<code-name-base>org.netbeans.modules.web.core</code-name-base>
404	</test-dependency>
405	<test-dependency>
406	<code-name-base>org.netbeans.modules.web.core.syntax</code-name-base>
407	</test-dependency>
408	</test-type>	417	</test-type>
409	</test-dependencies>	418	</test-dependencies>
410	<public-packages/>	419	<public-packages/>




import org.netbeans.spi.project.support.ant.EditableProperties;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;


/**

            if(oldRoot != null) {
                Document doc = oldRoot.getOwnerDocument();
                Element newRoot = doc.createElementNS(EarProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); //NOI18N
                XMLUtil.copyDocument(oldRoot, newRoot, EarProjectType.PROJECT_CONFIGURATION_NAMESPACE);
                
                //update <web-module-/additional/-libraries/> to <j2ee-module-/additional/-libraries/>
//                NodeList contList = newRoot.getElementsByTagNameNS(ns, "web-module-libraries");

                        Element library = (Element) libList.item(i);
                        Node webFile = library.getElementsByTagNameNS(ns, TAG_FILE).item(0);
                        //remove ${ and } from the beginning and end
                        String webFileText = XMLUtil.findText(webFile);
                        webFileText = webFileText.substring(2, webFileText.length() - 1);
                        if (webFileText.startsWith("libs.")) {
                            String libName = webFileText.substring(5, webFileText.indexOf(".classpath")); //NOI18N

        return cachedElement;
    }

    private static void copyDocument (Document doc, Element from, Element to) {
        NodeList nl = from.getChildNodes();
        int length = nl.getLength();
        for (int i=0; i< length; i++) {
            Node node = nl.item (i);
            Node newNode = null;
            switch (node.getNodeType()) {
                case Node.ELEMENT_NODE:
                    Element oldElement = (Element) node;
                    newNode = doc.createElementNS(EarProjectType.PROJECT_CONFIGURATION_NAMESPACE,oldElement.getTagName());
                    NamedNodeMap m = oldElement.getAttributes();
                    Element newElement = (Element) newNode;
                    for (int index = 0; index < m.getLength(); index++) {
                        Node attr = m.item(index);
                        newElement.setAttribute(attr.getNodeName(), attr.getNodeValue());
                    }
                    copyDocument(doc,oldElement,(Element)newNode);
                    break;
                case Node.TEXT_NODE:
                    Text oldText = (Text) node;
                    newNode = doc.createTextNode(oldText.getData());
                    break;
                case Node.COMMENT_NODE:
                    Comment oldComment = (Comment) node;
                    newNode = doc.createComment(oldComment.getData());
                    break;
            }
            if (newNode != null) {
                to.appendChild (newNode);
            }
        }
    }

    /**
     * Extract nested text from a node.
     * Currently does not handle coalescing text nodes, CDATA sections, etc.
     * @param parent a parent node
     * @return the nested text, or null if none was found
     */
    private static String findText(Node parent) {
        NodeList l = parent.getChildNodes();
        for (int i = 0; i < l.getLength(); i++) {
            if (l.item(i).getNodeType() == Node.TEXT_NODE) {
                Text text = (Text)l.item(i);
                return text.getNodeValue();
            }
        }
        return null;
    }

    
    public EditableProperties getUpdatedProjectProperties() {
        return helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH);
    }





package org.netbeans.modules.j2ee.earproject.classpath;

import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport.Item;
import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties;
import org.netbeans.modules.j2ee.earproject.EarProjectType;
import org.netbeans.modules.java.api.common.util.CommonProjectUtils;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;

/**
 * Defines the various class paths for a web project.

                        Element library = (Element) ch.item(i);
                        Node webFile = library.getElementsByTagNameNS(ns, TAG_FILE).item(0);
                        NodeList pathInEarElements = library.getElementsByTagNameNS(ns, TAG_PATH_IN_EAR);
                        earIncludesMap.put(XMLUtil.findText(webFile), pathInEarElements.getLength() > 0 ?
                            XMLUtil.findText(pathInEarElements.item(0)) : null);
                    }
                }
            }

        return earIncludesMap;
    }

    private static String findText(Node parent) {
        NodeList l = parent.getChildNodes();
        for (int i = 0; i < l.getLength(); i++) {
            if (l.item(i).getNodeType() == Node.TEXT_NODE) {
                Text text = (Text)l.item(i);
                return text.getNodeValue();
            }
        }
        return null;
    }
}


Lines 450-456 Link Here

(-)a/j2ee.ejbjarproject/nbproject/project.xml (-1 / +10 lines)
450	<build-prerequisite/>	450	<build-prerequisite/>
451	<compile-dependency/>	451	<compile-dependency/>
452	<run-dependency>	452	<run-dependency>
453	<specification-version>8.0</specification-version>	453	<specification-version>8.4</specification-version>
454	</run-dependency>	454	</run-dependency>
455	</dependency>	455	</dependency>
456	<dependency>	456	<dependency>
Lines 474-479 Link Here
474	<test-type>	474	<test-type>
475	<name>unit</name>	475	<name>unit</name>
476	<test-dependency>	476	<test-dependency>
		477	<code-name-base>org.netbeans.libs.junit4</code-name-base>
		478	<compile-dependency/>
		479	</test-dependency>
		480	<test-dependency>
477	<code-name-base>org.netbeans.modules.j2ee.ejbjarproject</code-name-base>	481	<code-name-base>org.netbeans.modules.j2ee.ejbjarproject</code-name-base>
478	<recursive/>	482	<recursive/>
479	<compile-dependency/>	483	<compile-dependency/>
Lines 482-487 Link Here
482	<code-name-base>org.netbeans.modules.masterfs</code-name-base>	486	<code-name-base>org.netbeans.modules.masterfs</code-name-base>
483	</test-dependency>	487	</test-dependency>
484	<test-dependency>	488	<test-dependency>
		489	<code-name-base>org.netbeans.modules.nbjunit</code-name-base>
		490	<recursive/>
		491	<compile-dependency/>
		492	</test-dependency>
		493	<test-dependency>
485	<code-name-base>org.netbeans.modules.projectui</code-name-base>	494	<code-name-base>org.netbeans.modules.projectui</code-name-base>
486	</test-dependency>	495	</test-dependency>
487	<test-dependency>	496	<test-dependency>




import org.openide.filesystems.FileStateInvalidException;
import org.openide.filesystems.FileSystem.AtomicAction;
import org.openide.util.Exceptions;
import org.openide.xml.XMLUtil;

/**
 * Represents one ejb module project

        if (element != null) {
            Document doc = element.getOwnerDocument();
            Element newRoot = doc.createElementNS (EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); //NOI18N
            XMLUtil.copyDocument (element, newRoot, EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE);
            Element srcRoots = doc.createElementNS(EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE, "source-roots");  //NOI18N
            Element root = doc.createElementNS (EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE,"root");   //NOI18N
            root.setAttribute ("id","src.dir");   //NOI18N

        }
    }

    private static void copyDocument (Document doc, Element from, Element to) {
        NodeList nl = from.getChildNodes();
        int length = nl.getLength();
        for (int i=0; i< length; i++) {
            Node node = nl.item (i);
            Node newNode = null;
            switch (node.getNodeType()) {
                case Node.ELEMENT_NODE:
                    Element oldElement = (Element) node;
                    newNode = doc.createElementNS(EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE,oldElement.getTagName());
                    copyDocument(doc,oldElement,(Element)newNode);
                    break;
                case Node.TEXT_NODE:
                    Text oldText = (Text) node;
                    newNode = doc.createTextNode(oldText.getData());
                    break;
                case Node.COMMENT_NODE:
                    Comment oldComment = (Comment) node;
                    newNode = doc.createComment(oldComment.getData());
                    break;
            }
            if (newNode != null) {
                to.appendChild (newNode);
            }
        }
    }

    public void fileAttributeChanged (org.openide.filesystems.FileAttributeEvent fe) {
    }    
    




import org.openide.filesystems.FileUtil;
import org.openide.util.Mutex;
import org.openide.util.NbBundle;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;

/**
 *

            if (oldRoot != null) {
                Document doc = oldRoot.getOwnerDocument();
                Element newRoot = doc.createElementNS (EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); //NOI18N
                XMLUtil.copyDocument (oldRoot, newRoot, EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE);
                if(version == 1) {
                    //1=>2 upgrade
                    Element sourceRoots = doc.createElementNS(EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE,"source-roots");  //NOI18N

                    for (int i = 0; i < libList.getLength(); i++) {
                        if (libList.item(i).getNodeType() == Node.ELEMENT_NODE) {
                            Element library = (Element) libList.item(i);
                            String fileText = XMLUtil.findText(library);
                            if (fileText.startsWith ("libs.")) {
                                String libName = fileText.substring(6, fileText.indexOf(".classpath")); //NOI18N
                                List/*<URL>*/ roots = LibraryManager.getDefault().getLibrary(libName).getContent("classpath"); //NOI18N

        return helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH);
    }

    private static void copyDocument (Document doc, Element from, Element to) {
        NodeList nl = from.getChildNodes();
        int length = nl.getLength();
        for (int i=0; i< length; i++) {
            Node node = nl.item (i);
            Node newNode = null;
            switch (node.getNodeType()) {
                case Node.ELEMENT_NODE:
                    Element oldElement = (Element) node;
                    newNode = doc.createElementNS(EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE,oldElement.getTagName());
                    //copy attributes
                    NamedNodeMap m = oldElement.getAttributes();
                    Element newElement = (Element) newNode;
                    for (int index = 0; index < m.getLength(); index++) {
                        Node attr = m.item(index);
                        newElement.setAttribute(attr.getNodeName(), attr.getNodeValue());
                    }
                    copyDocument(doc,oldElement,(Element)newNode);
                    break;
                case Node.TEXT_NODE:
                    Text oldText = (Text) node;
                    newNode = doc.createTextNode(oldText.getData());
                    break;
                case Node.COMMENT_NODE:
                    Comment oldComment = (Comment) node;
                    newNode = doc.createComment(oldComment.getData());
                    break;
            }
            if (newNode != null) {
                to.appendChild (newNode);
            }
        }
    }
    
    private static Element updateMinAntVersion (final Element root, final Document doc) {
        NodeList list = root.getElementsByTagNameNS (EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE,MINIMUM_ANT_VERSION_ELEMENT);
        if (list.getLength() == 1) {

        return root;
    }
    
    /**
     * Extract nested text from a node.
     * Currently does not handle coalescing text nodes, CDATA sections, etc.
     * @param parent a parent node
     * @return the nested text, or null if none was found
     */
    private static String findText(Node parent) {
        NodeList l = parent.getChildNodes();
        for (int i = 0; i < l.getLength(); i++) {
            if (l.item(i).getNodeType() == Node.TEXT_NODE) {
                Text text = (Text)l.item(i);
                return text.getNodeValue();
            }
        }
        return null;
    }
    
    private boolean showUpdateDialog() {
        return DialogDisplayer.getDefault().notify(
            new NotifyDescriptor.Confirmation (NbBundle.getMessage(UpdateProjectImpl.class,"TXT_ProjectUpdate",BUILD_NUMBER),




package org.netbeans.modules.j2ee.ejbjarproject.classpath;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.netbeans.modules.j2ee.common.Util;

import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProjectType;
import org.netbeans.modules.java.api.common.util.CommonProjectUtils;
import org.openide.xml.XMLUtil;

/**
 *

        for ( int i = 0; i < libs.getLength(); i++ ) {
            Element item = (Element)libs.item( i );
            // ejbjar is different from other j2ee projects - it stores reference without ${ and }
            String ref = "${"+XMLUtil.findText( item )+"}";
            libraries.add(ref); // NOI18N
            String dirs = item.getAttribute(ATTR_DIRS);
            if (Util.DESTINATION_DIRECTORY_ROOT.equals(dirs) ||

        Document doc = data.getOwnerDocument();
        for (ClassPathSupport.Item item : classpath) {
            if("true".equals(item.getAdditionalProperty(INCLUDE_IN_DEPLOYMENT))) { // NOI18N
                XMLUtil.appendChildElement(data,
                    createLibraryElement(antProjectHelper, doc, item, includedLibrariesElement), 
                    ejbjarElemOrder);
            }

        antProjectHelper.putPrimaryConfigurationData( data, true );
    }
    
    /**
     * Find all direct child elements of an element.
     * More useful than {@link Element#getElementsByTagNameNS} because it does
     * not recurse into recursive child elements.
     * Children which are all-whitespace text nodes are ignored; others cause
     * an exception to be thrown.
     * @param parent a parent element in a DOM tree
     * @return a list of direct child elements (may be empty)
     * @throws IllegalArgumentException if there are non-element children besides whitespace
     */
    private static List<Element> findSubElements(Element parent) throws IllegalArgumentException {
        NodeList l = parent.getChildNodes();
        List<Element> elements = new ArrayList<Element>(l.getLength());
        for (int i = 0; i < l.getLength(); i++) {
            Node n = l.item(i);
            if (n.getNodeType() == Node.ELEMENT_NODE) {
                elements.add((Element)n);
            } else if (n.getNodeType() == Node.TEXT_NODE) {
                String text = ((Text)n).getNodeValue();
                if (text.trim().length() > 0) {
                    throw new IllegalArgumentException("non-ws text encountered in " + parent + ": " + text); // NOI18N
                }
            } else if (n.getNodeType() == Node.COMMENT_NODE) {
                // skip
            } else {
                throw new IllegalArgumentException("unexpected non-element child of " + parent + ": " + n); // NOI18N
            }
        }
        return elements;
    }
    
    /**
     * Append child element to the correct position according to given
     * order.
     * @param parent parent to which the child will be added
     * @param el element to be added
     * @param order order of the elements which must be followed
     */
    private static void appendChildElement(Element parent, Element el, String[] order) {
        Element insertBefore = null;
        List l = Arrays.asList(order);
        int index = l.indexOf(el.getLocalName());
        assert index != -1 : el.getLocalName()+" was not found in "+l; // NOI18N
        Iterator it = findSubElements(parent).iterator();
        while (it.hasNext()) {
            Element e = (Element)it.next();
            int index2 = l.indexOf(e.getLocalName());
            assert index2 != -1 : e.getLocalName()+" was not found in "+l; // NOI18N
            if (index2 > index) {
                insertBefore = e;
                break;
            }
        }
        parent.insertBefore(el, insertBefore);
    }
        
    private static Element createLibraryElement(AntProjectHelper antProjectHelper, Document doc, Item item, String includedLibrariesElement) {
        Element libraryElement = doc.createElementNS( EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE, includedLibrariesElement );
        // ejbjar is different from other j2ee projects - it stores reference without ${ and }

        return libraryElement;
    }
       
    /**
     * Extracts <b>the first</b> nested text from an element.
     * Currently does not handle coalescing text nodes, CDATA sections, etc.
     * @param parent a parent element
     * @return the nested text, or null if none was found
     */
    private static String findText( Element parent ) {
        NodeList l = parent.getChildNodes();
        for ( int i = 0; i < l.getLength(); i++ ) {
            if ( l.item(i).getNodeType() == Node.TEXT_NODE ) {
                Text text = (Text)l.item( i );
                return text.getNodeValue();
            }
        }
        return null;
    }
        

    public void readAdditionalProperties(List<Item> items, String projectXMLElement) {
        Map<String, String> destination = new HashMap<String, String>();
        List<String> l = getIncludedLibraries(helper, projectXMLElement, destination);

Lines 200-206 Link Here

(-)a/java.freeform/nbproject/project.xml (-1 / +1 lines)
200	<build-prerequisite/>	200	<build-prerequisite/>
201	<compile-dependency/>	201	<compile-dependency/>
202	<run-dependency>	202	<run-dependency>
203	<specification-version>8.0</specification-version>	203	<specification-version>8.4</specification-version>
204	</run-dependency>	204	</run-dependency>
205	</dependency>	205	</dependency>
206	<dependency>	206	<dependency>




import org.openide.util.Mutex;
import org.openide.util.Utilities;
import org.openide.util.WeakListeners;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

        if (java == null) {
            return null;
        }
        List<Element> compilationUnits = XMLUtil.findSubElements(java);
        it = compilationUnits.iterator();
        while (it.hasNext()) {
            Element compilationUnitEl = (Element)it.next();

            if (java == null) {
                return;
            }
            for (Element compilationUnitEl : XMLUtil.findSubElements(java)) {
                assert compilationUnitEl.getLocalName().equals("compilation-unit") : compilationUnitEl;
                // For each compilation unit, find the package roots first.
                List<FileObject> packageRoots = findPackageRoots(helper, evaluator, compilationUnitEl);

    
    static List<String> findPackageRootNames(Element compilationUnitEl) {
        List<String> names = new ArrayList<String>();
        Iterator it = XMLUtil.findSubElements(compilationUnitEl).iterator();
        while (it.hasNext()) {
            Element e = (Element) it.next();
            if (!e.getLocalName().equals("package-root")) { // NOI18N
                continue;
            }
            String location = XMLUtil.findText(e);
            names.add(location);
        }
        return names;

    }
    
    private List<URL> createCompileClasspath(Element compilationUnitEl) {
        for (Element e : XMLUtil.findSubElements(compilationUnitEl)) {
            if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("compile")) { // NOI18N
                return createClasspath(e);
            }

     * Create a classpath from a &lt;classpath&gt; element.
     */
    private List<URL> createClasspath(Element classpathEl) {
        String cp = XMLUtil.findText(classpathEl);
        if (cp == null) {
            cp = "";
        }

    }
    
    private List<URL> createExecuteClasspath(List<String> packageRoots, Element compilationUnitEl) {
        for (Element e : XMLUtil.findSubElements(compilationUnitEl)) {
            if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("execute")) { // NOI18N
                return createClasspath(e);
            }

        List<URL> urls = new ArrayList<URL>();
        urls.addAll(createCompileClasspath(compilationUnitEl));
        boolean foundBuiltTos = false;
        for (Element builtTo : XMLUtil.findSubElements(compilationUnitEl)) {
            if (!builtTo.getLocalName().equals("built-to")) { // NOI18N
                continue;
            }
            foundBuiltTos = true;
            String rawtext = XMLUtil.findText(builtTo);
            assert rawtext != null : "Must have nonempty text inside <built-to>";
            String text = evaluator.evaluate(rawtext);
            if (text == null) {

    }
    
    private List<URL> createProcessorClasspath(Element compilationUnitEl) {
        for (Element e : XMLUtil.findSubElements(compilationUnitEl)) {
            if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("processor")) { // NOI18N
                return createClasspath(e);
            }

    }

    private List<URL> createBootClasspath(Element compilationUnitEl) {
        for (Element e : XMLUtil.findSubElements(compilationUnitEl)) {
            if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("boot")) { // NOI18N
                return createClasspath(e);
            }

            if (java == null) {
                return null;
            }
            List<Element> compilationUnits = XMLUtil.findSubElements(java);
            Iterator it = compilationUnits.iterator();
            while (it.hasNext()) {
                Element compilationUnitEl = (Element)it.next();

                rootFolder = null;
            }
            Element genldata = Util.getPrimaryConfigurationData(helper);
            Element foldersE = XMLUtil.findElement(genldata, "folders", Util.NAMESPACE); // NOI18N
            if (foldersE != null) {
                for (Element folderE : XMLUtil.findSubElements(foldersE)) {
                    if (folderE.getLocalName().equals("source-folder")) {
                        Element typeE = XMLUtil.findElement(folderE, "type", Util.NAMESPACE); // NOI18N
                        if (typeE != null) {
                            String type = XMLUtil.findText(typeE);
                            if (type.equals(JavaProjectConstants.SOURCES_TYPE_JAVA)) {
                                Element locationE = XMLUtil.findElement(folderE, "location", Util.NAMESPACE); // NOI18N
                                String location = evaluator.evaluate(XMLUtil.findText(locationE));
                                if (location != null && helper.resolveFile(location).equals(rootFolder)) {
                                    Element includesE = XMLUtil.findElement(folderE, "includes", Util.NAMESPACE); // NOI18N
                                    if (includesE != null) {
                                        incl = evaluator.evaluate(XMLUtil.findText(includesE));
                                        if (incl != null && incl.matches("\\$\\{[^}]+\\}")) { // NOI18N
                                            // Clearly intended to mean "include everything".
                                            incl = null;
                                        }
                                    }
                                    Element excludesE = XMLUtil.findElement(folderE, "excludes", Util.NAMESPACE); // NOI18N
                                    if (excludesE != null) {
                                        excl = evaluator.evaluate(XMLUtil.findText(excludesE));
                                    }
                                }
                            }




        antProject.setAttribute("basedir", /* ".." times count('/', FILE_SCRIPT_PATH) */".."); // NOI18N
        // Look for <properties> in project.xml and make corresponding definitions in the Ant script.
        Element data = Util.getPrimaryConfigurationData(helper);
        Element properties = XMLUtil.findElement(data, "properties", Util.NAMESPACE);
        if (properties != null) {
            for (Element el : XMLUtil.findSubElements(properties)) {
                Element nue = antProject.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);
                    nue.setAttribute("value", text);
                } else if (el.getLocalName().equals("property-file")) { // NOI18N
                    String text = XMLUtil.findText(el);
                    assert text != null;
                    nue.setAttribute("file", text);
                } else {

        if (java == null) {
            return Collections.emptyList();
        }
        return XMLUtil.findSubElements(java);
    }
    
    /**

     */
    private Element findCompilationUnit(String sources) {
        for (Element compilationUnitEl : compilationUnits()) {
            for (Element packageRoot : XMLUtil.findSubElements(compilationUnitEl)) {
                if (packageRoot.getLocalName().equals("package-root")) { // NOI18N
                    if (XMLUtil.findText(packageRoot).equals(sources)) {
                        return compilationUnitEl;
                    }
                }

     */
    private String findClassesOutputDir(Element compilationUnitEl) {
        // Look for an appropriate <built-to>.
        for (Element builtTo : XMLUtil.findSubElements(compilationUnitEl)) {
            if (builtTo.getLocalName().equals("built-to")) { // NOI18N
                String rawtext = XMLUtil.findText(builtTo);
                // Check that it is not an archive.
                String evaltext = evaluator.evaluate(rawtext);
                if (evaltext != null) {

    String findSourceLevel(String sources) {
        Element compilationUnitEl = findCompilationUnit(sources);
        if (compilationUnitEl != null) {
            Element sourceLevel = XMLUtil.findElement(compilationUnitEl, "source-level", JavaProjectNature.NS_JAVA_3);
            if (sourceLevel != null) {
                return XMLUtil.findText(sourceLevel);
            }
        }
        return null;

    String findCUClasspath(String sources, String moud) {
        Element compilationUnitEl = findCompilationUnit(sources);
        if (compilationUnitEl != null) {
            for (Element classpath : XMLUtil.findSubElements(compilationUnitEl)) {
                if (classpath.getLocalName().equals("classpath")) { // NOI18N
                    String mode = classpath.getAttribute("mode"); // NOI18N
                    if (mode.equals(moud)) {
                        return XMLUtil.findText(classpath);
                    }
                }
            }

        // 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) {
            //fix for #58442:
            ideActions = data.getOwnerDocument().createElementNS(Util.NAMESPACE, "ide-actions"); // NOI18N
            XMLUtil.appendChildElement(data, ideActions, rootElementsOrder);
        }
        Document doc = data.getOwnerDocument();
        Element action = doc.createElementNS(Util.NAMESPACE, "action"); // NOI18N

        } 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

                return null;
            }
        }
        for (Element target : XMLUtil.findSubElements(doc.getDocumentElement())) {
            if (target.getLocalName().equals("target") && targetName.equals(target.getAttribute("name"))) { // NOI18N
                return target;
            }

     */
    String[] findCommandBinding(String command) {
        Element data = Util.getPrimaryConfigurationData(helper);
        Element ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE); // NOI18N
        if (ideActions == null) {
            return null;
        }
        String scriptName = "build.xml"; // NOI18N
        for (Element action : XMLUtil.findSubElements(ideActions)) {
            assert action.getLocalName().equals("action");
            if (action.getAttribute("name").equals(command)) {
                Element script = XMLUtil.findElement(action, "script", Util.NAMESPACE); // NOI18N
                if (script != null) {
                    scriptName = XMLUtil.findText(script);
                }
                List<String> scriptPlusTargetNames = new ArrayList<String>();
                scriptPlusTargetNames.add(scriptName);
                for (Element target : XMLUtil.findSubElements(action)) {
                    if (target.getLocalName().equals("target")) { // NOI18N
                        scriptPlusTargetNames.add(XMLUtil.findText(target));
                    }
                }
                if (scriptName.equals(JdkConfiguration.NBJDK_XML) && scriptPlusTargetNames.size() > 1) {

    Element targetUsesTaskExactlyOnce(Element target, String taskName) {
        // XXX should maybe also look for any other usage of the task in the same script in case there is none in the mentioned target
        Element foundTask = null;
        for (Element task : XMLUtil.findSubElements(target)) {
            if (task.getLocalName().equals(taskName)) {
                if (foundTask != null) {
                    // Duplicate.




import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.queries.FileBuiltQuery.Status;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.support.ant.AntProjectEvent;
import org.netbeans.spi.project.support.ant.AntProjectHelper;

import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Mutex;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

        List<String> to   = new ArrayList<String>();
        
        if (java != null) {
            List<Element> compilationUnits = XMLUtil.findSubElements(java);
            Iterator it = compilationUnits.iterator();
            while (it.hasNext()) {
                Element compilationUnitEl = (Element)it.next();

    
    static List<String> findBuiltToNames(Element compilationUnitEl) {
        List<String> names = new ArrayList<String>();
        for (Element e : XMLUtil.findSubElements(compilationUnitEl)) {
            if (!e.getLocalName().equals("built-to")) { // NOI18N
                continue;
            }
            String location = XMLUtil.findText(e);
            names.add(location);
        }
        return names;




import org.openide.filesystems.FileUtil;
import org.openide.modules.SpecificationVersion;
import org.openide.util.Exceptions;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;


        //assert ProjectManager.mutex().isReadAccess() || ProjectManager.mutex().isWriteAccess();
        List<SourceFolder> list = new ArrayList<SourceFolder>();
        Element data = Util.getPrimaryConfigurationData(helper);
        Element foldersEl = XMLUtil.findElement(data, "folders", Util.NAMESPACE); // NOI18N
        if (foldersEl == null) {
            return list;
        }
        for (Element sourceFolderEl : XMLUtil.findSubElements(foldersEl)) {
            if (!sourceFolderEl.getLocalName().equals("source-folder")) { // NOI18N
                continue;
            }
            SourceFolder sf = new SourceFolder();
            Element el = XMLUtil.findElement(sourceFolderEl, "label", Util.NAMESPACE); // NOI18N
            if (el != null) {
                sf.label = XMLUtil.findText(el);
            }
            el = XMLUtil.findElement(sourceFolderEl, "type", Util.NAMESPACE); // NOI18N
            if (el != null) {
                sf.type = XMLUtil.findText(el);
            }
            el = XMLUtil.findElement(sourceFolderEl, "location", Util.NAMESPACE); // NOI18N
            if (el != null) {
                sf.location = XMLUtil.findText(el);
            }
            el = XMLUtil.findElement(sourceFolderEl, "includes", Util.NAMESPACE); // NOI18N
            if (el != null) {
                sf.includes = XMLUtil.findText(el);
            }
            el = XMLUtil.findElement(sourceFolderEl, "excludes", Util.NAMESPACE); // NOI18N
            if (el != null) {
                sf.excludes = XMLUtil.findText(el);
            }
            el = XMLUtil.findElement(sourceFolderEl, "encoding", Util.NAMESPACE); // NOI18N
            if (el != null) {
                sf.encoding = XMLUtil.findText(el);
            }
            if (type == null || type.equals(sf.type)) {
                if (sf.label == null || sf.label.length() == 0) {

        //assert ProjectManager.mutex().isWriteAccess();
        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 {
            for (Element sourceFolderEl : XMLUtil.findSubElements(foldersEl)) {
                if (!sourceFolderEl.getLocalName().equals("source-folder")) { // NOI18N
                    continue;
                }
                if (type == null) {
                    foldersEl.removeChild(sourceFolderEl);
                } else {
                    Element typeEl = XMLUtil.findElement(sourceFolderEl, "type", Util.NAMESPACE); // NOI18N
                    if (typeEl != null) {
                        String typeElValue = XMLUtil.findText(typeEl);
                        if (type.equals(typeElValue)) {
                            foldersEl.removeChild(sourceFolderEl);
                        }

                el.appendChild(doc.createTextNode(sf.encoding)); // NOI18N
                sourceFolderEl.appendChild(el);
            }
            XMLUtil.appendChildElement(foldersEl, sourceFolderEl, folderElementsOrder);
        }
        Util.putPrimaryConfigurationData(helper, data);
    }

        //assert ProjectManager.mutex().isReadAccess() || ProjectManager.mutex().isWriteAccess();
        List<SourceFolder> list = new ArrayList<SourceFolder>();
        Element data = Util.getPrimaryConfigurationData(helper);
        Element viewEl = XMLUtil.findElement(data, "view", Util.NAMESPACE); // NOI18N
        if (viewEl == null) {
            return list;
        }
        Element itemsEl = XMLUtil.findElement(viewEl, "items", Util.NAMESPACE); // NOI18N
        if (itemsEl == null) {
            return list;
        }
        for (Element sourceFolderEl : XMLUtil.findSubElements(itemsEl)) {
            if (!sourceFolderEl.getLocalName().equals("source-folder")) { // NOI18N
                continue;
            }
            SourceFolder sf = new SourceFolder();
            sf.style = sourceFolderEl.getAttribute("style"); // NOI18N
            assert sf.style != null && sf.style.length() > 0 : "Bad style attr on <source-folder> in " + helper; // NOI18N
            Element el = XMLUtil.findElement(sourceFolderEl, "label", Util.NAMESPACE); // NOI18N
            if (el != null) {
                sf.label = XMLUtil.findText(el);
            }
            el = XMLUtil.findElement(sourceFolderEl, "location", Util.NAMESPACE); // NOI18N
            if (el != null) {
                sf.location = XMLUtil.findText(el);
            }
            el = XMLUtil.findElement(sourceFolderEl, "includes", Util.NAMESPACE); // NOI18N
            if (el != null) {
                sf.includes = XMLUtil.findText(el);
            }
            el = XMLUtil.findElement(sourceFolderEl, "excludes", Util.NAMESPACE); // NOI18N
            if (el != null) {
                sf.excludes = XMLUtil.findText(el);
            }
            if (style == null || style.equals(sf.style)) {
                list.add(sf);

        ArrayList list = new ArrayList();
        Element data = Util.getPrimaryConfigurationData(helper);
        Document doc = data.getOwnerDocument();
        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);
        }
        List<Element> sourceViews = XMLUtil.findSubElements(itemsEl);
        Iterator it = sourceViews.iterator();
        while (it.hasNext()) {
            Element sourceViewEl = (Element)it.next();

                el.appendChild(doc.createTextNode(sf.excludes)); // NOI18N
                sourceFolderEl.appendChild(el);
            }
            XMLUtil.appendChildElement(itemsEl, sourceFolderEl, viewItemElementsOrder);
        }
        Util.putPrimaryConfigurationData(helper, data);
    }

        if (data == null) {
            return list;
        }
        for (Element cuEl : XMLUtil.findSubElements(data)) {
            JavaCompilationUnit cu = new JavaCompilationUnit();
            List<String> outputs = new ArrayList<String>();
            List<String> javadoc = new ArrayList<String>();
            List<JavaCompilationUnit.CP> cps = new ArrayList<JavaCompilationUnit.CP>();
            List<String> packageRoots = new ArrayList<String>();
            for (Element el : XMLUtil.findSubElements(cuEl)) {
                if (el.getLocalName().equals("package-root")) { // NOI18N
                    packageRoots.add(XMLUtil.findText(el));
                    continue;
                }
                if (el.getLocalName().equals("classpath")) { // NOI18N
                    JavaCompilationUnit.CP cp = new JavaCompilationUnit.CP();
                    cp.classpath = XMLUtil.findText(el);
                    cp.mode = el.getAttribute("mode"); // NOI18N
                    if (cp.mode != null && cp.classpath != null) {
                        cps.add(cp);

                    continue;
                }
                if (el.getLocalName().equals("built-to")) { // NOI18N
                    outputs.add(XMLUtil.findText(el));
                    continue;
                }
                if (el.getLocalName().equals("javadoc-built-to")) { // NOI18N
                    javadoc.add(XMLUtil.findText(el));
                    continue;
                }
                if (el.getLocalName().equals("source-level")) { // NOI18N
                    cu.sourceLevel = XMLUtil.findText(el);
                }
                if (el.getLocalName().equals("unit-tests")) { // NOI18N
                    cu.isTests = true;

            }
        }
        Document doc = data.getOwnerDocument();
        for (Element cuEl : XMLUtil.findSubElements(data)) {
            data.removeChild(cuEl);
        }
        for (JavaCompilationUnit cu : compUnits) {

        ArrayList list = new ArrayList();
        Element data = Util.getPrimaryConfigurationData(helper);
        Document doc = data.getOwnerDocument();
        Iterator it = XMLUtil.findSubElements(data).iterator();
        while (it.hasNext()) {
            Element exportEl = (Element)it.next();
            if (!exportEl.getLocalName().equals("export")) { // NOI18N

                el.appendChild(doc.createTextNode(export.cleanTarget)); // NOI18N
                exportEl.appendChild(el);
            }
            XMLUtil.appendChildElement(data, exportEl, rootElementsOrder);
        }
        Util.putPrimaryConfigurationData(helper, data);
    }

        ArrayList list = new ArrayList();
        Element data = Util.getPrimaryConfigurationData(helper);
        Document doc = data.getOwnerDocument();
        Element subproject = XMLUtil.findElement(data, "subprojects", Util.NAMESPACE); // NOI18N
        if (subproject != null) {
            data.removeChild(subproject);
        }
        subproject = doc.createElementNS(Util.NAMESPACE, "subprojects"); // NOI18N
        XMLUtil.appendChildElement(data, subproject, rootElementsOrder);
        
        Iterator it = subprojects.iterator();
        while (it.hasNext()) {

    private static void putBuildElement(AntProjectHelper helper, List<String> buildFolders, String elemName) {
        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<Element> folders = XMLUtil.findSubElements(foldersEl);
            Iterator it = folders.iterator();
            while (it.hasNext()) {
                Element buildFolderEl = (Element)it.next();

            Element locationEl = doc.createElementNS(Util.NAMESPACE, "location"); // NOI18N
            locationEl.appendChild(doc.createTextNode(location));
            buildFolderEl.appendChild(locationEl);
            XMLUtil.appendChildElement(foldersEl, buildFolderEl, folderElementsOrder);
        }
        Util.putPrimaryConfigurationData(helper, data);
    }

        //assert ProjectManager.mutex().isReadAccess() || ProjectManager.mutex().isWriteAccess();
        List<TargetMapping> list = new ArrayList<TargetMapping>();
        Element genldata = Util.getPrimaryConfigurationData(helper);
        Element actionsEl = XMLUtil.findElement(genldata, "ide-actions", Util.NAMESPACE); // NOI18N
        if (actionsEl == null) {
            return list;
        }
        for (Element actionEl : XMLUtil.findSubElements(actionsEl)) {
            TargetMapping tm = new TargetMapping();
            tm.name = actionEl.getAttribute("name"); // NOI18N
            List<String> targetNames = new ArrayList<String>();
            EditableProperties props = new EditableProperties(false);
            for (Element subEl : XMLUtil.findSubElements(actionEl)) {
                if (subEl.getLocalName().equals("target")) { // NOI18N
                    targetNames.add(XMLUtil.findText(subEl));
                    continue;
                }
                if (subEl.getLocalName().equals("script")) { // NOI18N
                    tm.script = XMLUtil.findText(subEl);
                    continue;
                }
                if (subEl.getLocalName().equals("context")) { // NOI18N
                    TargetMapping.Context ctx = new TargetMapping.Context();
                    for (Element contextSubEl : XMLUtil.findSubElements(subEl)) {
                        if (contextSubEl.getLocalName().equals("property")) { // NOI18N
                            ctx.property = XMLUtil.findText(contextSubEl);
                            continue;
                        }
                        if (contextSubEl.getLocalName().equals("format")) { // NOI18N
                            ctx.format = XMLUtil.findText(contextSubEl);
                            continue;
                        }
                        if (contextSubEl.getLocalName().equals("folder")) { // NOI18N
                            ctx.folder = XMLUtil.findText(contextSubEl);
                            continue;
                        }
                        if (contextSubEl.getLocalName().equals("pattern")) { // NOI18N
                            ctx.pattern = XMLUtil.findText(contextSubEl);
                            continue;
                        }
                        if (contextSubEl.getLocalName().equals("arity")) { // NOI18N
                            Element sepFilesEl = XMLUtil.findElement(contextSubEl, "separated-files", Util.NAMESPACE); // NOI18N
                            if (sepFilesEl != null) {
                                ctx.separator = XMLUtil.findText(sepFilesEl);
                            }
                            continue;
                        }

    
    private static void readProperty(Element propertyElement, EditableProperties props) {
        String key = propertyElement.getAttribute("name"); // NOI18N
        String value = XMLUtil.findText(propertyElement);
        props.setProperty(key, value);
    }





import java.util.List;
import javax.swing.event.ChangeListener;
import org.netbeans.api.java.queries.JavadocForBinaryQuery;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.spi.java.queries.JavadocForBinaryQueryImplementation;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.support.ant.PropertyEvaluator;
import org.openide.filesystems.FileUtil;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

    public JavadocForBinaryQuery.Result findJavadoc(URL binaryRoot) {
        Element data = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_3, true);
        if (data != null) {
            for (Element cu : XMLUtil.findSubElements(data)) {
                assert cu.getLocalName().equals("compilation-unit") : cu;
                boolean rightCU = false;
                for (Element builtTo : XMLUtil.findSubElements(cu)) {
                    if (builtTo.getLocalName().equals("built-to")) { // NOI18N
                        String rawtext = XMLUtil.findText(builtTo);
                        assert rawtext != null;
                        String evaltext = eval.evaluate(rawtext);
                        if (evaltext != null) {

                }
                if (rightCU) {
                    List<URL> resultURLs = new ArrayList<URL>();
                    for (Element javadocTo : XMLUtil.findSubElements(cu)) {
                        if (javadocTo.getLocalName().equals("javadoc-built-to")) { // NOI18N
                            String rawtext = XMLUtil.findText(javadocTo);
                            assert rawtext != null;
                            String evaltext = eval.evaluate(rawtext);
                            if (evaltext != null) {




import javax.swing.event.ChangeListener;
import org.netbeans.api.java.queries.SourceForBinaryQuery;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.spi.java.queries.SourceForBinaryQueryImplementation;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.support.ant.AntProjectEvent;

import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Mutex;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

            if (java == null) {
                return null;
            }
            for (Element compilationUnit : XMLUtil.findSubElements(java)) {
                assert compilationUnit.getLocalName().equals("compilation-unit") : compilationUnit;
                List<URL> binaries = findBinaries(compilationUnit);
                if (!binaries.isEmpty()) {

     */
    private List<URL> findBinaries(Element compilationUnitEl) {
        List<URL> binaries = new ArrayList<URL>();
        for (Element builtToEl : XMLUtil.findSubElements(compilationUnitEl)) {
            if (!builtToEl.getLocalName().equals("built-to")) { // NOI18N
                continue;
            }
            String text = XMLUtil.findText(builtToEl);
            String textEval = evaluator.evaluate(text);
            if (textEval == null) {
                continue;




import java.util.Map;
import java.util.WeakHashMap;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.spi.java.queries.SourceLevelQueryImplementation;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.support.ant.AntProjectHelper;

import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Mutex;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

        if (java == null) {
            return null;
        }
        for (Element compilationUnitEl : XMLUtil.findSubElements(java)) {
            assert compilationUnitEl.getLocalName().equals("compilation-unit") : compilationUnitEl;
            List<FileObject> packageRoots = Classpaths.findPackageRoots(helper, evaluator, compilationUnitEl);
            for (FileObject root : packageRoots) {

     * Get the source level indicated in a compilation unit (or null if none is indicated).
     */
    private String getLevel(Element compilationUnitEl) {
        Element sourceLevelEl = XMLUtil.findElement(compilationUnitEl, "source-level", JavaProjectNature.NS_JAVA_3);
        if (sourceLevelEl != null) {
            return XMLUtil.findText(sourceLevelEl);
        } else {
            return null;
        }




import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.spi.java.queries.MultipleRootsUnitTestForSourceQueryImplementation;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.support.ant.AntProjectHelper;

import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileStateInvalidException;
import org.openide.filesystems.FileUtil;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

        List<URL> tests = new ArrayList<URL>();
        Element data = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_3, true);
        if (data != null) {
            for (Element cu : XMLUtil.findSubElements(data)) {
                assert cu.getLocalName().equals("compilation-unit") : cu;
                boolean isTests = XMLUtil.findElement(cu, "unit-tests", JavaProjectNature.NS_JAVA_3) != null; // NOI18N
                for (Element pr : XMLUtil.findSubElements(cu)) {
                    if (pr.getLocalName().equals("package-root")) { // NOI18N
                        String rawtext = XMLUtil.findText(pr);
                        assert rawtext != null;
                        String evaltext = eval.evaluate(rawtext);
                        if (evaltext != null) {




import org.netbeans.api.project.ProjectUtils;
import org.netbeans.modules.ant.freeform.spi.ProjectAccessor;
import org.netbeans.modules.ant.freeform.spi.ProjectConstants;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.support.ant.PropertyEvaluator;

import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
import org.openide.util.RequestProcessor;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;

/**

        Set<String> classpathEntries = new HashSet<String>();
        Element java = JavaProjectGenerator.getJavaCompilationUnits(aux);
        if (java != null) {
            for (Element compilationUnitEl : XMLUtil.findSubElements(java)) {
                compilationUnits++;
                int builtTos = 0;
                int roots = 0;
                for (Element other : XMLUtil.findSubElements(compilationUnitEl)) {
                    String name = other.getLocalName();
                    if (name.equals("package-root")) { // NOI18N
                        roots++;
                    } else if (name.equals("built-to")) { // NOI18N
                        builtTos++;
                    } else if (name.equals("classpath")) { // NOI18N
                        String text = XMLUtil.findText(other);
                        if (text != null) {
                            String textEval = eval.evaluate(text);
                            if (textEval != null) {




import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.modules.java.freeform.JavaProjectGenerator;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.support.ant.EditableProperties;
import org.netbeans.spi.project.support.ant.GeneratedFilesHelper;

        Element projectE = nbjdkDoc.getDocumentElement();
        Set<String> targetsCreated = new HashSet<String>();
        // XXX remove any definition of ${ant.script}, which will by now be obsolete
        Element ideActionsE = XMLUtil.findElement(generalDataE, "ide-actions", Util.NAMESPACE);
        if (ideActionsE != null) {
            for (Element actionE : XMLUtil.findSubElements(ideActionsE)) {
                rebindAction(actionE, projectE, targetsCreated);
            }
        }
        Element viewE = XMLUtil.findElement(generalDataE, "ide-actions", Util.NAMESPACE);
        if (viewE != null) {
            Element contextMenuE = XMLUtil.findElement(viewE, "context-menu", Util.NAMESPACE);
            if (contextMenuE != null) {
                for (Element actionE : XMLUtil.findSubElements(contextMenuE)) {
                    if (!actionE.getLocalName().equals("action")) {
                        continue; // ignore <ide-action> here
                    }

    }

    private void rebindAction(Element actionE, Element projectE, Set<String> targetsCreated) {
        Element scriptE = XMLUtil.findElement(actionE, "script", Util.NAMESPACE); // NOI18N
        String script;
        if (scriptE != null) {
            script = XMLUtil.findText(scriptE);
            actionE.removeChild(scriptE);
        } else {
            script = "build.xml"; // NOI18N

        scriptE.appendChild(actionE.getOwnerDocument().createTextNode(NBJDK_XML));
        actionE.insertBefore(scriptE, actionE.getFirstChild());
        List<String> targetNames = new ArrayList<String>();
        for (Element targetE : XMLUtil.findSubElements(actionE)) {
            if (!targetE.getLocalName().equals("target")) { // NOI18N
                continue;
            }
            targetNames.add(XMLUtil.findText(targetE));
        }
        if (targetNames.isEmpty()) {
            targetNames.add(null);




import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Mutex;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;


        FileUtil.createData(new File(d, "s/ignored/file"));
        Element data = Util.getPrimaryConfigurationData(helper);
        Document doc = data.getOwnerDocument();
        Element sf = (Element) data.insertBefore(doc.createElementNS(Util.NAMESPACE, "folders"), XMLUtil.findElement(data, "view", Util.NAMESPACE)).
                appendChild(doc.createElementNS(Util.NAMESPACE, "source-folder"));
        sf.appendChild(doc.createElementNS(Util.NAMESPACE, "label")).appendChild(doc.createTextNode("Sources"));
        sf.appendChild(doc.createElementNS(Util.NAMESPACE, "type")).appendChild(doc.createTextNode(JavaProjectConstants.SOURCES_TYPE_JAVA));

        data.getElementsByTagName("properties").item(0).
                appendChild(doc.createElementNS(Util.NAMESPACE, "property-file")).
                appendChild(doc.createTextNode("config.properties"));
        Element folders = (Element) data.insertBefore(doc.createElementNS(Util.NAMESPACE, "folders"), XMLUtil.findElement(data, "view", Util.NAMESPACE));
        Element sf = (Element) folders.appendChild(doc.createElementNS(Util.NAMESPACE, "source-folder"));
        sf.appendChild(doc.createElementNS(Util.NAMESPACE, "label")).appendChild(doc.createTextNode("Sources #1"));
        sf.appendChild(doc.createElementNS(Util.NAMESPACE, "type")).appendChild(doc.createTextNode(JavaProjectConstants.SOURCES_TYPE_JAVA));




import java.util.Locale;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.modules.ant.freeform.FreeformProject;
import org.netbeans.modules.ant.freeform.FreeformProjectType;
import org.netbeans.modules.ant.freeform.TestBase;
import org.netbeans.modules.ant.freeform.spi.support.Util;
import org.netbeans.spi.project.ActionProvider;

        prj = copyProject(simple);
        // Remove existing context-sensitive bindings to make a clean slate.
        Element data = prj.getPrimaryConfigurationData();
        Element ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
        assertNotNull(ideActions);
        Iterator<Element> actionsIt = XMLUtil.findSubElements(ideActions).iterator();
        while (actionsIt.hasNext()) {
            Element action = actionsIt.next();
            assertEquals("action", action.getLocalName());
            if (XMLUtil.findElement(action, "context", Util.NAMESPACE) != null) {
                ideActions.removeChild(action);
            }
        }

        ja.addBinding("some.action", "special.xml", "special-target", "selection", "${some.src.dir}", "\\.java$", "relative-path", ",");
        Element data = prj.getPrimaryConfigurationData();
        assertNotNull(data);
        Element ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
        assertNotNull(ideActions);
        List<Element> actions = XMLUtil.findSubElements(ideActions);
        Element lastAction = actions.get(actions.size() - 1);
        String expectedXml =
            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +

        assertEquals(expectedXml, xmlToString(lastAction));
        ja.addBinding("some.other.action", "special.xml", "special-target", "selection", "${some.src.dir}", null, "relative-path", null);
        data = prj.getPrimaryConfigurationData();
        ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
        actions = XMLUtil.findSubElements(ideActions);
        lastAction = actions.get(actions.size() - 1);
        expectedXml =
            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +

        // Non-context-sensitive bindings have no <context> but need to add a view item.
        ja.addBinding("general.action", "special.xml", "special-target", null, null, null, null, null);
        data = prj.getPrimaryConfigurationData();
        ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
        actions = XMLUtil.findSubElements(ideActions);
        lastAction = actions.get(actions.size() - 1);
        expectedXml =
            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +

            "    <target>special-target</target>\n" +
            "</action>\n";
        assertEquals(expectedXml, xmlToString(lastAction));
        Element view = XMLUtil.findElement(data, "view", Util.NAMESPACE);
        assertNotNull(view);
        Element contextMenu = XMLUtil.findElement(view, "context-menu", Util.NAMESPACE);
        assertNotNull(contextMenu);
        // Currently (no FPG to help) it is always added as the last item.
        List<Element> contextMenuActions = XMLUtil.findSubElements(contextMenu);
        Element lastContextMenuAction = contextMenuActions.get(contextMenuActions.size() - 1);
        expectedXml =
            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +

        
        //test #58442:
        data = prj.getPrimaryConfigurationData();
        ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
        data.removeChild(ideActions);
        
        ja.addBinding("some.other.action", "special.xml", "special-target", "selection", "${some.src.dir}", null, "relative-path", null);
        data = prj.getPrimaryConfigurationData();
        ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
        actions = XMLUtil.findSubElements(ideActions);
        lastAction = actions.get(actions.size() - 1);
        expectedXml =
            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +

        assertEquals("Correct code generated for external script", expectedXml, xmlToString(root));
        // And also with locations defined as special properties in various ways...
        Element data = prj.getPrimaryConfigurationData();
        Element properties = XMLUtil.findElement(data, "properties", Util.NAMESPACE);
        assertNotNull(properties);
        Element property = data.getOwnerDocument().createElementNS(Util.NAMESPACE, "property");
        property.setAttribute("name", "external.xml");




import org.netbeans.spi.project.support.ant.PropertyUtils;
import org.openide.modules.ModuleInfo;
import org.openide.util.Lookup;
import org.openide.xml.XMLUtil;

/**
 * Tests for JavaProjectGenerator.

        // check that all elements are written in expected order
        
        Element el = Util.getPrimaryConfigurationData(helper);
        List subElements = XMLUtil.findSubElements(el);
        assertEquals(7, subElements.size());
        assertElementArray(subElements, 
            new String[]{"name", "properties", "folders", "ide-actions", "export", "view", "subprojects"}, 
            new String[]{null, null, null, null, null, null, null});
        Element el2 = (Element)subElements.get(5);
        subElements = XMLUtil.findSubElements(el2);
        assertEquals(2, subElements.size());
        assertElementArray(subElements, 
            new String[]{"items", "context-menu"}, 
            new String[]{null, null});
        Element el3 = (Element)subElements.get(0);
        List subEls = XMLUtil.findSubElements(el3);
        assertEquals(2, subEls.size());
        assertElementArray(subEls, 
            new String[]{"source-folder", "source-file"}, 
            new String[]{null, null});
        el3 = (Element)subElements.get(1);
        subEls = XMLUtil.findSubElements(el3);
        assertEquals(2, subEls.size());
        assertElementArray(subEls, 
            new String[]{"ide-action", "action"}, 

        FreeformProjectGenerator.putTargetMappings(helper, mappings);
//        ProjectManager.getDefault().saveAllProjects();
        el = Util.getPrimaryConfigurationData(helper);
        subElements = XMLUtil.findSubElements(el);
        assertEquals(7, subElements.size());
        assertElementArray(subElements, 
            new String[]{"name", "properties", "folders", "ide-actions", "export", "view", "subprojects"}, 
            new String[]{null, null, null, null, null, null, null});
        el2 = (Element)subElements.get(5);
        subElements = XMLUtil.findSubElements(el2);
        assertEquals(2, subElements.size());
        assertElementArray(subElements, 
            new String[]{"items", "context-menu"}, 
            new String[]{null, null});
        el3 = (Element)subElements.get(0);
        subEls = XMLUtil.findSubElements(el3);
        assertEquals(2, subEls.size());
        assertElementArray(subEls, 
            new String[]{"source-folder", "source-file"}, 
            new String[]{null, null});
        el3 = (Element)subElements.get(1);
        subEls = XMLUtil.findSubElements(el3);
        assertEquals(2, subEls.size());
        assertElementArray(subEls, 
            new String[]{"ide-action", "action"}, 

        String message = "Element "+element+" does not match [name="+expectedName+",value="+expectedValue+"]"; // NOI18N
        assertEquals(message, expectedName, element.getLocalName());
        if (expectedValue != null) {
            assertEquals(message, expectedValue, XMLUtil.findText(element));
        }
    }


            expectedValue+", attr="+expectedAttrName+", attrvalue="+expectedAttrValue+"]"; // NOI18N
        assertEquals(message, expectedName, element.getLocalName());
        if (expectedValue != null) {
            assertEquals(message, expectedValue, XMLUtil.findText(element));
        }
        String val = element.getAttribute(expectedAttrName);
        assertEquals(expectedAttrValue, val);

        JavaProjectGenerator.putSourceFolders(helper, folders, null);
//        ProjectManager.getDefault().saveAllProjects();
        Element el = Util.getPrimaryConfigurationData(helper);
        el = XMLUtil.findElement(el, "folders", Util.NAMESPACE);
        assertNotNull("Source folders were not saved correctly",  el);
        List subElements = XMLUtil.findSubElements(el);
        assertEquals(2, subElements.size());
        // compare first source folder
        Element el2 = (Element)subElements.get(0);
        assertElement(el2, "source-folder", null);
        List l1 = XMLUtil.findSubElements(el2);
        assertEquals(3, l1.size());
        assertElementArray(l1, 
            new String[]{"label", "type", "location"}, 

        // compare second source folder
        el2 = (Element)subElements.get(1);
        assertElement(el2, "source-folder", null);
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(3, l1.size());
        assertElementArray(l1, 
            new String[]{"label", "type", "location"}, 

        JavaProjectGenerator.putSourceFolders(helper, folders, "type2");
        ProjectManager.getDefault().saveAllProjects();
        el = Util.getPrimaryConfigurationData(helper);
        el = XMLUtil.findElement(el, "folders", Util.NAMESPACE);
        assertNotNull("Source folders were not saved correctly",  el);
        subElements = XMLUtil.findSubElements(el);
        assertEquals(2, subElements.size());
        // compare first source folder
        el2 = (Element)subElements.get(0);
        assertElement(el2, "source-folder", null);
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(3, l1.size());
        assertElementArray(l1, 
            new String[]{"label", "type", "location"}, 

        // compare second source folder
        el2 = (Element)subElements.get(1);
        assertElement(el2, "source-folder", null);
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(3, l1.size());
        assertElementArray(l1, 
            new String[]{"label", "type", "location"}, 

        JavaProjectGenerator.putSourceViews(helper, folders, null);
        ProjectManager.getDefault().saveAllProjects();
        Element el = Util.getPrimaryConfigurationData(helper);
        el = XMLUtil.findElement(el, "view", Util.NAMESPACE);
        assertNotNull("View folders were not saved correctly",  el);
        el = XMLUtil.findElement(el, "items", Util.NAMESPACE);
        assertNotNull("View folders were not saved correctly",  el);
        List subElements = XMLUtil.findSubElements(el);
        // there will be three sublements: <source-file> is added for build.xml during project.creation
        assertEquals(3, subElements.size());
        // compare first source view
        Element el2 = (Element)subElements.get(0);
        assertElement(el2, "source-folder", null, "style", "tree");
        List l1 = XMLUtil.findSubElements(el2);
        assertEquals(2, l1.size());
        assertElementArray(l1, 
            new String[]{"label", "location"}, 

        // compare second source view
        el2 = (Element)subElements.get(1);
        assertElement(el2, "source-folder", null, "style", "packages");
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(2, l1.size());
        assertElementArray(l1, 
            new String[]{"label", "location"}, 

        JavaProjectGenerator.putSourceViews(helper, folders, "packages");
        ProjectManager.getDefault().saveAllProjects();
        el = Util.getPrimaryConfigurationData(helper);
        el = XMLUtil.findElement(el, "view", Util.NAMESPACE);
        assertNotNull("Source views were not saved correctly",  el);
        el = XMLUtil.findElement(el, "items", Util.NAMESPACE);
        assertNotNull("View folders were not saved correctly",  el);
        subElements = XMLUtil.findSubElements(el);
        // there will be three sublements: <source-file> is added for build.xml during project.creation
        assertEquals("3 elements in " + subElements, 3, subElements.size());
        // compare first source view
        el2 = (Element)subElements.get(0);
        assertElement(el2, "source-folder", null, "style", "tree");
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(2, l1.size());
        assertElementArray(l1, 
            new String[]{"label", "location"}, 

        // compare second source view
        el2 = (Element)subElements.get(1);
        assertElement(el2, "source-folder", null, "style", "packages");
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(2, l1.size());
        assertElementArray(l1, 
            new String[]{"label", "location"}, 

//        ProjectManager.getDefault().saveAllProjects();
        Element el = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_1, true);
        assertNotNull("Java compilation units were not saved correctly",  el);
        List subElements = XMLUtil.findSubElements(el);
        assertEquals(2, subElements.size());
        // compare first compilation unit
        Element el2 = (Element)subElements.get(0);
        assertElement(el2, "compilation-unit", null);
        List l1 = XMLUtil.findSubElements(el2);
        assertEquals(7, l1.size());
        assertElementArray(l1, 
            new String[]{"package-root", "package-root", "classpath", "classpath", "built-to", "built-to", "source-level"}, 

        // compare second compilation unit
        el2 = (Element)subElements.get(1);
        assertElement(el2, "compilation-unit", null);
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(7, l1.size());
        assertElementArray(l1, 
            new String[]{"package-root", "package-root", "classpath", "classpath", "built-to", "built-to", "source-level"}, 

//        ProjectManager.getDefault().saveAllProjects();
        el = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_1, true);
        assertNotNull("Java compilation units were not saved correctly",  el);
        subElements = XMLUtil.findSubElements(el);
        assertEquals(1, subElements.size());
        // compare first compilation unit
        el2 = (Element)subElements.get(0);
        assertElement(el2, "compilation-unit", null);
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(1, l1.size());
        assertElementArray(l1, 
            new String[]{"package-root"}, 

        // Check that the correct /1 data was saved.
        Element el = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_1, true);
        assertNotNull("Java compilation units were saved in /1",  el);
        List<Element> subElements = XMLUtil.findSubElements(el);
        assertEquals(1, subElements.size());
        // compare the compilation unit
        Element el2 = (Element) subElements.get(0);
        assertElement(el2, "compilation-unit", null);
        assertElementArray(XMLUtil.findSubElements(el2),
            new String[] {"package-root"},
            new String[] {"pkgroot1"});
        ProjectManager.getDefault().saveAllProjects();

        assertNull("No /1 data", el);
        el = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_2, true);
        assertNotNull("Have /2 data", el);
        subElements = XMLUtil.findSubElements(el);
        assertEquals(1, subElements.size());
        // compare the compilation unit
        el2 = (Element) subElements.get(0);
        assertElement(el2, "compilation-unit", null);
        assertElementArray(XMLUtil.findSubElements(el2),
            new String[] {"package-root", "unit-tests"},
            new String[] {"pkgroot1", null});
        ProjectManager.getDefault().saveAllProjects();

        assertNull("No /1 data", el);
        el = aux.getConfigurationFragment(JavaProjectNature.EL_JAVA, JavaProjectNature.NS_JAVA_2, true);
        assertNotNull("Have /2 data", el);
        subElements = XMLUtil.findSubElements(el);
        assertEquals(1, subElements.size());
        // compare the compilation unit
        el2 = (Element) subElements.get(0);
        assertElement(el2, "compilation-unit", null);
        assertElementArray(XMLUtil.findSubElements(el2),
            new String[] {"package-root", "javadoc-built-to", "javadoc-built-to"},
            new String[] {"pkgroot1", "javadoc1", "javadoc2"});
        ProjectManager.getDefault().saveAllProjects();

        
        JavaProjectGenerator.putExports(helper, exports);
        Element el = Util.getPrimaryConfigurationData(helper);
        List subElements = XMLUtil.findSubElements(el);
        // 4, i.e. name, two exports and one view of build.xml file
        assertEquals(5, subElements.size());
        // compare first compilation unit

        assertElement(el2, "properties", null);
        el2 = (Element)subElements.get(2);
        assertElement(el2, "export", null);
        List l1 = XMLUtil.findSubElements(el2);
        assertEquals(5, l1.size());
        assertElementArray(l1, 
            new String[]{"type", "location", "script", "build-target", "clean-target"}, 

        // compare second compilation unit
        el2 = (Element)subElements.get(3);
        assertElement(el2, "export", null);
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(3, l1.size());
        assertElementArray(l1, 
            new String[]{"type", "location", "build-target"}, 

        
        JavaProjectGenerator.putExports(helper, exports);
        el = Util.getPrimaryConfigurationData(helper);
        subElements = XMLUtil.findSubElements(el);
        // 3, i.e. name, export and one view of build.xml file
        assertEquals(4, subElements.size());
        // compare first compilation unit

        assertElement(el2, "properties", null);
        el2 = (Element)subElements.get(2);
        assertElement(el2, "export", null);
        l1 = XMLUtil.findSubElements(el2);
        assertEquals(3, l1.size());
        assertElementArray(l1, 
            new String[]{"type", "location", "build-target"}, 

        
        JavaProjectGenerator.putSubprojects(helper, subprojects);
        Element el = Util.getPrimaryConfigurationData(helper);
        Element subprojectsEl = XMLUtil.findElement(el, "subprojects", Util.NAMESPACE);
        assertNotNull("<subprojects> element exists", subprojectsEl);
        List subElements = XMLUtil.findSubElements(subprojectsEl);
        assertEquals("project depends on two subprojects", 2, subElements.size());
        Element el2 = (Element)subElements.get(0);
        assertElement(el2, "project", "/some/path/projA");

        subprojects.add("/projC");
        JavaProjectGenerator.putSubprojects(helper, subprojects);
        el = Util.getPrimaryConfigurationData(helper);
        subprojectsEl = XMLUtil.findElement(el, "subprojects", Util.NAMESPACE);
        subElements = XMLUtil.findSubElements(subprojectsEl);
        assertEquals("project depends on one subproject", 1, subElements.size());
        el2 = (Element)subElements.get(0);
        assertElement(el2, "project", "/projC");
        subprojects = new ArrayList();
        JavaProjectGenerator.putSubprojects(helper, subprojects);
        el = Util.getPrimaryConfigurationData(helper);
        subprojectsEl = XMLUtil.findElement(el, "subprojects", Util.NAMESPACE);
        subElements = XMLUtil.findSubElements(subprojectsEl);
        assertEquals("project depends on one subproject", 0, subElements.size());
        
        ProjectManager.getDefault().saveAllProjects();

        
        JavaProjectGenerator.putBuildFolders(helper, buildFolders);
        Element el = Util.getPrimaryConfigurationData(helper);
        Element foldersEl = XMLUtil.findElement(el, "folders", Util.NAMESPACE);
        assertNotNull("<folders> element exists", foldersEl);
        List subElements = XMLUtil.findSubElements(foldersEl);
        assertEquals("project has two build-folders", 2, subElements.size());
        Element el2 = (Element)subElements.get(0);
        assertElement(el2, "build-folder", null);
        assertEquals("build-folder has one subelement", 1, XMLUtil.findSubElements(el2).size());
        assertElement((Element)XMLUtil.findSubElements(el2).get(0), "location", "/some/path/projA");
        el2 = (Element)subElements.get(1);
        assertElement(el2, "build-folder", null);
        assertEquals("build-folder has one subelement", 1, XMLUtil.findSubElements(el2).size());
        assertElement((Element)XMLUtil.findSubElements(el2).get(0), "location", "C:\\dev\\projB");
        
        ProjectManager.getDefault().saveAllProjects();
        

        buildFolders.add("/projC");
        JavaProjectGenerator.putBuildFolders(helper, buildFolders);
        el = Util.getPrimaryConfigurationData(helper);
        foldersEl = XMLUtil.findElement(el, "folders", Util.NAMESPACE);
        subElements = XMLUtil.findSubElements(foldersEl);
        assertEquals("project has one build-folder", 1, subElements.size());
        el2 = (Element)subElements.get(0);
        assertElement(el2, "build-folder", null);
        assertEquals("build-folder has one subelement", 1, XMLUtil.findSubElements(el2).size());
        assertElement((Element)XMLUtil.findSubElements(el2).get(0), "location", "/projC");
        buildFolders = new ArrayList();
        JavaProjectGenerator.putBuildFolders(helper, buildFolders);
        el = Util.getPrimaryConfigurationData(helper);
        foldersEl = XMLUtil.findElement(el, "folders", Util.NAMESPACE);
        subElements = XMLUtil.findSubElements(foldersEl);
        assertEquals("project has no build-folder", 0, subElements.size());
        
        ProjectManager.getDefault().saveAllProjects();

        
        JavaProjectGenerator.putBuildFiles(helper, buildFiles);
        Element el = Util.getPrimaryConfigurationData(helper);
        Element foldersEl = XMLUtil.findElement(el, "folders", Util.NAMESPACE);
        assertNotNull("<folders> element exists", foldersEl);
        List subElements = XMLUtil.findSubElements(foldersEl);
        assertEquals("project has two build-files", 2, subElements.size());
        Element el2 = (Element)subElements.get(0);
        assertElement(el2, "build-file", null);
        assertEquals("build-file has one subelement", 1, XMLUtil.findSubElements(el2).size());
        assertElement((Element)XMLUtil.findSubElements(el2).get(0), "location", "/some/path/projA/archive.jar");
        el2 = (Element)subElements.get(1);
        assertElement(el2, "build-file", null);
        assertEquals("build-file has one subelement", 1, XMLUtil.findSubElements(el2).size());
        assertElement((Element)XMLUtil.findSubElements(el2).get(0), "location", "C:\\dev\\projB\\library.jar");
        
        ProjectManager.getDefault().saveAllProjects();
        

        buildFiles.add("/projC/dist/projC.jar");
        JavaProjectGenerator.putBuildFiles(helper, buildFiles);
        el = Util.getPrimaryConfigurationData(helper);
        foldersEl = XMLUtil.findElement(el, "folders", Util.NAMESPACE);
        subElements = XMLUtil.findSubElements(foldersEl);
        assertEquals("project has one build-file", 1, subElements.size());
        el2 = (Element)subElements.get(0);
        assertElement(el2, "build-file", null);
        assertEquals("build-file has one subelement", 1, XMLUtil.findSubElements(el2).size());
        assertElement((Element)XMLUtil.findSubElements(el2).get(0), "location", "/projC/dist/projC.jar");
        
        buildFiles = new ArrayList();
        JavaProjectGenerator.putBuildFiles(helper, buildFiles);
        el = Util.getPrimaryConfigurationData(helper);
        foldersEl = XMLUtil.findElement(el, "folders", Util.NAMESPACE);
        subElements = XMLUtil.findSubElements(foldersEl);
        assertEquals("project has no build-file", 0, subElements.size());
        
        ProjectManager.getDefault().saveAllProjects();

Lines 280-286 Link Here

(-)a/java.j2seproject/nbproject/project.xml (-1 / +1 lines)
280	<build-prerequisite/>	280	<build-prerequisite/>
281	<compile-dependency/>	281	<compile-dependency/>
282	<run-dependency>	282	<run-dependency>
283	<specification-version>8.0</specification-version>	283	<specification-version>8.4</specification-version>
284	</run-dependency>	284	</run-dependency>
285	</dependency>	285	</dependency>
286	<dependency>	286	<dependency>




import org.openide.NotifyDescriptor;
import org.openide.util.Mutex;
import org.openide.util.NbBundle;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;

/**
 *

            if (oldRoot != null) {
                Document doc = oldRoot.getOwnerDocument();
                Element newRoot = doc.createElementNS (J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); //NOI18N
                XMLUtil.copyDocument (oldRoot, newRoot, J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE);
                Element sourceRoots = doc.createElementNS(J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE,"source-roots");  //NOI18N
                Element root = doc.createElementNS (J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE,"root");   //NOI18N
                root.setAttribute ("id","src.dir");   //NOI18N

                if (oldRoot != null) {
                    Document doc = oldRoot.getOwnerDocument();
                    Element newRoot = doc.createElementNS (J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); //NOI18N
                    XMLUtil.copyDocument (oldRoot, newRoot, J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE);
                    cachedElement = newRoot;
                }
            }

        }
    }

    private static void copyDocument (Document doc, Element from, Element to) {
        NodeList nl = from.getChildNodes();
        int length = nl.getLength();
        for (int i=0; i< length; i++) {
            Node node = nl.item (i);
            Node newNode = null;
            switch (node.getNodeType()) {
                case Node.ELEMENT_NODE:
                    Element oldElement = (Element) node;
                    newNode = doc.createElementNS(J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE,oldElement.getTagName());
                    NamedNodeMap m = oldElement.getAttributes();
                    Element newElement = (Element) newNode;
                    for (int index = 0; index < m.getLength(); index++) {
                        Node attr = m.item(index);
                          newElement.setAttribute(attr.getNodeName(), attr.getNodeValue());
                    }
                    copyDocument(doc,oldElement,newElement);
                    break;
                case Node.TEXT_NODE:
                    Text oldText = (Text) node;
                    newNode = doc.createTextNode(oldText.getData());
                    break;
                case Node.COMMENT_NODE:
                    Comment oldComment = (Comment) node;
                    newNode = doc.createComment(oldComment.getData());
                    break;
            }
            if (newNode != null) {
                to.appendChild (newNode);
            }
        }
    }

    private static void deleteMinAntVersion(final Element root) {
        NodeList list = root.getElementsByTagNameNS (J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE,MINIMUM_ANT_VERSION_ELEMENT);
        if (list.getLength() == 1) {

Lines 352-358 Link Here

(-)a/java.source/nbproject/project.xml (-1 / +1 lines)
352	<build-prerequisite/>	352	<build-prerequisite/>
353	<compile-dependency/>	353	<compile-dependency/>
354	<run-dependency>	354	<run-dependency>
355	<specification-version>8.0</specification-version>	355	<specification-version>8.4</specification-version>
356	</run-dependency>	356	</run-dependency>
357	</dependency>	357	</dependency>
358	<dependency>	358	<dependency>




                assert false : "Shared not implemented";
            }
            Element root = xml.getDocumentElement ();
            Element data = XMLUtil.findElement (root, elementName, namespace);
            if (data != null) {
                return  (Element) data.cloneNode (true);
            } else {

            }
            
            Element root = xml.getDocumentElement ();
            Element existing = XMLUtil.findElement (root, fragment.getLocalName (), fragment.getNamespaceURI ());
            // XXX first compare to existing and return if the same
            if (existing != null) {
                root.removeChild (existing);

            }

            Element root = xml.getDocumentElement ();
            Element data = XMLUtil.findElement (root, elementName, namespace);
            if (data != null) {
                root.removeChild (data);
                return true;

            }
        }
    }
    
    // copied from org.netbeans.modules.project.ant.Util
    private static Element findElement(Element parent, String name, String namespace) {
        Element result = null;
        NodeList l = parent.getChildNodes();
        int len = l.getLength();
        for (int i = 0; i < len; i++) {
            if (l.item(i).getNodeType() == Node.ELEMENT_NODE) {
                Element el = (Element)l.item(i);
                if (name.equals(el.getLocalName()) && namespace.equals(el.getNamespaceURI())) {
                    if (result == null) {
                        result = el;
                    } else {
                        return null;
                    }
                }
            }
        }
        return result;
    }
}

Lines 362-368 Link Here

(-)a/maven/nbproject/project.xml (-1 / +1 lines)
362	<build-prerequisite/>	362	<build-prerequisite/>
363	<compile-dependency/>	363	<compile-dependency/>
364	<run-dependency>	364	<run-dependency>
365	<specification-version>8.0</specification-version>	365	<specification-version>8.4</specification-version>
366	</run-dependency>	366	</run-dependency>
367	</dependency>	367	</dependency>
368	<dependency>	368	<dependency>




import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;


        if (shared) {
            //first check the document schedule for persistence
            if (scheduledDocument != null) {
                Element el = XMLUtil.findElement(scheduledDocument.getDocumentElement(), elementName, namespace);
                if (el != null) {
                    el = (Element) el.cloneNode(true);
                }

                        //TODO shall be have some kind of caching here to prevent frequent IO?
                        doc = XMLUtil.parse(new InputSource(in), false, true, null, null);
                        cachedDoc = doc;
                        return XMLUtil.findElement(doc.getDocumentElement(), elementName, namespace);
                    } catch (SAXException ex) {
                        ProblemReporterImpl impl = project.getProblemReporter();
                        if (!impl.hasReportWithId(BROKEN_NBCONFIG)) {

                } else {
                    //reuse cached value if available;
                    if (cachedDoc != null) {
                        return XMLUtil.findElement(cachedDoc.getDocumentElement(), elementName, namespace);
                    }
                }
            } else {

                Document doc;
                try {
                    doc = XMLUtil.parse(new InputSource(new StringReader(str)), false, true, null, null);
                    return XMLUtil.findElement(doc.getDocumentElement(), elementName, namespace);
                } catch (SAXException ex) {
                    ex.printStackTrace();
                } catch (IOException ex) {

            }
        }
        if (doc != null) {
            Element el = XMLUtil.findElement(doc.getDocumentElement(), fragment.getNodeName(), fragment.getNamespaceURI());
            if (el != null) {
                doc.getDocumentElement().removeChild(el);
            }

            }
        }
        if (doc != null) {
            Element el = XMLUtil.findElement(doc.getDocumentElement(), elementName, namespace);
            if (el != null) {
                doc.getDocumentElement().removeChild(el);
            }

        return true;
    }

    private static Element findElement(Element parent, String name, String namespace) {
        Element result = null;
        NodeList l = parent.getChildNodes();
        int len = l.getLength();
        for (int i = 0; i < len; i++) {
            if (l.item(i).getNodeType() == Node.ELEMENT_NODE) {
                Element el = (Element) l.item(i);
                if (name.equals(el.getLocalName()) && ((namespace == el.getNamespaceURI()) /*check both namespaces are null*/ || (namespace != null && namespace.equals(el.getNamespaceURI())))) {
                    if (result == null) {
                        result = el;
                    } else {
                        return null;
                    }
                }
            }
        }
        return result;
    }

    static class OpenConfigAction extends AbstractAction {

        private FileObject fo;

Lines 213-219 Link Here

(-)a/o.n.bluej/nbproject/project.xml (-1 / +1 lines)
213	<build-prerequisite/>	213	<build-prerequisite/>
214	<compile-dependency/>	214	<compile-dependency/>
215	<run-dependency>	215	<run-dependency>
216	<specification-version>8.0</specification-version>	216	<specification-version>8.4</specification-version>
217	</run-dependency>	217	</run-dependency>
218	</dependency>	218	</dependency>
219	<dependency>	219	<dependency>




import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.support.ant.EditableProperties;
import org.netbeans.spi.project.support.ant.GeneratedFilesHelper;
import org.openide.xml.XMLUtil;


/**

            if (oldRoot != null) {
                Document doc = oldRoot.getOwnerDocument();
                Element newRoot = doc.createElementNS (BluejProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); // NOI18N
                XMLUtil.copyDocument (oldRoot, newRoot, BluejProjectType.PROJECT_CONFIGURATION_NAMESPACE);
                Element sourceRoots = doc.createElementNS(BluejProjectType.PROJECT_CONFIGURATION_NAMESPACE,"source-roots");  // NOI18N
                Element root = doc.createElementNS (BluejProjectType.PROJECT_CONFIGURATION_NAMESPACE,"root");   // NOI18N
                root.setAttribute ("id","src.dir");   // NOI18N

                if (oldRoot != null) {
                    Document doc = oldRoot.getOwnerDocument();
                    Element newRoot = doc.createElementNS (BluejProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); // NOI18N
                    XMLUtil.copyDocument (oldRoot, newRoot, BluejProjectType.PROJECT_CONFIGURATION_NAMESPACE);
                    cachedElement = updateMinAntVersion (newRoot, doc);
                }
            }

        return cachedProperties;
    }

    private static void copyDocument (Document doc, Element from, Element to) {
        NodeList nl = from.getChildNodes();
        int length = nl.getLength();
        for (int i=0; i< length; i++) {
            Node node = nl.item (i);
            Node newNode = null;
            switch (node.getNodeType()) {
                case Node.ELEMENT_NODE:
                    Element oldElement = (Element) node;
                    newNode = doc.createElementNS(BluejProjectType.PROJECT_CONFIGURATION_NAMESPACE,oldElement.getTagName());
                    NamedNodeMap m = oldElement.getAttributes();
                    Element newElement = (Element) newNode;
                    for (int index = 0; index < m.getLength(); index++) {
                        Node attr = m.item(index);
                          newElement.setAttribute(attr.getNodeName(), attr.getNodeValue());
                    }
                    copyDocument(doc,oldElement,newElement);
                    break;
                case Node.TEXT_NODE:
                    Text oldText = (Text) node;
                    newNode = doc.createTextNode(oldText.getData());
                    break;
                case Node.COMMENT_NODE:
                    Comment oldComment = (Comment) node;
                    newNode = doc.createComment(oldComment.getData());
                    break;
            }
            if (newNode != null) {
                to.appendChild (newNode);
            }
        }
    }

    static final String MINIMUM_ANT_VERSION = "1.6.5";  // NOI18N
    
    private static Element updateMinAntVersion (final Element root, final Document doc) {

Lines 142-148 Link Here

(-)a/openide.loaders/nbproject/project.xml (-1 / +1 lines)
142	<build-prerequisite/>	142	<build-prerequisite/>
143	<compile-dependency/>	143	<compile-dependency/>
144	<run-dependency>	144	<run-dependency>
145	<specification-version>8.0</specification-version>	145	<specification-version>8.4</specification-version>
146	</run-dependency>	146	</run-dependency>
147	</dependency>	147	</dependency>
148	<dependency>	148	<dependency>




    @Deprecated
    public static Document parse (URL url, ErrorHandler eh, boolean validate) throws IOException, SAXException {
        
        return XMLUtil.parse (new InputSource(url.toExternalForm()),validate, false, eh, getChainingEntityResolver());
        builder.setErrorHandler(eh);
        builder.setEntityResolver(getChainingEntityResolver());
        
        return builder.parse (new InputSource(url.toExternalForm()));

    }

    /** Creates SAX parse that can be used to parse XML files.




      <class package="org.openide.xml" name="XMLUtil"/>
      <issue number="16629"/>
    </change>
    <change id="refactored-methods-into-XMLUtil">
        <api name="xml"/>
        <summary>Refactored XML methods from various modules to be added
        to <code>XMLUtil</code>.  Seven new methods added.</summary>
        <version major="8" minor="4"/>
        <date day="7" month="4" year="2010"/>
        <author login="mvfranz"/>
        <compatibility addition="yes"/>
        <description>
            <p>
                Refactored XML related methods into XMLUtil.
            </p>
        </description>
        <class package="org.openide.xml" name="XMLUtil"/>
        <issue number="136595"/>
    </change>
</changes>
<htmlcontents>
<head>

Lines 1-5 Link Here

(-)a/openide.util/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.openide.util	2	OpenIDE-Module: org.openide.util
3	OpenIDE-Module-Localizing-Bundle: org/openide/util/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/openide/util/Bundle.properties
4	OpenIDE-Module-Specification-Version: 8.2	4	OpenIDE-Module-Specification-Version: 8.4
5		5

Lines 45-52 Link Here

(-)a/openide.util/src/org/openide/xml/XMLUtil.java (+246 lines)
45	import java.io.IOException;	45	import java.io.IOException;
46	import java.io.OutputStream;	46	import java.io.OutputStream;
47	import java.io.StringReader;	47	import java.io.StringReader;
		48	import java.util.ArrayList;
		49	import java.util.Arrays;
48	import java.util.HashMap;	50	import java.util.HashMap;
49	import java.util.HashSet;	51	import java.util.HashSet;
		52	import java.util.List;
		53	import java.util.logging.Level;
		54	import java.util.logging.Logger;
50	import java.util.Map;	55	import java.util.Map;
51	import java.util.Set;	56	import java.util.Set;
52	import javax.xml.parsers.DocumentBuilder;	57	import javax.xml.parsers.DocumentBuilder;
Lines 64-69 Link Here
64	import javax.xml.transform.stream.StreamSource;	69	import javax.xml.transform.stream.StreamSource;
65	import javax.xml.validation.Schema;	70	import javax.xml.validation.Schema;
66	import javax.xml.validation.Validator;	71	import javax.xml.validation.Validator;
		72	import org.openide.util.Exceptions;
67	import org.w3c.dom.Attr;	73	import org.w3c.dom.Attr;
68	import org.w3c.dom.CDATASection;	74	import org.w3c.dom.CDATASection;
69	import org.w3c.dom.DOMException;	75	import org.w3c.dom.DOMException;
Lines 842-845 Link Here
842	}	848	}
843	return doc;	849	return doc;
844	}	850	}
		851
		852	/**
		853	* Append a child element to the parent at the specified location.
		854	*
		855	* Starting with a valid document, append an element according to the schema
		856	* sequence represented by the <code>order</code>. All existing child elements must be
		857	* include as well as the new element. The existing child element following
		858	* the new child is important, as the element will be 'inserted before', not
		859	* 'inserted after'.
		860	*
		861	* @param parent parent to which the child will be appended
		862	* @param el element to be added
		863	* @param order order of the elements which must be followed
		864	* @throws IllegalArgumentException if the order cannot be followed, either
		865	* a missing existing or new child element is not specifed in order
		866	*
		867	* @since 8.4
		868	*/
		869	public static void appendChildElement(Element parent, Element el, String[] order) throws IllegalArgumentException {
		870	List l = Arrays.asList(order);
		871	int index = l.indexOf(el.getLocalName());
		872
		873	// ensure the new new element is contained in the 'order'
		874	if (index == -1) {
		875	throw new IllegalArgumentException("new child element '"+ el.getLocalName() + "' not specified in order " + l); // NOI18N
		876	}
		877
		878	List<Element> elements = findSubElements(parent);
		879	Element insertBefore = null;
		880
		881	for (Element e : elements) {
		882	int index2 = l.indexOf(e.getLocalName());
		883	// ensure that all existing elements are in 'order'
		884	if (index2 == -1) {
		885	throw new IllegalArgumentException("Existing child element '" + e.getLocalName() + "' not specified in order " + l); // NOI18N
		886	}
		887	if (index2 > index) {
		888	insertBefore = e;
		889	break;
		890	}
		891	}
		892
		893	parent.insertBefore(el, insertBefore);
		894	}
		895
		896	/**
		897	* Find all direct child elements of an element.
		898	* Children which are all-whitespace text nodes or comments are ignored; others cause
		899	* an exception to be thrown.
		900	* @param parent a parent element in a DOM tree
		901	* @return a list of direct child elements (may be empty)
		902	* @throws IllegalArgumentException if there are non-element children besides whitespace
		903	*
		904	* @since 8.4
		905	*/
		906	public static List<Element> findSubElements(Element parent) throws IllegalArgumentException {
		907	NodeList l = parent.getChildNodes();
		908	List<Element> elements = new ArrayList<Element>(l.getLength());
		909	for (int i = 0; i < l.getLength(); i++) {
		910	Node n = l.item(i);
		911	if (n.getNodeType() == Node.ELEMENT_NODE) {
		912	elements.add((Element) n);
		913	} else if (n.getNodeType() == Node.TEXT_NODE) {
		914	String text = ((Text) n).getNodeValue();
915	if (text.trim().length() > 0) {
916	throw new IllegalArgumentException("non-ws text encountered in " + parent + ": " + text); // NOI18N
917	}
918	} else if (n.getNodeType() == Node.COMMENT_NODE) {
919	// OK, ignore
920	} else {
921	throw new IllegalArgumentException("unexpected non-element child of " + parent + ": " + n); // NOI18N
922	}
923	}
924	return elements;
925	}
926
927	/**
928	* Search for an XML element in the direct children of parent only.
929	*
930	* This compares localName (nodeName if localName is null) to name,
931	* and checks the tags namespace with the provided namespace.
932	* A <code>null</code> namespace will match any namespace.
933	*
934	* <ul>This is differs from the DOM version by:
935	* <li>not searching recursively</li>
936	* <li>returns a single result</li>
937	* </ul>
938	*
939	* @param parent a parent element
940	* @param name the intended local name
941	* @param namespace the intended namespace (or null)
942	* @return the one child element with that name, or null if none
943	* @throws IllegalArgumentException if there is multiple elements of the same name
944	*
945	* @since 8.4
946	*/
947	public static Element findElement(Element parent, String name, String namespace) throws IllegalArgumentException {
948	Element result = null;
949	NodeList l = parent.getChildNodes();
950	int nodeCount = l.getLength();
951	for (int i = 0; i < nodeCount; i++) {
952	if (l.item(i).getNodeType() == Node.ELEMENT_NODE) {
953	Node node = l.item(i);
954	String localName = node.getLocalName();
955	localName = localName == null ? node.getNodeName() : localName;
956
957	if (name.equals(localName)
958	&& (namespace == null \|\| namespace.equals(node.getNamespaceURI()))) {
959	if (result == null) {
960	result = (Element)node;
961	} else {
962	throw new IllegalArgumentException("more than one element with same name found");
963	}
964	}
965	}
966	}
967	return result;
968	}
969
970	/**
971	* Extract nested text from a node.
972	* Currently does not handle coalescing text nodes, CDATA sections, etc.
973	* @param parent a parent element
974	* @return the nested text, or null if none was found
975	*
976	* @since 8.4
977	*/
978	public static String findText(Node parent) {
979	NodeList l = parent.getChildNodes();
980	for (int i = 0; i < l.getLength(); i++) {
981	if (l.item(i).getNodeType() == Node.TEXT_NODE) {
982	Text text = (Text) l.item(i);
983	return text.getNodeValue();
984	}
985	}
986	return null;
987	}
988
989	/**
990	* Convert an XML fragment from one namespace to another.
991	*
992	* @param from element to translate
993	* @param namespace namespace to be translated to
994	* @return
995	*
996	* @since 8.4
997	*/
998	public static Element translateXML(Element from, String namespace) {
999	Element to = from.getOwnerDocument().createElementNS(namespace, from.getLocalName());
1000	NodeList nl = from.getChildNodes();
1001	int length = nl.getLength();
1002	for (int i = 0; i < length; i++) {
1003	Node node = nl.item(i);
1004	Node newNode;
1005	if (node.getNodeType() == Node.ELEMENT_NODE) {
1006	newNode = translateXML((Element) node, namespace);
1007	} else {
1008	newNode = node.cloneNode(true);
1009	}
1010	to.appendChild(newNode);
1011	}
1012	NamedNodeMap m = from.getAttributes();
1013	for (int i = 0; i < m.getLength(); i++) {
1014	Node attr = m.item(i);
1015	to.setAttribute(attr.getNodeName(), attr.getNodeValue());
1016	}
1017	return to;
1018	}
1019
1020	/**
1021	* Copy elements from one document to another attaching at the specified element
1022	* and translating the namespace.
1023	*
1024	* @param from copy the children of this element (exclusive)
1025	* @param to where to attach the copied elements
1026	* @param newNamespace destination namespace
1027	*
1028	* @since 8.4
1029	*/
1030	public static void copyDocument(Element from, Element to, String newNamespace) {
1031	Document doc = to.getOwnerDocument();
1032	NodeList nl = from.getChildNodes();
1033	int length = nl.getLength();
1034	for (int i = 0; i < length; i++) {
1035	Node node = nl.item(i);
1036	Node newNode = null;
1037	if (Node.ELEMENT_NODE == node.getNodeType()) {
1038	Element oldElement = (Element) node;
1039	newNode = doc.createElementNS(newNamespace, oldElement.getTagName());
1040	NamedNodeMap m = oldElement.getAttributes();
1041	Element newElement = (Element) newNode;
1042	for (int index = 0; index < m.getLength(); index++) {
1043	Node attr = m.item(index);
1044	newElement.setAttribute(attr.getNodeName(), attr.getNodeValue());
1045	}
1046	copyDocument(oldElement, newElement, newNamespace);
1047	} else {
1048	newNode = node.cloneNode(true);
1049	newNode = to.getOwnerDocument().importNode(newNode, true);
1050	}
1051	if (newNode != null) {
1052	to.appendChild(newNode);
1053	}
1054	}
1055	}
1056
1057	/**
1058	* Create an XML error handler that rethrows errors and fatal errors and logs warnings.
1059	* @return a standard error handler
1060	*
1061	* @since 8.4
1062	*/
1063	public static ErrorHandler defaultErrorHandler() {
1064	return new ErrHandler();
1065	}
1066
1067	private static final class ErrHandler implements ErrorHandler {
1068
1069	public ErrHandler() {}
1070
1071	private void annotate(SAXParseException exception) throws SAXException {
1072	Exceptions.attachMessage(exception, "Occurred at: " + exception.getSystemId() + ":" + exception.getLineNumber()); // NOI18N
1073	}
1074
1075	public void fatalError(SAXParseException exception) throws SAXException {
1076	annotate(exception);
1077	throw exception;
1078	}
1079
1080	public void error(SAXParseException exception) throws SAXException {
1081	annotate(exception);
1082	throw exception;
1083	}
1084
1085	public void warning(SAXParseException exception) throws SAXException {
1086	annotate(exception);
1087	Logger.getLogger(XMLUtil.class.getName()).log(Level.INFO, null, exception);
1088	}
1089
1090	}
845	}	1091	}




import java.io.StringReader;
import java.lang.ref.Reference;
import java.lang.ref.WeakReference;
import java.util.List;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.stream.StreamSource;

        assertGC("can collect resolver", resolverRef);
    }

    public void testAppendChildElement() throws Exception {
        Document doc = XMLUtil.parse(new InputSource(new StringReader("<root></root>")), false, true, null, null);
        Element parent = doc.createElementNS("unittest", "parent");
        Element newElement1 = doc.createElementNS("unittest", "new_element1");
        Element newElement2 = doc.createElementNS("unittest", "new_element2");
        Element newElement3 = doc.createElementNS("unittest", "new_element3");

        // append to the default root node (no match in order)
        XMLUtil.appendChildElement(parent, newElement1, new String[] { "new_element2", "new_element1" });
        NodeList children = parent.getChildNodes();
        assertEquals(1, children.getLength());

        // append after the child we just appended
        XMLUtil.appendChildElement(parent, newElement2, new String[] { "new_element2", "new_element1" });

        children = parent.getChildNodes();
        assertEquals(2, children.getLength());
        Node firstChild = parent.getChildNodes().item(0);
        Node secondChild = parent.getChildNodes().item(1);
        assertEquals("new_element2", firstChild.getNodeName());
        assertEquals("new_element1", secondChild.getNodeName());

        // failures

        try {
            // new child is not in the order list
            XMLUtil.appendChildElement(parent, newElement3, new String[] { "new_element2", "new_element1"});
            fail("Expecting IAE");
        } catch (IllegalArgumentException e) {
            assertEquals("new child element 'new_element3' not specified in order [new_element2, new_element1]", e.getMessage());
        }
        try {
            // existing child not in the order list
            XMLUtil.appendChildElement(parent, newElement3, new String[] { "new_element3"});
            fail("Expecting IAE");
        } catch (IllegalArgumentException e) {
            assertEquals("Existing child element 'new_element2' not specified in order [new_element3]", e.getMessage());
        }
    }

    public void testFindSubElements() throws Exception {
        Document doc = XMLUtil.parse(new InputSource(new StringReader("<root> <child1></child1><child2/><!-- comment --><child3/></root>")),
                false, true, null, null);

        Element parent = doc.getDocumentElement();
        assertEquals(5, parent.getChildNodes().getLength());
        List<Element> subElements = XMLUtil.findSubElements(parent);
        assertEquals(3, subElements.size());
        Element firstChild = subElements.get(0);
        Element secondChild = subElements.get(1);
        Element thirdChild = subElements.get(2);

        assertEquals("child1", firstChild.getNodeName());
        assertEquals("child2", secondChild.getNodeName());
        assertEquals("child3", thirdChild.getNodeName());

        Document failureDoc = XMLUtil.parse(new InputSource(new StringReader("<root>Non whitespace<!-- comment --></root>")),
            false, true, null, null);
        Element failedParent = failureDoc.getDocumentElement();
        try {
            XMLUtil.findSubElements(failedParent);
            fail("expected IAE");
        } catch (IllegalArgumentException e) { }
    }

    public void testFindElement() throws Exception {
        String xmlDoc = "<root> " +
                        " <h:table xmlns:h=\"http://www.w3.org/TR/html4/\">" +
                        " </h:table>" +
                        " <f:table xmlns:f=\"http://www.w3schools.com/furniture\">" +
                        " </f:table>" +
                        " <dup/><dup/>" +
                        " <h:form xmlns:h=\"http://www.w3.org/TR/html4/\">" +
                        " </h:form>" +
                        "</root>";
        
        Document doc = XMLUtil.parse(new InputSource(new StringReader(xmlDoc)), false, true, null, null);
        Element parent = doc.getDocumentElement();

        Element doesNotExist1 = XMLUtil.findElement(parent, "doesNotExist", "h");
        assertNull(doesNotExist1);

        Element doesNotExist2 = XMLUtil.findElement(parent, "doesNotExist", null);
        assertNull(doesNotExist2);

        Element noTable2 = XMLUtil.findElement(parent, "table", "h");
        assertNull(noTable2);

        Element noTable3 = XMLUtil.findElement(parent, "table", "f");
        assertNull(noTable3);

        Element table1 = XMLUtil.findElement(parent, "table", "http://www.w3.org/TR/html4/");
        assertNotNull(table1);

        Element table2 = XMLUtil.findElement(parent, "table", "http://www.w3schools.com/furniture");
        assertNotNull(table2);

        Element form1 = XMLUtil.findElement(parent, "form", "http://www.w3.org/TR/html4/");
        assertNotNull(form1);

        Element form2 = XMLUtil.findElement(parent, "form", null);
        assertNotNull(form2);

        assertEquals(form1, form2);

        try {
            XMLUtil.findElement(parent, "dup", null);
            fail("Expected IAE");
        } catch (IllegalArgumentException e) { }

        try {
            XMLUtil.findElement(parent, "table", null);
            fail("Expected IAE");
        } catch (IllegalArgumentException e) { }
    }

    public void testFindText() throws Exception {
        Document doc = XMLUtil.parse(new InputSource(new StringReader("<root>Text To Find<child></child></root>")),
                false, true, null, null);

        Element parent = doc.getDocumentElement();
        String foundText = XMLUtil.findText(parent);

        assertEquals("Text To Find", foundText);

        String notFoundText = XMLUtil.findText(parent.getFirstChild());

        assertNull(notFoundText);
    }

    public void testTranslateXML() throws Exception {
        // don't add any whitespace to the first 3 nodes
        String xmlDoc = "<root><table bgcolor='red'><tr>" +
                        "   <td>Apples</td>" +
                        "   <td>Bananas</td>" +
                        "  </tr>" +
                        " </table>" +
                        " <!-- comment -->" +
                        "<![CDATA[free form data]]>" +
                        "</root>";

        Document doc = XMLUtil.parse(new InputSource(new StringReader(xmlDoc)), false, true, null, null);
        Element parent = doc.getDocumentElement();

        Element translated = XMLUtil.translateXML((Element) parent.getFirstChild(), "http://www.w3.org/TR/html4/");

        ByteArrayOutputStream baos = new ByteArrayOutputStream();
        XMLUtil.write(doc, baos, "UTF-8");

        Document destDoc = XMLUtil.parse(new InputSource(new StringReader("<root/>")), false, true, null, null);

        destDoc.importNode(translated, true);
        baos = new ByteArrayOutputStream();
        XMLUtil.write(destDoc, baos, "UTF-8");

        assertEquals("http://www.w3.org/TR/html4/", translated.getNamespaceURI());
        assertEquals(1, translated.getAttributes().getLength());

        assertEquals("http://www.w3.org/TR/html4/", translated.getFirstChild().getNamespaceURI());
        assertEquals(0, translated.getFirstChild().getAttributes().getLength());
    }

    public void testCopyDocument() throws Exception {
        String srcXml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
                        "<root>" +
                        "   <table bgcolor='red'>" +
                        "    <tr>" +
                        "           <td>Apples</td>" +
                        "           <td>Bananas</td>" +
                        "       </tr>" +
                        "   </table>" +
                        " <!-- comment -->" +
                        "</root>";

        String resultXml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                        "<root>\n" +
                        "    <table xmlns=\"http://www.w3.org/TR/html4/\" bgcolor=\"red\">\n" +
                        "        <tr>\n" +
                        "            <td>Apples</td>\n" +
                        "            <td>Bananas</td>\n" +
                        "        </tr>\n" +
                        "    </table>\n" +
                        "    <!-- comment -->\n" +
                        "</root>\n";

        Document srcDoc = XMLUtil.parse(new InputSource(new StringReader(srcXml)), false, true, null, null);
        Element srcRoot = srcDoc.getDocumentElement();

        Document dstDoc = XMLUtil.parse(new InputSource(new StringReader("<root/>")), false, true, null, null);

        Element dstRoot = dstDoc.getDocumentElement();
        XMLUtil.copyDocument(srcRoot, dstRoot, "http://www.w3.org/TR/html4/");

        ByteArrayOutputStream baos = new ByteArrayOutputStream();
        XMLUtil.write(dstDoc, baos, "UTF-8");
        assertEquals(resultXml, baos.toString());

        assertEquals(1, dstDoc.getChildNodes().getLength());
        Element root = dstDoc.getDocumentElement();
        Element tableNode = (Element) root.getFirstChild().getNextSibling();

        assertEquals("table", tableNode.getNodeName());
        assertEquals("http://www.w3.org/TR/html4/", tableNode.getNamespaceURI());
        assertEquals(1, tableNode.getAttributes().getLength());
    }

}

Lines 146-152 Link Here

(-)a/profiler.nbmodule/nbproject/project.xml (-1 / +1 lines)
146	<build-prerequisite/>	146	<build-prerequisite/>
147	<compile-dependency/>	147	<compile-dependency/>
148	<run-dependency>	148	<run-dependency>
149	<specification-version>8.0</specification-version>	149	<specification-version>8.4</specification-version>
150	</run-dependency>	150	</run-dependency>
151	</dependency>	151	</dependency>
152	<dependency>	152	<dependency>




import org.netbeans.lib.profiler.common.Profiler;
import org.netbeans.lib.profiler.common.integration.IntegrationUtils;
import org.netbeans.modules.profiler.projectsupport.utilities.SourceUtils;
import org.openide.xml.XMLUtil;
import org.w3c.dom.NodeList;


/**

        }
        
        // Module is a NB module suite component, not a NB source module
        if (XMLUtil.findElement(e, "suite-component", namespace) != null) return false; // NOI18N
        
        // Module is a NB module suite component, not a NB source module
        if (XMLUtil.findElement(e, "standalone", namespace) != null) return false; // NOI18N
        
        // Module is a NB source module (neither suite component nor standalone)
        return true;
    }
    
    // COPIED FROM org.netbeans.modules.project.ant:
    // (except for namespace == null support in findElement)
    // (and support for comments in findSubElements)
    
    /**
     * Search for an XML element in the direct children of a parent.
     * DOM provides a similar method but it does a recursive search
     * which we do not want. It also gives a node list and we want
     * only one result.
     * @param parent a parent element
     * @param name the intended local name
     * @param namespace the intended namespace (or null)
     * @return the first child element with that name, or null if none
     */
    private static Element findElement(Element parent, String name, String namespace) {
        NodeList l = parent.getChildNodes();
        for (int i = 0; i < l.getLength(); i++) {
            if (l.item(i).getNodeType() == Node.ELEMENT_NODE) {
                Element el = (Element)l.item(i);
                if ((namespace == null && name.equals(el.getTagName())) ||
                        (namespace != null && name.equals(el.getLocalName()) &&
                        namespace.equals(el.getNamespaceURI()))) {
                    return el;
                }
            }
        }
        return null;
    }
}

Lines 166-172 Link Here

(-)a/project.ant/nbproject/project.xml (-1 / +1 lines)
166	<build-prerequisite/>	166	<build-prerequisite/>
167	<compile-dependency/>	167	<compile-dependency/>
168	<run-dependency>	168	<run-dependency>
169	<specification-version>8.0</specification-version>	169	<specification-version>8.4</specification-version>
170	</run-dependency>	170	</run-dependency>
171	</dependency>	171	</dependency>
172	<dependency>	172	<dependency>




        try {
            Document projectXml = loadProjectXml(projectDiskFile);
            if (projectXml != null) {
                Element typeEl = XMLUtil.findElement(projectXml.getDocumentElement(), "type", PROJECT_NS); // NOI18N
                if (typeEl != null) {
                    String type = XMLUtil.findText(typeEl);
                    if (type != null) {
                        AntBasedProjectType provider = findAntBasedProjectType(type);
                        if (provider != null) {

            LOG.log(Level.FINE, "could not load {0}", projectDiskFile);
            return null;
        }
        Element typeEl = XMLUtil.findElement(projectXml.getDocumentElement(), "type", PROJECT_NS); // NOI18N
        if (typeEl == null) {
            LOG.log(Level.FINE, "no <type> in {0}", projectDiskFile);
            return null;
        }
        String type = XMLUtil.findText(typeEl);
        if (type == null) {
            LOG.log(Level.FINE, "no <type> text in {0}", projectDiskFile);
            return null;

            } catch (ParserConfigurationException x) {
                throw new SAXException(x);
            }
            builder.setErrorHandler(XMLUtil.defaultErrorHandler());
            Document projectXml = builder.parse(src);
            LOG.fine("parsed document");
//            dumpFields(projectXml);




    public static String getLibrariesLocationText(AuxiliaryConfiguration aux) {
        Element libraries = aux.getConfigurationFragment(EL_LIBRARIES, NAMESPACE, true);
        if (libraries != null) {
            for (Element definitions : XMLUtil.findSubElements(libraries)) {
                assert definitions.getLocalName().equals(EL_DEFINITIONS) : definitions;
                String text = XMLUtil.findText(definitions);
                assert text != null : aux;
                return text;
            }

        if (libraries == null) {
            libraries = XMLUtil.createDocument("dummy", null, null, null).createElementNS(NAMESPACE, EL_LIBRARIES); // NOI18N
        } else {
            List<Element> elements = XMLUtil.findSubElements(libraries);
            if (elements.size() == 1) {
                libraries.removeChild(elements.get(0));
            }




import org.openide.util.NbCollections;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;

                        try {
                            String ns2 = ns.substring(0, slash + 1) + Integer.toString(Integer.parseInt(ns.substring(slash + 1)) + 1);
                            if (_resolveURI(ns2) != null) {
                                Element data2 = XMLUtil.translateXML(data, ns2);
                                data.getParentNode().replaceChild(data2, data);
                                try {
                                    validate(attempt);

        return null;
    }

    private static Element translateXML(Element from, String namespace) { // XXX use #136595
        Element to = from.getOwnerDocument().createElementNS(namespace, from.getLocalName());
        NodeList nl = from.getChildNodes();
        int length = nl.getLength();
        for (int i = 0; i < length; i++) {
            Node node = nl.item(i);
            Node newNode;
            if (node.getNodeType() == Node.ELEMENT_NODE) {
                newNode = translateXML((Element) node, namespace);
            } else {
                newNode = node.cloneNode(true);
            }
            to.appendChild(newNode);
        }
        NamedNodeMap m = from.getAttributes();
        for (int i = 0; i < m.getLength(); i++) {
            Node attr = m.item(i);
            to.setAttribute(attr.getNodeName(), attr.getNodeValue());
        }
        return to;
    }

}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Sun in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * Contributor(s):
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
 * Microsystems, Inc. All Rights Reserved.
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 */

package org.netbeans.modules.project.ant;

import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.openide.util.Exceptions;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;

/**
 * Utilities relating to Ant projects.
 * @author Jesse Glick
 */
public class Util {

    private Util() {}

    /**
     * Search for an XML element in the direct children of a parent.
     * DOM provides a similar method but it does a recursive search
     * which we do not want. It also gives a node list and we want
     * only one result.
     * @param parent a parent element
     * @param name the intended local name
     * @param namespace the intended namespace
     * @return the one child element with that name, or null if none or more than one
     */
    public static Element findElement(Element parent, String name, String namespace) {
        Element result = null;
        NodeList l = parent.getChildNodes();
        int len = l.getLength();
        for (int i = 0; i < len; i++) {
            if (l.item(i).getNodeType() == Node.ELEMENT_NODE) {
                Element el = (Element)l.item(i);
                if (namespace.equals(el.getNamespaceURI()) && name.equals(el.getLocalName())) {
                    if (result == null) {
                        result = el;
                    } else {
                        return null;
                    }
                }
            }
        }
        return result;
    }
    
    /**
     * Extract nested text from an element.
     * Currently does not handle coalescing text nodes, CDATA sections, etc.
     * @param parent a parent element
     * @return the nested text, or null if none was found
     */
    public static String findText(Element parent) {
        NodeList l = parent.getChildNodes();
        for (int i = 0; i < l.getLength(); i++) {
            if (l.item(i).getNodeType() == Node.TEXT_NODE) {
                Text text = (Text)l.item(i);
                return text.getNodeValue();
            }
        }
        return null;
    }
    
    /**
     * Find all direct child elements of an element.
     * More useful than {@link Element#getElementsByTagNameNS} because it does
     * not recurse into recursive child elements.
     * Children which are all-whitespace text nodes are ignored; others cause
     * an exception to be thrown.
     * @param parent a parent element in a DOM tree
     * @return a list of direct child elements (may be empty)
     * @throws IllegalArgumentException if there are non-element children besides whitespace
     */
    public static List<Element> findSubElements(Element parent) throws IllegalArgumentException {
        NodeList l = parent.getChildNodes();
        List<Element> elements = new ArrayList<Element>(l.getLength());
        for (int i = 0; i < l.getLength(); i++) {
            Node n = l.item(i);
            if (n.getNodeType() == Node.ELEMENT_NODE) {
                elements.add((Element)n);
            } else if (n.getNodeType() == Node.TEXT_NODE) {
                String text = ((Text)n).getNodeValue();
                if (text.trim().length() > 0) {
                    throw new IllegalArgumentException("non-ws text encountered in " + parent + ": " + text); // NOI18N
                }
            } else if (n.getNodeType() == Node.COMMENT_NODE) {
                // skip
            } else {
                throw new IllegalArgumentException("unexpected non-element child of " + parent + ": " + n); // NOI18N
            }
        }
        return elements;
    }
    
    /**
     * Create an XML error handler that rethrows errors and fatal errors and logs warnings.
     * @return a standard error handler
     */
    public static ErrorHandler defaultErrorHandler() {
        return new ErrHandler();
    }
    
    private static final class ErrHandler implements ErrorHandler {
        
        public ErrHandler() {}
        
        private void annotate(SAXParseException exception) throws SAXException {
            Exceptions.attachMessage(exception, "Occurred at: " + exception.getSystemId() + ":" + exception.getLineNumber()); // NOI18N
        }
        
        public void fatalError(SAXParseException exception) throws SAXException {
            annotate(exception);
            throw exception;
        }
        
        public void error(SAXParseException exception) throws SAXException {
            annotate(exception);
            throw exception;
        }
        
        public void warning(SAXParseException exception) throws SAXException {
            annotate(exception);
            Logger.getLogger(Util.class.getName()).log(Level.INFO, null, exception);
        }
        
    }
    
}




import org.netbeans.modules.project.ant.ProjectLibraryProvider;
import org.netbeans.modules.project.ant.ProjectXMLCatalogReader;
import org.netbeans.modules.project.ant.UserQuestionHandler;
import org.netbeans.modules.project.ant.Util;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.AuxiliaryProperties;
import org.netbeans.spi.project.CacheDirectoryProvider;

        File f = FileUtil.toFile(xml);
        assert f != null;
        try {
            Document doc = XMLUtil.parse(new InputSource(f.toURI().toString()), false, true, XMLUtil.defaultErrorHandler(), null);
            ProjectXMLCatalogReader.validate(doc.getDocumentElement());
            return doc;
        } catch (IOException e) {

        Document doc = getConfigurationXml(shared);
        if (shared) {
            Element project = doc.getDocumentElement();
            Element config = XMLUtil.findElement(project, "configuration", PROJECT_NS); // NOI18N
            assert config != null;
            return config;
        } else {

            public Element run() {
                synchronized (modifiedMetadataPaths) {
                    Element root = getConfigurationDataRoot(shared);
                    Element data = XMLUtil.findElement(root, elementName, namespace);
                    if (data != null) {
                        return cloneSafely(data);
                    } else {

            public Void run() {
                synchronized (modifiedMetadataPaths) {
                    Element root = getConfigurationDataRoot(shared);
                    Element existing = XMLUtil.findElement(root, fragment.getLocalName(), fragment.getNamespaceURI());
                    // XXX first compare to existing and return if the same
                    if (existing != null) {
                        root.removeChild(existing);

            public Boolean run() {
                synchronized (modifiedMetadataPaths) {
                    Element root = getConfigurationDataRoot(shared);
                    Element data = XMLUtil.findElement(root, elementName, namespace);
                    if (data != null) {
                        root.removeChild(data);
                        modifying(shared ? PROJECT_XML_PATH : PRIVATE_XML_PATH);




import org.netbeans.api.queries.CollocationQuery;
import org.netbeans.modules.project.ant.AntBasedProjectFactorySingleton;
import org.netbeans.modules.project.ant.ProjectLibraryProvider;
import org.netbeans.modules.project.ant.Util;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.SubprojectProvider;
import org.openide.ErrorManager;

        // Linear search; always keeping references sorted first by foreign project
        // name, then by target name.
        Element nextRefEl = null;
        Iterator<Element> it = XMLUtil.findSubElements(references).iterator();
        while (it.hasNext()) {
            Element testRefEl = it.next();
            RawReference testRef = RawReference.create(testRefEl);

    
    private static boolean removeRawReferenceElement(String foreignProjectName, String id, Element references, boolean escaped) throws IllegalArgumentException {
        // As with addRawReference, do a linear search through.
        for (Element testRefEl : XMLUtil.findSubElements(references)) {
            RawReference testRef = RawReference.create(testRefEl);
            String refID = testRef.getID();
            String refName = testRef.getForeignProjectName();

    }
    
    private static RawReference[] getRawReferences(Element references) throws IllegalArgumentException {
        List<Element> subEls = XMLUtil.findSubElements(references);
        List<RawReference> refs = new ArrayList<RawReference>(subEls.size());
        for (Element subEl : subEls) {
            refs.add(RawReference.create(subEl));

    }
    
    private static RawReference getRawReference(String foreignProjectName, String id, Element references, boolean escaped) throws IllegalArgumentException {
        for (Element subEl : XMLUtil.findSubElements(references)) {
            RawReference ref = RawReference.create(subEl);
            String refID = ref.getID();
            String refName = ref.getForeignProjectName();

                if (idx == -1) {
                    throw new IllegalArgumentException("bad subelement name: " + elName); // NOI18N
                }
                String val = XMLUtil.findText(el);
                if (val == null) {
                    throw new IllegalArgumentException("empty subelement: " + el); // NOI18N
                }

            if (!REF_NAME.equals(xml.getLocalName()) || !REFS_NS2.equals(xml.getNamespaceURI())) {
                throw new IllegalArgumentException("bad element name: " + xml); // NOI18N
            }
            List nl = XMLUtil.findSubElements(xml);
            if (nl.size() < 6) {
                throw new IllegalArgumentException("missing or extra data: " + xml); // NOI18N
            }

                if (idx == -1) {
                    throw new IllegalArgumentException("bad subelement name: " + elName); // NOI18N
                }
                String val = XMLUtil.findText(el);
                if (val == null) {
                    throw new IllegalArgumentException("empty subelement: " + el); // NOI18N
                }

                if (!"properties".equals(el.getLocalName())) { // NOI18N
                    throw new IllegalArgumentException("bad subelement. expected 'properties': " + el); // NOI18N
                }
                for (Element el2 : XMLUtil.findSubElements(el)) {
                    String key = el2.getAttribute("name");
                    String value = XMLUtil.findText(el2);
                    // #53553: NPE
                    if (value == null) {
                        value = ""; // NOI18N

Lines 58-63 Link Here

(-)a/project.ant/test/unit/src/org/netbeans/modules/project/ant/AntBasedProjectFactorySingletonTest.java (-1 / +2 lines)
58	import org.openide.util.Lookup;	58	import org.openide.util.Lookup;
59	import org.openide.util.lookup.Lookups;	59	import org.openide.util.lookup.Lookups;
60	import org.openide.util.test.MockLookup;	60	import org.openide.util.test.MockLookup;
		61	import org.openide.xml.XMLUtil;
61	import org.w3c.dom.Element;	62	import org.w3c.dom.Element;
62		63
63	public class AntBasedProjectFactorySingletonTest extends NbTestCase {	64	public class AntBasedProjectFactorySingletonTest extends NbTestCase {
Lines 238-244 Link Here
238	}	239	}
239	private static String namesOfChildren(Element e) {	240	private static String namesOfChildren(Element e) {
240	StringBuilder b = new StringBuilder();	241	StringBuilder b = new StringBuilder();
241	for (Element kid : Util.findSubElements(e)) {	242	for (Element kid : XMLUtil.findSubElements(e)) {
242	if (b.length() > 0) {	243	if (b.length() > 0) {
243	b.append(' ');	244	b.append(' ');
244	}	245	}




import org.netbeans.api.project.Project;
import org.netbeans.api.project.ant.AntArtifact;
import org.netbeans.modules.diff.builtin.provider.BuiltInDiffProvider;
import org.netbeans.modules.project.ant.Util;
import org.netbeans.spi.diff.DiffProvider;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.api.project.ProjectInformation;

            
            private String getText(String elementName) {
                Element data = helper.getPrimaryConfigurationData(true);
                Element el = XMLUtil.findElement(data, elementName, "urn:test:shared");
                if (el != null) {
                    String text = XMLUtil.findText(el);
                    if (text != null) {
                        return text;
                    }

        if (!f.isFile()) {
            return null;
        }
        return XMLUtil.parse(new InputSource(f.toURI().toString()), false, true, XMLUtil.defaultErrorHandler(), null);
    }
    
    /**




import org.netbeans.junit.NbTestCase;
import org.netbeans.junit.RandomlyFails;
import org.netbeans.modules.project.ant.ProjectLibraryProvider;
import org.netbeans.modules.project.ant.Util;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.CacheDirectoryProvider;
import org.openide.filesystems.FileObject;

        Element data = h.getPrimaryConfigurationData(true);
        assertEquals("correct element name", "data", data.getLocalName());
        assertEquals("correct element namespace", "urn:test:shared", data.getNamespaceURI());
        Element stuff = XMLUtil.findElement(data, "shared-stuff", "urn:test:shared");
        assertNotNull("had nested stuff in it", stuff);
        data = h.getPrimaryConfigurationData(false);
        assertEquals("correct element name", "data", data.getLocalName());
        assertEquals("correct element namespace", "urn:test:private", data.getNamespaceURI());
        stuff = XMLUtil.findElement(data, "private-stuff", "urn:test:private");
        assertNotNull("had nested stuff in it", stuff);
    }
    

        }
        assertEquals("correct element name", "data", data.getLocalName());
        assertEquals("correct element namespace", "urn:test:shared", data.getNamespaceURI());
        Element stuff = XMLUtil.findElement(data, "shared-stuff", "urn:test:shared");
        /* This now retains the former contents:
        assertNull("had no stuff in it", stuff);
         */

        pm.saveProject(p);
        Document doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PROJECT_XML_PATH);
        Element root = doc.getDocumentElement();
        Element type = XMLUtil.findElement(root, "type", AntProjectHelper.PROJECT_NS);
        assertEquals("correct restored type", "test", XMLUtil.findText(type));
        Element config = XMLUtil.findElement(root, "configuration", AntProjectHelper.PROJECT_NS);
        assertNotNull("have <configuration>", config);
        data = XMLUtil.findElement(config, "data", "urn:test:shared");
        assertNotNull("have <data>", data);
        Element details = XMLUtil.findElement(data, "details", "urn:test:shared");
        assertNotNull("have <details>", details);
    }
    

    public void testPutPrimaryConfigurationData() throws Exception {
        h.addAntProjectListener(l);
        Element data = h.getPrimaryConfigurationData(true);
        assertNotNull("<shared-stuff/> is there to start", XMLUtil.findElement(data, "shared-stuff", "urn:test:shared"));
        assertTrue("project is not initially modified", !pm.isModified(p));
        assertEquals("gPCD fires no events", 0, l.events().length);
        assertNotNull("config data has an owner document", data.getOwnerDocument());

        data.appendChild(nue);
        assertTrue("project is not modified after uncommitted change", !pm.isModified(p));
        assertEquals("no events fired after uncommitted change", 0, l.events().length);
        assertEquals("after uncommitted change gPCD does not yet have new <misc/>", null, XMLUtil.findElement(h.getPrimaryConfigurationData(true), "misc", "urn:test:shared"));
        h.putPrimaryConfigurationData(data, true);
        assertTrue("project is modified after committed change", pm.isModified(p));
        AntProjectEvent[] evs = l.events();

        assertEquals("correct helper", h, evs[0].getHelper());
        assertEquals("correct path", AntProjectHelper.PROJECT_XML_PATH, evs[0].getPath());
        assertTrue("expected change", evs[0].isExpected());
        nue = XMLUtil.findElement(h.getPrimaryConfigurationData(true), "misc", "urn:test:shared");
        assertNotNull("after committed change gPCD has new <misc/>", nue);
        assertEquals("new element name is correct", "misc", nue.getLocalName());
        assertEquals("new element namespace is correct", "urn:test:shared", nue.getNamespaceURI());
        Document doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PROJECT_XML_PATH);
        Element configuration = XMLUtil.findElement(doc.getDocumentElement(), "configuration", AntProjectHelper.PROJECT_NS);
        assertNotNull("still has <configuration> on disk", configuration);
        data = XMLUtil.findElement(configuration, "data", "urn:test:shared");
        assertNotNull("still has <data> on disk", data);
        nue = XMLUtil.findElement(data, "misc", "urn:test:shared");
        assertEquals("<misc/> not yet on disk", null, nue);
        pm.saveProject(p);
        assertTrue("project is not modified after save", !pm.isModified(p));
        assertEquals("saving changes fires no new events", 0, l.events().length);
        nue = XMLUtil.findElement(h.getPrimaryConfigurationData(true), "misc", "urn:test:shared");
        assertNotNull("after save gPCD still has new <misc/>", nue);
        doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PROJECT_XML_PATH);
        configuration = XMLUtil.findElement(doc.getDocumentElement(), "configuration", AntProjectHelper.PROJECT_NS);
        assertNotNull("still has <configuration> on disk", configuration);
        data = XMLUtil.findElement(configuration, "data", "urn:test:shared");
        assertNotNull("still has <data> on disk", data);
        nue = XMLUtil.findElement(data, "misc", "urn:test:shared");
        assertNotNull("<misc/> now on disk", nue);
        // #42147: changes made on disk should result in firing of an AntProjectEvent
        ProjectManager.mutex().writeAccess(new Mutex.ExceptionAction<Void>() {

        assertFalse("unexpected change", evs[0].isExpected());
        assertEquals("correct new display name", "Some New Name", ProjectUtils.getInformation(p).getDisplayName());
        data = h.getPrimaryConfigurationData(true);
        Element stuff = XMLUtil.findElement(data, "other-shared-stuff", "urn:test:shared");
        assertNotNull("have <other-shared-stuff/> now", stuff);
        AuxiliaryConfiguration aux = p.getLookup().lookup(AuxiliaryConfiguration.class);
        data = aux.getConfigurationFragment("data", "urn:test:shared-aux", true);
        assertNotNull("have aux <data>", data);
        stuff = XMLUtil.findElement(data, "other-aux-shared-stuff", "urn:test:shared-aux");
        assertNotNull("have <other-aux-shared-stuff/> now", stuff);
        // XXX try private.xml too
        // XXX try modifying both XML files, or different parts of the same, and saving in a batch

        assertNotNull("found shared <data>", data);
        assertEquals("correct name", "data", data.getLocalName());
        assertEquals("correct namespace", "urn:test:shared-aux", data.getNamespaceURI());
        Element stuff = XMLUtil.findElement(data, "aux-shared-stuff", "urn:test:shared-aux");
        assertNotNull("found <aux-shared-stuff/>", stuff);
        assertEquals("gCF fires no changes", 0, l.events().length);
        // Check write of shared data.

        pm.saveProject(p);
        assertEquals("saving project fires no new changes", 0, l.events().length);
        Document doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PROJECT_XML_PATH);
        Element config = XMLUtil.findElement(doc.getDocumentElement(), "configuration", AntProjectHelper.PROJECT_NS);
        assertNotNull("<configuration> still exists", config);
        data = XMLUtil.findElement(config, "data", "urn:test:shared-aux");
        assertNotNull("<data> still exists", data);
        stuff = XMLUtil.findElement(data, "aux-shared-stuff", "urn:test:shared-aux");
        assertNotNull("still have <aux-shared-stuff/>", stuff);
        assertEquals("attr written correctly", "val", stuff.getAttribute("attr"));
        // Check read of private data.

        assertNotNull("found shared <data>", data);
        assertEquals("correct name", "data", data.getLocalName());
        assertEquals("correct namespace", "urn:test:private-aux", data.getNamespaceURI());
        stuff = XMLUtil.findElement(data, "aux-private-stuff", "urn:test:private-aux");
        assertNotNull("found <aux-private-stuff/>", stuff);
        assertEquals("gCF fires no changes", 0, l.events().length);
        // Check write of private data.

        assertEquals("saving project fires no new changes", 0, l.events().length);
        doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PRIVATE_XML_PATH);
        config = doc.getDocumentElement();
        data = XMLUtil.findElement(config, "data", "urn:test:private-aux");
        assertNotNull("<data> still exists", data);
        stuff = XMLUtil.findElement(data, "aux-private-stuff", "urn:test:private-aux");
        assertNotNull("still have <aux-private-stuff/>", stuff);
        assertEquals("attr written correctly", "val", stuff.getAttribute("attr"));
        // Check that missing fragments are not returned.

        data = aux.getConfigurationFragment("hello", "urn:test:whatever", true);
        assertNotNull("can retrieve new frag", data);
        doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PROJECT_XML_PATH);
        config = XMLUtil.findElement(doc.getDocumentElement(), "configuration", AntProjectHelper.PROJECT_NS);
        assertNotNull("<configuration> still exists", config);
        data = XMLUtil.findElement(config, "hello", "urn:test:whatever");
        assertNotNull("<hello> still exists", data);
        assertEquals("correct nested contents too", "stuff", XMLUtil.findText(data));
        // Try removing a fragment.
        assertFalse("project is unmodified", pm.isModified(p));
        assertTrue("can remove new frag", aux.removeConfigurationFragment("hello", "urn:test:whatever", true));

        assertNull("now frag is gone", aux.getConfigurationFragment("hello", "urn:test:whatever", true));
        pm.saveProject(p);
        doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PROJECT_XML_PATH);
        config = XMLUtil.findElement(doc.getDocumentElement(), "configuration", AntProjectHelper.PROJECT_NS);
        assertNotNull("<configuration> still exists", config);
        data = XMLUtil.findElement(config, "hello", "urn:test:whatever");
        assertNull("now <hello> is gone", data);
        assertFalse("cannot remove a frag that is not there", aux.removeConfigurationFragment("hello", "urn:test:whatever", true));
        assertFalse("trying to remove a nonexistent frag does not modify project", pm.isModified(p));

        aux.putConfigurationFragment(data, true);
        pm.saveProject(p);
        doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PROJECT_XML_PATH);
        config = XMLUtil.findElement(doc.getDocumentElement(), "configuration", AntProjectHelper.PROJECT_NS);
        String[] names = new String[]{"aaa-namespace", "aaaa-namespace", "bbb-name-sp", "bbb-namespace", "bbb-namespace-1", "ccc-namespace", "data-urn:test:shared", "data-urn:test:shared-aux"};
        int count = 0;
        NodeList list = config.getChildNodes();

        assertNotNull("AuxiliaryConfiguration present", aux);

        Element data = aux.getConfigurationFragment("data", "urn:test:private-aux", false);
        Element stuff = XMLUtil.findElement(data, "aux-private-stuff", "urn:test:private-aux");
        assertNotNull("found <aux-private-stuff/>", stuff);
        // Check write of private data.
        stuff.setAttribute("attr", "val");

        //check the data are written:
        Document doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PRIVATE_XML_PATH);
        Element config = doc.getDocumentElement();
        data = XMLUtil.findElement(config, "data", "urn:test:private-aux");
        assertNotNull("<data> still exists", data);
        stuff = XMLUtil.findElement(data, "aux-private-stuff", "urn:test:private-aux");
        assertNotNull("still have <aux-private-stuff/>", stuff);
        assertEquals("attr written correctly", "val", stuff.getAttribute("attr"));
        

                System.out.println("starting #" + x);
                for (int i = 0; i < 1000; i++) {
                    Element data = h.getPrimaryConfigurationData(true);
                    XMLUtil.findSubElements(data);
                    if (i % 100 == 0) {
                        System.out.println("in the middle of #" + x);
                        try {




import org.netbeans.api.project.TestUtil;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.project.ant.AntBuildExtenderAccessor;
import org.netbeans.modules.project.ant.Util;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.modules.SpecificationVersion;
import org.openide.util.Utilities;
import org.openide.util.test.MockLookup;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;

        assertNull("No build-impl.xml yet", bi);
        // Modify shared data in a project.
        Element primdata = h.getPrimaryConfigurationData(true);
        Element oldDisplayName = XMLUtil.findElement(primdata, "display-name", "urn:test:shared");
        assertNotNull("had a <display-name> before", oldDisplayName);
        Element displayName = primdata.getOwnerDocument().createElementNS("urn:test:shared", "display-name");
        displayName.appendChild(primdata.getOwnerDocument().createTextNode("New Name"));

        NodeList l = doc.getElementsByTagName("description");
        assertEquals("one <description> in build-impl.xml", 1, l.getLength());
        el = (Element)l.item(0);
        assertEquals("correct description", "New Name", XMLUtil.findText(el));
        // Clear build-impl.xml to test if it is rewritten.
        bi.delete();
        // Now make some irrelevant change - e.g. to private.xml - and check that there is no modification.




import org.netbeans.api.project.TestUtil;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.project.ant.AntBasedProjectFactorySingleton;
import org.netbeans.modules.project.ant.Util;
import org.netbeans.api.project.ProjectInformation;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Mutex;
import org.openide.util.MutexException;
import org.openide.util.test.MockLookup;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;

                    NodeList l = doc.getElementsByTagNameNS(AntProjectHelper.PROJECT_NS, "type");
                    assertEquals("one <type>", 1, l.getLength());
                    Element el = (Element)l.item(0);
                    assertEquals("correct saved type", "test", XMLUtil.findText(el));
                    l = doc.getElementsByTagNameNS("urn:test:shared", "shared-stuff");
                    assertEquals("one <shared-stuff>", 1, l.getLength());
                    doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PRIVATE_XML_PATH);




import org.netbeans.api.queries.CollocationQuery;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.project.ant.ProjectLibraryProvider;
import org.netbeans.modules.project.ant.Util;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.SubprojectProvider;
import org.netbeans.spi.queries.CollocationQueryImplementation;

import org.openide.filesystems.FileUtil;
import org.openide.util.lookup.Lookups;
import org.openide.util.test.MockLookup;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;

        assertTrue("Project is still modified", pm.isModified(p));
        pm.saveProject(p);
        Document doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PROJECT_XML_PATH);
        Element config = XMLUtil.findElement(doc.getDocumentElement(), "configuration", AntProjectHelper.PROJECT_NS);
        assertNotNull("have <configuration>", config);
        Element references = XMLUtil.findElement(config, ReferenceHelper.REFS_NAME, ReferenceHelper.REFS_NS);
        assertNotNull("have <references>", references);
        NodeList nl = references.getElementsByTagNameNS(ReferenceHelper.REFS_NS, "reference");
        assertEquals("have three <reference>s", 3, nl.getLength());

            Element reference = (Element)nl.item(i);
            for (int j = 0; j < 6; j++) {
                String elementName = elementNames[j];
                Element element = XMLUtil.findElement(reference, elementName, ReferenceHelper.REFS_NS);
                assertNotNull("had element " + elementName + " in ref #" + i, element);
                assertEquals("correct text in " + elementName + " in ref #" + i, values[i][j], XMLUtil.findText(element));
            }
        }
    }

        Element refs = p.getLookup().lookup(AuxiliaryConfiguration.class).getConfigurationFragment(ReferenceHelper.REFS_NAME, namespace, true);
        assertNotNull(refs);
        List<String> actualScriptLocations = new ArrayList<String>();
        for (Element ref : XMLUtil.findSubElements(refs)) {
            Element script = XMLUtil.findElement(ref, "script", namespace);
            actualScriptLocations.add(XMLUtil.findText(script));
        }
        assertEquals(Arrays.asList(scriptLocations), actualScriptLocations);
    }

Lines 92-98 Link Here

(-)a/projectapi/nbproject/project.xml (-1 / +1 lines)
92	<build-prerequisite/>	92	<build-prerequisite/>
93	<compile-dependency/>	93	<compile-dependency/>
94	<run-dependency>	94	<run-dependency>
95	<specification-version>8.0</specification-version>	95	<specification-version>8.4</specification-version>
96	</run-dependency>	96	</run-dependency>
97	</dependency>	97	</dependency>
98	<dependency>	98	<dependency>




                                InputSource input = new InputSource(is);
                                input.setSystemId(config.getURL().toString());
                                Element root = XMLUtil.parse(input, false, true, /*XXX*/null, null).getDocumentElement();
                                return XMLUtil.findElement(root, elementName, namespace);
                            } finally {
                                is.close();
                            }

                            doc = XMLUtil.createDocument("auxiliary-configuration", "http://www.netbeans.org/ns/auxiliary-configuration/1", null, null);
                        }
                        Element root = doc.getDocumentElement();
                        Element oldFragment = XMLUtil.findElement(root, elementName, namespace);
                        if (oldFragment != null) {
                            root.removeChild(oldFragment);
                        }

                            is.close();
                        }
                        Element root = doc.getDocumentElement();
                        Element toRemove = XMLUtil.findElement(root, elementName, namespace);
                        if (toRemove != null) {
                            root.removeChild(toRemove);
                            if (root.getElementsByTagName("*").getLength() > 0) {

        });
    }

    private static Element findElement(Element parent, String name, String namespace) {
        Element result = null;
        NodeList l = parent.getChildNodes();
        int len = l.getLength();
        for (int i = 0; i < len; i++) {
            if (l.item(i).getNodeType() == Node.ELEMENT_NODE) {
                Element el = (Element) l.item(i);
                if (name.equals(el.getLocalName()) && namespace.equals(el.getNamespaceURI())) {
                    if (result == null) {
                        result = el;
                    } else {
                        return null;
                    }
                }
            }
        }
        return result;
    }

}

Lines 192-198 Link Here

(-)a/projectimport.eclipse.core/nbproject/project.xml (-1 / +1 lines)
192	<build-prerequisite/>	192	<build-prerequisite/>
193	<compile-dependency/>	193	<compile-dependency/>
194	<run-dependency>	194	<run-dependency>
195	<specification-version>8.0</specification-version>	195	<specification-version>8.4</specification-version>
196	</run-dependency>	196	</run-dependency>
197	</dependency>	197	</dependency>
198	<dependency>	198	<dependency>




    public static DotClassPath parse(File dotClasspath, List<Link> links) throws IOException {
        Document dotClasspathXml;
        try {
            dotClasspathXml = XMLUtil.parse(new InputSource(dotClasspath.toURI().toString()), false, true, XMLUtil.defaultErrorHandler(), null);
        } catch (SAXException e) {
            IOException ioe = (IOException) new IOException(dotClasspath + ": " + e.toString()).initCause(e); //NOI18N
            throw ioe;

        if (!"classpath".equals(classpathEl.getLocalName())) { // NOI18N
            return empty();
        }
        List<Element> classpathEntryEls = XMLUtil.findSubElements(classpathEl);
        if (classpathEntryEls == null) {
            return empty();
        }

                }
                props.put(key, value);
            }
            Element entryAttrs = XMLUtil.findElement(classpathEntry, "attributes", null); //NOI18N
            if (entryAttrs != null) {
                /*
                <classpathentry kind="lib" path="/home/dev/hibernate-annotations-3.3.1.GA/lib/hibernate-commons-annotations.jar" sourcepath="/home/dev/hibernate-annotations-3.3.1.GA/src">

                    </attributes>
                </classpathentry>
                 */
                List<Element> attrsList = XMLUtil.findSubElements(entryAttrs);
                if (attrsList != null) {
                    for (Element e : attrsList) {
                        props.put(e.getAttribute("name"), e.getAttribute("value")); //NOI18N




    public static String parse(File dotProject, Set<String> natures, List<Link> links, Set<Variable> variables) throws IOException {
        Document dotProjectXml;
        try {
            dotProjectXml = XMLUtil.parse(new InputSource(dotProject.toURI().toString()), false, true, XMLUtil.defaultErrorHandler(), null);
        } catch (SAXException e) {
            IOException ioe = (IOException) new IOException(dotProject + ": " + e.toString()).initCause(e); // NOI18N
            throw ioe;

            throw new IllegalStateException("given file is not eclipse .project file"); // NOI18N
        }
        
        Element naturesEl = XMLUtil.findElement(projectDescriptionEl, "natures", null); // NOI18N
        if (naturesEl != null) {
            List<Element> natureEls = XMLUtil.findSubElements(naturesEl);
            if (natureEls != null) {
                for (Element nature : natureEls) {
                    natures.add(nature.getTextContent());

            }
        }
        
        Element linksEl = XMLUtil.findElement(projectDescriptionEl, "linkedResources", null); // NOI18N
        if (linksEl != null) {
            List<Element> linkEls = XMLUtil.findSubElements(linksEl);
            if (linkEls != null) {
                for (Element link : linkEls) {
                    Element locationElement = XMLUtil.findElement(link, "location", null); // NOI18N
                    String loc;
                    if (locationElement == null) {
                        assert XMLUtil.findElement(link, "locationURI", null) != null : XMLUtil.findSubElements(link); // NOI18N
                        // XXX external source root can be defined using IDE variable. For some reason (in Eclipse)
                        // these variables are stored/managed separately from variables which can be used
                        // in classpath. For now these variables are not transfer to NetBeans and normalized
                        // path will be returned instead.
                        loc = resolveLink(XMLUtil.findElement(link, "locationURI", null).getTextContent(), variables); // NOI18N
                    } else {
                        loc = locationElement.getTextContent();
                    }
                    links.add(new Link(XMLUtil.findElement(link, "name", null).getTextContent(),  // NOI18N
                            "1".equals(XMLUtil.findElement(link, "type", null).getTextContent()), // NOI18N
                            loc));
                }
            }
        }
        return XMLUtil.findElement(projectDescriptionEl, "name", null).getTextContent(); //NOI18N
    }
    
    public static Facets readProjectFacets(File projectDir, Set<String> natures) throws IOException {

        }
        Document doc;
        try {
            doc = XMLUtil.parse(new InputSource(f.toURI().toString()), false, true, XMLUtil.defaultErrorHandler(), null);
        } catch (SAXException e) {
            IOException ioe = (IOException) new IOException(f + ": " + e.toString()).initCause(e); // NOI18N
            throw ioe;

        }
        
        List<Facets.Facet> facets = new ArrayList<Facets.Facet>();
        List<Element> elements = XMLUtil.findSubElements(root);
        for (Element element : elements) {
            if (!"installed".equals(element.getNodeName())) { // NOI18N
                continue;




        UserLibraryParser parser = new UserLibraryParser();
        Document xml;
        try {
            xml = XMLUtil.parse(new InputSource(new StringReader(xmlDoc)), false, true, XMLUtil.defaultErrorHandler(), null);
        } catch (SAXException e) {
            IOException ioe = (IOException) new IOException("Library '"+libName+"' cannot be parsed: " + e.toString()).initCause(e); // NOI18N
            throw ioe;

        if (!"userlibrary".equals(root.getLocalName())) { //NOI18N
            return false;
        }
        for (Element el : XMLUtil.findSubElements(root)) {
            if (!el.getNodeName().equals("archive")) { //NOI18N
                continue;
            }

            if (src.length() > 0) {
                sources.add(src);
            }
            Element el2 = XMLUtil.findElement(el, "attributes", null); //NOI18N
            if (el2 == null) {
                continue;
            }
            for (Element el3 : XMLUtil.findSubElements(el2)) {
                if (el3.getNodeName().equals("attribute") && "javadoc_location".equals(el3.getAttribute("name"))) { //NOI18N
                    String javadoc = el3.getAttribute("value"); //NOI18N
                    if (javadoc != null) {





package org.netbeans.modules.projectimport.eclipse.core;

import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
import org.openide.util.Parameters;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;

/**
 * Utilities relating to Ant projects.


    private Util() {}

    /**
     * Search for an XML element in the direct children of a parent.
     * DOM provides a similar method but it does a recursive search
     * which we do not want. It also gives a node list and we want
     * only one result.
     * @param parent a parent element
     * @param name the intended local name
     * @param namespace the intended namespace
     * @return the one child element with that name, or null if none or more than one
     */
    public static Element findElement(Element parent, String name, String namespace) {
        Element result = null;
        NodeList l = parent.getChildNodes();
        int len = l.getLength();
        for (int i = 0; i < len; i++) {
            if (l.item(i).getNodeType() == Node.ELEMENT_NODE) {
                Element el = (Element)l.item(i);
                if (name.equals(el.getLocalName()) && 
                        ((namespace != null && namespace.equals(el.getNamespaceURI())) || namespace == null)) {
                    if (result == null) {
                        result = el;
                    } else {
                        return null;
                    }
                }
            }
        }
        return result;
    }
    
    /**
     * Extract nested text from an element.
     * Currently does not handle coalescing text nodes, CDATA sections, etc.
     * @param parent a parent element
     * @return the nested text, or null if none was found
     */
    public static String findText(Element parent) {
        NodeList l = parent.getChildNodes();
        for (int i = 0; i < l.getLength(); i++) {
            if (l.item(i).getNodeType() == Node.TEXT_NODE) {
                Text text = (Text)l.item(i);
                return text.getNodeValue();
            }
        }
        return null;
    }
    
    /**
     * Find all direct child elements of an element.
     * More useful than {@link Element#getElementsByTagNameNS} because it does
     * not recurse into recursive child elements.
     * Children which are all-whitespace text nodes are ignored; others cause
     * an exception to be thrown.
     * @param parent a parent element in a DOM tree
     * @return a list of direct child elements (may be empty)
     * @throws IllegalArgumentException if there are non-element children besides whitespace
     */
    public static List<Element> findSubElements(Element parent) throws IllegalArgumentException {
        NodeList l = parent.getChildNodes();
        List<Element> elements = new ArrayList<Element>(l.getLength());
        for (int i = 0; i < l.getLength(); i++) {
            Node n = l.item(i);
            if (n.getNodeType() == Node.ELEMENT_NODE) {
                elements.add((Element)n);
            } else if (n.getNodeType() == Node.TEXT_NODE) {
                String text = ((Text)n).getNodeValue();
                if (text.trim().length() > 0) {
                    throw new IllegalArgumentException("non-ws text encountered in " + parent + ": " + text); // NOI18N
                }
            } else if (n.getNodeType() == Node.COMMENT_NODE) {
                // skip
            } else {
                throw new IllegalArgumentException("unexpected non-element child of " + parent + ": " + n); // NOI18N
            }
        }
        return elements;
    }
    
    /**
     * Create an XML error handler that rethrows errors and fatal errors and logs warnings.
     * @return a standard error handler
     */
    public static ErrorHandler defaultErrorHandler() {
        return new ErrHandler();
    }
    
    private static final class ErrHandler implements ErrorHandler {
        
        public ErrHandler() {}
        
        private void annotate(SAXParseException exception) throws SAXException {
            Exceptions.attachMessage(exception, "Occurred at: " + exception.getSystemId() + ":" + exception.getLineNumber()); // NOI18N
        }
        
        public void fatalError(SAXParseException exception) throws SAXException {
            annotate(exception);
            throw exception;
        }
        
        public void error(SAXParseException exception) throws SAXException {
            annotate(exception);
            throw exception;
        }
        
        public void warning(SAXParseException exception) throws SAXException {
            annotate(exception);
            Logger.getLogger(Util.class.getName()).log(Level.INFO, null, exception);
        }
        
    }

    public static void logUsage(Class srcClass, String message, Object ...params) {
        Parameters.notNull("message", message); // NOI18N





        }
        Document xml;
        try {
            xml = XMLUtil.parse(new InputSource(workspace.getUserJSFLibraries().toURI().toString()), false, true, XMLUtil.defaultErrorHandler(), null);
        } catch (SAXException e) {
            IOException ioe = (IOException) new IOException(workspace.getUserJSFLibraries() + ": " + e.toString()).initCause(e); // NOI18N
            throw ioe;

            !JSF_LIB_NS.equals(root.getNamespaceURI())) {
            return;
        }
        for (Element el : XMLUtil.findSubElements(root)) {
            String libraryName = el.getAttribute("Name"); // NOI18N
            List<String> jars = new ArrayList<String>();
            for (Element file : XMLUtil.findSubElements(el)) {
                String path = file.getAttribute("SourceLocation"); // NOI18N
                if (!"false".equals(file.getAttribute("RelativeToWorkspace"))) { // NOI18N
                    path = new File(workspace.getDirectory(), path).getPath();

Lines 96-102 Link Here

(-)a/projectimport.eclipse.web/nbproject/project.xml (-1 / +1 lines)
96	<build-prerequisite/>	96	<build-prerequisite/>
97	<compile-dependency/>	97	<compile-dependency/>
98	<run-dependency>	98	<run-dependency>
99	<specification-version>8.0</specification-version>	99	<specification-version>8.4</specification-version>
100	</run-dependency>	100	</run-dependency>
101	</dependency>	101	</dependency>
102	<dependency>	102	<dependency>




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Sun in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * Contributor(s):
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
 * Microsystems, Inc. All Rights Reserved.
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 */

package org.netbeans.modules.projectimport.eclipse.web;

import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.openide.util.Exceptions;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;

/**
 * Utilities relating to Ant projects.
 * @author Jesse Glick
 */
public class Util {

    private Util() {}

    /**
     * Search for an XML element in the direct children of a parent.
     * DOM provides a similar method but it does a recursive search
     * which we do not want. It also gives a node list and we want
     * only one result.
     * @param parent a parent element
     * @param name the intended local name
     * @param namespace the intended namespace
     * @return the one child element with that name, or null if none or more than one
     */
    public static Element findElement(Element parent, String name, String namespace) {
        Element result = null;
        NodeList l = parent.getChildNodes();
        int len = l.getLength();
        for (int i = 0; i < len; i++) {
            if (l.item(i).getNodeType() == Node.ELEMENT_NODE) {
                Element el = (Element)l.item(i);
                if (name.equals(el.getLocalName()) && 
                        ((namespace != null && namespace.equals(el.getNamespaceURI())) || namespace == null)) {
                    if (result == null) {
                        result = el;
                    } else {
                        return null;
                    }
                }
            }
        }
        return result;
    }
    
    /**
     * Extract nested text from an element.
     * Currently does not handle coalescing text nodes, CDATA sections, etc.
     * @param parent a parent element
     * @return the nested text, or null if none was found
     */
    public static String findText(Element parent) {
        NodeList l = parent.getChildNodes();
        for (int i = 0; i < l.getLength(); i++) {
            if (l.item(i).getNodeType() == Node.TEXT_NODE) {
                Text text = (Text)l.item(i);
                return text.getNodeValue();
            }
        }
        return null;
    }
    
    /**
     * Find all direct child elements of an element.
     * More useful than {@link Element#getElementsByTagNameNS} because it does
     * not recurse into recursive child elements.
     * Children which are all-whitespace text nodes are ignored; others cause
     * an exception to be thrown.
     * @param parent a parent element in a DOM tree
     * @return a list of direct child elements (may be empty)
     * @throws IllegalArgumentException if there are non-element children besides whitespace
     */
    public static List<Element> findSubElements(Element parent) throws IllegalArgumentException {
        NodeList l = parent.getChildNodes();
        List<Element> elements = new ArrayList<Element>(l.getLength());
        for (int i = 0; i < l.getLength(); i++) {
            Node n = l.item(i);
            if (n.getNodeType() == Node.ELEMENT_NODE) {
                elements.add((Element)n);
            } else if (n.getNodeType() == Node.TEXT_NODE) {
                String text = ((Text)n).getNodeValue();
                if (text.trim().length() > 0) {
                    throw new IllegalArgumentException("non-ws text encountered in " + parent + ": " + text); // NOI18N
                }
            } else if (n.getNodeType() == Node.COMMENT_NODE) {
                // skip
            } else {
                throw new IllegalArgumentException("unexpected non-element child of " + parent + ": " + n); // NOI18N
            }
        }
        return elements;
    }
    
    /**
     * Create an XML error handler that rethrows errors and fatal errors and logs warnings.
     * @return a standard error handler
     */
    public static ErrorHandler defaultErrorHandler() {
        return new ErrHandler();
    }
    
    private static final class ErrHandler implements ErrorHandler {
        
        public ErrHandler() {}
        
        private void annotate(SAXParseException exception) throws SAXException {
            Exceptions.attachMessage(exception, "Occurred at: " + exception.getSystemId() + ":" + exception.getLineNumber()); // NOI18N
        }
        
        public void fatalError(SAXParseException exception) throws SAXException {
            annotate(exception);
            throw exception;
        }
        
        public void error(SAXParseException exception) throws SAXException {
            annotate(exception);
            throw exception;
        }
        
        public void warning(SAXParseException exception) throws SAXException {
            annotate(exception);
            Logger.getLogger(Util.class.getName()).log(Level.INFO, null, exception);
        }
        
    }
    
}




        if (f.exists()) {
            Document webContent;
            try {
                webContent = XMLUtil.parse(new InputSource(f.toURI().toString()), false, true, XMLUtil.defaultErrorHandler(), null);
            } catch (SAXException e) {
                IOException ioe = (IOException) new IOException(f + ": " + e.toString()).initCause(e); //NOI18N
                throw ioe;

                return null;
            }
            WebContentData data = new WebContentData();
            Element moduleEl = XMLUtil.findElement(modulesEl, "wb-module", null); //NOI18N
            if (moduleEl != null) { // #175364
            for (Element el : XMLUtil.findSubElements(moduleEl)) {
                if ("wb-resource".equals(el.getNodeName())) { //NOI18N
                    if ("/".equals(el.getAttribute("deploy-path"))) { //NOI18N
                        data.webRoot = el.getAttribute("source-path"); //NOI18N

        if (f.exists()) {
            Document webContent;
            try {
                webContent = XMLUtil.parse(new InputSource(f.toURI().toString()), false, true, XMLUtil.defaultErrorHandler(), null);
            } catch (SAXException e) {
                IOException ioe = (IOException) new IOException(f + ": " + e.toString()).initCause(e); //NOI18N
                throw ioe;

            if ("5.0".equals(specVer)) {
                specVer = "1.5"; // NOI18N
            }
            Element attrsEl = XMLUtil.findElement(modulesEl, "attributes", null); //NOI18N
            if (attrsEl != null) {
                for (Element el : XMLUtil.findSubElements(attrsEl)) {
                    if ("attribute".equals(el.getNodeName())) { //NOI18N
                        if ("webrootdir".equals(el.getAttribute("name"))) { //NOI18N
                            data.webRoot = el.getAttribute("value"); //NOI18N

Lines 198-204 Link Here

(-)a/projectimport.jbuilder/nbproject/project.xml (-1 / +1 lines)
198	<build-prerequisite/>	198	<build-prerequisite/>
199	<compile-dependency/>	199	<compile-dependency/>
200	<run-dependency>	200	<run-dependency>
201	<specification-version>8.0</specification-version>	201	<specification-version>8.4</specification-version>
202	</run-dependency>	202	</run-dependency>
203	</dependency>	203	</dependency>
204	<dependency>	204	<dependency>




                return null;
            }

            List<Element> reqElems = XMLUtil.findSubElements(docEl);
            for (int i = 0; i < reqElems.size(); i++) {
                Element elem = (Element)reqElems.get(i);
                String classElem = getClassElement(elem);

    }

    private void resolvePath(final File[] folders, final AbstractProject.UserLibrary retval, final Element classElem) throws IllegalArgumentException {
        List<Element> pathElems = (classElem != null) ? XMLUtil.findSubElements(classElem) : Collections.EMPTY_LIST;
        for (int i = 0; i < pathElems.size(); i++) {
            String path = getPath((Element)pathElems.get(i));
            if (path != null) {

        String fullName = null;
        
        if (docEl != null) {
            try {XMLUtil.write(docEl.getOwnerDocument(), System.out, "UTC-8"); } catch (Exception e) {}
            Element fullNameElement = XMLUtil.findElement(docEl, FULLNAME_ELEMENT,null);
            fullName = (fullNameElement != null) ? XMLUtil.findText(fullNameElement) : null;
        }
        
        return fullName;

        String path = null;
        
        if (pathElem != null && pathElem.getNodeName().equals(name)) {
            path = XMLUtil.findText(pathElem);
            
        }
        

Lines 185-191 Link Here

(-)a/projectui/nbproject/project.xml (-1 / +1 lines)
185	<build-prerequisite/>	185	<build-prerequisite/>
186	<compile-dependency/>	186	<compile-dependency/>
187	<run-dependency>	187	<run-dependency>
188	<specification-version>8.0</specification-version>	188	<specification-version>8.4</specification-version>
189	</run-dependency>	189	</run-dependency>
190	</dependency>	190	</dependency>
191	<dependency>	191	<dependency>




                assert false : "Shared not implemented";
            }
            Element root = xml.getDocumentElement ();
            Element data = XMLUtil.findElement (root, elementName, namespace);
            if (data != null) {
                return  (Element) data.cloneNode (true);
            } else {

            }
            
            Element root = xml.getDocumentElement ();
            Element existing = XMLUtil.findElement (root, fragment.getLocalName (), fragment.getNamespaceURI ());
            // XXX first compare to existing and return if the same
            if (existing != null) {
                root.removeChild (existing);

            }

            Element root = xml.getDocumentElement ();
            Element data = XMLUtil.findElement (root, elementName, namespace);
            if (data != null) {
                root.removeChild (data);
                return true;

            }
        }
    }
    
    // copied from org.netbeans.modules.project.ant.Util
    private static Element findElement(Element parent, String name, String namespace) {
        Element result = null;
        NodeList l = parent.getChildNodes();
        int len = l.getLength();
        for (int i = 0; i < len; i++) {
            if (l.item(i).getNodeType() == Node.ELEMENT_NODE) {
                Element el = (Element)l.item(i);
                if (name.equals(el.getLocalName()) && namespace.equals(el.getNamespaceURI())) {
                    if (result == null) {
                        result = el;
                    } else {
                        return null;
                    }
                }
            }
        }
        return result;
    }
}

Lines 265-271 Link Here

(-)a/ruby.project/nbproject/project.xml (-1 / +1 lines)
265	<build-prerequisite/>	265	<build-prerequisite/>
266	<compile-dependency/>	266	<compile-dependency/>
267	<run-dependency>	267	<run-dependency>
268	<specification-version>8.0</specification-version>	268	<specification-version>8.4</specification-version>
269	</run-dependency>	269	</run-dependency>
270	</dependency>	270	</dependency>
271	<dependency>	271	<dependency>





import java.io.IOException;
import javax.swing.JButton;
import org.w3c.dom.Comment;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
import org.openide.DialogDisplayer;
import org.openide.ErrorManager;
import org.openide.NotifyDescriptor;

        EditableProperties cachedProperties = this.helper.getProperties(RakeProjectHelper.PROJECT_PROPERTIES_PATH);
        return cachedProperties;
    }

    private static void copyDocument(Document doc, Element from, Element to, String projectConfigurationNamespace) {
        NodeList nl = from.getChildNodes();
        int length = nl.getLength();
        for (int i=0; i< length; i++) {
            Node node = nl.item (i);
            Node newNode = null;
            switch (node.getNodeType()) {
                case Node.ELEMENT_NODE:
                    Element oldElement = (Element) node;
                    newNode = doc.createElementNS(projectConfigurationNamespace, oldElement.getTagName());
                    NamedNodeMap m = oldElement.getAttributes();
                    Element newElement = (Element) newNode;
                    for (int index = 0; index < m.getLength(); index++) {
                        Node attr = m.item(index);
                          newElement.setAttribute(attr.getNodeName(), attr.getNodeValue());
                    }
                    copyDocument(doc, oldElement, newElement, projectConfigurationNamespace);
                    break;
                case Node.TEXT_NODE:
                    Text oldText = (Text) node;
                    newNode = doc.createTextNode(oldText.getData());
                    break;
                case Node.COMMENT_NODE:
                    Comment oldComment = (Comment) node;
                    newNode = doc.createComment(oldComment.getData());
                    break;
            }
            if (newNode != null) {
                to.appendChild (newNode);
            }
        }
    }
    
//    private static Element updateMinAntVersion (final Element root, final Document doc) {
//        NodeList list = root.getElementsByTagNameNS (RubyProjectType.PROJECT_CONFIGURATION_NAMESPACE,MINIMUM_ANT_VERSION_ELEMENT);

Lines 98-104 Link Here

(-)a/ruby.rakeproject/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>8.0</specification-version>	101	<specification-version>8.4</specification-version>
102	</run-dependency>	102	</run-dependency>
103	</dependency>	103	</dependency>
104	<dependency>	104	<dependency>




        }
        Document projectXml;
        try {
            projectXml = XMLUtil.parse(new InputSource(projectDiskFile.toURI().toString()), false, true, XMLUtil.defaultErrorHandler(), null);
        } catch (SAXException e) {
            IOException ioe = (IOException) new IOException(projectDiskFile + ": " + e.toString()).initCause(e);
            Exceptions.attachLocalizedMessage(ioe, NbBundle.getMessage(RakeBasedProjectFactorySingleton.class,

        if (!"project".equals(projectEl.getLocalName()) || !PROJECT_NS.equals(projectEl.getNamespaceURI())) { // NOI18N
            return null;
        }
        Element typeEl = XMLUtil.findElement(projectEl, "type", PROJECT_NS); // NOI18N
        if (typeEl == null) {
            return null;
        }
        String type = XMLUtil.findText(typeEl);
        if (type == null) {
            return null;
        }




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Sun in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * Contributor(s):
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
 * Microsystems, Inc. All Rights Reserved.
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 */

package org.netbeans.modules.ruby.modules.project.rake;

import java.util.ArrayList;
import java.util.List;
import org.openide.ErrorManager;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;

/**
 * Utilities relating to Ant projects.
 * @author Jesse Glick
 */
public class Util {

    private Util() {}

    /**
     * Search for an XML element in the direct children of a parent.
     * DOM provides a similar method but it does a recursive search
     * which we do not want. It also gives a node list and we want
     * only one result.
     * @param parent a parent element
     * @param name the intended local name
     * @param namespace the intended namespace
     * @return the one child element with that name, or null if none or more than one
     */
    public static Element findElement(Element parent, String name, String namespace) {
        Element result = null;
        NodeList l = parent.getChildNodes();
        int len = l.getLength();
        for (int i = 0; i < len; i++) {
            if (l.item(i).getNodeType() == Node.ELEMENT_NODE) {
                Element el = (Element)l.item(i);
                if (name.equals(el.getLocalName()) && namespace.equals(el.getNamespaceURI())) {
                    if (result == null) {
                        result = el;
                    } else {
                        return null;
                    }
                }
            }
        }
        return result;
    }
    
    /**
     * Extract nested text from an element.
     * Currently does not handle coalescing text nodes, CDATA sections, etc.
     * @param parent a parent element
     * @return the nested text, or null if none was found
     */
    public static String findText(Element parent) {
        NodeList l = parent.getChildNodes();
        for (int i = 0; i < l.getLength(); i++) {
            if (l.item(i).getNodeType() == Node.TEXT_NODE) {
                Text text = (Text)l.item(i);
                return text.getNodeValue();
            }
        }
        return null;
    }
    
    /**
     * Find all direct child elements of an element.
     * More useful than {@link Element#getElementsByTagNameNS} because it does
     * not recurse into recursive child elements.
     * Children which are all-whitespace text nodes are ignored; others cause
     * an exception to be thrown.
     * @param parent a parent element in a DOM tree
     * @return a list of direct child elements (may be empty)
     * @throws IllegalArgumentException if there are non-element children besides whitespace
     */
    public static List<Element> findSubElements(Element parent) throws IllegalArgumentException {
        NodeList l = parent.getChildNodes();
        List<Element> elements = new ArrayList<Element>(l.getLength());
        for (int i = 0; i < l.getLength(); i++) {
            Node n = l.item(i);
            if (n.getNodeType() == Node.ELEMENT_NODE) {
                elements.add((Element)n);
            } else if (n.getNodeType() == Node.TEXT_NODE) {
                String text = ((Text)n).getNodeValue();
                if (text.trim().length() > 0) {
                    throw new IllegalArgumentException("non-ws text encountered in " + parent + ": " + text); // NOI18N
                }
            } else if (n.getNodeType() == Node.COMMENT_NODE) {
                // skip
            } else {
                throw new IllegalArgumentException("unexpected non-element child of " + parent + ": " + n); // NOI18N
            }
        }
        return elements;
    }
    
    /**
     * Create an XML error handler that rethrows errors and fatal errors and logs warnings.
     * @return a standard error handler
     */
    public static ErrorHandler defaultErrorHandler() {
        return new ErrHandler();
    }
    
    private static final class ErrHandler implements ErrorHandler {
        
        public ErrHandler() {}
        
        private void annotate(SAXParseException exception) throws SAXException {
            ErrorManager.getDefault().annotate(exception, ErrorManager.UNKNOWN,
                "Occurred at: " + exception.getSystemId() + ":" + exception.getLineNumber(), // NOI18N
                null, null, null);
        }
        
        public void fatalError(SAXParseException exception) throws SAXException {
            annotate(exception);
            throw exception;
        }
        
        public void error(SAXParseException exception) throws SAXException {
            annotate(exception);
            throw exception;
        }
        
        public void warning(SAXParseException exception) throws SAXException {
            annotate(exception);
            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, exception);
        }
        
    }
    
}





package org.netbeans.modules.ruby.spi.project.support.rake;

import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.net.URL;
import java.util.Iterator;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.modules.ruby.modules.project.rake.RakeBasedProjectFactorySingleton;
import org.netbeans.modules.ruby.modules.project.rake.Util;
import org.openide.filesystems.FileLock;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;




import org.netbeans.modules.ruby.api.project.rake.RakeArtifact;
import org.netbeans.modules.ruby.modules.project.rake.RakeBasedProjectFactorySingleton;
import org.netbeans.modules.ruby.modules.project.rake.UserQuestionHandler;
import org.netbeans.modules.ruby.modules.project.rake.Util;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.AuxiliaryProperties;
import org.netbeans.spi.project.CacheDirectoryProvider;

        File f = FileUtil.toFile(xml);
        assert f != null;
        try {
            return XMLUtil.parse(new InputSource(f.toURI().toString()), false, true, XMLUtil.defaultErrorHandler(), null);
        } catch (IOException e) {
            if (!QUIETLY_SWALLOW_XML_LOAD_ERRORS) {
                ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);

        Document doc = getConfigurationXml(shared);
        if (shared) {
            Element project = doc.getDocumentElement();
            Element config = XMLUtil.findElement(project, "configuration", PROJECT_NS); // NOI18N
            assert config != null;
            return config;
        } else {

            public Element run() {
                synchronized (modifiedMetadataPaths) {
                    Element root = getConfigurationDataRoot(shared);
                    Element data = XMLUtil.findElement(root, elementName, namespace);
                    if (data != null) {
                        return cloneSafely(data);
                    } else {

            public Void run() {
                synchronized (modifiedMetadataPaths) {
                    Element root = getConfigurationDataRoot(shared);
                    Element existing = XMLUtil.findElement(root, fragment.getLocalName(), fragment.getNamespaceURI());
                    // XXX first compare to existing and return if the same
                    if (existing != null) {
                        root.removeChild(existing);

            public Boolean run() {
                synchronized (modifiedMetadataPaths) {
                    Element root = getConfigurationDataRoot(shared);
                    Element data = XMLUtil.findElement(root, elementName, namespace);
                    if (data != null) {
                        root.removeChild(data);
                        modifying(shared ? PROJECT_XML_PATH : PRIVATE_XML_PATH);




import org.netbeans.modules.ruby.api.project.rake.RakeArtifactQuery;
import org.netbeans.api.queries.CollocationQuery;
import org.netbeans.modules.ruby.modules.project.rake.RakeBasedProjectFactorySingleton;
import org.netbeans.modules.ruby.modules.project.rake.Util;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.SubprojectProvider;
import org.openide.ErrorManager;

        // Linear search; always keeping references sorted first by foreign project
        // name, then by target name.
        Element nextRefEl = null;
        Iterator<Element> it = XMLUtil.findSubElements(references).iterator();
        while (it.hasNext()) {
            Element testRefEl = it.next();
            RawReference testRef = RawReference.create(testRefEl);

    
    private static boolean removeRawReferenceElement(String foreignProjectName, String id, Element references, boolean escaped) throws IllegalArgumentException {
        // As with addRawReference, do a linear search through.
        for (Element testRefEl : XMLUtil.findSubElements(references)) {
            RawReference testRef = RawReference.create(testRefEl);
            String refID = testRef.getID();
            String refName = testRef.getForeignProjectName();

    }
    
    private static RawReference[] getRawReferences(Element references) throws IllegalArgumentException {
        List<Element> subEls = XMLUtil.findSubElements(references);
        List<RawReference> refs = new ArrayList<RawReference>(subEls.size());
        for (Element subEl : subEls) {
            refs.add(RawReference.create(subEl));

    }
    
    private static RawReference getRawReference(String foreignProjectName, String id, Element references, boolean escaped) throws IllegalArgumentException {
        for (Element subEl : XMLUtil.findSubElements(references)) {
            RawReference ref = RawReference.create(subEl);
            String refID = ref.getID();
            String refName = ref.getForeignProjectName();

                if (idx == -1) {
                    throw new IllegalArgumentException("bad subelement name: " + elName); // NOI18N
                }
                String val = XMLUtil.findText(el);
                if (val == null) {
                    throw new IllegalArgumentException("empty subelement: " + el); // NOI18N
                }

            if (!REF_NAME.equals(xml.getLocalName()) || !REFS_NS2.equals(xml.getNamespaceURI())) {
                throw new IllegalArgumentException("bad element name: " + xml); // NOI18N
            }
            List nl = XMLUtil.findSubElements(xml);
            if (nl.size() < 6) {
                throw new IllegalArgumentException("missing or extra data: " + xml); // NOI18N
            }

                if (idx == -1) {
                    throw new IllegalArgumentException("bad subelement name: " + elName); // NOI18N
                }
                String val = XMLUtil.findText(el);
                if (val == null) {
                    throw new IllegalArgumentException("empty subelement: " + el); // NOI18N
                }

                if (!"properties".equals(el.getLocalName())) { // NOI18N
                    throw new IllegalArgumentException("bad subelement. expected 'properties': " + el); // NOI18N
                }
                for (Element el2 : XMLUtil.findSubElements(el)) {
                    String key = el2.getAttribute("name");
                    String value = XMLUtil.findText(el2);
                    // #53553: NPE
                    if (value == null) {
                        value = ""; // NOI18N




                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>8.4</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                <test-type>
                    <name>unit</name>
                    <test-dependency>
                        <code-name-base>org.netbeans.libs.freemarker</code-name-base>
                        <recursive/>
                        <compile-dependency/>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
                        <compile-dependency/>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.modules.editor.mimelookup.impl</code-name-base>

                        <code-name-base>org.netbeans.modules.editor.settings.storage</code-name-base>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.modules.javahelp</code-name-base>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
                        <recursive/>
                        <compile-dependency/>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.modules.projectui</code-name-base>
                        <recursive/>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.modules.web.freeform</code-name-base>
                        <recursive/>
                        <compile-dependency/>
                    </test-dependency>
                </test-type>
            </test-dependencies>




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();




import org.openide.filesystems.FileUtil;
import org.openide.modules.ModuleInfo;
import org.openide.util.Lookup;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Element;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;

        // check that the correct /1 data was saved
        Element el = aux.getConfigurationFragment(WebProjectNature.EL_WEB, WebProjectNature.NS_WEB_1, true);
        assertNotNull("Web modules should be saved in /1",  el);
        List<Element> subElements = XMLUtil.findSubElements(el);
        assertEquals(1, subElements.size());
        
        // compare the web module
        Element el2 = subElements.get(0);
        assertElement(el2, "web-module", null);
        assertElementArray(XMLUtil.findSubElements(el2),
            new String[] {"doc-root", "context-path", "j2ee-spec-level", "web-inf"},
            new String[] {"web",      "mymodule",     "1.5",             "web/WEB-INF"});
        // validate against schema:

        assertNull("No /1 data should exist.", el);
        el = aux.getConfigurationFragment(WebProjectNature.EL_WEB, WebProjectNature.NS_WEB_2, true);
        assertNotNull("Should have /2 data.", el);
        subElements = XMLUtil.findSubElements(el);
        assertEquals(1, subElements.size());
        // compare the web module
        el2 = subElements.get(0);
        assertElement(el2, "web-module", null);
        assertElementArray(XMLUtil.findSubElements(el2),
            new String[] {"doc-root", "context-path", "j2ee-spec-level", "web-inf"},
            new String[] {"web",      "mymodule",     "1.5",             "somewhereelse/WEB-INF"});
        // validate against schema:

        assertNull("No /1 data should exist.", el);
        el = aux.getConfigurationFragment(WebProjectNature.EL_WEB, WebProjectNature.NS_WEB_2, true);
        assertNotNull("Should have /2 data.", el);
        subElements = XMLUtil.findSubElements(el);
        assertEquals(1, subElements.size());
        // compare the web module
        el2 = subElements.get(0);
        assertElement(el2, "web-module", null);
        assertElementArray(XMLUtil.findSubElements(el2),
            new String[] {"doc-root", "context-path", "j2ee-spec-level", "web-inf"},
            new String[] {"web",      "mymodule",     "1.5",             "somewhereelse/WEB-INF"});
        // validate against schema:

        String message = "Element "+element+" does not match [name="+expectedName+",value="+expectedValue+"]"; // NOI18N
        assertEquals(message, expectedName, element.getLocalName());
        if (expectedValue != null) {
            assertEquals(message, expectedValue, XMLUtil.findText(element));
        }
    }


            expectedValue+", attr="+expectedAttrName+", attrvalue="+expectedAttrValue+"]"; // NOI18N
        assertEquals(message, expectedName, element.getLocalName());
        if (expectedValue != null) {
            assertEquals(message, expectedValue, XMLUtil.findText(element));
        }
        String val = element.getAttribute(expectedAttrName);
        assertEquals(expectedAttrValue, val);

Lines 489-495 Link Here

(-)a/web.project/nbproject/project.xml (-6 / +15 lines)
489	<build-prerequisite/>	489	<build-prerequisite/>
490	<compile-dependency/>	490	<compile-dependency/>
491	<run-dependency>	491	<run-dependency>
492	<specification-version>8.0</specification-version>	492	<specification-version>8.4</specification-version>
493	</run-dependency>	493	</run-dependency>
494	</dependency>	494	</dependency>
495	<dependency>	495	<dependency>
Lines 522-528 Link Here
522	<test-type>	522	<test-type>
523	<name>unit</name>	523	<name>unit</name>
524	<test-dependency>	524	<test-dependency>
525	<code-name-base>org.netbeans.modules.web.project</code-name-base>	525	<code-name-base>org.netbeans.libs.junit4</code-name-base>
		526	<compile-dependency/>
		527	</test-dependency>
		528	<test-dependency>
		529	<code-name-base>org.netbeans.modules.j2eeapis</code-name-base>
		530	</test-dependency>
		531	<test-dependency>
		532	<code-name-base>org.netbeans.modules.masterfs</code-name-base>
		533	</test-dependency>
		534	<test-dependency>
		535	<code-name-base>org.netbeans.modules.nbjunit</code-name-base>
526	<recursive/>	536	<recursive/>
527	<compile-dependency/>	537	<compile-dependency/>
528	</test-dependency>	538	</test-dependency>
Lines 532-541 Link Here
532	<test/>	542	<test/>
533	</test-dependency>	543	</test-dependency>
534	<test-dependency>	544	<test-dependency>
535	<code-name-base>org.netbeans.modules.j2eeapis</code-name-base>	545	<code-name-base>org.netbeans.modules.web.project</code-name-base>
536	</test-dependency>	546	<recursive/>
537	<test-dependency>	547	<compile-dependency/>
538	<code-name-base>org.netbeans.modules.masterfs</code-name-base>
539	</test-dependency>	548	</test-dependency>
540	<test-dependency>	549	<test-dependency>
541	<code-name-base>org.openide.util</code-name-base>	550	<code-name-base>org.openide.util</code-name-base>




import org.openide.filesystems.URLMapper;
import org.openide.util.Mutex;
import org.openide.util.NbBundle;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Comment;
import org.w3c.dom.Document;
import org.w3c.dom.Element;

            if (oldRoot != null) {
                Document doc = oldRoot.getOwnerDocument();
                Element newRoot = doc.createElementNS (WebProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); //NOI18N
                XMLUtil.copyDocument (oldRoot, newRoot, WebProjectType.PROJECT_CONFIGURATION_NAMESPACE);
                if (version == 1) {
                    //1->2 upgrade
                    Element sourceRoots = doc.createElementNS(WebProjectType.PROJECT_CONFIGURATION_NAMESPACE,"source-roots");  //NOI18N

                            Element library = (Element) libList.item(i);
                            Node webFile = library.getElementsByTagNameNS(ns, TAG_FILE).item(0);
                            //remove ${ and } from the beginning and end
                            String webFileText = XMLUtil.findText(webFile);
                            webFileText = webFileText.substring(2, webFileText.length() - 1);
//                            warIncludesMap.put(webFileText, pathInWarElements.getLength() > 0 ? findText((Element) pathInWarElements.item(0)) : Item.PATH_IN_WAR_NONE);
                            if (webFileText.startsWith ("lib.")) {

        }
    }

    /**
     * Extract nested text from a node.
     * Currently does not handle coalescing text nodes, CDATA sections, etc.
     * @param parent a parent node
     * @return the nested text, or null if none was found
     */
    private static String findText(Node parent) {
        NodeList l = parent.getChildNodes();
        for (int i = 0; i < l.getLength(); i++) {
            if (l.item(i).getNodeType() == Node.TEXT_NODE) {
                Text text = (Text)l.item(i);
                return text.getNodeValue();
            }
        }
        return null;
    }
    
    private static void copyDocument (Document doc, Element from, Element to) {
        NodeList nl = from.getChildNodes();
        int length = nl.getLength();
        for (int i=0; i< length; i++) {
            Node node = nl.item (i);
            Node newNode = null;
            switch (node.getNodeType()) {
                case Node.ELEMENT_NODE:
                    Element oldElement = (Element) node;
                    newNode = doc.createElementNS(WebProjectType.PROJECT_CONFIGURATION_NAMESPACE,oldElement.getTagName());
                    NamedNodeMap m = oldElement.getAttributes();
                    Element newElement = (Element) newNode;
                    for (int index = 0; index < m.getLength(); index++) {
                        Node attr = m.item(index);
                        newElement.setAttribute(attr.getNodeName(), attr.getNodeValue());
                    }
                    copyDocument(doc,oldElement,(Element)newNode);
                    break;
                case Node.TEXT_NODE:
                    Text oldText = (Text) node;
                    newNode = doc.createTextNode(oldText.getData());
                    break;
                case Node.COMMENT_NODE:
                    Comment oldComment = (Comment) node;
                    newNode = doc.createComment(oldComment.getData());
                    break;
            }
            if (newNode != null) {
                to.appendChild (newNode);
            }
        }
    }

    private static Element updateMinAntVersion (final Element root, final Document doc) {
        NodeList list = root.getElementsByTagNameNS (WebProjectType.PROJECT_CONFIGURATION_NAMESPACE,TAG_MINIMUM_ANT_VERSION);
        if (list.getLength() == 1) {




import java.util.List;
import java.util.Map;
import org.netbeans.modules.j2ee.common.Util;
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
import org.netbeans.modules.java.api.common.classpath.ClassPathSupport.Item;
import org.netbeans.modules.java.api.common.util.CommonProjectUtils;
import org.netbeans.modules.web.project.WebProjectType;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;

/**
 * Defines the various class paths for a web project.

                            Node webFile = library.getElementsByTagNameNS(ns, TAG_FILE).item(0);
                            NodeList pathInWarElements = library.getElementsByTagNameNS(ns, TAG_PATH_IN_WAR);
                            //remove ${ and } from the beginning and end
                            String webFileText = XMLUtil.findText(webFile);
                            webFileText = webFileText.substring(2, webFileText.length() - 1);
                            
                            //#86522
                            if (webModuleLibraries.equals(TAG_WEB_MODULE__ADDITIONAL_LIBRARIES)) {
                                String pathInWar = PATH_IN_WAR_NONE;
                                if (pathInWarElements.getLength() > 0) {
                                    pathInWar = XMLUtil.findText((Element) pathInWarElements.item(0));
                                    if (pathInWar == null)
                                        pathInWar = "";
                                }
                                warIncludesMap.put(webFileText, pathInWar);
                            } else {
                                warIncludesMap.put(webFileText, pathInWarElements.getLength() > 0 ? XMLUtil.findText((Element) pathInWarElements.item(0)) : PATH_IN_WAR_NONE);
                            }
                            if (dirs != null) {
                                warIncludesMap.put(webFileText+"."+Util.DESTINATION_DIRECTORY, dirs);

    }

    /**
     * Extracts <b>the first</b> nested text from an element.
     * Currently does not handle coalescing text nodes, CDATA sections, etc.
     * @param parent a parent element
     * @return the nested text, or null if none was found
     */
    private static String findText( Element parent ) {
        NodeList l = parent.getChildNodes();
        for ( int i = 0; i < l.getLength(); i++ ) {
            if ( l.item(i).getNodeType() == Node.TEXT_NODE ) {
                Text text = (Text)l.item( i );
                return text.getNodeValue();
            }
        }
        return null;
    }
    
    /**
     * Extract nested text from a node.
     * Currently does not handle coalescing text nodes, CDATA sections, etc.
     * @param parent a parent node
     * @return the nested text, or null if none was found
     */
    private static String findText(Node parent) {
        NodeList l = parent.getChildNodes();
        for (int i = 0; i < l.getLength(); i++) {
            if (l.item(i).getNodeType() == Node.TEXT_NODE) {
                Text text = (Text)l.item(i);
                return text.getNodeValue();
            }
        }
        return null;
    }

    /**
     * Updates the project helper with the list of classpath items which are to be
     * included in deployment.
     */

Return to bug 136595

Lines 1467-1489 Link Here

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/customizer/SuiteCustomizerLibraries.java (-9 / +9 lines)
1467	dependencies = new HashSet<Dependency>();	1467	dependencies = new HashSet<Dependency>();
1468	// Cannot use ProjectXMLManager since we need to report also deps on nonexistent modules.	1468	// Cannot use ProjectXMLManager since we need to report also deps on nonexistent modules.
1469	Element dataE = project.getPrimaryConfigurationData();	1469	Element dataE = project.getPrimaryConfigurationData();
1470	Element depsE = Util.findElement(dataE, "module-dependencies", NbModuleProject.NAMESPACE_SHARED); // NOI18N	1470	Element depsE = XMLUtil.findElement(dataE, "module-dependencies", NbModuleProject.NAMESPACE_SHARED); // NOI18N
1471	assert depsE != null : "Malformed metadata in " + project;	1471	assert depsE != null : "Malformed metadata in " + project;
1472	for (Element dep : Util.findSubElements(depsE)) {	1472	for (Element dep : XMLUtil.findSubElements(depsE)) {
1473	Element run = Util.findElement(dep, "run-dependency", NbModuleProject.NAMESPACE_SHARED); // NOI18N	1473	Element run = XMLUtil.findElement(dep, "run-dependency", NbModuleProject.NAMESPACE_SHARED); // NOI18N
1474	if (run == null) {	1474	if (run == null) {
1475	continue;	1475	continue;
1476	}	1476	}
1477	String text = Util.findText(Util.findElement(dep, "code-name-base", NbModuleProject.NAMESPACE_SHARED)); // NOI18N	1477	String text = XMLUtil.findText(XMLUtil.findElement(dep, "code-name-base", NbModuleProject.NAMESPACE_SHARED)); // NOI18N
1478	Element relverE = Util.findElement(run, "release-version", NbModuleProject.NAMESPACE_SHARED); // NOI18N	1478	Element relverE = XMLUtil.findElement(run, "release-version", NbModuleProject.NAMESPACE_SHARED); // NOI18N
1479	if (relverE != null) {	1479	if (relverE != null) {
1480	text += '/' + Util.findText(relverE);	1480	text += '/' + XMLUtil.findText(relverE);
1481	}	1481	}
1482	Element specverE = Util.findElement(run, "specification-version", NbModuleProject.NAMESPACE_SHARED); // NOI18N	1482	Element specverE = XMLUtil.findElement(run, "specification-version", NbModuleProject.NAMESPACE_SHARED); // NOI18N
1483	if (specverE != null) {	1483	if (specverE != null) {
1484	text += " > " + Util.findText(specverE);	1484	text += " > " + XMLUtil.findText(specverE);
1485	} else {	1485	} else {
1486	Element implver = Util.findElement(run, "implementation-version", NbModuleProject.NAMESPACE_SHARED); // NOI18N	1486	Element implver = XMLUtil.findElement(run, "implementation-version", NbModuleProject.NAMESPACE_SHARED); // NOI18N
1487	if (implver != null) {	1487	if (implver != null) {
1488	// Will special-case '*' as an impl version to mean "match anything".	1488	// Will special-case '*' as an impl version to mean "match anything".
1489	text += " = *"; // NOI18N	1489	text += " = *"; // NOI18N

Lines 172-177 Link Here

(-)a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProject.java (-28 / +2 lines)
172	import org.openide.filesystems.FileStateInvalidException;	172	import org.openide.filesystems.FileStateInvalidException;
173	import org.openide.filesystems.FileSystem.AtomicAction;	173	import org.openide.filesystems.FileSystem.AtomicAction;
174	import org.openide.util.Exceptions;	174	import org.openide.util.Exceptions;
		175	import org.openide.xml.XMLUtil;
175		176
176	/**	177	/**
177	* Represents one ejb module project	178	* Represents one ejb module project
Lines 627-633 Link Here
627	if (element != null) {	628	if (element != null) {
628	Document doc = element.getOwnerDocument();	629	Document doc = element.getOwnerDocument();
629	Element newRoot = doc.createElementNS (EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); //NOI18N	630	Element newRoot = doc.createElementNS (EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); //NOI18N
630	copyDocument (doc, element, newRoot);	631	XMLUtil.copyDocument (element, newRoot, EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE);
631	Element srcRoots = doc.createElementNS(EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE, "source-roots"); //NOI18N	632	Element srcRoots = doc.createElementNS(EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE, "source-roots"); //NOI18N
632	Element root = doc.createElementNS (EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE,"root"); //NOI18N	633	Element root = doc.createElementNS (EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE,"root"); //NOI18N
633	root.setAttribute ("id","src.dir"); //NOI18N	634	root.setAttribute ("id","src.dir"); //NOI18N
Lines 643-675 Link Here
643	}	644	}
644	}	645	}
645		646
646	private static void copyDocument (Document doc, Element from, Element to) {
647	NodeList nl = from.getChildNodes();
648	int length = nl.getLength();
649	for (int i=0; i< length; i++) {
650	Node node = nl.item (i);
651	Node newNode = null;
652	switch (node.getNodeType()) {
653	case Node.ELEMENT_NODE:
654	Element oldElement = (Element) node;
655	newNode = doc.createElementNS(EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE,oldElement.getTagName());
656	copyDocument(doc,oldElement,(Element)newNode);
657	break;
658	case Node.TEXT_NODE:
659	Text oldText = (Text) node;
660	newNode = doc.createTextNode(oldText.getData());
661	break;
662	case Node.COMMENT_NODE:
663	Comment oldComment = (Comment) node;
664	newNode = doc.createComment(oldComment.getData());
665	break;
666	}
667	if (newNode != null) {
668	to.appendChild (newNode);
669	}
670	}
671	}
672
673	public void fileAttributeChanged (org.openide.filesystems.FileAttributeEvent fe) {	647	public void fileAttributeChanged (org.openide.filesystems.FileAttributeEvent fe) {
674	}	648	}
675		649

Lines 67-84 Link Here

(-)a/ant.freeform/src/org/netbeans/modules/ant/freeform/Actions.java (-38 / +34 lines)
67	import javax.swing.JMenuItem;	67	import javax.swing.JMenuItem;
68	import javax.swing.JSeparator;	68	import javax.swing.JSeparator;
69	import org.apache.tools.ant.module.api.support.ActionUtils;	69	import org.apache.tools.ant.module.api.support.ActionUtils;
70	import org.netbeans.modules.ant.freeform.spi.support.Util;
71	import org.netbeans.modules.ant.freeform.ui.TargetMappingPanel;	70	import org.netbeans.modules.ant.freeform.ui.TargetMappingPanel;
72	import org.netbeans.modules.ant.freeform.ui.UnboundTargetAlert;	71	import org.netbeans.modules.ant.freeform.ui.UnboundTargetAlert;
73	import org.netbeans.spi.project.ActionProvider;	72	import org.netbeans.spi.project.ActionProvider;
74	import org.netbeans.spi.project.support.ant.AntProjectHelper;	73	import org.netbeans.spi.project.support.ant.AntProjectHelper;
75	import org.netbeans.spi.project.ui.support.CommonProjectActions;
76	import org.netbeans.spi.project.ui.support.DefaultProjectOperations;	74	import org.netbeans.spi.project.ui.support.DefaultProjectOperations;
77	import org.netbeans.spi.project.ui.support.ProjectSensitiveActions;	75	import org.netbeans.spi.project.ui.support.ProjectSensitiveActions;
78	import org.openide.DialogDisplayer;	76	import org.openide.DialogDisplayer;
79	import org.openide.ErrorManager;	77	import org.openide.ErrorManager;
80	import org.openide.NotifyDescriptor;	78	import org.openide.NotifyDescriptor;
81	import org.openide.actions.FindAction;
82	import org.openide.awt.DynamicMenuContent;	79	import org.openide.awt.DynamicMenuContent;
83	import org.openide.filesystems.FileObject;	80	import org.openide.filesystems.FileObject;
84	import org.openide.filesystems.FileUtil;	81	import org.openide.filesystems.FileUtil;
Lines 86-94 Link Here
86	import org.openide.util.ContextAwareAction;	83	import org.openide.util.ContextAwareAction;
87	import org.openide.util.Lookup;	84	import org.openide.util.Lookup;
88	import org.openide.util.NbBundle;	85	import org.openide.util.NbBundle;
89	import org.openide.util.Utilities;
90	import org.openide.util.actions.Presenter;	86	import org.openide.util.actions.Presenter;
91	import org.openide.util.actions.SystemAction;	87	import org.openide.xml.XMLUtil;
92	import org.w3c.dom.Element;	88	import org.w3c.dom.Element;
93		89
94	/**	90	/**
Lines 141-153 Link Here
141		137
142	public String[] getSupportedActions() {	138	public String[] getSupportedActions() {
143	Element genldata = project.getPrimaryConfigurationData();	139	Element genldata = project.getPrimaryConfigurationData();
144	Element actionsEl = Util.findElement(genldata, "ide-actions", FreeformProjectType.NS_GENERAL); // NOI18N	140	Element actionsEl = XMLUtil.findElement(genldata, "ide-actions", FreeformProjectType.NS_GENERAL); // NOI18N
145	if (actionsEl == null) {	141	if (actionsEl == null) {
146	return new String[0];	142	return new String[0];
147	}	143	}
148	// Use a set, not a list, since when using context you can define one action several times:	144	// Use a set, not a list, since when using context you can define one action several times:
149	Set<String> names = new LinkedHashSet<String>();	145	Set<String> names = new LinkedHashSet<String>();
150	for (Element actionEl : Util.findSubElements(actionsEl)) {	146	for (Element actionEl : XMLUtil.findSubElements(actionsEl)) {
151	names.add(actionEl.getAttribute("name")); // NOI18N	147	names.add(actionEl.getAttribute("name")); // NOI18N
152	}	148	}
153	// #46886: also always enable all common global actions, in case they should be selected:	149	// #46886: also always enable all common global actions, in case they should be selected:
Lines 174-189 Link Here
174	}	170	}
175		171
176	Element genldata = project.getPrimaryConfigurationData();	172	Element genldata = project.getPrimaryConfigurationData();
177	Element actionsEl = Util.findElement(genldata, "ide-actions", FreeformProjectType.NS_GENERAL); // NOI18N	173	Element actionsEl = XMLUtil.findElement(genldata, "ide-actions", FreeformProjectType.NS_GENERAL); // NOI18N
178	if (actionsEl == null) {	174	if (actionsEl == null) {
179	throw new IllegalArgumentException("No commands supported"); // NOI18N	175	throw new IllegalArgumentException("No commands supported"); // NOI18N
180	}	176	}
181	boolean foundAction = false;	177	boolean foundAction = false;
182	for (Element actionEl : Util.findSubElements(actionsEl)) {	178	for (Element actionEl : XMLUtil.findSubElements(actionsEl)) {
183	if (actionEl.getAttribute("name").equals(command)) { // NOI18N	179	if (actionEl.getAttribute("name").equals(command)) { // NOI18N
184	foundAction = true;	180	foundAction = true;
185	// XXX perhaps check also existence of script	181	// XXX perhaps check also existence of script
186	Element contextEl = Util.findElement(actionEl, "context", FreeformProjectType.NS_GENERAL); // NOI18N	182	Element contextEl = XMLUtil.findElement(actionEl, "context", FreeformProjectType.NS_GENERAL); // NOI18N
187	if (contextEl != null) {	183	if (contextEl != null) {
188	// Check whether the context contains files all in this folder,	184	// Check whether the context contains files all in this folder,
189	// matching the pattern if any, and matching the arity (single/multiple).	185	// matching the pattern if any, and matching the arity (single/multiple).
Lines 194-202 Link Here
194	return true;	190	return true;
195	} else if (!selection.isEmpty()) {	191	} else if (!selection.isEmpty()) {
196	// Multiple selection; check arity.	192	// Multiple selection; check arity.
197	Element arityEl = Util.findElement(contextEl, "arity", FreeformProjectType.NS_GENERAL); // NOI18N	193	Element arityEl = XMLUtil.findElement(contextEl, "arity", FreeformProjectType.NS_GENERAL); // NOI18N
198	assert arityEl != null : "No <arity> in <context> for " + command;	194	assert arityEl != null : "No <arity> in <context> for " + command;
199	if (Util.findElement(arityEl, "separated-files", FreeformProjectType.NS_GENERAL) != null) { // NOI18N	195	if (XMLUtil.findElement(arityEl, "separated-files", FreeformProjectType.NS_GENERAL) != null) { // NOI18N
200	// Supports multiple selection, take it.	196	// Supports multiple selection, take it.
201	return true;	197	return true;
202	}	198	}
Lines 238-249 Link Here
238	}	234	}
239		235
240	Element genldata = project.getPrimaryConfigurationData();	236	Element genldata = project.getPrimaryConfigurationData();
241	Element actionsEl = Util.findElement(genldata, "ide-actions", FreeformProjectType.NS_GENERAL); // NOI18N	237	Element actionsEl = XMLUtil.findElement(genldata, "ide-actions", FreeformProjectType.NS_GENERAL); // NOI18N
242	if (actionsEl == null) {	238	if (actionsEl == null) {
243	throw new IllegalArgumentException("No commands supported"); // NOI18N	239	throw new IllegalArgumentException("No commands supported"); // NOI18N
244	}	240	}
245	boolean foundAction = false;	241	boolean foundAction = false;
246	for (Element actionEl : Util.findSubElements(actionsEl)) {	242	for (Element actionEl : XMLUtil.findSubElements(actionsEl)) {
247	if (actionEl.getAttribute("name").equals(command)) { // NOI18N	243	if (actionEl.getAttribute("name").equals(command)) { // NOI18N
248	foundAction = true;	244	foundAction = true;
249	runConfiguredAction(project, actionEl, context);	245	runConfiguredAction(project, actionEl, context);
Lines 278-286 Link Here
278	_files.add(d.getPrimaryFile());	274	_files.add(d.getPrimaryFile());
279	}	275	}
280	Collection<? extends FileObject> files = _files;	276	Collection<? extends FileObject> files = _files;
281	Element folderEl = Util.findElement(contextEl, "folder", FreeformProjectType.NS_GENERAL); // NOI18N	277	Element folderEl = XMLUtil.findElement(contextEl, "folder", FreeformProjectType.NS_GENERAL); // NOI18N
282	assert folderEl != null : "Must have <folder> in <context>";	278	assert folderEl != null : "Must have <folder> in <context>";
283	String rawtext = Util.findText(folderEl);	279	String rawtext = XMLUtil.findText(folderEl);
284	assert rawtext != null : "Must have text contents in <folder>";	280	assert rawtext != null : "Must have text contents in <folder>";
285	String evaltext = project.evaluator().evaluate(rawtext);	281	String evaltext = project.evaluator().evaluate(rawtext);
286	if (evaltext == null) {	282	if (evaltext == null) {
Lines 291-299 Link Here
291	return Collections.emptyMap();	287	return Collections.emptyMap();
292	}	288	}
293	Pattern pattern = null;	289	Pattern pattern = null;
294	Element patternEl = Util.findElement(contextEl, "pattern", FreeformProjectType.NS_GENERAL); // NOI18N	290	Element patternEl = XMLUtil.findElement(contextEl, "pattern", FreeformProjectType.NS_GENERAL); // NOI18N
295	if (patternEl != null) {	291	if (patternEl != null) {
296	String text = Util.findText(patternEl);	292	String text = XMLUtil.findText(patternEl);
297	assert text != null : "Must have text contents in <pattern>";	293	assert text != null : "Must have text contents in <pattern>";
298	try {	294	try {
299	pattern = Pattern.compile(text);	295	pattern = Pattern.compile(text);
Lines 322-330 Link Here
322	*/	318	*/
323	private static void runConfiguredAction(FreeformProject project, Element actionEl, Lookup context) {	319	private static void runConfiguredAction(FreeformProject project, Element actionEl, Lookup context) {
324	String script;	320	String script;
325	Element scriptEl = Util.findElement(actionEl, "script", FreeformProjectType.NS_GENERAL); // NOI18N	321	Element scriptEl = XMLUtil.findElement(actionEl, "script", FreeformProjectType.NS_GENERAL); // NOI18N
326	if (scriptEl != null) {	322	if (scriptEl != null) {
327	script = Util.findText(scriptEl);	323	script = XMLUtil.findText(scriptEl);
328	} else {	324	} else {
329	script = "build.xml"; // NOI18N	325	script = "build.xml"; // NOI18N
330	}	326	}
Lines 340-352 Link Here
340	DialogDisplayer.getDefault().notify(nd);	336	DialogDisplayer.getDefault().notify(nd);
341	return;	337	return;
342	}	338	}
343	List<Element> targets = Util.findSubElements(actionEl);	339	List<Element> targets = XMLUtil.findSubElements(actionEl);
344	List<String> targetNames = new ArrayList<String>(targets.size());	340	List<String> targetNames = new ArrayList<String>(targets.size());
345	for (Element targetEl : targets) {	341	for (Element targetEl : targets) {
346	if (!targetEl.getLocalName().equals("target")) { // NOI18N	342	if (!targetEl.getLocalName().equals("target")) { // NOI18N
347	continue;	343	continue;
348	}	344	}
349	targetNames.add(Util.findText(targetEl));	345	targetNames.add(XMLUtil.findText(targetEl));
350	}	346	}
351	String[] targetNameArray;	347	String[] targetNameArray;
352	if (!targetNames.isEmpty()) {	348	if (!targetNames.isEmpty()) {
Lines 356-362 Link Here
356	targetNameArray = null;	352	targetNameArray = null;
357	}	353	}
358	Properties props = new Properties();	354	Properties props = new Properties();
359	Element contextEl = Util.findElement(actionEl, "context", FreeformProjectType.NS_GENERAL); // NOI18N	355	Element contextEl = XMLUtil.findElement(actionEl, "context", FreeformProjectType.NS_GENERAL); // NOI18N
360	if (contextEl != null) {	356	if (contextEl != null) {
361	Map<String,FileObject> selection = findSelection(contextEl, context, project);	357	Map<String,FileObject> selection = findSelection(contextEl, context, project);
362	if (selection.isEmpty()) {	358	if (selection.isEmpty()) {
Lines 365-382 Link Here
365	String separator = null;	361	String separator = null;
366	if (selection.size() > 1) {	362	if (selection.size() > 1) {
367	// Find the right separator.	363	// Find the right separator.
368	Element arityEl = Util.findElement(contextEl, "arity", FreeformProjectType.NS_GENERAL); // NOI18N	364	Element arityEl = XMLUtil.findElement(contextEl, "arity", FreeformProjectType.NS_GENERAL); // NOI18N
369	assert arityEl != null : "No <arity> in <context> for " + actionEl.getAttribute("name");	365	assert arityEl != null : "No <arity> in <context> for " + actionEl.getAttribute("name");
370	Element sepFilesEl = Util.findElement(arityEl, "separated-files", FreeformProjectType.NS_GENERAL); // NOI18N	366	Element sepFilesEl = XMLUtil.findElement(arityEl, "separated-files", FreeformProjectType.NS_GENERAL); // NOI18N
371	if (sepFilesEl == null) {	367	if (sepFilesEl == null) {
372	// Only handles single files -> skip it.	368	// Only handles single files -> skip it.
373	return;	369	return;
374	}	370	}
375	separator = Util.findText(sepFilesEl);	371	separator = XMLUtil.findText(sepFilesEl);
376	}	372	}
377	Element formatEl = Util.findElement(contextEl, "format", FreeformProjectType.NS_GENERAL); // NOI18N	373	Element formatEl = XMLUtil.findElement(contextEl, "format", FreeformProjectType.NS_GENERAL); // NOI18N
378	assert formatEl != null : "No <format> in <context> for " + actionEl.getAttribute("name");	374	assert formatEl != null : "No <format> in <context> for " + actionEl.getAttribute("name");
379	String format = Util.findText(formatEl);	375	String format = XMLUtil.findText(formatEl);
380	StringBuffer buf = new StringBuffer();	376	StringBuffer buf = new StringBuffer();
381	Iterator<Map.Entry<String,FileObject>> it = selection.entrySet().iterator();	377	Iterator<Map.Entry<String,FileObject>> it = selection.entrySet().iterator();
382	while (it.hasNext()) {	378	while (it.hasNext()) {
Lines 427-435 Link Here
427	buf.append(separator);	423	buf.append(separator);
428	}	424	}
429	}	425	}
430	Element propEl = Util.findElement(contextEl, "property", FreeformProjectType.NS_GENERAL); // NOI18N	426	Element propEl = XMLUtil.findElement(contextEl, "property", FreeformProjectType.NS_GENERAL); // NOI18N
431	assert propEl != null : "No <property> in <context> for " + actionEl.getAttribute("name");	427	assert propEl != null : "No <property> in <context> for " + actionEl.getAttribute("name");
432	String prop = Util.findText(propEl);	428	String prop = XMLUtil.findText(propEl);
433	assert prop != null : "Must have text contents in <property>";	429	assert prop != null : "Must have text contents in <property>";
434	props.setProperty(prop, buf.toString());	430	props.setProperty(prop, buf.toString());
435	}	431	}
Lines 437-443 Link Here
437	if (!propEl.getLocalName().equals("property")) { // NOI18N	433	if (!propEl.getLocalName().equals("property")) { // NOI18N
438	continue;	434	continue;
439	}	435	}
440	String rawtext = Util.findText(propEl);	436	String rawtext = XMLUtil.findText(propEl);
441	if (rawtext == null) {	437	if (rawtext == null) {
442	// Legal to have e.g. <property name="intentionally-left-blank"/>	438	// Legal to have e.g. <property name="intentionally-left-blank"/>
443	rawtext = ""; // NOI18N	439	rawtext = ""; // NOI18N
Lines 503-514 Link Here
503	static Action[] contextMenuCustomActions(FreeformProject p) {	499	static Action[] contextMenuCustomActions(FreeformProject p) {
504	List<Action> actions = new ArrayList<Action>();	500	List<Action> actions = new ArrayList<Action>();
505	Element genldata = p.getPrimaryConfigurationData();	501	Element genldata = p.getPrimaryConfigurationData();
506	Element viewEl = Util.findElement(genldata, "view", FreeformProjectType.NS_GENERAL); // NOI18N	502	Element viewEl = XMLUtil.findElement(genldata, "view", FreeformProjectType.NS_GENERAL); // NOI18N
507	if (viewEl != null) {	503	if (viewEl != null) {
508	Element contextMenuEl = Util.findElement(viewEl, "context-menu", FreeformProjectType.NS_GENERAL); // NOI18N	504	Element contextMenuEl = XMLUtil.findElement(viewEl, "context-menu", FreeformProjectType.NS_GENERAL); // NOI18N
509	if (contextMenuEl != null) {	505	if (contextMenuEl != null) {
510	actions.add(null);	506	actions.add(null);
511	for (Element actionEl : Util.findSubElements(contextMenuEl)) {	507	for (Element actionEl : XMLUtil.findSubElements(contextMenuEl)) {
512	if (actionEl.getLocalName().equals("ide-action")) { // NOI18N	508	if (actionEl.getLocalName().equals("ide-action")) { // NOI18N
513	String cmd = actionEl.getAttribute("name");	509	String cmd = actionEl.getAttribute("name");
514	String displayName;	510	String displayName;
Lines 547-555 Link Here
547		543
548	public boolean isEnabled() {	544	public boolean isEnabled() {
549	String script;	545	String script;
550	Element scriptEl = Util.findElement(actionEl, "script", FreeformProjectType.NS_GENERAL); // NOI18N	546	Element scriptEl = XMLUtil.findElement(actionEl, "script", FreeformProjectType.NS_GENERAL); // NOI18N
551	if (scriptEl != null) {	547	if (scriptEl != null) {
552	script = Util.findText(scriptEl);	548	script = XMLUtil.findText(scriptEl);
553	} else {	549	} else {
554	script = "build.xml"; // NOI18N	550	script = "build.xml"; // NOI18N
555	}	551	}
Lines 559-566 Link Here
559		555
560	public Object getValue(String key) {	556	public Object getValue(String key) {
561	if (key.equals(Action.NAME)) {	557	if (key.equals(Action.NAME)) {
562	Element labelEl = Util.findElement(actionEl, "label", FreeformProjectType.NS_GENERAL); // NOI18N	558	Element labelEl = XMLUtil.findElement(actionEl, "label", FreeformProjectType.NS_GENERAL); // NOI18N
563	return Util.findText(labelEl);	559	return XMLUtil.findText(labelEl);
564	} else {	560	} else {
565	return super.getValue(key);	561	return super.getValue(key);
566	}	562	}

Lines 46-57 Link Here

(-)a/ant.freeform/src/org/netbeans/modules/ant/freeform/FreeformSources.java (-13 / +13 lines)
46	import org.netbeans.api.project.ProjectManager;	46	import org.netbeans.api.project.ProjectManager;
47	import org.netbeans.api.project.SourceGroup;	47	import org.netbeans.api.project.SourceGroup;
48	import org.netbeans.api.project.Sources;	48	import org.netbeans.api.project.Sources;
49	import org.netbeans.modules.ant.freeform.spi.support.Util;
50	import org.netbeans.spi.project.support.ant.AntProjectEvent;	49	import org.netbeans.spi.project.support.ant.AntProjectEvent;
51	import org.netbeans.spi.project.support.ant.AntProjectListener;	50	import org.netbeans.spi.project.support.ant.AntProjectListener;
52	import org.netbeans.spi.project.support.ant.SourcesHelper;	51	import org.netbeans.spi.project.support.ant.SourcesHelper;
53	import org.openide.util.ChangeSupport;	52	import org.openide.util.ChangeSupport;
54	import org.openide.util.Mutex;	53	import org.openide.util.Mutex;
		54	import org.openide.xml.XMLUtil;
55	import org.w3c.dom.Element;	55	import org.w3c.dom.Element;
56		56
57	/**	57	/**
Lines 86-117 Link Here
86	private Sources initSources() {	86	private Sources initSources() {
87	SourcesHelper h = new SourcesHelper(project, project.helper(), project.evaluator());	87	SourcesHelper h = new SourcesHelper(project, project.helper(), project.evaluator());
88	Element genldata = project.getPrimaryConfigurationData();	88	Element genldata = project.getPrimaryConfigurationData();
89	Element foldersE = Util.findElement(genldata, "folders", FreeformProjectType.NS_GENERAL); // NOI18N	89	Element foldersE = XMLUtil.findElement(genldata, "folders", FreeformProjectType.NS_GENERAL); // NOI18N
90	if (foldersE != null) {	90	if (foldersE != null) {
91	for (Element folderE : Util.findSubElements(foldersE)) {	91	for (Element folderE : XMLUtil.findSubElements(foldersE)) {
92	Element locationE = Util.findElement(folderE, "location", FreeformProjectType.NS_GENERAL); // NOI18N	92	Element locationE = XMLUtil.findElement(folderE, "location", FreeformProjectType.NS_GENERAL); // NOI18N
93	String location = Util.findText(locationE);	93	String location = XMLUtil.findText(locationE);
94	if (folderE.getLocalName().equals("build-folder")) { // NOI18N	94	if (folderE.getLocalName().equals("build-folder")) { // NOI18N
95	h.addNonSourceRoot(location);	95	h.addNonSourceRoot(location);
96	} else if (folderE.getLocalName().equals("build-file")) { // NOI18N	96	} else if (folderE.getLocalName().equals("build-file")) { // NOI18N
97	h.addOwnedFile(location);	97	h.addOwnedFile(location);
98	} else {	98	} else {
99	assert folderE.getLocalName().equals("source-folder") : folderE;	99	assert folderE.getLocalName().equals("source-folder") : folderE;
100	Element nameE = Util.findElement(folderE, "label", FreeformProjectType.NS_GENERAL); // NOI18N	100	Element nameE = XMLUtil.findElement(folderE, "label", FreeformProjectType.NS_GENERAL); // NOI18N
101	String name = Util.findText(nameE);	101	String name = XMLUtil.findText(nameE);
102	Element typeE = Util.findElement(folderE, "type", FreeformProjectType.NS_GENERAL); // NOI18N	102	Element typeE = XMLUtil.findElement(folderE, "type", FreeformProjectType.NS_GENERAL); // NOI18N
103	String includes = null;	103	String includes = null;
104	Element includesE = Util.findElement(folderE, "includes", FreeformProjectType.NS_GENERAL); // NOI18N	104	Element includesE = XMLUtil.findElement(folderE, "includes", FreeformProjectType.NS_GENERAL); // NOI18N
105	if (includesE != null) {	105	if (includesE != null) {
106	includes = Util.findText(includesE);	106	includes = XMLUtil.findText(includesE);
107	}	107	}
108	String excludes = null;	108	String excludes = null;
109	Element excludesE = Util.findElement(folderE, "excludes", FreeformProjectType.NS_GENERAL); // NOI18N	109	Element excludesE = XMLUtil.findElement(folderE, "excludes", FreeformProjectType.NS_GENERAL); // NOI18N
110	if (excludesE != null) {	110	if (excludesE != null) {
111	excludes = Util.findText(excludesE);	111	excludes = XMLUtil.findText(excludesE);
112	}	112	}
113	if (typeE != null) {	113	if (typeE != null) {
114	String type = Util.findText(typeE);	114	String type = XMLUtil.findText(typeE);
115	h.addTypedSourceRoot(location, includes, excludes, type, name, null, null);	115	h.addTypedSourceRoot(location, includes, excludes, type, name, null, null);
116	} else {	116	} else {
117	h.addPrincipalSourceRoot(location, includes, excludes, name, null, null);	117	h.addPrincipalSourceRoot(location, includes, excludes, name, null, null);

Lines 51-56 Link Here

(-)a/ant.freeform/src/org/netbeans/modules/ant/freeform/FreeformTemplateAttributesProvider.java (-2 / +3 lines)
51	import org.openide.loaders.CreateFromTemplateAttributesProvider;	51	import org.openide.loaders.CreateFromTemplateAttributesProvider;
52	import org.openide.loaders.DataFolder;	52	import org.openide.loaders.DataFolder;
53	import org.openide.loaders.DataObject;	53	import org.openide.loaders.DataObject;
		54	import org.openide.xml.XMLUtil;
54	import org.w3c.dom.Element;	55	import org.w3c.dom.Element;
55		56
56	/**	57	/**
Lines 77-90 Link Here
77		78
78	public Map<String, ?> attributesFor(DataObject template, DataFolder target, String name) {	79	public Map<String, ?> attributesFor(DataObject template, DataFolder target, String name) {
79	Element primData = Util.getPrimaryConfigurationData(helper);	80	Element primData = Util.getPrimaryConfigurationData(helper);
80	Element licenseEl = Util.findElement(primData, "project-license", Util.NAMESPACE); // NOI18N	81	Element licenseEl = XMLUtil.findElement(primData, "project-license", Util.NAMESPACE); // NOI18N
81	Charset charset = encodingQuery.getEncoding(target.getPrimaryFile());	82	Charset charset = encodingQuery.getEncoding(target.getPrimaryFile());
82	if (licenseEl == null && charset == null) {	83	if (licenseEl == null && charset == null) {
83	return null;	84	return null;
84	} else {	85	} else {
85	Map<String, String> values = new HashMap<String, String>();	86	Map<String, String> values = new HashMap<String, String>();
86	if (licenseEl != null) {	87	if (licenseEl != null) {
87	values.put("license", evaluator.evaluate(Util.findText(licenseEl))); // NOI18N	88	values.put("license", evaluator.evaluate(XMLUtil.findText(licenseEl))); // NOI18N
88	}	89	}
89	if (charset != null) {	90	if (charset != null) {
90	values.put("encoding", charset.name()); // NOI18N	91	values.put("encoding", charset.name()); // NOI18N

Lines 46-60 Link Here

(-)a/ant.freeform/src/org/netbeans/modules/ant/freeform/Subprojects.java (-5 / +4 lines)
46	import java.util.Collections;	46	import java.util.Collections;
47	import java.util.HashSet;	47	import java.util.HashSet;
48	import java.util.Iterator;	48	import java.util.Iterator;
49	import java.util.List;
50	import java.util.Set;	49	import java.util.Set;
51	import javax.swing.event.ChangeListener;	50	import javax.swing.event.ChangeListener;
52	import org.netbeans.api.project.Project;	51	import org.netbeans.api.project.Project;
53	import org.netbeans.api.project.ProjectManager;	52	import org.netbeans.api.project.ProjectManager;
54	import org.netbeans.modules.ant.freeform.spi.support.Util;
55	import org.netbeans.spi.project.SubprojectProvider;	53	import org.netbeans.spi.project.SubprojectProvider;
56	import org.openide.ErrorManager;	54	import org.openide.ErrorManager;
57	import org.openide.filesystems.FileObject;	55	import org.openide.filesystems.FileObject;
		56	import org.openide.xml.XMLUtil;
58	import org.w3c.dom.Element;	57	import org.w3c.dom.Element;
59		58
60	/**	59	/**
Lines 88-98 Link Here
88	*/	87	*/
89	private Set<Project> createSubprojects(Set<Project> subprojects) {	88	private Set<Project> createSubprojects(Set<Project> subprojects) {
90	Element config = project.getPrimaryConfigurationData();	89	Element config = project.getPrimaryConfigurationData();
91	Element subprjsEl = Util.findElement(config, "subprojects", FreeformProjectType.NS_GENERAL); // NOI18N	90	Element subprjsEl = XMLUtil.findElement(config, "subprojects", FreeformProjectType.NS_GENERAL); // NOI18N
92	if (subprjsEl != null) {	91	if (subprjsEl != null) {
93	for (Element prjEl : Util.findSubElements(subprjsEl)) {	92	for (Element prjEl : XMLUtil.findSubElements(subprjsEl)) {
94	assert prjEl.getLocalName().equals("project") : "Bad element " + prjEl + " in <subprojects> for " + project;	93	assert prjEl.getLocalName().equals("project") : "Bad element " + prjEl + " in <subprojects> for " + project;
95	String rawtext = Util.findText(prjEl);	94	String rawtext = XMLUtil.findText(prjEl);
96	assert rawtext != null : "Need text content for <project> in " + project;	95	assert rawtext != null : "Need text content for <project> in " + project;
97	String evaltext = project.evaluator().evaluate(rawtext);	96	String evaltext = project.evaluator().evaluate(rawtext);
98	if (evaltext == null) {	97	if (evaltext == null) {

Lines 43-52 Link Here

(-)a/ant.freeform/src/org/netbeans/modules/ant/freeform/spi/support/Util.java (-139 / +3 lines)
43		43
44	import java.io.File;	44	import java.io.File;
45	import java.io.IOException;	45	import java.io.IOException;
46	import java.util.ArrayList;
47	import java.util.Arrays;
48	import java.util.Iterator;
49	import java.util.List;
50	import javax.xml.XMLConstants;	46	import javax.xml.XMLConstants;
51	import javax.xml.validation.Schema;	47	import javax.xml.validation.Schema;
52	import javax.xml.validation.SchemaFactory;	48	import javax.xml.validation.SchemaFactory;
Lines 71-80 Link Here
71	import org.w3c.dom.DOMException;	67	import org.w3c.dom.DOMException;
72	import org.w3c.dom.Document;	68	import org.w3c.dom.Document;
73	import org.w3c.dom.Element;	69	import org.w3c.dom.Element;
74	import org.w3c.dom.NamedNodeMap;
75	import org.w3c.dom.Node;
76	import org.w3c.dom.NodeList;
77	import org.w3c.dom.Text;
78	import org.w3c.dom.ls.DOMImplementationLS;	70	import org.w3c.dom.ls.DOMImplementationLS;
79	import org.w3c.dom.ls.LSSerializer;	71	import org.w3c.dom.ls.LSSerializer;
80	import org.xml.sax.SAXException;	72	import org.xml.sax.SAXException;
Lines 87-170 Link Here
87		79
88	private Util() {}	80	private Util() {}
89		81
90	// XXX XML methods copied from ant/project... make a general API of these instead?
91
92	/**
93	* Search for an XML element in the direct children of a parent.
94	* DOM provides a similar method but it does a recursive search
95	* which we do not want. It also gives a node list and we want
96	* only one result.
97	* @param parent a parent element
98	* @param name the intended local name
99	* @param namespace the intended namespace
100	* @return the one child element with that name, or null if none or more than one
101	*/
102	public static Element findElement(Element parent, String name, String namespace) {
103	Element result = null;
104	NodeList l = parent.getChildNodes();
105	for (int i = 0; i < l.getLength(); i++) {
106	if (l.item(i).getNodeType() == Node.ELEMENT_NODE) {
107	Element el = (Element)l.item(i);
108	if (name.equals(el.getLocalName()) && namespace.equals(el.getNamespaceURI())) {
109	if (result == null) {
110	result = el;
111	} else {
112	return null;
113	}
114	}
115	}
116	}
117	return result;
118	}
119
120	/**
121	* Extract nested text from an element.
122	* Currently does not handle coalescing text nodes, CDATA sections, etc.
123	* @param parent a parent element
124	* @return the nested text, or null if none was found
125	*/
126	public static String findText(Element parent) {
127	NodeList l = parent.getChildNodes();
128	for (int i = 0; i < l.getLength(); i++) {
129	if (l.item(i).getNodeType() == Node.TEXT_NODE) {
130	Text text = (Text)l.item(i);
131	return text.getNodeValue();
132	}
133	}
134	return null;
135	}
136
137	/**
138	* Find all direct child elements of an element.
139	* More useful than {@link Element#getElementsByTagNameNS} because it does
140	* not recurse into recursive child elements.
141	* Children which are all-whitespace text nodes are ignored; others cause
142	* an exception to be thrown.
143	* @param parent a parent element in a DOM tree
144	* @return a list of direct child elements (may be empty)
145	* @throws IllegalArgumentException if there are non-element children besides whitespace
146	*/
147	public static List<Element> findSubElements(Element parent) throws IllegalArgumentException {
148	NodeList l = parent.getChildNodes();
149	List<Element> elements = new ArrayList<Element>(l.getLength());
150	for (int i = 0; i < l.getLength(); i++) {
151	Node n = l.item(i);
152	if (n.getNodeType() == Node.ELEMENT_NODE) {
153	elements.add((Element)n);
154	} else if (n.getNodeType() == Node.TEXT_NODE) {
155	String text = ((Text)n).getNodeValue();
156	if (text.trim().length() > 0) {
157	throw new IllegalArgumentException("non-ws text encountered in " + parent + ": " + text); // NOI18N
158	}
159	} else if (n.getNodeType() == Node.COMMENT_NODE) {
160	// skip
161	} else {
162	throw new IllegalArgumentException("unexpected non-element child of " + parent + ": " + n); // NOI18N
163	}
164	}
165	return elements;
166	}
167
168	/**	82	/**
169	* Finds AuxiliaryConfiguration for the given project helper. The method	83	* Finds AuxiliaryConfiguration for the given project helper. The method
170	* finds project associated with the helper and searches	84	* finds project associated with the helper and searches
Lines 241-271 Link Here
241	}	155	}
242	}	156	}
243		157
244	/**
245	* Append child element to the correct position according to given
246	* order.
247	* @param parent parent to which the child will be added
248	* @param el element to be added
249	* @param order order of the elements which must be followed
250	*/
251	public static void appendChildElement(Element parent, Element el, String[] order) {
252	Element insertBefore = null;
253	List l = Arrays.asList(order);
254	int index = l.indexOf(el.getLocalName());
255	assert index != -1 : el.getLocalName()+" was not found in "+l; // NOI18N
256	Iterator it = Util.findSubElements(parent).iterator();
257	while (it.hasNext()) {
258	Element e = (Element)it.next();
259	int index2 = l.indexOf(e.getLocalName());
260	assert index2 != -1 : e.getLocalName()+" was not found in "+l; // NOI18N
261	if (index2 > index) {
262	insertBefore = e;
263	break;
264	}
265	}
266	parent.insertBefore(el, insertBefore);
267	}
268
269	/**Get the "default" (user-specified) ant script for the given freeform project.	158	/**Get the "default" (user-specified) ant script for the given freeform project.
270	* Please note that this method may return <code>null</code> if there is no such script.	159	* Please note that this method may return <code>null</code> if there is no such script.
271	*	160	*
Lines 287-317 Link Here
287	}	176	}
288		177
289	/**	178	/**
290	* Convert an XML fragment from one namespace to another.
291	*/
292	private static Element translateXML(Element from, String namespace) {
293	Element to = from.getOwnerDocument().createElementNS(namespace, from.getLocalName());
294	NodeList nl = from.getChildNodes();
295	int length = nl.getLength();
296	for (int i = 0; i < length; i++) {
297	Node node = nl.item(i);
298	Node newNode;
299	if (node.getNodeType() == Node.ELEMENT_NODE) {
300	newNode = translateXML((Element) node, namespace);
301	} else {
302	newNode = node.cloneNode(true);
303	}
304	to.appendChild(newNode);
305	}
306	NamedNodeMap m = from.getAttributes();
307	for (int i = 0; i < m.getLength(); i++) {
308	Node attr = m.item(i);
309	to.setAttribute(attr.getNodeName(), attr.getNodeValue());
310	}
311	return to;
312	}
313
314	/**
315	* Namespace of data used in {@link #getPrimaryConfigurationData} and {@link #putPrimaryConfigurationData}.	179	* Namespace of data used in {@link #getPrimaryConfigurationData} and {@link #putPrimaryConfigurationData}.
316	* @since org.netbeans.modules.ant.freeform/1 1.15	180	* @since org.netbeans.modules.ant.freeform/1 1.15
317	*/	181	*/
Lines 332-338 Link Here
332	if (data != null) {	196	if (data != null) {
333	return data;	197	return data;
334	} else {	198	} else {
335	return translateXML(helper.getPrimaryConfigurationData(true), NAMESPACE);	199	return XMLUtil.translateXML(helper.getPrimaryConfigurationData(true), NAMESPACE);
336	}	200	}
337	}	201	}
338	});	202	});
Lines 353-359 Link Here
353	}	217	}
354	ProjectManager.mutex().writeAccess(new Mutex.Action<Void>() {	218	ProjectManager.mutex().writeAccess(new Mutex.Action<Void>() {
355	public Void run() {	219	public Void run() {
356	Element dataAs1 = translateXML(data, FreeformProjectType.NS_GENERAL_1);	220	Element dataAs1 = XMLUtil.translateXML(data, FreeformProjectType.NS_GENERAL_1);
357	if (SCHEMA_1 == null) {	221	if (SCHEMA_1 == null) {
358	try {	222	try {
359	SchemaFactory f = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);	223	SchemaFactory f = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
Lines 390-396 Link Here
390	Element dummy1 = doc.createElementNS(FreeformProjectType.NS_GENERAL_1, FreeformProjectType.NAME_SHARED);	254	Element dummy1 = doc.createElementNS(FreeformProjectType.NS_GENERAL_1, FreeformProjectType.NAME_SHARED);
391	// Make sure it is not invalid.	255	// Make sure it is not invalid.
392	dummy1.appendChild(doc.createElementNS(FreeformProjectType.NS_GENERAL_1, "name")). // NOI18N	256	dummy1.appendChild(doc.createElementNS(FreeformProjectType.NS_GENERAL_1, "name")). // NOI18N
393	appendChild(doc.createTextNode(findText(findElement(data, "name", NAMESPACE)))); // NOI18N	257	appendChild(doc.createTextNode(XMLUtil.findText(XMLUtil.findElement(data, "name", NAMESPACE)))); // NOI18N
394	helper.putPrimaryConfigurationData(dummy1, true);	258	helper.putPrimaryConfigurationData(dummy1, true);
395	helper.createAuxiliaryConfiguration().putConfigurationFragment(data, true);	259	helper.createAuxiliaryConfiguration().putConfigurationFragment(data, true);
396	}	260	}

Lines 64-70 Link Here

(-)a/ant.freeform/src/org/netbeans/modules/ant/freeform/ui/FolderNodeFactory.java (-12 / +12 lines)
64	import org.netbeans.api.queries.VisibilityQuery;	64	import org.netbeans.api.queries.VisibilityQuery;
65	import org.netbeans.modules.ant.freeform.FreeformProject;	65	import org.netbeans.modules.ant.freeform.FreeformProject;
66	import org.netbeans.modules.ant.freeform.FreeformProjectType;	66	import org.netbeans.modules.ant.freeform.FreeformProjectType;
67	import org.netbeans.modules.ant.freeform.spi.support.Util;
68	import org.netbeans.modules.ant.freeform.spi.ProjectNature;	67	import org.netbeans.modules.ant.freeform.spi.ProjectNature;
69	import org.netbeans.spi.project.support.ant.AntProjectEvent;	68	import org.netbeans.spi.project.support.ant.AntProjectEvent;
70	import org.netbeans.spi.project.support.ant.AntProjectListener;	69	import org.netbeans.spi.project.support.ant.AntProjectListener;
Lines 91-96 Link Here
91	import org.openide.util.RequestProcessor;	90	import org.openide.util.RequestProcessor;
92	import org.openide.util.actions.SystemAction;	91	import org.openide.util.actions.SystemAction;
93	import org.openide.util.lookup.Lookups;	92	import org.openide.util.lookup.Lookups;
		93	import org.openide.xml.XMLUtil;
94	import org.w3c.dom.Element;	94	import org.w3c.dom.Element;
95		95
96	/**	96	/**
Lines 136-145 Link Here
136		136
137	private void updateKeys(boolean fromListener) {	137	private void updateKeys(boolean fromListener) {
138	Element genldata = p.getPrimaryConfigurationData();	138	Element genldata = p.getPrimaryConfigurationData();
139	Element viewEl = Util.findElement(genldata, "view", FreeformProjectType.NS_GENERAL); // NOI18N	139	Element viewEl = XMLUtil.findElement(genldata, "view", FreeformProjectType.NS_GENERAL); // NOI18N
140	if (viewEl != null) {	140	if (viewEl != null) {
141	Element itemsEl = Util.findElement(viewEl, "items", FreeformProjectType.NS_GENERAL); // NOI18N	141	Element itemsEl = XMLUtil.findElement(viewEl, "items", FreeformProjectType.NS_GENERAL); // NOI18N
142	keys = Util.findSubElements(itemsEl);	142	keys = XMLUtil.findSubElements(itemsEl);
143	} else {	143	} else {
144	keys = Collections.<Element>emptyList();	144	keys = Collections.<Element>emptyList();
145	}	145	}
Lines 182-189 Link Here
182		182
183	public Node node(Element itemEl) {	183	public Node node(Element itemEl) {
184		184
185	Element locationEl = Util.findElement(itemEl, "location", FreeformProjectType.NS_GENERAL); // NOI18N	185	Element locationEl = XMLUtil.findElement(itemEl, "location", FreeformProjectType.NS_GENERAL); // NOI18N
186	String location = Util.findText(locationEl);	186	String location = XMLUtil.findText(locationEl);
187	String locationEval = p.evaluator().evaluate(location);	187	String locationEval = p.evaluator().evaluate(location);
188	if (locationEval == null) {	188	if (locationEval == null) {
189	return null;	189	return null;
Lines 194-202 Link Here
194	return null;	194	return null;
195	}	195	}
196	String label;	196	String label;
197	Element labelEl = Util.findElement(itemEl, "label", FreeformProjectType.NS_GENERAL); // NOI18N	197	Element labelEl = XMLUtil.findElement(itemEl, "label", FreeformProjectType.NS_GENERAL); // NOI18N
198	if (labelEl != null) {	198	if (labelEl != null) {
199	label = Util.findText(labelEl);	199	label = XMLUtil.findText(labelEl);
200	} else {	200	} else {
201	label = null;	201	label = null;
202	}	202	}
Lines 206-223 Link Here
206	return null;	206	return null;
207	}	207	}
208	String includes = null;	208	String includes = null;
209	Element includesEl = Util.findElement(itemEl, "includes", FreeformProjectType.NS_GENERAL); // NOI18N	209	Element includesEl = XMLUtil.findElement(itemEl, "includes", FreeformProjectType.NS_GENERAL); // NOI18N
210	if (includesEl != null) {	210	if (includesEl != null) {
211	includes = p.evaluator().evaluate(Util.findText(includesEl));	211	includes = p.evaluator().evaluate(XMLUtil.findText(includesEl));
212	if (includes.matches("\\$\\{[^}]+\\}")) { // NOI18N	212	if (includes.matches("\\$\\{[^}]+\\}")) { // NOI18N
213	// Clearly intended to mean "include everything".	213	// Clearly intended to mean "include everything".
214	includes = null;	214	includes = null;
215	}	215	}
216	}	216	}
217	String excludes = null;	217	String excludes = null;
218	Element excludesEl = Util.findElement(itemEl, "excludes", FreeformProjectType.NS_GENERAL); // NOI18N	218	Element excludesEl = XMLUtil.findElement(itemEl, "excludes", FreeformProjectType.NS_GENERAL); // NOI18N
219	if (excludesEl != null) {	219	if (excludesEl != null) {
220	excludes = p.evaluator().evaluate(Util.findText(excludesEl));	220	excludes = p.evaluator().evaluate(XMLUtil.findText(excludesEl));
221	}	221	}
222	String style = itemEl.getAttribute("style"); // NOI18N	222	String style = itemEl.getAttribute("style"); // NOI18N
223	for (ProjectNature nature : Lookup.getDefault().lookupAll(ProjectNature.class)) {	223	for (ProjectNature nature : Lookup.getDefault().lookupAll(ProjectNature.class)) {

Lines 49-54 Link Here

(-)a/ant.freeform/test/unit/src/org/netbeans/modules/ant/freeform/ArtifactProviderTest.java (-3 / +4 lines)
49	import org.netbeans.api.project.ant.AntArtifactQuery;	49	import org.netbeans.api.project.ant.AntArtifactQuery;
50	import org.netbeans.modules.ant.freeform.spi.support.Util;	50	import org.netbeans.modules.ant.freeform.spi.support.Util;
51	import org.netbeans.spi.project.support.ant.AntProjectHelper;	51	import org.netbeans.spi.project.support.ant.AntProjectHelper;
		52	import org.openide.xml.XMLUtil;
52	import org.w3c.dom.Document;	53	import org.w3c.dom.Document;
53	import org.w3c.dom.Element;	54	import org.w3c.dom.Element;
54		55
Lines 137-143 Link Here
137	//assert ProjectManager.mutex().isWriteAccess();	138	//assert ProjectManager.mutex().isWriteAccess();
138	Element data = Util.getPrimaryConfigurationData(helper);	139	Element data = Util.getPrimaryConfigurationData(helper);
139	Document doc = data.getOwnerDocument();	140	Document doc = data.getOwnerDocument();
140	for (Element exportEl : Util.findSubElements(data)) {	141	for (Element exportEl : XMLUtil.findSubElements(data)) {
141	if (!exportEl.getLocalName().equals("export")) { // NOI18N	142	if (!exportEl.getLocalName().equals("export")) { // NOI18N
142	continue;	143	continue;
143	}	144	}
Lines 165-173 Link Here
165	el.appendChild(doc.createTextNode(export.cleanTarget)); // NOI18N	166	el.appendChild(doc.createTextNode(export.cleanTarget)); // NOI18N
166	exportEl.appendChild(el);	167	exportEl.appendChild(el);
167	}	168	}
168	Element later = Util.findElement(data, "view", FreeformProjectType.NS_GENERAL);	169	Element later = XMLUtil.findElement(data, "view", FreeformProjectType.NS_GENERAL);
169	if (later == null) {	170	if (later == null) {
170	later = Util.findElement(data, "subprojects", FreeformProjectType.NS_GENERAL);	171	later = XMLUtil.findElement(data, "subprojects", FreeformProjectType.NS_GENERAL);
171	}	172	}
172	data.insertBefore(exportEl, later);	173	data.insertBefore(exportEl, later);
173	}	174	}

Lines 70-75 Link Here

(-)a/ant.freeform/test/unit/src/org/netbeans/modules/ant/freeform/ui/ViewTest.java (-5 / +6 lines)
70	import org.openide.nodes.NodeReorderEvent;	70	import org.openide.nodes.NodeReorderEvent;
71	import org.w3c.dom.Document;	71	import org.w3c.dom.Document;
72	import org.openide.util.Lookup;	72	import org.openide.util.Lookup;
		73	import org.openide.xml.XMLUtil;
73	import org.w3c.dom.Element;	74	import org.w3c.dom.Element;
74	import org.w3c.dom.NodeList;	75	import org.w3c.dom.NodeList;
75		76
Lines 120-138 Link Here
120	TestNL l = new TestNL();	121	TestNL l = new TestNL();
121	root.addNodeListener(l);	122	root.addNodeListener(l);
122	Element data = extsrcroot.getPrimaryConfigurationData();	123	Element data = extsrcroot.getPrimaryConfigurationData();
123	Element view = Util.findElement(data, "view", FreeformProjectType.NS_GENERAL);	124	Element view = XMLUtil.findElement(data, "view", FreeformProjectType.NS_GENERAL);
124	assertNotNull("have <view>", view);	125	assertNotNull("have <view>", view);
125	Element items = Util.findElement(view, "items", FreeformProjectType.NS_GENERAL);	126	Element items = XMLUtil.findElement(view, "items", FreeformProjectType.NS_GENERAL);
126	assertNotNull("have <items>", items);	127	assertNotNull("have <items>", items);
127	Element sourceFolder = Util.findElement(items, "source-folder", FreeformProjectType.NS_GENERAL);	128	Element sourceFolder = XMLUtil.findElement(items, "source-folder", FreeformProjectType.NS_GENERAL);
128	assertNotNull("have <source-folder>", sourceFolder);	129	assertNotNull("have <source-folder>", sourceFolder);
129	Element location = Util.findElement(sourceFolder, "location", FreeformProjectType.NS_GENERAL);	130	Element location = XMLUtil.findElement(sourceFolder, "location", FreeformProjectType.NS_GENERAL);
130	assertNotNull("have <location>", location);	131	assertNotNull("have <location>", location);
131	NodeList nl = location.getChildNodes();	132	NodeList nl = location.getChildNodes();
132	assertEquals("one child", 1, nl.getLength());	133	assertEquals("one child", 1, nl.getLength());
133	location.removeChild(nl.item(0));	134	location.removeChild(nl.item(0));
134	location.appendChild(location.getOwnerDocument().createTextNode("../src2"));	135	location.appendChild(location.getOwnerDocument().createTextNode("../src2"));
135	Element sourceFile = Util.findElement(items, "source-file", FreeformProjectType.NS_GENERAL);	136	Element sourceFile = XMLUtil.findElement(items, "source-file", FreeformProjectType.NS_GENERAL);
136	assertNotNull("have <source-file>", sourceFile);	137	assertNotNull("have <source-file>", sourceFile);
137	items.removeChild(sourceFile);	138	items.removeChild(sourceFile);
138	extsrcroot.putPrimaryConfigurationData(data);	139	extsrcroot.putPrimaryConfigurationData(data);

Lines 125-230 Link Here

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/Util.java (-98 / +1 lines)
125	private static final String SFS_VALID_PATH_RE = "(\\p{Alnum}\|\\/\|_)+"; // NOI18N	125	private static final String SFS_VALID_PATH_RE = "(\\p{Alnum}\|\\/\|_)+"; // NOI18N
126		126
127	// COPIED FROM org.netbeans.modules.project.ant:	127	// COPIED FROM org.netbeans.modules.project.ant:
128	// (except for namespace == null support in findElement)	128	// (EXCEPT except for namespace == null support in findElement)
129	// (and support for comments in findSubElements)	129	// (and support for comments in findSubElements)
130		130
131	/**
132	* Search for an XML element in the direct children of a parent.
133	* DOM provides a similar method but it does a recursive search
134	* which we do not want. It also gives a node list and we want
135	* only one result.
136	* @param parent a parent element
137	* @param name the intended local name
138	* @param namespace the intended namespace (or null)
139	* @return the first child element with that name, or null if none
140	*/
141	public static Element findElement(Element parent, String name, String namespace) {
142	NodeList l = parent.getChildNodes();
143	for (int i = 0; i < l.getLength(); i++) {
144	if (l.item(i).getNodeType() == Node.ELEMENT_NODE) {
145	Element el = (Element)l.item(i);
146	if ((namespace == null && name.equals(el.getTagName())) \|\|
147	(namespace != null && name.equals(el.getLocalName()) &&
148	namespace.equals(el.getNamespaceURI()))) {
149	return el;
150	}
151	}
152	}
153	return null;
154	}
155
156	/**
157	* Extract nested text from an element.
158	* Currently does not handle coalescing text nodes, CDATA sections, etc.
159	* @param parent a parent element
160	* @return the nested text, or null if none was found
161	*/
162	public static String findText(Element parent) {
163	NodeList l = parent.getChildNodes();
164	for (int i = 0; i < l.getLength(); i++) {
165	if (l.item(i).getNodeType() == Node.TEXT_NODE) {
166	Text text = (Text)l.item(i);
167	return text.getNodeValue();
168	}
169	}
170	return null;
171	}
172
173	/**
174	* Find all direct child elements of an element.
175	* More useful than {@link Element#getElementsByTagNameNS} because it does
176	* not recurse into recursive child elements.
177	* Children which are all-whitespace text nodes or comments are ignored; others cause
178	* an exception to be thrown.
179	* @param parent a parent element in a DOM tree
180	* @return a list of direct child elements (may be empty)
181	* @throws IllegalArgumentException if there are non-element children besides whitespace
182	*/
183	public static List<Element> findSubElements(Element parent) throws IllegalArgumentException {
184	NodeList l = parent.getChildNodes();
185	List<Element> elements = new ArrayList<Element>(l.getLength());
186	for (int i = 0; i < l.getLength(); i++) {
187	Node n = l.item(i);
188	if (n.getNodeType() == Node.ELEMENT_NODE) {
189	elements.add((Element)n);
190	} else if (n.getNodeType() == Node.TEXT_NODE) {
191	String text = ((Text)n).getNodeValue();
192	if (text.trim().length() > 0) {
193	throw new IllegalArgumentException("non-ws text encountered in " + parent + ": " + text); // NOI18N
194	}
195	} else if (n.getNodeType() == Node.COMMENT_NODE) {
196	// OK, ignore
197	} else {
198	throw new IllegalArgumentException("unexpected non-element child of " + parent + ": " + n); // NOI18N
199	}
200	}
201	return elements;
202	}
203
204	/**
205	* Convert an XML fragment from one namespace to another.
206	*/
207	public static Element translateXML(Element from, String namespace) {
208	Element to = from.getOwnerDocument().createElementNS(namespace, from.getLocalName());
209	NodeList nl = from.getChildNodes();
210	int length = nl.getLength();
211	for (int i = 0; i < length; i++) {
212	Node node = nl.item(i);
213	Node newNode;
214	if (node.getNodeType() == Node.ELEMENT_NODE) {
215	newNode = translateXML((Element) node, namespace);
216	} else {
217	newNode = node.cloneNode(true);
218	}
219	to.appendChild(newNode);
220	}
221	NamedNodeMap m = from.getAttributes();
222	for (int i = 0; i < m.getLength(); i++) {
223	Node attr = m.item(i);
224	to.setAttribute(attr.getNodeName(), attr.getNodeValue());
225	}
226	return to;
227	}
228		131
229	/**	132	/**
230	* Pass to {@link XPath#setNamespaceContext} to bind {@code nbm:} to the /3 namespace.	133	* Pass to {@link XPath#setNamespaceContext} to bind {@code nbm:} to the /3 namespace.

Lines 63-69 Link Here

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/queries/ClassPathProviderImpl.java (-7 / +7 lines)
63	import org.netbeans.spi.java.classpath.ClassPathProvider;	63	import org.netbeans.spi.java.classpath.ClassPathProvider;
64	import org.netbeans.spi.java.classpath.support.ClassPathSupport;	64	import org.netbeans.spi.java.classpath.support.ClassPathSupport;
65	import org.netbeans.modules.apisupport.project.NbModuleProject;	65	import org.netbeans.modules.apisupport.project.NbModuleProject;
66	import org.netbeans.modules.apisupport.project.Util;
67	import org.netbeans.spi.java.classpath.PathResourceImplementation;	66	import org.netbeans.spi.java.classpath.PathResourceImplementation;
68	import org.netbeans.spi.java.project.classpath.support.ProjectClassPathSupport;	67	import org.netbeans.spi.java.project.classpath.support.ProjectClassPathSupport;
69	import org.netbeans.spi.project.support.ant.AntProjectEvent;	68	import org.netbeans.spi.project.support.ant.AntProjectEvent;
Lines 74-79 Link Here
74	import org.openide.filesystems.FileStateInvalidException;	73	import org.openide.filesystems.FileStateInvalidException;
75	import org.openide.filesystems.FileUtil;	74	import org.openide.filesystems.FileUtil;
76	import org.openide.util.WeakListeners;	75	import org.openide.util.WeakListeners;
		76	import org.openide.xml.XMLUtil;
77	import org.w3c.dom.Element;	77	import org.w3c.dom.Element;
78		78
79	public final class ClassPathProviderImpl implements ClassPathProvider {	79	public final class ClassPathProviderImpl implements ClassPathProvider {
Lines 296-304 Link Here
296	for (Map.Entry<FileObject,Element> entry : project.getExtraCompilationUnits().entrySet()) {	296	for (Map.Entry<FileObject,Element> entry : project.getExtraCompilationUnits().entrySet()) {
297	final FileObject pkgroot = entry.getKey();	297	final FileObject pkgroot = entry.getKey();
298	Element pkgrootEl = entry.getValue();	298	Element pkgrootEl = entry.getValue();
299	Element classpathEl = Util.findElement(pkgrootEl, "classpath", NbModuleProject.NAMESPACE_SHARED); // NOI18N	299	Element classpathEl = XMLUtil.findElement(pkgrootEl, "classpath", NbModuleProject.NAMESPACE_SHARED); // NOI18N
300	assert classpathEl != null : "no <classpath> in " + pkgrootEl;	300	assert classpathEl != null : "no <classpath> in " + pkgrootEl;
301	final String classpathS = Util.findText(classpathEl);	301	final String classpathS = XMLUtil.findText(classpathEl);
302	if (classpathS == null) {	302	if (classpathS == null) {
303	extraCompilationUnitsCompile.put(pkgroot, ClassPathSupport.createClassPath(new URL[0]));	303	extraCompilationUnitsCompile.put(pkgroot, ClassPathSupport.createClassPath(new URL[0]));
304	extraCompilationUnitsExecute.put(pkgroot, ClassPathSupport.createClassPath(new URL[0]));	304	extraCompilationUnitsExecute.put(pkgroot, ClassPathSupport.createClassPath(new URL[0]));
Lines 333-341 Link Here
333	}	333	}
334	public void configurationXmlChanged(AntProjectEvent ev) {	334	public void configurationXmlChanged(AntProjectEvent ev) {
335	Element pkgrootEl = project.getExtraCompilationUnits().get(pkgroot);	335	Element pkgrootEl = project.getExtraCompilationUnits().get(pkgroot);
336	Element classpathEl = Util.findElement(pkgrootEl, "classpath", NbModuleProject.NAMESPACE_SHARED); // NOI18N	336	Element classpathEl = XMLUtil.findElement(pkgrootEl, "classpath", NbModuleProject.NAMESPACE_SHARED); // NOI18N
337	assert classpathEl != null : "no <classpath> in " + pkgrootEl;	337	assert classpathEl != null : "no <classpath> in " + pkgrootEl;
338	cpS = Util.findText(classpathEl);	338	cpS = XMLUtil.findText(classpathEl);
339	pcs.firePropertyChange(PROP_RESOURCES, null, null);	339	pcs.firePropertyChange(PROP_RESOURCES, null, null);
340	}	340	}
341	public void propertiesChanged(AntProjectEvent ev) {}	341	public void propertiesChanged(AntProjectEvent ev) {}
Lines 344-354 Link Here
344	extraCompilationUnitsCompile.put(pkgroot, ClassPathFactory.createClassPath(ecuCompile));	344	extraCompilationUnitsCompile.put(pkgroot, ClassPathFactory.createClassPath(ecuCompile));
345	// Add <built-to> dirs and JARs for ClassPath.EXECUTE.	345	// Add <built-to> dirs and JARs for ClassPath.EXECUTE.
346	List<PathResourceImplementation> extraEntries = new ArrayList<PathResourceImplementation>();	346	List<PathResourceImplementation> extraEntries = new ArrayList<PathResourceImplementation>();
347	for (Element kid : Util.findSubElements(pkgrootEl)) {	347	for (Element kid : XMLUtil.findSubElements(pkgrootEl)) {
348	if (!kid.getLocalName().equals("built-to")) { // NOI18N	348	if (!kid.getLocalName().equals("built-to")) { // NOI18N
349	continue;	349	continue;
350	}	350	}
351	String rawtext = Util.findText(kid);	351	String rawtext = XMLUtil.findText(kid);
352	assert rawtext != null : "Null content for <built-to> in " + project;	352	assert rawtext != null : "Null content for <built-to> in " + project;
353	String text = project.evaluator().evaluate(rawtext);	353	String text = project.evaluator().evaluate(rawtext);
354	if (text == null) {	354	if (text == null) {

Lines 409-421 Link Here

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/queries/GlobalSourceForBinaryImpl.java (-5 / +5 lines)
409	is.close();	409	is.close();
410	}	410	}
411	Element docel = doc.getDocumentElement();	411	Element docel = doc.getDocumentElement();
412	Element type = Util.findElement(docel, "type", "http://www.netbeans.org/ns/project/1"); // NOI18N	412	Element type = XMLUtil.findElement(docel, "type", "http://www.netbeans.org/ns/project/1"); // NOI18N
413	String cnb = null;	413	String cnb = null;
414	if (Util.findText(type).equals("org.netbeans.modules.apisupport.project")) { // NOI18N	414	if (XMLUtil.findText(type).equals("org.netbeans.modules.apisupport.project")) { // NOI18N
415	Element cfg = Util.findElement(docel, "configuration", "http://www.netbeans.org/ns/project/1"); // NOI18N	415	Element cfg = XMLUtil.findElement(docel, "configuration", "http://www.netbeans.org/ns/project/1"); // NOI18N
416	Element data = Util.findElement(cfg, "data", null); // NOI18N	416	Element data = XMLUtil.findElement(cfg, "data", null); // NOI18N
417	if (data != null) {	417	if (data != null) {
418	cnb = Util.findText(Util.findElement(data, "code-name-base", null)); // NOI18N	418	cnb = XMLUtil.findText(XMLUtil.findElement(data, "code-name-base", null)); // NOI18N
419	}	419	}
420	}	420	}
421	return cnb;	421	return cnb;

Lines 56-62 Link Here

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/customizer/BasicBrandingModel.java (-3 / +3 lines)
56	import org.netbeans.api.annotations.common.CheckForNull;	56	import org.netbeans.api.annotations.common.CheckForNull;
57	import org.netbeans.api.annotations.common.NullAllowed;	57	import org.netbeans.api.annotations.common.NullAllowed;
58	import org.netbeans.api.project.Project;	58	import org.netbeans.api.project.Project;
59	import org.netbeans.modules.apisupport.project.Util;
60	import org.netbeans.modules.apisupport.project.suite.BrandingSupport;	59	import org.netbeans.modules.apisupport.project.suite.BrandingSupport;
61	import org.netbeans.modules.apisupport.project.suite.BrandingSupport.BrandedFile;	60	import org.netbeans.modules.apisupport.project.suite.BrandingSupport.BrandedFile;
62	import org.netbeans.modules.apisupport.project.suite.BrandingSupport.BundleKey;	61	import org.netbeans.modules.apisupport.project.suite.BrandingSupport.BundleKey;
Lines 67-72 Link Here
67	import org.openide.filesystems.FileUtil;	66	import org.openide.filesystems.FileUtil;
68	import org.openide.util.ChangeSupport;	67	import org.openide.util.ChangeSupport;
69	import org.openide.util.NbBundle;	68	import org.openide.util.NbBundle;
		69	import org.openide.xml.XMLUtil;
70	import org.w3c.dom.Element;	70	import org.w3c.dom.Element;
71		71
72	/**	72	/**
Lines 406-413 Link Here
406	res = getProjectDirectoryFile().getName();	406	res = getProjectDirectoryFile().getName();
407	return res;	407	return res;
408	}	408	}
409	Element nameEl = Util.findElement(suiteProps.getProject().getHelper().getPrimaryConfigurationData(true), "name", SuiteProjectType.NAMESPACE_SHARED); // NOI18N	409	Element nameEl = XMLUtil.findElement(suiteProps.getProject().getHelper().getPrimaryConfigurationData(true), "name", SuiteProjectType.NAMESPACE_SHARED); // NOI18N
410	String text = (nameEl != null) ? Util.findText(nameEl) : null;	410	String text = (nameEl != null) ? XMLUtil.findText(nameEl) : null;
411	return (text != null) ? text : "???"; // NOI18N	411	return (text != null) ? text : "???"; // NOI18N
412	}	412	}
413		413

Lines 201-208 Link Here

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/universe/ModuleList.java (-16 / +16 lines)
201	if (data == null) {	201	if (data == null) {
202	throw new IOException("Not an NBM project in " + basedir); // NOI18N	202	throw new IOException("Not an NBM project in " + basedir); // NOI18N
203	}	203	}
204	boolean suiteComponent = Util.findElement(data, "suite-component", NbModuleProject.NAMESPACE_SHARED) != null; // NOI18N	204	boolean suiteComponent = XMLUtil.findElement(data, "suite-component", NbModuleProject.NAMESPACE_SHARED) != null; // NOI18N
205	boolean standalone = Util.findElement(data, "standalone", NbModuleProject.NAMESPACE_SHARED) != null; // NOI18N	205	boolean standalone = XMLUtil.findElement(data, "standalone", NbModuleProject.NAMESPACE_SHARED) != null; // NOI18N
206	assert !(suiteComponent && standalone) : basedir;	206	assert !(suiteComponent && standalone) : basedir;
207	if (suiteComponent) {	207	if (suiteComponent) {
208	PropertyEvaluator eval = parseProperties(basedir, null, NbModuleType.SUITE_COMPONENT, "irrelevant"); // NOI18N	208	PropertyEvaluator eval = parseProperties(basedir, null, NbModuleType.SUITE_COMPONENT, "irrelevant"); // NOI18N
Lines 528-550 Link Here
528	}	528	}
529	assert root != null ^ type != NbModuleType.NETBEANS_ORG;	529	assert root != null ^ type != NbModuleType.NETBEANS_ORG;
530	assert path != null ^ type != NbModuleType.NETBEANS_ORG;	530	assert path != null ^ type != NbModuleType.NETBEANS_ORG;
531	String cnb = Util.findText(Util.findElement(data, "code-name-base", NbModuleProject.NAMESPACE_SHARED)); // NOI18N	531	String cnb = XMLUtil.findText(XMLUtil.findElement(data, "code-name-base", NbModuleProject.NAMESPACE_SHARED)); // NOI18N
532	PropertyEvaluator eval = parseProperties(basedir, root, type, cnb);	532	PropertyEvaluator eval = parseProperties(basedir, root, type, cnb);
533	String module = eval.getProperty("module.jar"); // NOI18N	533	String module = eval.getProperty("module.jar"); // NOI18N
534	// Cf. ParseProjectXml.computeClasspath:	534	// Cf. ParseProjectXml.computeClasspath:
535	StringBuffer cpextra = new StringBuffer();	535	StringBuffer cpextra = new StringBuffer();
536	for (Element ext : Util.findSubElements(data)) {	536	for (Element ext : XMLUtil.findSubElements(data)) {
537	if (!ext.getLocalName().equals("class-path-extension")) { // NOI18N	537	if (!ext.getLocalName().equals("class-path-extension")) { // NOI18N
538	continue;	538	continue;
539	}	539	}
540	Element binaryOrigin = Util.findElement(ext, "binary-origin", NbModuleProject.NAMESPACE_SHARED); // NOI18N	540	Element binaryOrigin = XMLUtil.findElement(ext, "binary-origin", NbModuleProject.NAMESPACE_SHARED); // NOI18N
541	String text;	541	String text;
542	if (binaryOrigin != null) {	542	if (binaryOrigin != null) {
543	text = Util.findText(binaryOrigin);	543	text = XMLUtil.findText(binaryOrigin);
544	} else {	544	} else {
545	Element runtimeRelativePath = Util.findElement(ext, "runtime-relative-path", NbModuleProject.NAMESPACE_SHARED); // NOI18N	545	Element runtimeRelativePath = XMLUtil.findElement(ext, "runtime-relative-path", NbModuleProject.NAMESPACE_SHARED); // NOI18N
546	assert runtimeRelativePath != null : "Malformed <class-path-extension> in " + basedir;	546	assert runtimeRelativePath != null : "Malformed <class-path-extension> in " + basedir;
547	String reltext = Util.findText(runtimeRelativePath);	547	String reltext = XMLUtil.findText(runtimeRelativePath);
548	// XXX assumes that module.jar is not overridden independently of module.jar.dir:	548	// XXX assumes that module.jar is not overridden independently of module.jar.dir:
549	text = "${cluster}/${module.jar.dir}/" + reltext; // NOI18N	549	text = "${cluster}/${module.jar.dir}/" + reltext; // NOI18N
550	}	550	}
Lines 967-975 Link Here
967	} catch (SAXException e) {	967	} catch (SAXException e) {
968	throw (IOException) new IOException(e.toString()).initCause(e);	968	throw (IOException) new IOException(e.toString()).initCause(e);
969	}	969	}
970	for (Element moduleVersion : Util.findSubElements(doc.getDocumentElement())) {	970	for (Element moduleVersion : XMLUtil.findSubElements(doc.getDocumentElement())) {
971	if (moduleVersion.getTagName().equals("module_version") && moduleVersion.getAttribute("last").equals("true")) { // NOI18N	971	if (moduleVersion.getTagName().equals("module_version") && moduleVersion.getAttribute("last").equals("true")) { // NOI18N
972	for (Element fileEl : Util.findSubElements(moduleVersion)) {	972	for (Element fileEl : XMLUtil.findSubElements(moduleVersion)) {
973	if (fileEl.getTagName().equals("file")) { // NOI18N	973	if (fileEl.getTagName().equals("file")) { // NOI18N
974	String name = fileEl.getAttribute("name"); // NOI18N	974	String name = fileEl.getAttribute("name"); // NOI18N
975	File f = new File(cluster, name.replace('/', File.separatorChar));	975	File f = new File(cluster, name.replace('/', File.separatorChar));
Lines 1007-1024 Link Here
1007	throw (IOException) new IOException(projectXml + ": " + e.toString()).initCause(e); // NOI18N	1007	throw (IOException) new IOException(projectXml + ": " + e.toString()).initCause(e); // NOI18N
1008	}	1008	}
1009	Element docel = doc.getDocumentElement();	1009	Element docel = doc.getDocumentElement();
1010	Element type = Util.findElement(docel, "type", "http://www.netbeans.org/ns/project/1"); // NOI18N	1010	Element type = XMLUtil.findElement(docel, "type", "http://www.netbeans.org/ns/project/1"); // NOI18N
1011	if (!Util.findText(type).equals("org.netbeans.modules.apisupport.project")) { // NOI18N	1011	if (!XMLUtil.findText(type).equals("org.netbeans.modules.apisupport.project")) { // NOI18N
1012	return null;	1012	return null;
1013	}	1013	}
1014	Element cfg = Util.findElement(docel, "configuration", "http://www.netbeans.org/ns/project/1"); // NOI18N	1014	Element cfg = XMLUtil.findElement(docel, "configuration", "http://www.netbeans.org/ns/project/1"); // NOI18N
1015	Element data = Util.findElement(cfg, "data", NbModuleProject.NAMESPACE_SHARED); // NOI18N	1015	Element data = XMLUtil.findElement(cfg, "data", NbModuleProject.NAMESPACE_SHARED); // NOI18N
1016	if (data != null) {	1016	if (data != null) {
1017	return data;	1017	return data;
1018	} else {	1018	} else {
1019	data = Util.findElement(cfg, "data", NbModuleProject.NAMESPACE_SHARED_2); // NOI18N	1019	data = XMLUtil.findElement(cfg, "data", NbModuleProject.NAMESPACE_SHARED_2); // NOI18N
1020	if (data != null) {	1020	if (data != null) {
1021	return Util.translateXML(data, NbModuleProject.NAMESPACE_SHARED);	1021	return XMLUtil.translateXML(data, NbModuleProject.NAMESPACE_SHARED);
1022	} else {	1022	} else {
1023	return null;	1023	return null;
1024	}	1024	}

Lines 61-66 Link Here

(-)a/j2ee.archive/src/org/netbeans/modules/j2ee/archive/project/UpdateHelper.java (-34 / +3 lines)
61	import org.netbeans.spi.project.AuxiliaryConfiguration;	61	import org.netbeans.spi.project.AuxiliaryConfiguration;
62	import org.netbeans.spi.project.support.ant.AntProjectHelper;	62	import org.netbeans.spi.project.support.ant.AntProjectHelper;
63	import org.netbeans.spi.project.support.ant.EditableProperties;	63	import org.netbeans.spi.project.support.ant.EditableProperties;
		64	import org.openide.xml.XMLUtil;
64		65
65		66
66	/**	67	/**
Lines 277-283 Link Here
277	if (oldRoot != null) {	278	if (oldRoot != null) {
278	Document doc = oldRoot.getOwnerDocument();	279	Document doc = oldRoot.getOwnerDocument();
279	Element newRoot = doc.createElementNS (ArchiveProjectType.PROJECT_CONFIGURATION_NS,DATA); //NOI18N	280	Element newRoot = doc.createElementNS (ArchiveProjectType.PROJECT_CONFIGURATION_NS,DATA); //NOI18N
280	copyDocument (doc, oldRoot, newRoot);	281	XMLUtil.copyDocument (oldRoot, newRoot, ArchiveProjectType.PROJECT_CONFIGURATION_NS);
281	Element sourceRoots = doc.createElementNS(ArchiveProjectType.PROJECT_CONFIGURATION_NS,"source-roots"); //NOI18N	282	Element sourceRoots = doc.createElementNS(ArchiveProjectType.PROJECT_CONFIGURATION_NS,"source-roots"); //NOI18N
282	Element root = doc.createElementNS (ArchiveProjectType.PROJECT_CONFIGURATION_NS,"root"); //NOI18N	283	Element root = doc.createElementNS (ArchiveProjectType.PROJECT_CONFIGURATION_NS,"root"); //NOI18N
283	root.setAttribute ("id","src.dir"); //NOI18N	284	root.setAttribute ("id","src.dir"); //NOI18N
Lines 294-300 Link Here
294	if (oldRoot != null) {	295	if (oldRoot != null) {
295	Document doc = oldRoot.getOwnerDocument();	296	Document doc = oldRoot.getOwnerDocument();
296	Element newRoot = doc.createElementNS (ArchiveProjectType.PROJECT_CONFIGURATION_NS,DATA); //NOI18N	297	Element newRoot = doc.createElementNS (ArchiveProjectType.PROJECT_CONFIGURATION_NS,DATA); //NOI18N
297	copyDocument (doc, oldRoot, newRoot);	298	XMLUtil.copyDocument (oldRoot, newRoot, ArchiveProjectType.PROJECT_CONFIGURATION_NS);
298	cachedElement = updateMinAntVersion (newRoot, doc);	299	cachedElement = updateMinAntVersion (newRoot, doc);
299	}	300	}
300	}	301	}
Lines 317-354 Link Here
317	return cachedProperties;	318	return cachedProperties;
318	}	319	}
319		320
320	private static void copyDocument (Document doc, Element from, Element to) {
321	NodeList nl = from.getChildNodes();
322	int length = nl.getLength();
323	for (int i=0; i< length; i++) {
324	Node node = nl.item (i);
325	Node newNode = null;
326	switch (node.getNodeType()) {
327	case Node.ELEMENT_NODE:
328	Element oldElement = (Element) node;
329	newNode = doc.createElementNS(ArchiveProjectType.PROJECT_CONFIGURATION_NS,oldElement.getTagName());
330	NamedNodeMap m = oldElement.getAttributes();
331	Element newElement = (Element) newNode;
332	for (int index = 0; index < m.getLength(); index++) {
333	Node attr = m.item(index);
334	newElement.setAttribute(attr.getNodeName(), attr.getNodeValue());
335	}
336	copyDocument(doc,oldElement,newElement);
337	break;
338	case Node.TEXT_NODE:
339	Text oldText = (Text) node;
340	newNode = doc.createTextNode(oldText.getData());
341	break;
342	case Node.COMMENT_NODE:
343	Comment oldComment = (Comment) node;
344	newNode = doc.createComment(oldComment.getData());
345	break;
346	}
347	if (newNode != null) {
348	to.appendChild (newNode);
349	}
350	}
351	}
352	public static final String MINIMUM_ANT_VERSION = "1.6.5"; // NOI18N	321	public static final String MINIMUM_ANT_VERSION = "1.6.5"; // NOI18N
353		322
354	private static Element updateMinAntVersion (final Element root, final Document doc) {	323	private static Element updateMinAntVersion (final Element root, final Document doc) {

Lines 53-58 Link Here

(-)a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/UpdateProjectImpl.java (-35 / +3 lines)
53	import org.openide.DialogDisplayer;	53	import org.openide.DialogDisplayer;
54	import org.openide.NotifyDescriptor;	54	import org.openide.NotifyDescriptor;
55	import org.openide.util.NbBundle;	55	import org.openide.util.NbBundle;
		56	import org.openide.xml.XMLUtil;
56	import org.w3c.dom.Comment;	57	import org.w3c.dom.Comment;
57	import org.w3c.dom.Document;	58	import org.w3c.dom.Document;
58	import org.w3c.dom.Element;	59	import org.w3c.dom.Element;
Lines 147-153 Link Here
147	if (oldRoot != null) {	148	if (oldRoot != null) {
148	Document doc = oldRoot.getOwnerDocument();	149	Document doc = oldRoot.getOwnerDocument();
149	Element newRoot = doc.createElementNS (AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); //NOI18N	150	Element newRoot = doc.createElementNS (AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); //NOI18N
150	copyDocument (doc, oldRoot, newRoot);	151	XMLUtil.copyDocument (oldRoot, newRoot, AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE);
151	Element sourceRoots = doc.createElementNS(AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE,"source-roots"); //NOI18N	152	Element sourceRoots = doc.createElementNS(AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE,"source-roots"); //NOI18N
152	Element root = doc.createElementNS (AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE,"root"); //NOI18N	153	Element root = doc.createElementNS (AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE,"root"); //NOI18N
153	root.setAttribute ("id","src.dir"); //NOI18N	154	root.setAttribute ("id","src.dir"); //NOI18N
Lines 164-170 Link Here
164	if (oldRoot != null) {	165	if (oldRoot != null) {
165	Document doc = oldRoot.getOwnerDocument();	166	Document doc = oldRoot.getOwnerDocument();
166	Element newRoot = doc.createElementNS (AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); //NOI18N	167	Element newRoot = doc.createElementNS (AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); //NOI18N
167	copyDocument (doc, oldRoot, newRoot);	168	XMLUtil.copyDocument (oldRoot, newRoot, AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE);
168	cachedElement = updateMinAntVersion (newRoot, doc);	169	cachedElement = updateMinAntVersion (newRoot, doc);
169	}	170	}
170	}	171	}
Lines 187-225 Link Here
187	return cachedProperties;	188	return cachedProperties;
188	}	189	}
189		190
190	private static void copyDocument (Document doc, Element from, Element to) {
191	NodeList nl = from.getChildNodes();
192	int length = nl.getLength();
193	for (int i=0; i< length; i++) {
194	Node node = nl.item (i);
195	Node newNode = null;
196	switch (node.getNodeType()) {
197	case Node.ELEMENT_NODE:
198	Element oldElement = (Element) node;
199	newNode = doc.createElementNS(AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE,oldElement.getTagName());
200	NamedNodeMap m = oldElement.getAttributes();
201	Element newElement = (Element) newNode;
202	for (int index = 0; index < m.getLength(); index++) {
203	Node attr = m.item(index);
204	newElement.setAttribute(attr.getNodeName(), attr.getNodeValue());
205	}
206	copyDocument(doc,oldElement,newElement);
207	break;
208	case Node.TEXT_NODE:
209	Text oldText = (Text) node;
210	newNode = doc.createTextNode(oldText.getData());
211	break;
212	case Node.COMMENT_NODE:
213	Comment oldComment = (Comment) node;
214	newNode = doc.createComment(oldComment.getData());
215	break;
216	}
217	if (newNode != null) {
218	to.appendChild (newNode);
219	}
220	}
221	}
222
223	private static Element updateMinAntVersion (final Element root, final Document doc) {	191	private static Element updateMinAntVersion (final Element root, final Document doc) {
224	NodeList list = root.getElementsByTagNameNS (AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE,MINIMUM_ANT_VERSION_ELEMENT);	192	NodeList list = root.getElementsByTagNameNS (AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE,MINIMUM_ANT_VERSION_ELEMENT);
225	if (list.getLength() == 1) {	193	if (list.getLength() == 1) {

Lines 51-61 Link Here

(-)a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/classpath/ClassPathSupportCallbackImpl.java (-19 / +2 lines)
51	import org.netbeans.modules.java.api.common.classpath.ClassPathSupport.Item;	51	import org.netbeans.modules.java.api.common.classpath.ClassPathSupport.Item;
52	import org.netbeans.modules.java.api.common.util.CommonProjectUtils;	52	import org.netbeans.modules.java.api.common.util.CommonProjectUtils;
53	import org.netbeans.spi.project.support.ant.AntProjectHelper;	53	import org.netbeans.spi.project.support.ant.AntProjectHelper;
		54	import org.openide.xml.XMLUtil;
54	import org.w3c.dom.Document;	55	import org.w3c.dom.Document;
55	import org.w3c.dom.Element;	56	import org.w3c.dom.Element;
56	import org.w3c.dom.Node;	57	import org.w3c.dom.Node;
57	import org.w3c.dom.NodeList;	58	import org.w3c.dom.NodeList;
58	import org.w3c.dom.Text;
59		59
60	/**	60	/**
61	*	61	*
Lines 91-97 Link Here
91	for ( int i = 0; i < libs.getLength(); i++ ) {	91	for ( int i = 0; i < libs.getLength(); i++ ) {
92	Element item = (Element)libs.item( i );	92	Element item = (Element)libs.item( i );
93	// appclient is different from other j2ee projects - it stores reference without ${ and }	93	// appclient is different from other j2ee projects - it stores reference without ${ and }
94	String ref = "${"+findText( item )+"}";	94	String ref = "${"+XMLUtil.findText( item )+"}";
95	libraries.add(ref); // NOI18N	95	libraries.add(ref); // NOI18N
96	String dirs = item.getAttribute(ATTR_DIRS);	96	String dirs = item.getAttribute(ATTR_DIRS);
97	if (Util.DESTINATION_DIRECTORY_ROOT.equals(dirs) \|\|	97	if (Util.DESTINATION_DIRECTORY_ROOT.equals(dirs) \|\|
Lines 140-162 Link Here
140	return libraryElement;	140	return libraryElement;
141	}	141	}
142		142
143	/**
144	* Extracts <b>the first</b> nested text from an element.
145	* Currently does not handle coalescing text nodes, CDATA sections, etc.
146	* @param parent a parent element
147	* @return the nested text, or null if none was found
148	*/
149	private static String findText( Element parent ) {
150	NodeList l = parent.getChildNodes();
151	for ( int i = 0; i < l.getLength(); i++ ) {
152	if ( l.item(i).getNodeType() == Node.TEXT_NODE ) {
153	Text text = (Text)l.item( i );
154	return text.getNodeValue();
155	}
156	}
157	return null;
158	}
159
160	public void readAdditionalProperties(List<Item> items, String projectXMLElement) {	143	public void readAdditionalProperties(List<Item> items, String projectXMLElement) {
161	Map<String, String> destination = new HashMap<String, String>();	144	Map<String, String> destination = new HashMap<String, String>();
162	List<String> l = getIncludedLibraries(antProjectHelper, projectXMLElement, destination);	145	List<String> l = getIncludedLibraries(antProjectHelper, projectXMLElement, destination);

Lines 60-71 Link Here

(-)a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/UpdateProjectImpl.java (-56 / +3 lines)
60	import org.netbeans.spi.project.support.ant.EditableProperties;	60	import org.netbeans.spi.project.support.ant.EditableProperties;
61	import org.openide.filesystems.FileObject;	61	import org.openide.filesystems.FileObject;
62	import org.openide.filesystems.FileUtil;	62	import org.openide.filesystems.FileUtil;
63	import org.w3c.dom.Comment;	63	import org.openide.xml.XMLUtil;
64	import org.w3c.dom.Document;	64	import org.w3c.dom.Document;
65	import org.w3c.dom.NamedNodeMap;
66	import org.w3c.dom.Node;	65	import org.w3c.dom.Node;
67	import org.w3c.dom.NodeList;	66	import org.w3c.dom.NodeList;
68	import org.w3c.dom.Text;
69		67
70		68
71	/**	69	/**
Lines 159-165 Link Here
159	if(oldRoot != null) {	157	if(oldRoot != null) {
160	Document doc = oldRoot.getOwnerDocument();	158	Document doc = oldRoot.getOwnerDocument();
161	Element newRoot = doc.createElementNS(EarProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); //NOI18N	159	Element newRoot = doc.createElementNS(EarProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); //NOI18N
162	copyDocument(doc, oldRoot, newRoot);	160	XMLUtil.copyDocument(oldRoot, newRoot, EarProjectType.PROJECT_CONFIGURATION_NAMESPACE);
163		161
164	//update <web-module-/additional/-libraries/> to <j2ee-module-/additional/-libraries/>	162	//update <web-module-/additional/-libraries/> to <j2ee-module-/additional/-libraries/>
165	// NodeList contList = newRoot.getElementsByTagNameNS(ns, "web-module-libraries");	163	// NodeList contList = newRoot.getElementsByTagNameNS(ns, "web-module-libraries");
Lines 173-179 Link Here
173	Element library = (Element) libList.item(i);	171	Element library = (Element) libList.item(i);
174	Node webFile = library.getElementsByTagNameNS(ns, TAG_FILE).item(0);	172	Node webFile = library.getElementsByTagNameNS(ns, TAG_FILE).item(0);
175	//remove ${ and } from the beginning and end	173	//remove ${ and } from the beginning and end
176	String webFileText = findText(webFile);	174	String webFileText = XMLUtil.findText(webFile);
177	webFileText = webFileText.substring(2, webFileText.length() - 1);	175	webFileText = webFileText.substring(2, webFileText.length() - 1);
178	if (webFileText.startsWith("libs.")) {	176	if (webFileText.startsWith("libs.")) {
179	String libName = webFileText.substring(5, webFileText.indexOf(".classpath")); //NOI18N	177	String libName = webFileText.substring(5, webFileText.indexOf(".classpath")); //NOI18N
Lines 209-265 Link Here
209	return cachedElement;	207	return cachedElement;
210	}	208	}
211		209
212	private static void copyDocument (Document doc, Element from, Element to) {
213	NodeList nl = from.getChildNodes();
214	int length = nl.getLength();
215	for (int i=0; i< length; i++) {
216	Node node = nl.item (i);
217	Node newNode = null;
218	switch (node.getNodeType()) {
219	case Node.ELEMENT_NODE:
220	Element oldElement = (Element) node;
221	newNode = doc.createElementNS(EarProjectType.PROJECT_CONFIGURATION_NAMESPACE,oldElement.getTagName());
222	NamedNodeMap m = oldElement.getAttributes();
223	Element newElement = (Element) newNode;
224	for (int index = 0; index < m.getLength(); index++) {
225	Node attr = m.item(index);
226	newElement.setAttribute(attr.getNodeName(), attr.getNodeValue());
227	}
228	copyDocument(doc,oldElement,(Element)newNode);
229	break;
230	case Node.TEXT_NODE:
231	Text oldText = (Text) node;
232	newNode = doc.createTextNode(oldText.getData());
233	break;
234	case Node.COMMENT_NODE:
235	Comment oldComment = (Comment) node;
236	newNode = doc.createComment(oldComment.getData());
237	break;
238	}
239	if (newNode != null) {
240	to.appendChild (newNode);
241	}
242	}
243	}
244
245	/**
246	* Extract nested text from a node.
247	* Currently does not handle coalescing text nodes, CDATA sections, etc.
248	* @param parent a parent node
249	* @return the nested text, or null if none was found
250	*/
251	private static String findText(Node parent) {
252	NodeList l = parent.getChildNodes();
253	for (int i = 0; i < l.getLength(); i++) {
254	if (l.item(i).getNodeType() == Node.TEXT_NODE) {
255	Text text = (Text)l.item(i);
256	return text.getNodeValue();
257	}
258	}
259	return null;
260	}
261
262
263	public EditableProperties getUpdatedProjectProperties() {	210	public EditableProperties getUpdatedProjectProperties() {
264	return helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH);	211	return helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH);
265	}	212	}

Lines 41-60 Link Here

(-)a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/classpath/ClassPathSupportCallbackImpl.java (-15 / +3 lines)
41		41
42	package org.netbeans.modules.j2ee.earproject.classpath;	42	package org.netbeans.modules.j2ee.earproject.classpath;
43		43
44	import java.util.ArrayList;
45	import java.util.LinkedHashMap;	44	import java.util.LinkedHashMap;
46	import java.util.List;	45	import java.util.List;
47	import java.util.Map;	46	import java.util.Map;
48	import org.netbeans.modules.java.api.common.classpath.ClassPathSupport.Item;	47	import org.netbeans.modules.java.api.common.classpath.ClassPathSupport.Item;
49	import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties;
50	import org.netbeans.modules.j2ee.earproject.EarProjectType;	48	import org.netbeans.modules.j2ee.earproject.EarProjectType;
51	import org.netbeans.modules.java.api.common.util.CommonProjectUtils;	49	import org.netbeans.modules.java.api.common.util.CommonProjectUtils;
52	import org.netbeans.spi.project.support.ant.AntProjectHelper;	50	import org.netbeans.spi.project.support.ant.AntProjectHelper;
		51	import org.openide.xml.XMLUtil;
53	import org.w3c.dom.Document;	52	import org.w3c.dom.Document;
54	import org.w3c.dom.Element;	53	import org.w3c.dom.Element;
55	import org.w3c.dom.Node;	54	import org.w3c.dom.Node;
56	import org.w3c.dom.NodeList;	55	import org.w3c.dom.NodeList;
57	import org.w3c.dom.Text;
58		56
59	/**	57	/**
60	* Defines the various class paths for a web project.	58	* Defines the various class paths for a web project.
Lines 135-142 Link Here
135	Element library = (Element) ch.item(i);	133	Element library = (Element) ch.item(i);
136	Node webFile = library.getElementsByTagNameNS(ns, TAG_FILE).item(0);	134	Node webFile = library.getElementsByTagNameNS(ns, TAG_FILE).item(0);
137	NodeList pathInEarElements = library.getElementsByTagNameNS(ns, TAG_PATH_IN_EAR);	135	NodeList pathInEarElements = library.getElementsByTagNameNS(ns, TAG_PATH_IN_EAR);
138	earIncludesMap.put(findText(webFile), pathInEarElements.getLength() > 0 ?	136	earIncludesMap.put(XMLUtil.findText(webFile), pathInEarElements.getLength() > 0 ?
139	findText(pathInEarElements.item(0)) : null);	137	XMLUtil.findText(pathInEarElements.item(0)) : null);
140	}	138	}
141	}	139	}
142	}	140	}
Lines 144-158 Link Here
144	return earIncludesMap;	142	return earIncludesMap;
145	}	143	}
146		144
147	private static String findText(Node parent) {
148	NodeList l = parent.getChildNodes();
149	for (int i = 0; i < l.getLength(); i++) {
150	if (l.item(i).getNodeType() == Node.TEXT_NODE) {
151	Text text = (Text)l.item(i);
152	return text.getNodeValue();
153	}
154	}
155	return null;
156	}
157	}	145	}
158		146

Lines 42-50 Link Here

(-)a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/classpath/ClassPathSupportCallbackImpl.java (-79 / +3 lines)
42	package org.netbeans.modules.j2ee.ejbjarproject.classpath;	42	package org.netbeans.modules.j2ee.ejbjarproject.classpath;
43		43
44	import java.util.ArrayList;	44	import java.util.ArrayList;
45	import java.util.Arrays;
46	import java.util.HashMap;	45	import java.util.HashMap;
47	import java.util.Iterator;
48	import java.util.List;	46	import java.util.List;
49	import java.util.Map;	47	import java.util.Map;
50	import org.netbeans.modules.j2ee.common.Util;	48	import org.netbeans.modules.j2ee.common.Util;
Lines 55-63 Link Here
55	import org.w3c.dom.Element;	53	import org.w3c.dom.Element;
56	import org.w3c.dom.Node;	54	import org.w3c.dom.Node;
57	import org.w3c.dom.NodeList;	55	import org.w3c.dom.NodeList;
58	import org.w3c.dom.Text;
59	import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProjectType;	56	import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProjectType;
60	import org.netbeans.modules.java.api.common.util.CommonProjectUtils;	57	import org.netbeans.modules.java.api.common.util.CommonProjectUtils;
		58	import org.openide.xml.XMLUtil;
61		59
62	/**	60	/**
63	*	61	*
Lines 95-101 Link Here
95	for ( int i = 0; i < libs.getLength(); i++ ) {	93	for ( int i = 0; i < libs.getLength(); i++ ) {
96	Element item = (Element)libs.item( i );	94	Element item = (Element)libs.item( i );
97	// ejbjar is different from other j2ee projects - it stores reference without ${ and }	95	// ejbjar is different from other j2ee projects - it stores reference without ${ and }
98	String ref = "${"+findText( item )+"}";	96	String ref = "${"+XMLUtil.findText( item )+"}";
99	libraries.add(ref); // NOI18N	97	libraries.add(ref); // NOI18N
100	String dirs = item.getAttribute(ATTR_DIRS);	98	String dirs = item.getAttribute(ATTR_DIRS);
101	if (Util.DESTINATION_DIRECTORY_ROOT.equals(dirs) \|\|	99	if (Util.DESTINATION_DIRECTORY_ROOT.equals(dirs) \|\|
Lines 125-131 Link Here
125	Document doc = data.getOwnerDocument();	123	Document doc = data.getOwnerDocument();
126	for (ClassPathSupport.Item item : classpath) {	124	for (ClassPathSupport.Item item : classpath) {
127	if("true".equals(item.getAdditionalProperty(INCLUDE_IN_DEPLOYMENT))) { // NOI18N	125	if("true".equals(item.getAdditionalProperty(INCLUDE_IN_DEPLOYMENT))) { // NOI18N
128	appendChildElement(data,	126	XMLUtil.appendChildElement(data,
129	createLibraryElement(antProjectHelper, doc, item, includedLibrariesElement),	127	createLibraryElement(antProjectHelper, doc, item, includedLibrariesElement),
130	ejbjarElemOrder);	128	ejbjarElemOrder);
131	}	129	}
Lines 134-195 Link Here
134	antProjectHelper.putPrimaryConfigurationData( data, true );	132	antProjectHelper.putPrimaryConfigurationData( data, true );
135	}	133	}
136		134
137	/**
138	* Find all direct child elements of an element.
139	* More useful than {@link Element#getElementsByTagNameNS} because it does
140	* not recurse into recursive child elements.
141	* Children which are all-whitespace text nodes are ignored; others cause
142	* an exception to be thrown.
143	* @param parent a parent element in a DOM tree
144	* @return a list of direct child elements (may be empty)
145	* @throws IllegalArgumentException if there are non-element children besides whitespace
146	*/
147	private static List<Element> findSubElements(Element parent) throws IllegalArgumentException {
148	NodeList l = parent.getChildNodes();
149	List<Element> elements = new ArrayList<Element>(l.getLength());
150	for (int i = 0; i < l.getLength(); i++) {
151	Node n = l.item(i);
152	if (n.getNodeType() == Node.ELEMENT_NODE) {
153	elements.add((Element)n);
154	} else if (n.getNodeType() == Node.TEXT_NODE) {
155	String text = ((Text)n).getNodeValue();
156	if (text.trim().length() > 0) {
157	throw new IllegalArgumentException("non-ws text encountered in " + parent + ": " + text); // NOI18N
158	}
159	} else if (n.getNodeType() == Node.COMMENT_NODE) {
160	// skip
161	} else {
162	throw new IllegalArgumentException("unexpected non-element child of " + parent + ": " + n); // NOI18N
163	}
164	}
165	return elements;
166	}
167
168	/**
169	* Append child element to the correct position according to given
170	* order.
171	* @param parent parent to which the child will be added
172	* @param el element to be added
173	* @param order order of the elements which must be followed
174	*/
175	private static void appendChildElement(Element parent, Element el, String[] order) {
176	Element insertBefore = null;
177	List l = Arrays.asList(order);
178	int index = l.indexOf(el.getLocalName());
179	assert index != -1 : el.getLocalName()+" was not found in "+l; // NOI18N
180	Iterator it = findSubElements(parent).iterator();
181	while (it.hasNext()) {
182	Element e = (Element)it.next();
183	int index2 = l.indexOf(e.getLocalName());
184	assert index2 != -1 : e.getLocalName()+" was not found in "+l; // NOI18N
185	if (index2 > index) {
186	insertBefore = e;
187	break;
188	}
189	}
190	parent.insertBefore(el, insertBefore);
191	}
192
193	private static Element createLibraryElement(AntProjectHelper antProjectHelper, Document doc, Item item, String includedLibrariesElement) {	135	private static Element createLibraryElement(AntProjectHelper antProjectHelper, Document doc, Item item, String includedLibrariesElement) {
194	Element libraryElement = doc.createElementNS( EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE, includedLibrariesElement );	136	Element libraryElement = doc.createElementNS( EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE, includedLibrariesElement );
195	// ejbjar is different from other j2ee projects - it stores reference without ${ and }	137	// ejbjar is different from other j2ee projects - it stores reference without ${ and }
Lines 198-221 Link Here
198	return libraryElement;	140	return libraryElement;
199	}	141	}
200		142
201	/**
202	* Extracts <b>the first</b> nested text from an element.
203	* Currently does not handle coalescing text nodes, CDATA sections, etc.
204	* @param parent a parent element
205	* @return the nested text, or null if none was found
206	*/
207	private static String findText( Element parent ) {
208	NodeList l = parent.getChildNodes();
209	for ( int i = 0; i < l.getLength(); i++ ) {
210	if ( l.item(i).getNodeType() == Node.TEXT_NODE ) {
211	Text text = (Text)l.item( i );
212	return text.getNodeValue();
213	}
214	}
215	return null;
216	}
217
218
219	public void readAdditionalProperties(List<Item> items, String projectXMLElement) {	143	public void readAdditionalProperties(List<Item> items, String projectXMLElement) {
220	Map<String, String> destination = new HashMap<String, String>();	144	Map<String, String> destination = new HashMap<String, String>();
221	List<String> l = getIncludedLibraries(helper, projectXMLElement, destination);	145	List<String> l = getIncludedLibraries(helper, projectXMLElement, destination);

Lines 89-94 Link Here

(-)a/java.freeform/src/org/netbeans/modules/java/freeform/Classpaths.java (-22 / +23 lines)
89	import org.openide.util.Mutex;	89	import org.openide.util.Mutex;
90	import org.openide.util.Utilities;	90	import org.openide.util.Utilities;
91	import org.openide.util.WeakListeners;	91	import org.openide.util.WeakListeners;
		92	import org.openide.xml.XMLUtil;
92	import org.w3c.dom.Element;	93	import org.w3c.dom.Element;
93		94
94	/**	95	/**
Lines 193-199 Link Here
193	if (java == null) {	194	if (java == null) {
194	return null;	195	return null;
195	}	196	}
196	List<Element> compilationUnits = Util.findSubElements(java);	197	List<Element> compilationUnits = XMLUtil.findSubElements(java);
197	it = compilationUnits.iterator();	198	it = compilationUnits.iterator();
198	while (it.hasNext()) {	199	while (it.hasNext()) {
199	Element compilationUnitEl = (Element)it.next();	200	Element compilationUnitEl = (Element)it.next();
Lines 258-264 Link Here
258	if (java == null) {	259	if (java == null) {
259	return;	260	return;
260	}	261	}
261	for (Element compilationUnitEl : Util.findSubElements(java)) {	262	for (Element compilationUnitEl : XMLUtil.findSubElements(java)) {
262	assert compilationUnitEl.getLocalName().equals("compilation-unit") : compilationUnitEl;	263	assert compilationUnitEl.getLocalName().equals("compilation-unit") : compilationUnitEl;
263	// For each compilation unit, find the package roots first.	264	// For each compilation unit, find the package roots first.
264	List<FileObject> packageRoots = findPackageRoots(helper, evaluator, compilationUnitEl);	265	List<FileObject> packageRoots = findPackageRoots(helper, evaluator, compilationUnitEl);
Lines 337-349 Link Here
337		338
338	static List<String> findPackageRootNames(Element compilationUnitEl) {	339	static List<String> findPackageRootNames(Element compilationUnitEl) {
339	List<String> names = new ArrayList<String>();	340	List<String> names = new ArrayList<String>();
340	Iterator it = Util.findSubElements(compilationUnitEl).iterator();	341	Iterator it = XMLUtil.findSubElements(compilationUnitEl).iterator();
341	while (it.hasNext()) {	342	while (it.hasNext()) {
342	Element e = (Element) it.next();	343	Element e = (Element) it.next();
343	if (!e.getLocalName().equals("package-root")) { // NOI18N	344	if (!e.getLocalName().equals("package-root")) { // NOI18N
344	continue;	345	continue;
345	}	346	}
346	String location = Util.findText(e);	347	String location = XMLUtil.findText(e);
347	names.add(location);	348	names.add(location);
348	}	349	}
349	return names;	350	return names;
Lines 421-427 Link Here
421	}	422	}
422		423
423	private List<URL> createCompileClasspath(Element compilationUnitEl) {	424	private List<URL> createCompileClasspath(Element compilationUnitEl) {
424	for (Element e : Util.findSubElements(compilationUnitEl)) {	425	for (Element e : XMLUtil.findSubElements(compilationUnitEl)) {
425	if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("compile")) { // NOI18N	426	if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("compile")) { // NOI18N
426	return createClasspath(e);	427	return createClasspath(e);
427	}	428	}
Lines 434-440 Link Here
434	* Create a classpath from a <classpath> element.	435	* Create a classpath from a <classpath> element.
435	*/	436	*/
436	private List<URL> createClasspath(Element classpathEl) {	437	private List<URL> createClasspath(Element classpathEl) {
437	String cp = Util.findText(classpathEl);	438	String cp = XMLUtil.findText(classpathEl);
438	if (cp == null) {	439	if (cp == null) {
439	cp = "";	440	cp = "";
440	}	441	}
Lines 456-462 Link Here
456	}	457	}
457		458
458	private List<URL> createExecuteClasspath(List<String> packageRoots, Element compilationUnitEl) {	459	private List<URL> createExecuteClasspath(List<String> packageRoots, Element compilationUnitEl) {
459	for (Element e : Util.findSubElements(compilationUnitEl)) {	460	for (Element e : XMLUtil.findSubElements(compilationUnitEl)) {
460	if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("execute")) { // NOI18N	461	if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("execute")) { // NOI18N
461	return createClasspath(e);	462	return createClasspath(e);
462	}	463	}
Lines 466-477 Link Here
466	List<URL> urls = new ArrayList<URL>();	467	List<URL> urls = new ArrayList<URL>();
467	urls.addAll(createCompileClasspath(compilationUnitEl));	468	urls.addAll(createCompileClasspath(compilationUnitEl));
468	boolean foundBuiltTos = false;	469	boolean foundBuiltTos = false;
469	for (Element builtTo : Util.findSubElements(compilationUnitEl)) {	470	for (Element builtTo : XMLUtil.findSubElements(compilationUnitEl)) {
470	if (!builtTo.getLocalName().equals("built-to")) { // NOI18N	471	if (!builtTo.getLocalName().equals("built-to")) { // NOI18N
471	continue;	472	continue;
472	}	473	}
473	foundBuiltTos = true;	474	foundBuiltTos = true;
474	String rawtext = Util.findText(builtTo);	475	String rawtext = XMLUtil.findText(builtTo);
475	assert rawtext != null : "Must have nonempty text inside <built-to>";	476	assert rawtext != null : "Must have nonempty text inside <built-to>";
476	String text = evaluator.evaluate(rawtext);	477	String text = evaluator.evaluate(rawtext);
477	if (text == null) {	478	if (text == null) {
Lines 486-492 Link Here
486	}	487	}
487		488
488	private List<URL> createProcessorClasspath(Element compilationUnitEl) {	489	private List<URL> createProcessorClasspath(Element compilationUnitEl) {
489	for (Element e : Util.findSubElements(compilationUnitEl)) {	490	for (Element e : XMLUtil.findSubElements(compilationUnitEl)) {
490	if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("processor")) { // NOI18N	491	if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("processor")) { // NOI18N
491	return createClasspath(e);	492	return createClasspath(e);
492	}	493	}
Lines 496-502 Link Here
496	}	497	}
497		498
498	private List<URL> createBootClasspath(Element compilationUnitEl) {	499	private List<URL> createBootClasspath(Element compilationUnitEl) {
499	for (Element e : Util.findSubElements(compilationUnitEl)) {	500	for (Element e : XMLUtil.findSubElements(compilationUnitEl)) {
500	if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("boot")) { // NOI18N	501	if (e.getLocalName().equals("classpath") && e.getAttribute("mode").equals("boot")) { // NOI18N
501	return createClasspath(e);	502	return createClasspath(e);
502	}	503	}
Lines 571-577 Link Here
571	if (java == null) {	572	if (java == null) {
572	return null;	573	return null;
573	}	574	}
574	List<Element> compilationUnits = Util.findSubElements(java);	575	List<Element> compilationUnits = XMLUtil.findSubElements(java);
575	Iterator it = compilationUnits.iterator();	576	Iterator it = compilationUnits.iterator();
576	while (it.hasNext()) {	577	while (it.hasNext()) {
577	Element compilationUnitEl = (Element)it.next();	578	Element compilationUnitEl = (Element)it.next();
Lines 680-707 Link Here
680	rootFolder = null;	681	rootFolder = null;
681	}	682	}
682	Element genldata = Util.getPrimaryConfigurationData(helper);	683	Element genldata = Util.getPrimaryConfigurationData(helper);
683	Element foldersE = Util.findElement(genldata, "folders", Util.NAMESPACE); // NOI18N	684	Element foldersE = XMLUtil.findElement(genldata, "folders", Util.NAMESPACE); // NOI18N
684	if (foldersE != null) {	685	if (foldersE != null) {
685	for (Element folderE : Util.findSubElements(foldersE)) {	686	for (Element folderE : XMLUtil.findSubElements(foldersE)) {
686	if (folderE.getLocalName().equals("source-folder")) {	687	if (folderE.getLocalName().equals("source-folder")) {
687	Element typeE = Util.findElement(folderE, "type", Util.NAMESPACE); // NOI18N	688	Element typeE = XMLUtil.findElement(folderE, "type", Util.NAMESPACE); // NOI18N
688	if (typeE != null) {	689	if (typeE != null) {
689	String type = Util.findText(typeE);	690	String type = XMLUtil.findText(typeE);
690	if (type.equals(JavaProjectConstants.SOURCES_TYPE_JAVA)) {	691	if (type.equals(JavaProjectConstants.SOURCES_TYPE_JAVA)) {
691	Element locationE = Util.findElement(folderE, "location", Util.NAMESPACE); // NOI18N	692	Element locationE = XMLUtil.findElement(folderE, "location", Util.NAMESPACE); // NOI18N
692	String location = evaluator.evaluate(Util.findText(locationE));	693	String location = evaluator.evaluate(XMLUtil.findText(locationE));
693	if (location != null && helper.resolveFile(location).equals(rootFolder)) {	694	if (location != null && helper.resolveFile(location).equals(rootFolder)) {
694	Element includesE = Util.findElement(folderE, "includes", Util.NAMESPACE); // NOI18N	695	Element includesE = XMLUtil.findElement(folderE, "includes", Util.NAMESPACE); // NOI18N
695	if (includesE != null) {	696	if (includesE != null) {
696	incl = evaluator.evaluate(Util.findText(includesE));	697	incl = evaluator.evaluate(XMLUtil.findText(includesE));
697	if (incl != null && incl.matches("\\$\\{[^}]+\\}")) { // NOI18N	698	if (incl != null && incl.matches("\\$\\{[^}]+\\}")) { // NOI18N
698	// Clearly intended to mean "include everything".	699	// Clearly intended to mean "include everything".
699	incl = null;	700	incl = null;
700	}	701	}
701	}	702	}
702	Element excludesE = Util.findElement(folderE, "excludes", Util.NAMESPACE); // NOI18N	703	Element excludesE = XMLUtil.findElement(folderE, "excludes", Util.NAMESPACE); // NOI18N
703	if (excludesE != null) {	704	if (excludesE != null) {
704	excl = evaluator.evaluate(Util.findText(excludesE));	705	excl = evaluator.evaluate(XMLUtil.findText(excludesE));
705	}	706	}
706	}	707	}
707	}	708	}

Lines 506-524 Link Here

(-)a/java.freeform/src/org/netbeans/modules/java/freeform/JavaActions.java (-25 / +25 lines)
506	antProject.setAttribute("basedir", /* ".." times count('/', FILE_SCRIPT_PATH) */".."); // NOI18N	506	antProject.setAttribute("basedir", /* ".." times count('/', FILE_SCRIPT_PATH) */".."); // NOI18N
507	// Look for <properties> in project.xml and make corresponding definitions in the Ant script.	507	// Look for <properties> in project.xml and make corresponding definitions in the Ant script.
508	Element data = Util.getPrimaryConfigurationData(helper);	508	Element data = Util.getPrimaryConfigurationData(helper);
509	Element properties = Util.findElement(data, "properties", Util.NAMESPACE);	509	Element properties = XMLUtil.findElement(data, "properties", Util.NAMESPACE);
510	if (properties != null) {	510	if (properties != null) {
511	for (Element el : Util.findSubElements(properties)) {	511	for (Element el : XMLUtil.findSubElements(properties)) {
512	Element nue = antProject.getOwnerDocument().createElement("property"); // NOI18N	512	Element nue = antProject.getOwnerDocument().createElement("property"); // NOI18N
513	if (el.getLocalName().equals("property")) { // NOI18N	513	if (el.getLocalName().equals("property")) { // NOI18N
514	String name = el.getAttribute("name"); // NOI18N	514	String name = el.getAttribute("name"); // NOI18N
515	assert name != null;	515	assert name != null;
516	String text = Util.findText(el);	516	String text = XMLUtil.findText(el);
517	assert text != null;	517	assert text != null;
518	nue.setAttribute("name", name);	518	nue.setAttribute("name", name);
519	nue.setAttribute("value", text);	519	nue.setAttribute("value", text);
520	} else if (el.getLocalName().equals("property-file")) { // NOI18N	520	} else if (el.getLocalName().equals("property-file")) { // NOI18N
521	String text = Util.findText(el);	521	String text = XMLUtil.findText(el);
522	assert text != null;	522	assert text != null;
523	nue.setAttribute("file", text);	523	nue.setAttribute("file", text);
524	} else {	524	} else {
Lines 615-621 Link Here
615	if (java == null) {	615	if (java == null) {
616	return Collections.emptyList();	616	return Collections.emptyList();
617	}	617	}
618	return Util.findSubElements(java);	618	return XMLUtil.findSubElements(java);
619	}	619	}
620		620
621	/**	621	/**
Lines 684-692 Link Here
684	*/	684	*/
685	private Element findCompilationUnit(String sources) {	685	private Element findCompilationUnit(String sources) {
686	for (Element compilationUnitEl : compilationUnits()) {	686	for (Element compilationUnitEl : compilationUnits()) {
687	for (Element packageRoot : Util.findSubElements(compilationUnitEl)) {	687	for (Element packageRoot : XMLUtil.findSubElements(compilationUnitEl)) {
688	if (packageRoot.getLocalName().equals("package-root")) { // NOI18N	688	if (packageRoot.getLocalName().equals("package-root")) { // NOI18N
689	if (Util.findText(packageRoot).equals(sources)) {	689	if (XMLUtil.findText(packageRoot).equals(sources)) {
690	return compilationUnitEl;	690	return compilationUnitEl;
691	}	691	}
692	}	692	}
Lines 714-722 Link Here
714	*/	714	*/
715	private String findClassesOutputDir(Element compilationUnitEl) {	715	private String findClassesOutputDir(Element compilationUnitEl) {
716	// Look for an appropriate <built-to>.	716	// Look for an appropriate <built-to>.
717	for (Element builtTo : Util.findSubElements(compilationUnitEl)) {	717	for (Element builtTo : XMLUtil.findSubElements(compilationUnitEl)) {
718	if (builtTo.getLocalName().equals("built-to")) { // NOI18N	718	if (builtTo.getLocalName().equals("built-to")) { // NOI18N
719	String rawtext = Util.findText(builtTo);	719	String rawtext = XMLUtil.findText(builtTo);
720	// Check that it is not an archive.	720	// Check that it is not an archive.
721	String evaltext = evaluator.evaluate(rawtext);	721	String evaltext = evaluator.evaluate(rawtext);
722	if (evaltext != null) {	722	if (evaltext != null) {
Lines 745-753 Link Here
745	String findSourceLevel(String sources) {	745	String findSourceLevel(String sources) {
746	Element compilationUnitEl = findCompilationUnit(sources);	746	Element compilationUnitEl = findCompilationUnit(sources);
747	if (compilationUnitEl != null) {	747	if (compilationUnitEl != null) {
748	Element sourceLevel = Util.findElement(compilationUnitEl, "source-level", JavaProjectNature.NS_JAVA_3);	748	Element sourceLevel = XMLUtil.findElement(compilationUnitEl, "source-level", JavaProjectNature.NS_JAVA_3);
749	if (sourceLevel != null) {	749	if (sourceLevel != null) {
750	return Util.findText(sourceLevel);	750	return XMLUtil.findText(sourceLevel);
751	}	751	}
752	}	752	}
753	return null;	753	return null;
Lines 761-771 Link Here
761	String findCUClasspath(String sources, String moud) {	761	String findCUClasspath(String sources, String moud) {
762	Element compilationUnitEl = findCompilationUnit(sources);	762	Element compilationUnitEl = findCompilationUnit(sources);
763	if (compilationUnitEl != null) {	763	if (compilationUnitEl != null) {
764	for (Element classpath : Util.findSubElements(compilationUnitEl)) {	764	for (Element classpath : XMLUtil.findSubElements(compilationUnitEl)) {
765	if (classpath.getLocalName().equals("classpath")) { // NOI18N	765	if (classpath.getLocalName().equals("classpath")) { // NOI18N
766	String mode = classpath.getAttribute("mode"); // NOI18N	766	String mode = classpath.getAttribute("mode"); // NOI18N
767	if (mode.equals(moud)) {	767	if (mode.equals(moud)) {
768	return Util.findText(classpath);	768	return XMLUtil.findText(classpath);
769	}	769	}
770	}	770	}
771	}	771	}
Lines 810-820 Link Here
810	// XXX cannot use FreeformProjectGenerator since that is currently not a public support SPI from ant/freeform	810	// XXX cannot use FreeformProjectGenerator since that is currently not a public support SPI from ant/freeform
811	// 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	811	// 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
812	Element data = Util.getPrimaryConfigurationData(helper);	812	Element data = Util.getPrimaryConfigurationData(helper);
813	Element ideActions = Util.findElement(data, "ide-actions", Util.NAMESPACE); // NOI18N	813	Element ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE); // NOI18N
814	if (ideActions == null) {	814	if (ideActions == null) {
815	//fix for #58442:	815	//fix for #58442:
816	ideActions = data.getOwnerDocument().createElementNS(Util.NAMESPACE, "ide-actions"); // NOI18N	816	ideActions = data.getOwnerDocument().createElementNS(Util.NAMESPACE, "ide-actions"); // NOI18N
817	Util.appendChildElement(data, ideActions, rootElementsOrder);	817	XMLUtil.appendChildElement(data, ideActions, rootElementsOrder);
818	}	818	}
819	Document doc = data.getOwnerDocument();	819	Document doc = data.getOwnerDocument();
820	Element action = doc.createElementNS(Util.NAMESPACE, "action"); // NOI18N	820	Element action = doc.createElementNS(Util.NAMESPACE, "action"); // NOI18N
Lines 854-862 Link Here
854	} else {	854	} else {
855	// Add a context menu item, since it applies to the project as a whole.	855	// Add a context menu item, since it applies to the project as a whole.
856	// Assume there is already a <context-menu> defined, which is quite likely.	856	// Assume there is already a <context-menu> defined, which is quite likely.
857	Element view = Util.findElement(data, "view", Util.NAMESPACE); // NOI18N	857	Element view = XMLUtil.findElement(data, "view", Util.NAMESPACE); // NOI18N
858	if (view != null) {	858	if (view != null) {
859	Element contextMenu = Util.findElement(view, "context-menu", Util.NAMESPACE); // NOI18N	859	Element contextMenu = XMLUtil.findElement(view, "context-menu", Util.NAMESPACE); // NOI18N
860	if (contextMenu != null) {	860	if (contextMenu != null) {
861	Element ideAction = doc.createElementNS(Util.NAMESPACE, "ide-action"); // NOI18N	861	Element ideAction = doc.createElementNS(Util.NAMESPACE, "ide-action"); // NOI18N
862	ideAction.setAttribute("name", command); // NOI18N	862	ideAction.setAttribute("name", command); // NOI18N
Lines 994-1000 Link Here
994	return null;	994	return null;
995	}	995	}
996	}	996	}
997	for (Element target : Util.findSubElements(doc.getDocumentElement())) {	997	for (Element target : XMLUtil.findSubElements(doc.getDocumentElement())) {
998	if (target.getLocalName().equals("target") && targetName.equals(target.getAttribute("name"))) { // NOI18N	998	if (target.getLocalName().equals("target") && targetName.equals(target.getAttribute("name"))) { // NOI18N
999	return target;	999	return target;
1000	}	1000	}
Lines 1010-1032 Link Here
1010	*/	1010	*/
1011	String[] findCommandBinding(String command) {	1011	String[] findCommandBinding(String command) {
1012	Element data = Util.getPrimaryConfigurationData(helper);	1012	Element data = Util.getPrimaryConfigurationData(helper);
1013	Element ideActions = Util.findElement(data, "ide-actions", Util.NAMESPACE); // NOI18N	1013	Element ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE); // NOI18N
1014	if (ideActions == null) {	1014	if (ideActions == null) {
1015	return null;	1015	return null;
1016	}	1016	}
1017	String scriptName = "build.xml"; // NOI18N	1017	String scriptName = "build.xml"; // NOI18N
1018	for (Element action : Util.findSubElements(ideActions)) {	1018	for (Element action : XMLUtil.findSubElements(ideActions)) {
1019	assert action.getLocalName().equals("action");	1019	assert action.getLocalName().equals("action");
1020	if (action.getAttribute("name").equals(command)) {	1020	if (action.getAttribute("name").equals(command)) {
1021	Element script = Util.findElement(action, "script", Util.NAMESPACE); // NOI18N	1021	Element script = XMLUtil.findElement(action, "script", Util.NAMESPACE); // NOI18N
1022	if (script != null) {	1022	if (script != null) {
1023	scriptName = Util.findText(script);	1023	scriptName = XMLUtil.findText(script);
1024	}	1024	}
1025	List<String> scriptPlusTargetNames = new ArrayList<String>();	1025	List<String> scriptPlusTargetNames = new ArrayList<String>();
1026	scriptPlusTargetNames.add(scriptName);	1026	scriptPlusTargetNames.add(scriptName);
1027	for (Element target : Util.findSubElements(action)) {	1027	for (Element target : XMLUtil.findSubElements(action)) {
1028	if (target.getLocalName().equals("target")) { // NOI18N	1028	if (target.getLocalName().equals("target")) { // NOI18N
1029	scriptPlusTargetNames.add(Util.findText(target));	1029	scriptPlusTargetNames.add(XMLUtil.findText(target));
1030	}	1030	}
1031	}	1031	}
1032	if (scriptName.equals(JdkConfiguration.NBJDK_XML) && scriptPlusTargetNames.size() > 1) {	1032	if (scriptName.equals(JdkConfiguration.NBJDK_XML) && scriptPlusTargetNames.size() > 1) {
Lines 1069-1075 Link Here
1069	Element targetUsesTaskExactlyOnce(Element target, String taskName) {	1069	Element targetUsesTaskExactlyOnce(Element target, String taskName) {
1070	// XXX should maybe also look for any other usage of the task in the same script in case there is none in the mentioned target	1070	// XXX should maybe also look for any other usage of the task in the same script in case there is none in the mentioned target
1071	Element foundTask = null;	1071	Element foundTask = null;
1072	for (Element task : Util.findSubElements(target)) {	1072	for (Element task : XMLUtil.findSubElements(target)) {
1073	if (task.getLocalName().equals(taskName)) {	1073	if (task.getLocalName().equals(taskName)) {
1074	if (foundTask != null) {	1074	if (foundTask != null) {
1075	// Duplicate.	1075	// Duplicate.

Lines 51-57 Link Here

(-)a/java.freeform/src/org/netbeans/modules/java/freeform/UsageLogger.java (-4 / +4 lines)
51	import org.netbeans.api.project.ProjectUtils;	51	import org.netbeans.api.project.ProjectUtils;
52	import org.netbeans.modules.ant.freeform.spi.ProjectAccessor;	52	import org.netbeans.modules.ant.freeform.spi.ProjectAccessor;
53	import org.netbeans.modules.ant.freeform.spi.ProjectConstants;	53	import org.netbeans.modules.ant.freeform.spi.ProjectConstants;
54	import org.netbeans.modules.ant.freeform.spi.support.Util;
55	import org.netbeans.spi.project.AuxiliaryConfiguration;	54	import org.netbeans.spi.project.AuxiliaryConfiguration;
56	import org.netbeans.spi.project.support.ant.AntProjectHelper;	55	import org.netbeans.spi.project.support.ant.AntProjectHelper;
57	import org.netbeans.spi.project.support.ant.PropertyEvaluator;	56	import org.netbeans.spi.project.support.ant.PropertyEvaluator;
Lines 61-66 Link Here
61	import org.openide.util.Exceptions;	60	import org.openide.util.Exceptions;
62	import org.openide.util.NbBundle;	61	import org.openide.util.NbBundle;
63	import org.openide.util.RequestProcessor;	62	import org.openide.util.RequestProcessor;
		63	import org.openide.xml.XMLUtil;
64	import org.w3c.dom.Element;	64	import org.w3c.dom.Element;
65		65
66	/**	66	/**
Lines 109-126 Link Here
109	Set<String> classpathEntries = new HashSet<String>();	109	Set<String> classpathEntries = new HashSet<String>();
110	Element java = JavaProjectGenerator.getJavaCompilationUnits(aux);	110	Element java = JavaProjectGenerator.getJavaCompilationUnits(aux);
111	if (java != null) {	111	if (java != null) {
112	for (Element compilationUnitEl : Util.findSubElements(java)) {	112	for (Element compilationUnitEl : XMLUtil.findSubElements(java)) {
113	compilationUnits++;	113	compilationUnits++;
114	int builtTos = 0;	114	int builtTos = 0;
115	int roots = 0;	115	int roots = 0;
116	for (Element other : Util.findSubElements(compilationUnitEl)) {	116	for (Element other : XMLUtil.findSubElements(compilationUnitEl)) {
117	String name = other.getLocalName();	117	String name = other.getLocalName();
118	if (name.equals("package-root")) { // NOI18N	118	if (name.equals("package-root")) { // NOI18N
119	roots++;	119	roots++;
120	} else if (name.equals("built-to")) { // NOI18N	120	} else if (name.equals("built-to")) { // NOI18N
121	builtTos++;	121	builtTos++;
122	} else if (name.equals("classpath")) { // NOI18N	122	} else if (name.equals("classpath")) { // NOI18N
123	String text = Util.findText(other);	123	String text = XMLUtil.findText(other);
124	if (text != null) {	124	if (text != null) {
125	String textEval = eval.evaluate(text);	125	String textEval = eval.evaluate(text);
126	if (textEval != null) {	126	if (textEval != null) {

Lines 77-82 Link Here

(-)a/java.freeform/test/unit/src/org/netbeans/modules/java/freeform/ClasspathsTest.java (-2 / +3 lines)
77	import org.openide.filesystems.FileObject;	77	import org.openide.filesystems.FileObject;
78	import org.openide.filesystems.FileUtil;	78	import org.openide.filesystems.FileUtil;
79	import org.openide.util.Mutex;	79	import org.openide.util.Mutex;
		80	import org.openide.xml.XMLUtil;
80	import org.w3c.dom.Document;	81	import org.w3c.dom.Document;
81	import org.w3c.dom.Element;	82	import org.w3c.dom.Element;
82		83
Lines 456-462 Link Here
456	FileUtil.createData(new File(d, "s/ignored/file"));	457	FileUtil.createData(new File(d, "s/ignored/file"));
457	Element data = Util.getPrimaryConfigurationData(helper);	458	Element data = Util.getPrimaryConfigurationData(helper);
458	Document doc = data.getOwnerDocument();	459	Document doc = data.getOwnerDocument();
459	Element sf = (Element) data.insertBefore(doc.createElementNS(Util.NAMESPACE, "folders"), Util.findElement(data, "view", Util.NAMESPACE)).	460	Element sf = (Element) data.insertBefore(doc.createElementNS(Util.NAMESPACE, "folders"), XMLUtil.findElement(data, "view", Util.NAMESPACE)).
460	appendChild(doc.createElementNS(Util.NAMESPACE, "source-folder"));	461	appendChild(doc.createElementNS(Util.NAMESPACE, "source-folder"));
461	sf.appendChild(doc.createElementNS(Util.NAMESPACE, "label")).appendChild(doc.createTextNode("Sources"));	462	sf.appendChild(doc.createElementNS(Util.NAMESPACE, "label")).appendChild(doc.createTextNode("Sources"));
462	sf.appendChild(doc.createElementNS(Util.NAMESPACE, "type")).appendChild(doc.createTextNode(JavaProjectConstants.SOURCES_TYPE_JAVA));	463	sf.appendChild(doc.createElementNS(Util.NAMESPACE, "type")).appendChild(doc.createTextNode(JavaProjectConstants.SOURCES_TYPE_JAVA));
Lines 547-553 Link Here
547	data.getElementsByTagName("properties").item(0).	548	data.getElementsByTagName("properties").item(0).
548	appendChild(doc.createElementNS(Util.NAMESPACE, "property-file")).	549	appendChild(doc.createElementNS(Util.NAMESPACE, "property-file")).
549	appendChild(doc.createTextNode("config.properties"));	550	appendChild(doc.createTextNode("config.properties"));
550	Element folders = (Element) data.insertBefore(doc.createElementNS(Util.NAMESPACE, "folders"), Util.findElement(data, "view", Util.NAMESPACE));	551	Element folders = (Element) data.insertBefore(doc.createElementNS(Util.NAMESPACE, "folders"), XMLUtil.findElement(data, "view", Util.NAMESPACE));
551	Element sf = (Element) folders.appendChild(doc.createElementNS(Util.NAMESPACE, "source-folder"));	552	Element sf = (Element) folders.appendChild(doc.createElementNS(Util.NAMESPACE, "source-folder"));
552	sf.appendChild(doc.createElementNS(Util.NAMESPACE, "label")).appendChild(doc.createTextNode("Sources #1"));	553	sf.appendChild(doc.createElementNS(Util.NAMESPACE, "label")).appendChild(doc.createTextNode("Sources #1"));
553	sf.appendChild(doc.createElementNS(Util.NAMESPACE, "type")).appendChild(doc.createTextNode(JavaProjectConstants.SOURCES_TYPE_JAVA));	554	sf.appendChild(doc.createElementNS(Util.NAMESPACE, "type")).appendChild(doc.createTextNode(JavaProjectConstants.SOURCES_TYPE_JAVA));

Lines 51-57 Link Here

(-)a/java.freeform/test/unit/src/org/netbeans/modules/java/freeform/JavaActionsTest.java (-17 / +16 lines)
51	import java.util.Locale;	51	import java.util.Locale;
52	import org.netbeans.api.project.ProjectManager;	52	import org.netbeans.api.project.ProjectManager;
53	import org.netbeans.modules.ant.freeform.FreeformProject;	53	import org.netbeans.modules.ant.freeform.FreeformProject;
54	import org.netbeans.modules.ant.freeform.FreeformProjectType;
55	import org.netbeans.modules.ant.freeform.TestBase;	54	import org.netbeans.modules.ant.freeform.TestBase;
56	import org.netbeans.modules.ant.freeform.spi.support.Util;	55	import org.netbeans.modules.ant.freeform.spi.support.Util;
57	import org.netbeans.spi.project.ActionProvider;	56	import org.netbeans.spi.project.ActionProvider;
Lines 88-100 Link Here
88	prj = copyProject(simple);	87	prj = copyProject(simple);
89	// Remove existing context-sensitive bindings to make a clean slate.	88	// Remove existing context-sensitive bindings to make a clean slate.
90	Element data = prj.getPrimaryConfigurationData();	89	Element data = prj.getPrimaryConfigurationData();
91	Element ideActions = Util.findElement(data, "ide-actions", Util.NAMESPACE);	90	Element ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
92	assertNotNull(ideActions);	91	assertNotNull(ideActions);
93	Iterator<Element> actionsIt = Util.findSubElements(ideActions).iterator();	92	Iterator<Element> actionsIt = XMLUtil.findSubElements(ideActions).iterator();
94	while (actionsIt.hasNext()) {	93	while (actionsIt.hasNext()) {
95	Element action = actionsIt.next();	94	Element action = actionsIt.next();
96	assertEquals("action", action.getLocalName());	95	assertEquals("action", action.getLocalName());
97	if (Util.findElement(action, "context", Util.NAMESPACE) != null) {	96	if (XMLUtil.findElement(action, "context", Util.NAMESPACE) != null) {
98	ideActions.removeChild(action);	97	ideActions.removeChild(action);
99	}	98	}
100	}	99	}
Lines 209-217 Link Here
209	ja.addBinding("some.action", "special.xml", "special-target", "selection", "${some.src.dir}", "\\.java$", "relative-path", ",");	208	ja.addBinding("some.action", "special.xml", "special-target", "selection", "${some.src.dir}", "\\.java$", "relative-path", ",");
210	Element data = prj.getPrimaryConfigurationData();	209	Element data = prj.getPrimaryConfigurationData();
211	assertNotNull(data);	210	assertNotNull(data);
212	Element ideActions = Util.findElement(data, "ide-actions", Util.NAMESPACE);	211	Element ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
213	assertNotNull(ideActions);	212	assertNotNull(ideActions);
214	List<Element> actions = Util.findSubElements(ideActions);	213	List<Element> actions = XMLUtil.findSubElements(ideActions);
215	Element lastAction = actions.get(actions.size() - 1);	214	Element lastAction = actions.get(actions.size() - 1);
216	String expectedXml =	215	String expectedXml =
217	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +	216	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
Lines 231-238 Link Here
231	assertEquals(expectedXml, xmlToString(lastAction));	230	assertEquals(expectedXml, xmlToString(lastAction));
232	ja.addBinding("some.other.action", "special.xml", "special-target", "selection", "${some.src.dir}", null, "relative-path", null);	231	ja.addBinding("some.other.action", "special.xml", "special-target", "selection", "${some.src.dir}", null, "relative-path", null);
233	data = prj.getPrimaryConfigurationData();	232	data = prj.getPrimaryConfigurationData();
234	ideActions = Util.findElement(data, "ide-actions", Util.NAMESPACE);	233	ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
235	actions = Util.findSubElements(ideActions);	234	actions = XMLUtil.findSubElements(ideActions);
236	lastAction = actions.get(actions.size() - 1);	235	lastAction = actions.get(actions.size() - 1);
237	expectedXml =	236	expectedXml =
238	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +	237	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
Lines 252-259 Link Here
252	// Non-context-sensitive bindings have no <context> but need to add a view item.	251	// Non-context-sensitive bindings have no <context> but need to add a view item.
253	ja.addBinding("general.action", "special.xml", "special-target", null, null, null, null, null);	252	ja.addBinding("general.action", "special.xml", "special-target", null, null, null, null, null);
254	data = prj.getPrimaryConfigurationData();	253	data = prj.getPrimaryConfigurationData();
255	ideActions = Util.findElement(data, "ide-actions", Util.NAMESPACE);	254	ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
256	actions = Util.findSubElements(ideActions);	255	actions = XMLUtil.findSubElements(ideActions);
257	lastAction = actions.get(actions.size() - 1);	256	lastAction = actions.get(actions.size() - 1);
258	expectedXml =	257	expectedXml =
259	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +	258	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
Lines 262-273 Link Here
262	" <target>special-target</target>\n" +	261	" <target>special-target</target>\n" +
263	"</action>\n";	262	"</action>\n";
264	assertEquals(expectedXml, xmlToString(lastAction));	263	assertEquals(expectedXml, xmlToString(lastAction));
265	Element view = Util.findElement(data, "view", Util.NAMESPACE);	264	Element view = XMLUtil.findElement(data, "view", Util.NAMESPACE);
266	assertNotNull(view);	265	assertNotNull(view);
267	Element contextMenu = Util.findElement(view, "context-menu", Util.NAMESPACE);	266	Element contextMenu = XMLUtil.findElement(view, "context-menu", Util.NAMESPACE);
268	assertNotNull(contextMenu);	267	assertNotNull(contextMenu);
269	// Currently (no FPG to help) it is always added as the last item.	268	// Currently (no FPG to help) it is always added as the last item.
270	List<Element> contextMenuActions = Util.findSubElements(contextMenu);	269	List<Element> contextMenuActions = XMLUtil.findSubElements(contextMenu);
271	Element lastContextMenuAction = contextMenuActions.get(contextMenuActions.size() - 1);	270	Element lastContextMenuAction = contextMenuActions.get(contextMenuActions.size() - 1);
272	expectedXml =	271	expectedXml =
273	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +	272	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
Lines 276-288 Link Here
276		275
277	//test #58442:	276	//test #58442:
278	data = prj.getPrimaryConfigurationData();	277	data = prj.getPrimaryConfigurationData();
279	ideActions = Util.findElement(data, "ide-actions", Util.NAMESPACE);	278	ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
280	data.removeChild(ideActions);	279	data.removeChild(ideActions);
281		280
282	ja.addBinding("some.other.action", "special.xml", "special-target", "selection", "${some.src.dir}", null, "relative-path", null);	281	ja.addBinding("some.other.action", "special.xml", "special-target", "selection", "${some.src.dir}", null, "relative-path", null);
283	data = prj.getPrimaryConfigurationData();	282	data = prj.getPrimaryConfigurationData();
284	ideActions = Util.findElement(data, "ide-actions", Util.NAMESPACE);	283	ideActions = XMLUtil.findElement(data, "ide-actions", Util.NAMESPACE);
285	actions = Util.findSubElements(ideActions);	284	actions = XMLUtil.findSubElements(ideActions);
286	lastAction = actions.get(actions.size() - 1);	285	lastAction = actions.get(actions.size() - 1);
287	expectedXml =	286	expectedXml =
288	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +	287	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
Lines 460-466 Link Here
460	assertEquals("Correct code generated for external script", expectedXml, xmlToString(root));	459	assertEquals("Correct code generated for external script", expectedXml, xmlToString(root));
461	// And also with locations defined as special properties in various ways...	460	// And also with locations defined as special properties in various ways...
462	Element data = prj.getPrimaryConfigurationData();	461	Element data = prj.getPrimaryConfigurationData();
463	Element properties = Util.findElement(data, "properties", Util.NAMESPACE);	462	Element properties = XMLUtil.findElement(data, "properties", Util.NAMESPACE);
464	assertNotNull(properties);	463	assertNotNull(properties);
465	Element property = data.getOwnerDocument().createElementNS(Util.NAMESPACE, "property");	464	Element property = data.getOwnerDocument().createElementNS(Util.NAMESPACE, "property");
466	property.setAttribute("name", "external.xml");	465	property.setAttribute("name", "external.xml");

Lines 53-65 Link Here

(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/UpdateProjectImpl.java (-38 / +3 lines)
53	import org.openide.NotifyDescriptor;	53	import org.openide.NotifyDescriptor;
54	import org.openide.util.Mutex;	54	import org.openide.util.Mutex;
55	import org.openide.util.NbBundle;	55	import org.openide.util.NbBundle;
56	import org.w3c.dom.Comment;	56	import org.openide.xml.XMLUtil;
57	import org.w3c.dom.Document;	57	import org.w3c.dom.Document;
58	import org.w3c.dom.Element;	58	import org.w3c.dom.Element;
59	import org.w3c.dom.NamedNodeMap;
60	import org.w3c.dom.Node;	59	import org.w3c.dom.Node;
61	import org.w3c.dom.NodeList;	60	import org.w3c.dom.NodeList;
62	import org.w3c.dom.Text;
63		61
64	/**	62	/**
65	*	63	*
Lines 153-159 Link Here
153	if (oldRoot != null) {	151	if (oldRoot != null) {
154	Document doc = oldRoot.getOwnerDocument();	152	Document doc = oldRoot.getOwnerDocument();
155	Element newRoot = doc.createElementNS (J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); //NOI18N	153	Element newRoot = doc.createElementNS (J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); //NOI18N
156	copyDocument (doc, oldRoot, newRoot);	154	XMLUtil.copyDocument (oldRoot, newRoot, J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE);
157	Element sourceRoots = doc.createElementNS(J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE,"source-roots"); //NOI18N	155	Element sourceRoots = doc.createElementNS(J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE,"source-roots"); //NOI18N
158	Element root = doc.createElementNS (J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE,"root"); //NOI18N	156	Element root = doc.createElementNS (J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE,"root"); //NOI18N
159	root.setAttribute ("id","src.dir"); //NOI18N	157	root.setAttribute ("id","src.dir"); //NOI18N
Lines 170-176 Link Here
170	if (oldRoot != null) {	168	if (oldRoot != null) {
171	Document doc = oldRoot.getOwnerDocument();	169	Document doc = oldRoot.getOwnerDocument();
172	Element newRoot = doc.createElementNS (J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); //NOI18N	170	Element newRoot = doc.createElementNS (J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); //NOI18N
173	copyDocument (doc, oldRoot, newRoot);	171	XMLUtil.copyDocument (oldRoot, newRoot, J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE);
174	cachedElement = newRoot;	172	cachedElement = newRoot;
175	}	173	}
176	}	174	}
Lines 204-242 Link Here
204	}	202	}
205	}	203	}
206		204
207	private static void copyDocument (Document doc, Element from, Element to) {
208	NodeList nl = from.getChildNodes();
209	int length = nl.getLength();
210	for (int i=0; i< length; i++) {
211	Node node = nl.item (i);
212	Node newNode = null;
213	switch (node.getNodeType()) {
214	case Node.ELEMENT_NODE:
215	Element oldElement = (Element) node;
216	newNode = doc.createElementNS(J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE,oldElement.getTagName());
217	NamedNodeMap m = oldElement.getAttributes();
218	Element newElement = (Element) newNode;
219	for (int index = 0; index < m.getLength(); index++) {
220	Node attr = m.item(index);
221	newElement.setAttribute(attr.getNodeName(), attr.getNodeValue());
222	}
223	copyDocument(doc,oldElement,newElement);
224	break;
225	case Node.TEXT_NODE:
226	Text oldText = (Text) node;
227	newNode = doc.createTextNode(oldText.getData());
228	break;
229	case Node.COMMENT_NODE:
230	Comment oldComment = (Comment) node;
231	newNode = doc.createComment(oldComment.getData());
232	break;
233	}
234	if (newNode != null) {
235	to.appendChild (newNode);
236	}
237	}
238	}
239
240	private static void deleteMinAntVersion(final Element root) {	205	private static void deleteMinAntVersion(final Element root) {
241	NodeList list = root.getElementsByTagNameNS (J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE,MINIMUM_ANT_VERSION_ELEMENT);	206	NodeList list = root.getElementsByTagNameNS (J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE,MINIMUM_ANT_VERSION_ELEMENT);
242	if (list.getLength() == 1) {	207	if (list.getLength() == 1) {

Lines 190-196 Link Here

(-)a/java.source/test/unit/src/org/netbeans/modules/java/source/usages/TestSupport.java (-23 / +3 lines)
190	assert false : "Shared not implemented";	190	assert false : "Shared not implemented";
191	}	191	}
192	Element root = xml.getDocumentElement ();	192	Element root = xml.getDocumentElement ();
193	Element data = findElement (root, elementName, namespace);	193	Element data = XMLUtil.findElement (root, elementName, namespace);
194	if (data != null) {	194	if (data != null) {
195	return (Element) data.cloneNode (true);	195	return (Element) data.cloneNode (true);
196	} else {	196	} else {
Lines 205-211 Link Here
205	}	205	}
206		206
207	Element root = xml.getDocumentElement ();	207	Element root = xml.getDocumentElement ();
208	Element existing = findElement (root, fragment.getLocalName (), fragment.getNamespaceURI ());	208	Element existing = XMLUtil.findElement (root, fragment.getLocalName (), fragment.getNamespaceURI ());
209	// XXX first compare to existing and return if the same	209	// XXX first compare to existing and return if the same
210	if (existing != null) {	210	if (existing != null) {
211	root.removeChild (existing);	211	root.removeChild (existing);
Lines 236-242 Link Here
236	}	236	}
237		237
238	Element root = xml.getDocumentElement ();	238	Element root = xml.getDocumentElement ();
239	Element data = findElement (root, elementName, namespace);	239	Element data = XMLUtil.findElement (root, elementName, namespace);
240	if (data != null) {	240	if (data != null) {
241	root.removeChild (data);	241	root.removeChild (data);
242	return true;	242	return true;
Lines 245-268 Link Here
245	}	245	}
246	}	246	}
247	}	247	}
248
249	// copied from org.netbeans.modules.project.ant.Util
250	private static Element findElement(Element parent, String name, String namespace) {
251	Element result = null;
252	NodeList l = parent.getChildNodes();
253	int len = l.getLength();
254	for (int i = 0; i < len; i++) {
255	if (l.item(i).getNodeType() == Node.ELEMENT_NODE) {
256	Element el = (Element)l.item(i);
257	if (name.equals(el.getLocalName()) && namespace.equals(el.getNamespaceURI())) {
258	if (result == null) {
259	result = el;
260	} else {
261	return null;
262	}
263	}
264	}
265	}
266	return result;
267	}
268	}	248	}

Lines 65-72 Link Here

(-)a/maven/src/org/netbeans/modules/maven/M2AuxilaryConfigImpl.java (-27 / +6 lines)
65	import org.w3c.dom.DOMException;	65	import org.w3c.dom.DOMException;
66	import org.w3c.dom.Document;	66	import org.w3c.dom.Document;
67	import org.w3c.dom.Element;	67	import org.w3c.dom.Element;
68	import org.w3c.dom.Node;
69	import org.w3c.dom.NodeList;
70	import org.xml.sax.InputSource;	68	import org.xml.sax.InputSource;
71	import org.xml.sax.SAXException;	69	import org.xml.sax.SAXException;
72		70
Lines 142-148 Link Here
142	if (shared) {	140	if (shared) {
143	//first check the document schedule for persistence	141	//first check the document schedule for persistence
144	if (scheduledDocument != null) {	142	if (scheduledDocument != null) {
145	Element el = findElement(scheduledDocument.getDocumentElement(), elementName, namespace);	143	Element el = XMLUtil.findElement(scheduledDocument.getDocumentElement(), elementName, namespace);
146	if (el != null) {	144	if (el != null) {
147	el = (Element) el.cloneNode(true);	145	el = (Element) el.cloneNode(true);
148	}	146	}
Lines 159-165 Link Here
159	//TODO shall be have some kind of caching here to prevent frequent IO?	157	//TODO shall be have some kind of caching here to prevent frequent IO?
160	doc = XMLUtil.parse(new InputSource(in), false, true, null, null);	158	doc = XMLUtil.parse(new InputSource(in), false, true, null, null);
161	cachedDoc = doc;	159	cachedDoc = doc;
162	return findElement(doc.getDocumentElement(), elementName, namespace);	160	return XMLUtil.findElement(doc.getDocumentElement(), elementName, namespace);
163	} catch (SAXException ex) {	161	} catch (SAXException ex) {
164	ProblemReporterImpl impl = project.getProblemReporter();	162	ProblemReporterImpl impl = project.getProblemReporter();
165	if (!impl.hasReportWithId(BROKEN_NBCONFIG)) {	163	if (!impl.hasReportWithId(BROKEN_NBCONFIG)) {
Lines 189-195 Link Here
189	} else {	187	} else {
190	//reuse cached value if available;	188	//reuse cached value if available;
191	if (cachedDoc != null) {	189	if (cachedDoc != null) {
192	return findElement(cachedDoc.getDocumentElement(), elementName, namespace);	190	return XMLUtil.findElement(cachedDoc.getDocumentElement(), elementName, namespace);
193	}	191	}
194	}	192	}
195	} else {	193	} else {
Lines 203-209 Link Here
203	Document doc;	201	Document doc;
204	try {	202	try {
205	doc = XMLUtil.parse(new InputSource(new StringReader(str)), false, true, null, null);	203	doc = XMLUtil.parse(new InputSource(new StringReader(str)), false, true, null, null);
206	return findElement(doc.getDocumentElement(), elementName, namespace);	204	return XMLUtil.findElement(doc.getDocumentElement(), elementName, namespace);
207	} catch (SAXException ex) {	205	} catch (SAXException ex) {
208	ex.printStackTrace();	206	ex.printStackTrace();
209	} catch (IOException ex) {	207	} catch (IOException ex) {
Lines 254-260 Link Here
254	}	252	}
255	}	253	}
256	if (doc != null) {	254	if (doc != null) {
257	Element el = findElement(doc.getDocumentElement(), fragment.getNodeName(), fragment.getNamespaceURI());	255	Element el = XMLUtil.findElement(doc.getDocumentElement(), fragment.getNodeName(), fragment.getNamespaceURI());
258	if (el != null) {	256	if (el != null) {
259	doc.getDocumentElement().removeChild(el);	257	doc.getDocumentElement().removeChild(el);
260	}	258	}
Lines 319-325 Link Here
319	}	317	}
320	}	318	}
321	if (doc != null) {	319	if (doc != null) {
322	Element el = findElement(doc.getDocumentElement(), elementName, namespace);	320	Element el = XMLUtil.findElement(doc.getDocumentElement(), elementName, namespace);
323	if (el != null) {	321	if (el != null) {
324	doc.getDocumentElement().removeChild(el);	322	doc.getDocumentElement().removeChild(el);
325	}	323	}
Lines 341-365 Link Here
341	return true;	339	return true;
342	}	340	}
343		341
344	private static Element findElement(Element parent, String name, String namespace) {
345	Element result = null;
346	NodeList l = parent.getChildNodes();
347	int len = l.getLength();
348	for (int i = 0; i < len; i++) {
349	if (l.item(i).getNodeType() == Node.ELEMENT_NODE) {
350	Element el = (Element) l.item(i);
351	if (name.equals(el.getLocalName()) && ((namespace == el.getNamespaceURI()) /check both namespaces are null/ \|\| (namespace != null && namespace.equals(el.getNamespaceURI())))) {
352	if (result == null) {
353	result = el;
354	} else {
355	return null;
356	}
357	}
358	}
359	}
360	return result;
361	}
362
363	static class OpenConfigAction extends AbstractAction {	342	static class OpenConfigAction extends AbstractAction {
364		343
365	private FileObject fo;	344	private FileObject fo;

Lines 61-66 Link Here

(-)a/o.n.bluej/src/org/netbeans/bluej/UpdateHelper.java (-35 / +3 lines)
61	import org.netbeans.spi.project.support.ant.AntProjectHelper;	61	import org.netbeans.spi.project.support.ant.AntProjectHelper;
62	import org.netbeans.spi.project.support.ant.EditableProperties;	62	import org.netbeans.spi.project.support.ant.EditableProperties;
63	import org.netbeans.spi.project.support.ant.GeneratedFilesHelper;	63	import org.netbeans.spi.project.support.ant.GeneratedFilesHelper;
		64	import org.openide.xml.XMLUtil;
64		65
65		66
66	/**	67	/**
Lines 267-273 Link Here
267	if (oldRoot != null) {	268	if (oldRoot != null) {
268	Document doc = oldRoot.getOwnerDocument();	269	Document doc = oldRoot.getOwnerDocument();
269	Element newRoot = doc.createElementNS (BluejProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); // NOI18N	270	Element newRoot = doc.createElementNS (BluejProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); // NOI18N
270	copyDocument (doc, oldRoot, newRoot);	271	XMLUtil.copyDocument (oldRoot, newRoot, BluejProjectType.PROJECT_CONFIGURATION_NAMESPACE);
271	Element sourceRoots = doc.createElementNS(BluejProjectType.PROJECT_CONFIGURATION_NAMESPACE,"source-roots"); // NOI18N	272	Element sourceRoots = doc.createElementNS(BluejProjectType.PROJECT_CONFIGURATION_NAMESPACE,"source-roots"); // NOI18N
272	Element root = doc.createElementNS (BluejProjectType.PROJECT_CONFIGURATION_NAMESPACE,"root"); // NOI18N	273	Element root = doc.createElementNS (BluejProjectType.PROJECT_CONFIGURATION_NAMESPACE,"root"); // NOI18N
273	root.setAttribute ("id","src.dir"); // NOI18N	274	root.setAttribute ("id","src.dir"); // NOI18N
Lines 284-290 Link Here
284	if (oldRoot != null) {	285	if (oldRoot != null) {
285	Document doc = oldRoot.getOwnerDocument();	286	Document doc = oldRoot.getOwnerDocument();
286	Element newRoot = doc.createElementNS (BluejProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); // NOI18N	287	Element newRoot = doc.createElementNS (BluejProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); // NOI18N
287	copyDocument (doc, oldRoot, newRoot);	288	XMLUtil.copyDocument (oldRoot, newRoot, BluejProjectType.PROJECT_CONFIGURATION_NAMESPACE);
288	cachedElement = updateMinAntVersion (newRoot, doc);	289	cachedElement = updateMinAntVersion (newRoot, doc);
289	}	290	}
290	}	291	}
Lines 307-345 Link Here
307	return cachedProperties;	308	return cachedProperties;
308	}	309	}
309		310
310	private static void copyDocument (Document doc, Element from, Element to) {
311	NodeList nl = from.getChildNodes();
312	int length = nl.getLength();
313	for (int i=0; i< length; i++) {
314	Node node = nl.item (i);
315	Node newNode = null;
316	switch (node.getNodeType()) {
317	case Node.ELEMENT_NODE:
318	Element oldElement = (Element) node;
319	newNode = doc.createElementNS(BluejProjectType.PROJECT_CONFIGURATION_NAMESPACE,oldElement.getTagName());
320	NamedNodeMap m = oldElement.getAttributes();
321	Element newElement = (Element) newNode;
322	for (int index = 0; index < m.getLength(); index++) {
323	Node attr = m.item(index);
324	newElement.setAttribute(attr.getNodeName(), attr.getNodeValue());
325	}
326	copyDocument(doc,oldElement,newElement);
327	break;
328	case Node.TEXT_NODE:
329	Text oldText = (Text) node;
330	newNode = doc.createTextNode(oldText.getData());
331	break;
332	case Node.COMMENT_NODE:
333	Comment oldComment = (Comment) node;
334	newNode = doc.createComment(oldComment.getData());
335	break;
336	}
337	if (newNode != null) {
338	to.appendChild (newNode);
339	}
340	}
341	}
342
343	static final String MINIMUM_ANT_VERSION = "1.6.5"; // NOI18N	311	static final String MINIMUM_ANT_VERSION = "1.6.5"; // NOI18N
344		312
345	private static Element updateMinAntVersion (final Element root, final Document doc) {	313	private static Element updateMinAntVersion (final Element root, final Document doc) {

Lines 609-620 Link Here

(-)a/openide.loaders/src/org/openide/loaders/XMLDataObject.java (-6 / +1 lines)
609	@Deprecated	609	@Deprecated
610	public static Document parse (URL url, ErrorHandler eh, boolean validate) throws IOException, SAXException {	610	public static Document parse (URL url, ErrorHandler eh, boolean validate) throws IOException, SAXException {
611		611
612	DocumentBuilder builder = XMLDataObjectImpl.makeBuilder(validate);	612	return XMLUtil.parse (new InputSource(url.toExternalForm()),validate, false, eh, getChainingEntityResolver());
613	builder.setErrorHandler(eh);
614	builder.setEntityResolver(getChainingEntityResolver());
615
616	return builder.parse (new InputSource(url.toExternalForm()));
617
618	}	613	}
619		614
620	/** Creates SAX parse that can be used to parse XML files.	615	/** Creates SAX parse that can be used to parse XML files.

Lines 1457-1462 Link Here

(-)a/openide.util/apichanges.xml (+16 lines)
1457	<class package="org.openide.xml" name="XMLUtil"/>	1457	<class package="org.openide.xml" name="XMLUtil"/>
1458	<issue number="16629"/>	1458	<issue number="16629"/>
1459	</change>	1459	</change>
		1460	<change id="refactored-methods-into-XMLUtil">
		1461	<api name="xml"/>
		1462	<summary>Refactored XML methods from various modules to be added
		1463	to <code>XMLUtil</code>. Seven new methods added.</summary>
		1464	<version major="8" minor="4"/>
		1465	<date day="7" month="4" year="2010"/>
		1466	<author login="mvfranz"/>
		1467	<compatibility addition="yes"/>
		1468	<description>
		1469	<p>
		1470	Refactored XML related methods into XMLUtil.
		1471	</p>
		1472	</description>
		1473	<class package="org.openide.xml" name="XMLUtil"/>
		1474	<issue number="136595"/>
		1475	</change>
1460	</changes>	1476	</changes>
1461	<htmlcontents>	1477	<htmlcontents>
1462	<head>	1478	<head>