Attachment #40558 for bug #93509

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

Lines 112-118 Link Here

(-)java/j2seproject/nbproject/project.xml (-1 / +1 lines)
112	<compile-dependency/>	112	<compile-dependency/>
113	<run-dependency>	113	<run-dependency>
114	<release-version>1</release-version>	114	<release-version>1</release-version>
115	<specification-version>1.15</specification-version>	115	<specification-version>1.16</specification-version>
116	</run-dependency>	116	</run-dependency>
117	</dependency>	117	</dependency>
118	<dependency>	118	<dependency>





package org.netbeans.modules.java.j2seproject;

import org.netbeans.spi.project.ant.AntBuildExtenderImplementation;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.Icon;

import org.netbeans.api.project.ProjectInformation;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.project.ant.AntArtifact;
import org.netbeans.api.project.ant.AntBuildExtender;
import org.netbeans.modules.java.j2seproject.api.J2SEPropertyEvaluator;
import org.netbeans.modules.java.j2seproject.classpath.ClassPathProviderImpl;
import org.netbeans.modules.java.j2seproject.classpath.J2SEProjectClassPathExtender;

import org.netbeans.modules.java.j2seproject.wsclient.J2SEProjectWebServicesSupportProvider;
import org.netbeans.modules.websvc.api.client.WebServicesClientSupport;
import org.netbeans.modules.websvc.api.jaxws.client.JAXWSClientSupport;
import org.netbeans.modules.websvc.api.jaxws.project.GeneratedFilesHelper;
import org.netbeans.modules.websvc.api.jaxws.project.WSUtils;
import org.netbeans.modules.websvc.api.jaxws.project.config.JaxWsModel;
import org.netbeans.modules.websvc.api.jaxws.project.config.JaxWsModelProvider;

import org.netbeans.spi.project.SubprojectProvider;
import org.netbeans.spi.project.ant.AntArtifactProvider;
import org.netbeans.spi.project.support.LookupProviderSupport;
import org.netbeans.spi.project.ant.AntBuildExtenderImplementation;
import org.netbeans.spi.project.support.ant.AntBuildExtenderSupport;
import org.netbeans.spi.project.support.ant.AntProjectEvent;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.support.ant.AntProjectListener;
import org.netbeans.spi.project.support.ant.EditableProperties;
import org.netbeans.spi.project.support.ant.FilterPropertyProvider;
import org.netbeans.spi.project.support.ant.GeneratedFilesHelper;
import org.netbeans.spi.project.support.ant.ProjectXmlSavedHook;
import org.netbeans.spi.project.support.ant.PropertyEvaluator;
import org.netbeans.spi.project.support.ant.PropertyProvider;

    private JaxWsModel jaxWsModel;
    private JaxWsListener jaxWsListener;
    private FileObject jaxWsFo;
    private AntBuildExtender buildExtender;

    J2SEProject(AntProjectHelper helper) throws IOException {
        this.helper = helper;
        eval = createEvaluator();
        aux = helper.createAuxiliaryConfiguration();
        refHelper = new ReferenceHelper(helper, aux, eval);
        buildExtender = AntBuildExtenderSupport.createAntExtender(new J2SEExtenderImplementation());
        genFilesHelper = new GeneratedFilesHelper(helper, buildExtender);
        this.updateHelper = new UpdateHelper (this, this.helper, this.aux, this.genFilesHelper,
            UpdateHelper.createDefaultNotifier());
        j2seProjectWebServicesClientSupport = new J2SEProjectWebServicesClientSupport(this, helper, refHelper);

            new J2SEFileBuiltQuery (this.helper, evaluator(),getSourceRoots(),getTestSourceRoots()), //Does not use APH to get/put properties/cfgdata
            new RecommendedTemplatesImpl (this.updateHelper),
            new J2SEProjectClassPathExtender(cpMod),
            buildExtender,
            cpMod,
            this, // never cast an externally obtained Project to J2SEProject - use lookup instead
            new J2SEProjectOperations(this),

    }
    
    // Package private methods -------------------------------------------------
    
   
    /**
     * Returns the source roots of this project
     * @return project's source roots



    // Private innerclasses ----------------------------------------------------
 
    private final class Info implements ProjectInformation {
        
        private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);

                genFilesHelper.refreshBuildScript(
                    GeneratedFilesHelper.BUILD_IMPL_XML_PATH,
                    J2SEProject.class.getResource("resources/build-impl.xsl"),
//                    jaxWsFo,
                    false);
                genFilesHelper.refreshBuildScript(
                    GeneratedFilesHelper.BUILD_XML_PATH,
                    J2SEProject.class.getResource("resources/build.xsl"),
//                    jaxWsFo,
                    false);
            }
        }

                    genFilesHelper.refreshBuildScript(
                        GeneratedFilesHelper.BUILD_IMPL_XML_PATH,
                        J2SEProject.class.getResource("resources/build-impl.xsl"),
//                        jaxWsFo,
                        true);
                    genFilesHelper.refreshBuildScript(
                        GeneratedFilesHelper.BUILD_XML_PATH,
                        J2SEProject.class.getResource("resources/build.xsl"),
//                        jaxWsFo,
                        true);
                }                
            } catch (IOException e) {

    }
    
    public FileObject findJaxWsFileObject() {
        return helper.getProjectDirectory().getFileObject(org.netbeans.modules.websvc.api.jaxws.project.GeneratedFilesHelper.JAX_WS_XML_PATH);
    }
    
    private JaxWsModel getJaxWsModel() {

                            genFilesHelper.refreshBuildScript(
                            GeneratedFilesHelper.BUILD_IMPL_XML_PATH,
                            J2SEProject.class.getResource("resources/build-impl.xsl"), // NOI18N
//                            jaxWsFo,
                            false);
                        } catch (IOException ex) {}
                    }
                    

                
            } catch (IOException ex) {}
        }
    }

    private class J2SEExtenderImplementation implements AntBuildExtenderImplementation {

        public List<String> getExtendableTargets() {
            String[] targets = new String[] {
                "-do-init", "-init-check", "-post-clean", "jar"
            };
            return Arrays.asList(targets);
        }

        public void updateBuildExtensionMetadata(Element element) {
            Element el = updateHelper.getPrimaryConfigurationData(true);
            Element correctDocOne = (Element) el.getOwnerDocument().importNode(element, true);
            NodeList nl = el.getElementsByTagName(AntBuildExtenderImplementation.ELEMENT_ROOT);
            if (nl.getLength() == 1) {
                Element old = (Element) nl.item(0);
                el.replaceChild(correctDocOne, old);
            } else {
                el.appendChild(correctDocOne);
            }
            updateHelper.putPrimaryConfigurationData(el, true);
        }

        public Element getBuildExtensionMetadata() {
            Element el = updateHelper.getPrimaryConfigurationData(true);
            NodeList nl = el.getElementsByTagName(AntBuildExtenderImplementation.ELEMENT_ROOT);
            if (nl.getLength() == 1) {
                return (Element) nl.item(0).cloneNode(true);
            }
            return null;
        }

        public Project getOwningProject() {
            return J2SEProject.this;
        }

    }

}

Lines 32-38 Link Here

(-)java/j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectType.java (-1 / +1 lines)
32		32
33	public static final String TYPE = "org.netbeans.modules.java.j2seproject"; // NOI18N	33	public static final String TYPE = "org.netbeans.modules.java.j2seproject"; // NOI18N
34	private static final String PROJECT_CONFIGURATION_NAME = "data"; // NOI18N	34	private static final String PROJECT_CONFIGURATION_NAME = "data"; // NOI18N
35	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2se-project/3"; // NOI18N	35	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2se-project/4"; // NOI18N
36	private static final String PRIVATE_CONFIGURATION_NAME = "data"; // NOI18N	36	private static final String PRIVATE_CONFIGURATION_NAME = "data"; // NOI18N
37	private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2se-project-private/1"; // NOI18N	37	private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2se-project-private/1"; // NOI18N
38		38




import java.io.IOException;
import javax.swing.JButton;
import org.netbeans.modules.java.j2seproject.ui.customizer.J2SEProjectProperties;
import org.netbeans.modules.websvc.api.jaxws.project.GeneratedFilesHelper;
import org.w3c.dom.Comment;
import org.w3c.dom.Document;
import org.w3c.dom.Element;

import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.support.ant.EditableProperties;
import org.netbeans.spi.project.support.ant.GeneratedFilesHelper;


/**

    public synchronized boolean isCurrent () {
        if (this.isCurrent == null) {
            if ((this.cfg.getConfigurationFragment("data","http://www.netbeans.org/ns/j2se-project/1",true) != null) || 
                (this.cfg.getConfigurationFragment("data","http://www.netbeans.org/ns/j2se-project/2",true) != null) ||
                (this.cfg.getConfigurationFragment("data","http://www.netbeans.org/ns/j2se-project/3",true) != null)) {
                this.isCurrent = Boolean.FALSE;
            } else {
                this.isCurrent = Boolean.TRUE;

        this.helper.putPrimaryConfigurationData(getUpdatedSharedConfigurationData(),true);
        this.cfg.removeConfigurationFragment("data","http://www.netbeans.org/ns/j2se-project/1",true); //NOI18N
        this.cfg.removeConfigurationFragment("data","http://www.netbeans.org/ns/j2se-project/2",true); //NOI18N
        this.cfg.removeConfigurationFragment("data","http://www.netbeans.org/ns/j2se-project/3",true); //NOI18N
        ProjectManager.getDefault().saveProject (this.project);
        synchronized(this) {
            this.isCurrent = Boolean.TRUE;

                    Element newRoot = doc.createElementNS (J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); //NOI18N
                    copyDocument (doc, oldRoot, newRoot);
                    cachedElement = updateMinAntVersion (newRoot, doc);
                } else {
                    oldRoot = this.cfg.getConfigurationFragment("data","http://www.netbeans.org/ns/j2se-project/3",true);    //NOI18N
                    if (oldRoot != null) {
                        Document doc = oldRoot.getOwnerDocument();
                        Element newRoot = doc.createElementNS (J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE,"data"); //NOI18N
                        copyDocument (doc, oldRoot, newRoot);
                        cachedElement = updateMinAntVersion (newRoot, doc);
                        //TODO anything else??
                    }
                }
            }
        }

Lines 24-29 Link Here

(-)java/j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl (+1 lines)
24	xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1"	24	xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1"
25	xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2"	25	xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2"
26	xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3"	26	xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3"
		27	xmlns:j2seproject4="http://www.netbeans.org/ns/j2se-project/4"
27	xmlns:projdeps="http://www.netbeans.org/ns/ant-project-references/1"	28	xmlns:projdeps="http://www.netbeans.org/ns/ant-project-references/1"
28	xmlns:projdeps2="http://www.netbeans.org/ns/ant-project-references/2"	29	xmlns:projdeps2="http://www.netbeans.org/ns/ant-project-references/2"
29	xmlns:jaxws="http://www.netbeans.org/ns/jax-ws/1"	30	xmlns:jaxws="http://www.netbeans.org/ns/jax-ws/1"

Lines 20-26 Link Here

(-)java/j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build.xsl (-1 / +1 lines)
20	<xsl:stylesheet version="1.0"	20	<xsl:stylesheet version="1.0"
21	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"	21	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
22	xmlns:project="http://www.netbeans.org/ns/project/1"	22	xmlns:project="http://www.netbeans.org/ns/project/1"
23	xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/3"	23	xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/4"
24	xmlns:xalan="http://xml.apache.org/xslt"	24	xmlns:xalan="http://xml.apache.org/xslt"
25	exclude-result-prefixes="xalan project j2seproject">	25	exclude-result-prefixes="xalan project j2seproject">
26	<xsl:output method="xml" indent="yes" encoding="UTF-8" xalan:indent-amount="4"/>	26	<xsl:output method="xml" indent="yes" encoding="UTF-8" xalan:indent-amount="4"/>




<?xml version="1.0" encoding="UTF-8"?>
<!--
The contents of this file are subject to the terms of the Common Development
and Distribution License (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.html
or http://www.netbeans.org/cddl.txt.

When distributing Covered Code, include this CDDL Header Notice in each file
and include the License file at http://www.netbeans.org/cddl.txt.
If applicable, add the following below the CDDL Header, with the fields
enclosed by brackets [] replaced by your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"

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.
-->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
            targetNamespace="http://www.netbeans.org/ns/j2se-project/4"
            xmlns="http://www.netbeans.org/ns/j2se-project/4"
            elementFormDefault="qualified">
    <xsd:element name="data">
        <xsd:complexType>
            <xsd:sequence>
                <xsd:element name="name" type="xsd:token"/>
                <xsd:element name="minimum-ant-version" minOccurs="0">
                    <xsd:simpleType>
                        <xsd:restriction base="xsd:NMTOKEN">
                            <xsd:pattern value="1\.[0-9]+(\.[0-9]+)?"/>
                        </xsd:restriction>
                    </xsd:simpleType>
                </xsd:element>
                <xsd:element name="explicit-platform" minOccurs="0">
                    <xsd:complexType>
                        <xsd:attribute name="explicit-source-supported" use="required">
                            <xsd:simpleType>
                                <xsd:restriction base="xsd:NMTOKEN">
                                    <xsd:enumeration value="true"/>
                                    <xsd:enumeration value="false"/>
                                </xsd:restriction>
                            </xsd:simpleType>
                        </xsd:attribute>
                    </xsd:complexType>
                </xsd:element>
                <xsd:element name="web-service-clients" minOccurs="0" type="webServiceClientsType"/>
                <xsd:element name="source-roots">
                    <xsd:complexType>
                        <xsd:sequence>
                            <xsd:element name="root" minOccurs="0" maxOccurs="unbounded">
                                <xsd:complexType>
                                    <xsd:attribute name="id" use="required" type="xsd:token"/>
                                    <xsd:attribute name="name" use="optional" type="xsd:token"/>
                                </xsd:complexType>
                            </xsd:element>
                        </xsd:sequence>
                    </xsd:complexType>
                </xsd:element>
                <xsd:element name="test-roots">
                    <xsd:complexType>
                        <xsd:sequence>
                            <xsd:element name="root" minOccurs="0" maxOccurs="unbounded">
                                <xsd:complexType>
                                    <xsd:attribute name="id" use="required" type="xsd:token"/>
                                    <xsd:attribute name="name" use="optional" type="xsd:token"/>
                                </xsd:complexType>
                            </xsd:element>
                        </xsd:sequence>
                    </xsd:complexType>
                </xsd:element>
                <xsd:element name="buildExtensions" minOccurs="0" type="buildExtensionsType"/>
            </xsd:sequence>
        </xsd:complexType>
    </xsd:element>
    
    <xsd:complexType name="webServiceClientsType">
        <xsd:sequence>
            <xsd:element name="web-service-client" type="webServiceClientType" minOccurs="0" maxOccurs="unbounded"/>
        </xsd:sequence>
    </xsd:complexType>
     
    <xsd:complexType name="webServiceClientType">
        <xsd:sequence>
            <xsd:element name="web-service-client-name" type="xsd:token"/>
            <xsd:element name="web-service-stub-type" type="xsd:token"/>
            <xsd:element name="client-source-url" type="xsd:anyURI" minOccurs="0"/>
        </xsd:sequence>
    </xsd:complexType>
    
    <!-- how to define in one place only and have it referenced everywhere?? -->
    <xsd:complexType name="buildExtensionsType">
        <xsd:sequence>
            <xsd:element name="extension" minOccurs="0" maxOccurs="unbounded">
                <xsd:complexType>
                    <xsd:sequence>
                        <xsd:element name="dependency" minOccurs="0" maxOccurs="unbounded">
                            <xsd:complexType>
                                <xsd:attribute name="target" use="required" type="xsd:token"/>
                                <xsd:attribute name="dependsOn" use="required" type="xsd:token"/>
                            </xsd:complexType>
                        </xsd:element>
                    </xsd:sequence>
                    <xsd:attribute name="id" use="required" type="xsd:token"/>
                    <xsd:attribute name="file" use="required" type="xsd:token"/>
                </xsd:complexType>
            </xsd:element>
        </xsd:sequence>
    </xsd:complexType>
</xsd:schema>

Lines 32-38 Link Here

(-)java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerProviderImpl.java (-1 / +1 lines)
32	import org.netbeans.api.project.ProjectUtils;	32	import org.netbeans.api.project.ProjectUtils;
33	import org.netbeans.modules.java.j2seproject.J2SEProject;	33	import org.netbeans.modules.java.j2seproject.J2SEProject;
34	import org.netbeans.modules.java.j2seproject.UpdateHelper;	34	import org.netbeans.modules.java.j2seproject.UpdateHelper;
35	import org.netbeans.modules.websvc.api.jaxws.project.GeneratedFilesHelper;	35	import org.netbeans.spi.project.support.ant.GeneratedFilesHelper;
36	import org.netbeans.spi.project.support.ant.PropertyEvaluator;	36	import org.netbeans.spi.project.support.ant.PropertyEvaluator;
37	import org.netbeans.spi.project.support.ant.ReferenceHelper;	37	import org.netbeans.spi.project.support.ant.ReferenceHelper;
38	import org.netbeans.spi.project.ui.CustomizerProvider;	38	import org.netbeans.spi.project.ui.CustomizerProvider;




import org.netbeans.modules.java.j2seproject.SourceRoots;
import org.netbeans.modules.java.j2seproject.UpdateHelper;
import org.netbeans.modules.java.j2seproject.classpath.ClassPathSupport;
import org.netbeans.modules.websvc.api.jaxws.project.GeneratedFilesHelper;
import org.netbeans.spi.java.project.support.ui.IncludeExcludeVisualizer;
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.netbeans.spi.project.support.ant.PropertyEvaluator;
import org.netbeans.spi.project.support.ant.ReferenceHelper;
import org.netbeans.spi.project.support.ant.ui.StoreGroup;

                final FileObject projectDir = updateHelper.getAntProjectHelper().getProjectDirectory();
                public Boolean run() throws IOException {
                    if ((genFileHelper.getBuildScriptState(GeneratedFilesHelper.BUILD_IMPL_XML_PATH,
                        J2SEProject.class.getResource("resources/build-impl.xsl")//, //NOI18N
                        /**findJaxWsFileObject(projectDir) **/)
                        & GeneratedFilesHelper.FLAG_MODIFIED) == GeneratedFilesHelper.FLAG_MODIFIED) {  //NOI18N
                        if (showModifiedMessage (NbBundle.getMessage(J2SEProjectProperties.class,"TXT_ModifiedTitle"))) {
                            //Delete user modified build-impl.xml

        }
    }
    
//    private FileObject findJaxWsFileObject(FileObject projectDir) {
//        return projectDir.getFileObject(GeneratedFilesHelper.JAX_WS_XML_PATH);
//    }
    
    void loadIncludesExcludes(IncludeExcludeVisualizer v) {
        Set<File> roots = new HashSet<File>();

Return to bug 93509

Lines 19-30 Link Here

(-)java/j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java (-10 / +58 lines)
19		19
20	package org.netbeans.modules.java.j2seproject;	20	package org.netbeans.modules.java.j2seproject;
21		21
		22	import org.netbeans.spi.project.ant.AntBuildExtenderImplementation;
22	import java.beans.PropertyChangeEvent;	23	import java.beans.PropertyChangeEvent;
23	import java.beans.PropertyChangeListener;	24	import java.beans.PropertyChangeListener;
24	import java.beans.PropertyChangeSupport;	25	import java.beans.PropertyChangeSupport;
25	import java.io.File;	26	import java.io.File;
26	import java.io.IOException;	27	import java.io.IOException;
		28	import java.util.Arrays;
27	import java.util.Collections;	29	import java.util.Collections;
		30	import java.util.List;
28	import java.util.logging.Level;	31	import java.util.logging.Level;
29	import java.util.logging.Logger;	32	import java.util.logging.Logger;
30	import javax.swing.Icon;	33	import javax.swing.Icon;
Lines 36-41 Link Here
36	import org.netbeans.api.project.ProjectInformation;	39	import org.netbeans.api.project.ProjectInformation;
37	import org.netbeans.api.project.ProjectManager;	40	import org.netbeans.api.project.ProjectManager;
38	import org.netbeans.api.project.ant.AntArtifact;	41	import org.netbeans.api.project.ant.AntArtifact;
		42	import org.netbeans.api.project.ant.AntBuildExtender;
39	import org.netbeans.modules.java.j2seproject.api.J2SEPropertyEvaluator;	43	import org.netbeans.modules.java.j2seproject.api.J2SEPropertyEvaluator;
40	import org.netbeans.modules.java.j2seproject.classpath.ClassPathProviderImpl;	44	import org.netbeans.modules.java.j2seproject.classpath.ClassPathProviderImpl;
41	import org.netbeans.modules.java.j2seproject.classpath.J2SEProjectClassPathExtender;	45	import org.netbeans.modules.java.j2seproject.classpath.J2SEProjectClassPathExtender;
Lines 54-60 Link Here
54	import org.netbeans.modules.java.j2seproject.wsclient.J2SEProjectWebServicesSupportProvider;	58	import org.netbeans.modules.java.j2seproject.wsclient.J2SEProjectWebServicesSupportProvider;
55	import org.netbeans.modules.websvc.api.client.WebServicesClientSupport;	59	import org.netbeans.modules.websvc.api.client.WebServicesClientSupport;
56	import org.netbeans.modules.websvc.api.jaxws.client.JAXWSClientSupport;	60	import org.netbeans.modules.websvc.api.jaxws.client.JAXWSClientSupport;
57	import org.netbeans.modules.websvc.api.jaxws.project.GeneratedFilesHelper;
58	import org.netbeans.modules.websvc.api.jaxws.project.WSUtils;	61	import org.netbeans.modules.websvc.api.jaxws.project.WSUtils;
59	import org.netbeans.modules.websvc.api.jaxws.project.config.JaxWsModel;	62	import org.netbeans.modules.websvc.api.jaxws.project.config.JaxWsModel;
60	import org.netbeans.modules.websvc.api.jaxws.project.config.JaxWsModelProvider;	63	import org.netbeans.modules.websvc.api.jaxws.project.config.JaxWsModelProvider;
Lines 65-75 Link Here
65	import org.netbeans.spi.project.SubprojectProvider;	68	import org.netbeans.spi.project.SubprojectProvider;
66	import org.netbeans.spi.project.ant.AntArtifactProvider;	69	import org.netbeans.spi.project.ant.AntArtifactProvider;
67	import org.netbeans.spi.project.support.LookupProviderSupport;	70	import org.netbeans.spi.project.support.LookupProviderSupport;
		71	import org.netbeans.spi.project.ant.AntBuildExtenderImplementation;
		72	import org.netbeans.spi.project.support.ant.AntBuildExtenderSupport;
68	import org.netbeans.spi.project.support.ant.AntProjectEvent;	73	import org.netbeans.spi.project.support.ant.AntProjectEvent;
69	import org.netbeans.spi.project.support.ant.AntProjectHelper;	74	import org.netbeans.spi.project.support.ant.AntProjectHelper;
70	import org.netbeans.spi.project.support.ant.AntProjectListener;	75	import org.netbeans.spi.project.support.ant.AntProjectListener;
71	import org.netbeans.spi.project.support.ant.EditableProperties;	76	import org.netbeans.spi.project.support.ant.EditableProperties;
72	import org.netbeans.spi.project.support.ant.FilterPropertyProvider;	77	import org.netbeans.spi.project.support.ant.FilterPropertyProvider;
		78	import org.netbeans.spi.project.support.ant.GeneratedFilesHelper;
73	import org.netbeans.spi.project.support.ant.ProjectXmlSavedHook;	79	import org.netbeans.spi.project.support.ant.ProjectXmlSavedHook;
74	import org.netbeans.spi.project.support.ant.PropertyEvaluator;	80	import org.netbeans.spi.project.support.ant.PropertyEvaluator;
75	import org.netbeans.spi.project.support.ant.PropertyProvider;	81	import org.netbeans.spi.project.support.ant.PropertyProvider;
Lines 124-136 Link Here
124	private JaxWsModel jaxWsModel;	130	private JaxWsModel jaxWsModel;
125	private JaxWsListener jaxWsListener;	131	private JaxWsListener jaxWsListener;
126	private FileObject jaxWsFo;	132	private FileObject jaxWsFo;
		133	private AntBuildExtender buildExtender;
127		134
128	J2SEProject(AntProjectHelper helper) throws IOException {	135	J2SEProject(AntProjectHelper helper) throws IOException {
129	this.helper = helper;	136	this.helper = helper;
130	eval = createEvaluator();	137	eval = createEvaluator();
131	aux = helper.createAuxiliaryConfiguration();	138	aux = helper.createAuxiliaryConfiguration();
132	refHelper = new ReferenceHelper(helper, aux, eval);	139	refHelper = new ReferenceHelper(helper, aux, eval);
133	genFilesHelper = new GeneratedFilesHelper(helper);	140	buildExtender = AntBuildExtenderSupport.createAntExtender(new J2SEExtenderImplementation());
		141	genFilesHelper = new GeneratedFilesHelper(helper, buildExtender);
134	this.updateHelper = new UpdateHelper (this, this.helper, this.aux, this.genFilesHelper,	142	this.updateHelper = new UpdateHelper (this, this.helper, this.aux, this.genFilesHelper,
135	UpdateHelper.createDefaultNotifier());	143	UpdateHelper.createDefaultNotifier());
136	j2seProjectWebServicesClientSupport = new J2SEProjectWebServicesClientSupport(this, helper, refHelper);	144	j2seProjectWebServicesClientSupport = new J2SEProjectWebServicesClientSupport(this, helper, refHelper);
Lines 246-251 Link Here
246	new J2SEFileBuiltQuery (this.helper, evaluator(),getSourceRoots(),getTestSourceRoots()), //Does not use APH to get/put properties/cfgdata	254	new J2SEFileBuiltQuery (this.helper, evaluator(),getSourceRoots(),getTestSourceRoots()), //Does not use APH to get/put properties/cfgdata
247	new RecommendedTemplatesImpl (this.updateHelper),	255	new RecommendedTemplatesImpl (this.updateHelper),
248	new J2SEProjectClassPathExtender(cpMod),	256	new J2SEProjectClassPathExtender(cpMod),
		257	buildExtender,
249	cpMod,	258	cpMod,
250	this, // never cast an externally obtained Project to J2SEProject - use lookup instead	259	this, // never cast an externally obtained Project to J2SEProject - use lookup instead
251	new J2SEProjectOperations(this),	260	new J2SEProjectOperations(this),
Lines 278-284 Link Here
278	}	287	}
279		288
280	// Package private methods -------------------------------------------------	289	// Package private methods -------------------------------------------------
281		290
		291
282	/**	292	/**
283	* Returns the source roots of this project	293	* Returns the source roots of this project
284	* @return project's source roots	294	* @return project's source roots
Lines 335-341 Link Here
335		345
336		346
337	// Private innerclasses ----------------------------------------------------	347	// Private innerclasses ----------------------------------------------------
338		348
339	private final class Info implements ProjectInformation {	349	private final class Info implements ProjectInformation {
340		350
341	private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);	351	private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
Lines 397-408 Link Here
397	genFilesHelper.refreshBuildScript(	407	genFilesHelper.refreshBuildScript(
398	GeneratedFilesHelper.BUILD_IMPL_XML_PATH,	408	GeneratedFilesHelper.BUILD_IMPL_XML_PATH,
399	J2SEProject.class.getResource("resources/build-impl.xsl"),	409	J2SEProject.class.getResource("resources/build-impl.xsl"),
400	jaxWsFo,	410	// jaxWsFo,
401	false);	411	false);
402	genFilesHelper.refreshBuildScript(	412	genFilesHelper.refreshBuildScript(
403	GeneratedFilesHelper.BUILD_XML_PATH,	413	GeneratedFilesHelper.BUILD_XML_PATH,
404	J2SEProject.class.getResource("resources/build.xsl"),	414	J2SEProject.class.getResource("resources/build.xsl"),
405	jaxWsFo,	415	// jaxWsFo,
406	false);	416	false);
407	}	417	}
408	}	418	}
Lines 421-432 Link Here
421	genFilesHelper.refreshBuildScript(	431	genFilesHelper.refreshBuildScript(
422	GeneratedFilesHelper.BUILD_IMPL_XML_PATH,	432	GeneratedFilesHelper.BUILD_IMPL_XML_PATH,
423	J2SEProject.class.getResource("resources/build-impl.xsl"),	433	J2SEProject.class.getResource("resources/build-impl.xsl"),
424	jaxWsFo,	434	// jaxWsFo,
425	true);	435	true);
426	genFilesHelper.refreshBuildScript(	436	genFilesHelper.refreshBuildScript(
427	GeneratedFilesHelper.BUILD_XML_PATH,	437	GeneratedFilesHelper.BUILD_XML_PATH,
428	J2SEProject.class.getResource("resources/build.xsl"),	438	J2SEProject.class.getResource("resources/build.xsl"),
429	jaxWsFo,	439	// jaxWsFo,
430	true);	440	true);
431	}	441	}
432	} catch (IOException e) {	442	} catch (IOException e) {
Lines 646-652 Link Here
646	}	656	}
647		657
648	public FileObject findJaxWsFileObject() {	658	public FileObject findJaxWsFileObject() {
649	return helper.getProjectDirectory().getFileObject(GeneratedFilesHelper.JAX_WS_XML_PATH);	659	return helper.getProjectDirectory().getFileObject(org.netbeans.modules.websvc.api.jaxws.project.GeneratedFilesHelper.JAX_WS_XML_PATH);
650	}	660	}
651		661
652	private JaxWsModel getJaxWsModel() {	662	private JaxWsModel getJaxWsModel() {
Lines 675-681 Link Here
675	genFilesHelper.refreshBuildScript(	685	genFilesHelper.refreshBuildScript(
676	GeneratedFilesHelper.BUILD_IMPL_XML_PATH,	686	GeneratedFilesHelper.BUILD_IMPL_XML_PATH,
677	J2SEProject.class.getResource("resources/build-impl.xsl"), // NOI18N	687	J2SEProject.class.getResource("resources/build-impl.xsl"), // NOI18N
678	jaxWsFo, false);	688	// jaxWsFo,
		689	false);
679	} catch (IOException ex) {}	690	} catch (IOException ex) {}
680	}	691	}
681		692
Lines 683-688 Link Here
683		694
684	} catch (IOException ex) {}	695	} catch (IOException ex) {}
685	}	696	}
		697	}
		698
		699	private class J2SEExtenderImplementation implements AntBuildExtenderImplementation {
		700
		701	public List<String> getExtendableTargets() {
		702	String[] targets = new String[] {
		703	"-do-init", "-init-check", "-post-clean", "jar"
		704	};
		705	return Arrays.asList(targets);
		706	}
		707
		708	public void updateBuildExtensionMetadata(Element element) {
		709	Element el = updateHelper.getPrimaryConfigurationData(true);
		710	Element correctDocOne = (Element) el.getOwnerDocument().importNode(element, true);
		711	NodeList nl = el.getElementsByTagName(AntBuildExtenderImplementation.ELEMENT_ROOT);
		712	if (nl.getLength() == 1) {
		713	Element old = (Element) nl.item(0);
		714	el.replaceChild(correctDocOne, old);
		715	} else {
		716	el.appendChild(correctDocOne);
		717	}
		718	updateHelper.putPrimaryConfigurationData(el, true);
		719	}
		720
		721	public Element getBuildExtensionMetadata() {
		722	Element el = updateHelper.getPrimaryConfigurationData(true);
		723	NodeList nl = el.getElementsByTagName(AntBuildExtenderImplementation.ELEMENT_ROOT);
		724	if (nl.getLength() == 1) {
		725	return (Element) nl.item(0).cloneNode(true);
		726	}
		727	return null;
		728	}
		729
		730	public Project getOwningProject() {
		731	return J2SEProject.this;
		732	}
		733
686	}	734	}
687		735
688	}	736	}

Added Link Here

(-)java/j2seproject/src/org/netbeans/modules/java/j2seproject/resources/j2se-project4.xsd (+110 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<!--
3	The contents of this file are subject to the terms of the Common Development
4	and Distribution License (the License). You may not use this file except in
5	compliance with the License.
6
7	You can obtain a copy of the License at http://www.netbeans.org/cddl.html
8	or http://www.netbeans.org/cddl.txt.
9
10	When distributing Covered Code, include this CDDL Header Notice in each file
11	and include the License file at http://www.netbeans.org/cddl.txt.
12	If applicable, add the following below the CDDL Header, with the fields
13	enclosed by brackets [] replaced by your own identifying information:
14	"Portions Copyrighted [year] [name of copyright owner]"
15
16	The Original Software is NetBeans. The Initial Developer of the Original
17	Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
18	Microsystems, Inc. All Rights Reserved.
19	-->
20	<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
21	targetNamespace="http://www.netbeans.org/ns/j2se-project/4"
22	xmlns="http://www.netbeans.org/ns/j2se-project/4"
23	elementFormDefault="qualified">
24	<xsd:element name="data">
25	<xsd:complexType>
26	<xsd:sequence>
27	<xsd:element name="name" type="xsd:token"/>
28	<xsd:element name="minimum-ant-version" minOccurs="0">
29	<xsd:simpleType>
30	<xsd:restriction base="xsd:NMTOKEN">
31	<xsd:pattern value="1\.[0-9]+(\.[0-9]+)?"/>
32	</xsd:restriction>
33	</xsd:simpleType>
34	</xsd:element>
35	<xsd:element name="explicit-platform" minOccurs="0">
36	<xsd:complexType>
37	<xsd:attribute name="explicit-source-supported" use="required">
38	<xsd:simpleType>
39	<xsd:restriction base="xsd:NMTOKEN">
40	<xsd:enumeration value="true"/>
41	<xsd:enumeration value="false"/>
42	</xsd:restriction>
43	</xsd:simpleType>
44	</xsd:attribute>
45	</xsd:complexType>
46	</xsd:element>
47	<xsd:element name="web-service-clients" minOccurs="0" type="webServiceClientsType"/>
48	<xsd:element name="source-roots">
49	<xsd:complexType>
50	<xsd:sequence>
51	<xsd:element name="root" minOccurs="0" maxOccurs="unbounded">
52	<xsd:complexType>
53	<xsd:attribute name="id" use="required" type="xsd:token"/>
54	<xsd:attribute name="name" use="optional" type="xsd:token"/>
55	</xsd:complexType>
56	</xsd:element>
57	</xsd:sequence>
58	</xsd:complexType>
59	</xsd:element>
60	<xsd:element name="test-roots">
61	<xsd:complexType>
62	<xsd:sequence>
63	<xsd:element name="root" minOccurs="0" maxOccurs="unbounded">
64	<xsd:complexType>
65	<xsd:attribute name="id" use="required" type="xsd:token"/>
66	<xsd:attribute name="name" use="optional" type="xsd:token"/>
67	</xsd:complexType>
68	</xsd:element>
69	</xsd:sequence>
70	</xsd:complexType>
71	</xsd:element>
72	<xsd:element name="buildExtensions" minOccurs="0" type="buildExtensionsType"/>
73	</xsd:sequence>
74	</xsd:complexType>
75	</xsd:element>
76
77	<xsd:complexType name="webServiceClientsType">
78	<xsd:sequence>
79	<xsd:element name="web-service-client" type="webServiceClientType" minOccurs="0" maxOccurs="unbounded"/>
80	</xsd:sequence>
81	</xsd:complexType>
82
83	<xsd:complexType name="webServiceClientType">
84	<xsd:sequence>
85	<xsd:element name="web-service-client-name" type="xsd:token"/>
86	<xsd:element name="web-service-stub-type" type="xsd:token"/>
87	<xsd:element name="client-source-url" type="xsd:anyURI" minOccurs="0"/>
88	</xsd:sequence>
89	</xsd:complexType>
90
91	<!-- how to define in one place only and have it referenced everywhere?? -->
92	<xsd:complexType name="buildExtensionsType">
93	<xsd:sequence>
94	<xsd:element name="extension" minOccurs="0" maxOccurs="unbounded">
95	<xsd:complexType>
96	<xsd:sequence>
97	<xsd:element name="dependency" minOccurs="0" maxOccurs="unbounded">
98	<xsd:complexType>
99	<xsd:attribute name="target" use="required" type="xsd:token"/>
100	<xsd:attribute name="dependsOn" use="required" type="xsd:token"/>
101	</xsd:complexType>
102	</xsd:element>
103	</xsd:sequence>
104	<xsd:attribute name="id" use="required" type="xsd:token"/>
105	<xsd:attribute name="file" use="required" type="xsd:token"/>
106	</xsd:complexType>
107	</xsd:element>
108	</xsd:sequence>
109	</xsd:complexType>
110	</xsd:schema>