Attachment #76480 for bug #153655

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

Lines 61-67 Link Here

(-)a/ant.freeform/nbproject/project.xml (-1 / +1 lines)
61	<compile-dependency/>	61	<compile-dependency/>
62	<run-dependency>	62	<run-dependency>
63	<release-version>1</release-version>	63	<release-version>1</release-version>
64	<specification-version>1.15</specification-version>	64	<specification-version>1.30</specification-version>
65	</run-dependency>	65	</run-dependency>
66	</dependency>	66	</dependency>
67	<dependency>	67	<dependency>




import org.netbeans.modules.ant.freeform.ui.View;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.support.LookupProviderSupport;
import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.support.ant.PropertyEvaluator;
import org.netbeans.spi.project.support.ant.PropertyUtils;

import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.Mutex;
import org.openide.util.Utilities;
import org.openide.util.lookup.Lookups;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;

 * One freeform project.
 * @author Jesse Glick
 */
@AntBasedProjectRegistration(
    type=FreeformProjectType.TYPE,
    iconResource="org/netbeans/modules/ant/freeform/resources/freeform-project.png",
    sharedName=FreeformProjectType.NAME_SHARED,
    privateName=FreeformProjectType.NAME_SHARED,
    sharedNamespace=FreeformProjectType.NS_GENERAL_1,
    privateNamespace=FreeformProjectType.NS_GENERAL_PRIVATE
)
public final class FreeformProject implements Project {
    
    public static final Lookup.Result<ProjectNature> PROJECT_NATURES = Lookup.getDefault().lookupResult(ProjectNature.class);

        return eval;
    }

    @Override
    public String toString() {
        return "FreeformProject[" + getProjectDirectory() + "]"; // NOI18N
    }





package org.netbeans.modules.ant.freeform;

import java.io.IOException;
import org.netbeans.api.project.Project;
import org.netbeans.spi.project.support.ant.AntBasedProjectType;
import org.netbeans.spi.project.support.ant.AntProjectHelper;

/**
 * Freeform project type.
 * @author Jesse Glick
 */
public final class FreeformProjectType {
public final class FreeformProjectType implements AntBasedProjectType {

    public static final String TYPE = "org.netbeans.modules.ant.freeform";
    public static final String NS_GENERAL_1 = "http://www.netbeans.org/ns/freeform-project/1"; // NOI18N
    public static final String NS_GENERAL = org.netbeans.modules.ant.freeform.spi.support.Util.NAMESPACE;
    public static final String NAME_SHARED = "general-data"; // NOI18N
    static final String NS_GENERAL_PRIVATE = "http://www.netbeans.org/ns/freeform-project-private/1"; // NOI18N
    
    /** Default constructor for lookup. */
    public FreeformProjectType() {}
    
    public Project createProject(AntProjectHelper helper) throws IOException {
        return new FreeformProject(helper);
    }
    
    public String getPrimaryConfigurationDataElementName(boolean shared) {
        return NAME_SHARED;
    }
    
    public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
        // No private.xml defined anyway.
        return shared ? /* old! for FreeformProjectGenerator */ NS_GENERAL_1 : NS_GENERAL_PRIVATE;
    }
    
    public String getType() {
        return TYPE; // NOI18N
    }
    
}

Lines 196-202 Link Here

(-)a/apisupport.project/nbproject/project.xml (-1 / +1 lines)
196	<compile-dependency/>	196	<compile-dependency/>
197	<run-dependency>	197	<run-dependency>
198	<release-version>1</release-version>	198	<release-version>1</release-version>
199	<specification-version>1.28</specification-version>	199	<specification-version>1.30</specification-version>
200	</run-dependency>	200	</run-dependency>
201	</dependency>	201	</dependency>
202	<dependency>	202	<dependency>

Lines 112-117 Link Here

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/NbModuleProject.java (-1 / +10 lines)
112	import org.netbeans.modules.apisupport.project.universe.LocalizedBundleInfo;	112	import org.netbeans.modules.apisupport.project.universe.LocalizedBundleInfo;
113	import org.netbeans.modules.apisupport.project.universe.ModuleEntry;	113	import org.netbeans.modules.apisupport.project.universe.ModuleEntry;
114	import org.netbeans.spi.project.support.LookupProviderSupport;	114	import org.netbeans.spi.project.support.LookupProviderSupport;
		115	import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;
115	import org.netbeans.spi.project.ui.RecommendedTemplates;	116	import org.netbeans.spi.project.ui.RecommendedTemplates;
116	import org.netbeans.spi.project.ui.support.UILookupMergerSupport;	117	import org.netbeans.spi.project.ui.support.UILookupMergerSupport;
117	import org.openide.modules.SpecificationVersion;	118	import org.openide.modules.SpecificationVersion;
Lines 121-126 Link Here
121	* A NetBeans module project.	122	* A NetBeans module project.
122	* @author Jesse Glick	123	* @author Jesse Glick
123	*/	124	*/
		125	@AntBasedProjectRegistration(
		126	type=NbModuleProjectType.TYPE,
		127	iconResource="org/netbeans/modules/apisupport/project/resources/module.png", // NOI18N
		128	sharedName=NbModuleProjectType.NAME_SHARED,
		129	sharedNamespace= NbModuleProjectType.NAMESPACE_SHARED,
		130	privateName=NbModuleProjectType.NAME_PRIVATE,
		131	privateNamespace= NbModuleProjectType.NAMESPACE_PRIVATE
		132	)
124	public final class NbModuleProject implements Project {	133	public final class NbModuleProject implements Project {
125		134
126	public static final String NB_PROJECT_ICON_PATH =	135	public static final String NB_PROJECT_ICON_PATH =
Lines 139-145 Link Here
139	private final GeneratedFilesHelper genFilesHelper;	148	private final GeneratedFilesHelper genFilesHelper;
140	private final NbModuleProviderImpl typeProvider;	149	private final NbModuleProviderImpl typeProvider;
141		150
142	NbModuleProject(AntProjectHelper helper) throws IOException {	151	public NbModuleProject(AntProjectHelper helper) throws IOException {
143	AuxiliaryConfiguration aux = helper.createAuxiliaryConfiguration();	152	AuxiliaryConfiguration aux = helper.createAuxiliaryConfiguration();
144	for (int v = 4; v < 10; v++) {	153	for (int v = 4; v < 10; v++) {
145	if (aux.getConfigurationFragment("data", "http://www.netbeans.org/ns/nb-module-project/" + v, true) != null) { // NOI18N	154	if (aux.getConfigurationFragment("data", "http://www.netbeans.org/ns/nb-module-project/" + v, true) != null) { // NOI18N





package org.netbeans.modules.apisupport.project;

import java.io.IOException;
import javax.swing.Icon;
import org.netbeans.api.project.Project;
import org.netbeans.spi.project.support.ant.AntBasedProjectType2;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.openide.util.ImageUtilities;

/**
 * Constants.
 * @author Jesse Glick
 */
public final class NbModuleProjectType {
public final class NbModuleProjectType implements AntBasedProjectType2 {

    static final String TYPE = "org.netbeans.modules.apisupport.project"; // NOI18N
    static final String NAME_SHARED = "data"; // NOI18N
    public static final String NAMESPACE_SHARED = "http://www.netbeans.org/ns/nb-module-project/3"; // NOI18N
    public static final String NAMESPACE_SHARED_2 = "http://www.netbeans.org/ns/nb-module-project/2"; // NOI18N
    static final String NAME_PRIVATE = "data"; // NOI18N
    static final String NAMESPACE_PRIVATE = "http://www.netbeans.org/ns/nb-module-project-private/1"; // NOI18N
    
    private NbModuleProjectType() {}
    public NbModuleProjectType() {}
    
    public String getType() {
        return TYPE;
    }
    
    public Project createProject(AntProjectHelper helper) throws IOException {
        return new NbModuleProject(helper);
    }
    
    public String getPrimaryConfigurationDataElementName(boolean shared) {
        return shared ? NAME_SHARED : NAME_PRIVATE;
    }
    
    public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
        return shared ? NAMESPACE_SHARED : NAMESPACE_PRIVATE;
    }

    public Icon getIcon() {
        return ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/apisupport/project/resources/module.png", true));
    }
    
}

Lines 67-72 Link Here

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/suite/SuiteProject.java (+9 lines)
67	import org.netbeans.modules.apisupport.project.ui.customizer.SuiteProperties;	67	import org.netbeans.modules.apisupport.project.ui.customizer.SuiteProperties;
68	import org.netbeans.modules.apisupport.project.universe.NbPlatform;	68	import org.netbeans.modules.apisupport.project.universe.NbPlatform;
69	import org.netbeans.spi.project.support.LookupProviderSupport;	69	import org.netbeans.spi.project.support.LookupProviderSupport;
		70	import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;
70	import org.netbeans.spi.project.support.ant.AntProjectEvent;	71	import org.netbeans.spi.project.support.ant.AntProjectEvent;
71	import org.netbeans.spi.project.support.ant.AntProjectHelper;	72	import org.netbeans.spi.project.support.ant.AntProjectHelper;
72	import org.netbeans.spi.project.support.ant.AntProjectListener;	73	import org.netbeans.spi.project.support.ant.AntProjectListener;
Lines 93-98 Link Here
93	* Represents one module suite project.	94	* Represents one module suite project.
94	* @author Jesse Glick	95	* @author Jesse Glick
95	*/	96	*/
		97	@AntBasedProjectRegistration(
		98	type=SuiteProjectType.TYPE,
		99	iconResource="org/netbeans/modules/apisupport/project/suite/resources/suite.png", // NOI18N
		100	sharedName=SuiteProjectType.NAME_SHARED,
		101	sharedNamespace= SuiteProjectType.NAMESPACE_SHARED,
		102	privateName=SuiteProjectType.NAME_PRIVATE,
		103	privateNamespace= SuiteProjectType.NAMESPACE_PRIVATE
		104	)
96	public final class SuiteProject implements Project {	105	public final class SuiteProject implements Project {
97		106
98	public static final String SUITE_ICON_PATH =	107	public static final String SUITE_ICON_PATH =





package org.netbeans.modules.apisupport.project.suite;

import java.io.IOException;
import javax.swing.Icon;
import org.netbeans.api.project.Project;
import org.netbeans.spi.project.support.ant.AntBasedProjectType2;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.openide.util.ImageUtilities;

/**
 * Factory for NetBeans module suite projects.
 * @author Jesse Glick
 */
public final class SuiteProjectType {
public final class SuiteProjectType implements AntBasedProjectType2 {

    public static final String TYPE = "org.netbeans.modules.apisupport.project.suite"; // NOI18N
    static final String NAME_SHARED = "data"; // NOI18N
    public static final String NAMESPACE_SHARED = "http://www.netbeans.org/ns/nb-module-suite-project/1"; // NOI18N
    static final String NAME_PRIVATE = "data"; // NOI18N
    static final String NAMESPACE_PRIVATE = "http://www.netbeans.org/ns/nb-module-suite-project-private/1"; // NOI18N
    
    /** Default constructor for lookup. */
    private SuiteProjectType() {}
    
    public String getType() {
        return TYPE;
    }
    
    public Project createProject(AntProjectHelper helper) throws IOException {
        return new SuiteProject(helper);
    }
    
    public String getPrimaryConfigurationDataElementName(boolean shared) {
        return shared ? NAME_SHARED : NAME_PRIVATE;
    }
    
    public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
        return shared ? NAMESPACE_SHARED : NAMESPACE_PRIVATE;
    }

    public Icon getIcon() {
        return ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/apisupport/project/suite/resources/suite.png", true));
    }
    
}

Lines 156-162 Link Here

(-)a/bpel.project/nbproject/project.xml (-1 / +1 lines)
156	<compile-dependency/>	156	<compile-dependency/>
157	<run-dependency>	157	<run-dependency>
158	<release-version>1</release-version>	158	<release-version>1</release-version>
159	<specification-version>1.12.1</specification-version>	159	<specification-version>1.30</specification-version>
160	</run-dependency>	160	</run-dependency>
161	</dependency>	161	</dependency>
162	<dependency>	162	<dependency>

Lines 87-92 Link Here

(-)a/bpel.project/src/org/netbeans/modules/bpel/project/BpelproProject.java (+7 lines)
87	import org.netbeans.modules.xml.retriever.catalog.CatalogWriteModel;	87	import org.netbeans.modules.xml.retriever.catalog.CatalogWriteModel;
88	import org.netbeans.modules.xml.retriever.catalog.CatalogWriteModelFactory;	88	import org.netbeans.modules.xml.retriever.catalog.CatalogWriteModelFactory;
89	import org.netbeans.modules.xml.xam.locator.CatalogModelException;	89	import org.netbeans.modules.xml.xam.locator.CatalogModelException;
		90	import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;
90	import org.netbeans.spi.project.support.ant.PropertyUtils;	91	import org.netbeans.spi.project.support.ant.PropertyUtils;
91	import org.w3c.dom.Element;	92	import org.w3c.dom.Element;
92	import org.w3c.dom.Node;	93	import org.w3c.dom.Node;
Lines 96-101 Link Here
96	/**	97	/**
97	* @author Chris Webster	98	* @author Chris Webster
98	*/	99	*/
		100	@AntBasedProjectRegistration(
		101	type=BpelproProjectType.TYPE,
		102	iconResource="org/netbeans/modules/bpel/project/resources/bpelProject.png",
		103	sharedNamespace=BpelproProjectType.PROJECT_CONFIGURATION_NAMESPACE,
		104	privateNamespace=BpelproProjectType.PRIVATE_CONFIGURATION_NAMESPACE
		105	)
99	public final class BpelproProject implements Project, AntProjectListener, ProjectPropertyProvider {	106	public final class BpelproProject implements Project, AntProjectListener, ProjectPropertyProvider {
100	private static final Icon PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/bpel/project/resources/bpelProject.png")); // NOI18N	107	private static final Icon PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/bpel/project/resources/bpelProject.png")); // NOI18N
101		108




 */
package org.netbeans.modules.bpel.project;

import java.io.IOException;
import org.netbeans.api.project.Project;
import org.netbeans.spi.project.support.ant.AntBasedProjectType;
import org.netbeans.spi.project.support.ant.AntProjectHelper;

/**
 * Factory for EJB Module projects
 * @author Chris Webster
 */
public class BpelproProjectType {
public class BpelproProjectType implements AntBasedProjectType {
    public static final String TYPE = "org.netbeans.modules.bpel.project";
    public static final String PROJECT_CONFIGURATION_NAME = "data";
    public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-bpelpro/1";
    public static final String PRIVATE_CONFIGURATION_NAME = "data";
    public static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-bpelpro-private/1";
    
    public BpelproProjectType() {
        int i = 0;
    }
    
    public String getType() {
        return TYPE;
    }
    
    public Project createProject(AntProjectHelper helper) throws IOException {
        if (null == helper)
            throw new IllegalArgumentException("helper");
        return new BpelproProject(helper);
    }

    public String getPrimaryConfigurationDataElementName(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
    }
    
    public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
    }
}

Lines 59-64 Link Here

(-)a/bpel.project/src/org/netbeans/modules/bpel/project/IcanproProject.java (+7 lines)
59	import org.openide.util.Utilities;	59	import org.openide.util.Utilities;
60	import org.openide.util.lookup.Lookups;	60	import org.openide.util.lookup.Lookups;
61	import org.netbeans.spi.project.AuxiliaryConfiguration;	61	import org.netbeans.spi.project.AuxiliaryConfiguration;
		62	import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;
62	import org.netbeans.spi.project.support.ant.EditableProperties;	63	import org.netbeans.spi.project.support.ant.EditableProperties;
63	import org.openide.DialogDescriptor;	64	import org.openide.DialogDescriptor;
64	import org.openide.DialogDisplayer;	65	import org.openide.DialogDisplayer;
Lines 72-77 Link Here
72	* Represents one ejb module project	73	* Represents one ejb module project
73	* @author Chris Webster	74	* @author Chris Webster
74	*/	75	*/
		76	@AntBasedProjectRegistration(
		77	type=IcanproProjectType.TYPE,
		78	iconResource="org/netbeans/modules/bpel/project/ui/resources/icanproProjectIcon.gif",
		79	sharedNamespace=IcanproProjectType.PROJECT_CONFIGURATION_NAMESPACE,
		80	privateNamespace=IcanproProjectType.PRIVATE_CONFIGURATION_NAMESPACE
		81	)
75	public final class IcanproProject implements Project, AntProjectListener {	82	public final class IcanproProject implements Project, AntProjectListener {
76		83
77	private static final Icon PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/bpel/project/ui/resources/icanproProjectIcon.gif")); // NOI18N	84	private static final Icon PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/bpel/project/ui/resources/icanproProjectIcon.gif")); // NOI18N





package org.netbeans.modules.bpel.project;

import java.io.IOException;
import org.netbeans.api.project.Project;
import org.netbeans.spi.project.support.ant.AntBasedProjectType;
import org.netbeans.spi.project.support.ant.AntProjectHelper;

/**
 * Factory for EJB Module projects
 * @author Chris Webster
 */
public class IcanproProjectType implements IcanproConstants {
    public static final String TYPE = " org.netbeans.modules.bpel.project";
    private static final String PROJECT_CONFIGURATION_NAME = "data";
    public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-icanpro/1";
    static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-icanpro-private/1";
    private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-icanpro-private/1";
    
    
    public IcanproProjectType() {
        int i = 0;
    }
    
    public String getType() {
        return TYPE;
    }
    
    public Project createProject(AntProjectHelper helper) throws IOException {
        if (null == helper)
            throw new IllegalArgumentException("helper");
        return new IcanproProject(helper);
    }

    public String getPrimaryConfigurationDataElementName(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
    }
    
    public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
    }
    
}

Lines 77-82 Link Here

(-)a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/MakeProject.java (-1 / +8 lines)
77	import org.netbeans.modules.cnd.utils.MIMENames;	77	import org.netbeans.modules.cnd.utils.MIMENames;
78	import org.netbeans.spi.project.AuxiliaryConfiguration;	78	import org.netbeans.spi.project.AuxiliaryConfiguration;
79	import org.netbeans.spi.project.SubprojectProvider;	79	import org.netbeans.spi.project.SubprojectProvider;
		80	import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;
80	import org.netbeans.spi.project.support.ant.AntProjectEvent;	81	import org.netbeans.spi.project.support.ant.AntProjectEvent;
81	import org.netbeans.spi.project.support.ant.AntProjectHelper;	82	import org.netbeans.spi.project.support.ant.AntProjectHelper;
82	import org.netbeans.spi.project.support.ant.AntProjectListener;	83	import org.netbeans.spi.project.support.ant.AntProjectListener;
Lines 108-113 Link Here
108	/**	109	/**
109	* Represents one plain Make project.	110	* Represents one plain Make project.
110	*/	111	*/
		112	@AntBasedProjectRegistration(
		113	iconResource=MakeConfigurationDescriptor.ICON,
		114	type=MakeProjectType.TYPE,
		115	sharedNamespace=MakeProjectType.PROJECT_CONFIGURATION_NAMESPACE,
		116	privateNamespace=MakeProjectType.PRIVATE_CONFIGURATION_NAMESPACE
		117	)
111	public final class MakeProject implements Project, AntProjectListener {	118	public final class MakeProject implements Project, AntProjectListener {
112		119
113	// private static final Icon MAKE_PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/cnd/makeproject/ui/resources/makeProject.gif")); // NOI18N	120	// private static final Icon MAKE_PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/cnd/makeproject/ui/resources/makeProject.gif")); // NOI18N
Lines 129-135 Link Here
129	private Set<String> cppExtensions = MakeProject.createExtensionSet();	136	private Set<String> cppExtensions = MakeProject.createExtensionSet();
130	private String sourceEncoding = null;	137	private String sourceEncoding = null;
131		138
132	MakeProject(AntProjectHelper helper) throws IOException {	139	public MakeProject(AntProjectHelper helper) throws IOException {
133	this.helper = helper;	140	this.helper = helper;
134	eval = createEvaluator();	141	eval = createEvaluator();
135	AuxiliaryConfiguration aux = helper.createAuxiliaryConfiguration();	142	AuxiliaryConfiguration aux = helper.createAuxiliaryConfiguration();





package org.netbeans.modules.cnd.makeproject;

import java.io.IOException;
import org.netbeans.api.project.Project;
import org.netbeans.spi.project.support.ant.AntBasedProjectType;
import org.netbeans.spi.project.support.ant.AntProjectHelper;

/**
 * Factory for simple Make projects.
 */
public final class MakeProjectType {
public final class MakeProjectType implements AntBasedProjectType {

    public static final String TYPE = "org.netbeans.modules.cnd.makeproject"; // NOI18N
    private static final String PROJECT_CONFIGURATION_NAME = "data"; // NOI18N
    public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/make-project/1"; // NOI18N
    static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/make-project-private/1"; // NOI18N
    private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/make-project-private/1"; // NOI18N
    public static final String MAKE_DEP_PROJECTS = "make-dep-projects"; // NOI18N
    public static final String MAKE_DEP_PROJECT = "make-dep-project"; // NOI18N
    public static final String SOURCE_ENCODING_TAG = "sourceEncoding"; // NOI18N
    
    /** Do nothing, just a service. */
    public MakeProjectType() {}
    
    public String getType() {
        return TYPE;
    }
    
    public Project createProject(AntProjectHelper helper) throws IOException {
        return new MakeProject(helper);
    }

    public String getPrimaryConfigurationDataElementName(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
    }
    
    public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
    }
    
}

Lines 101-107 Link Here

(-)a/compapp.projects.base/nbproject/project.xml (-1 / +1 lines)
101	<compile-dependency/>	101	<compile-dependency/>
102	<run-dependency>	102	<run-dependency>
103	<release-version>1</release-version>	103	<release-version>1</release-version>
104	<specification-version>1.12.1</specification-version>	104	<specification-version>1.30</specification-version>
105	</run-dependency>	105	</run-dependency>
106	</dependency>	106	</dependency>
107	<dependency>	107	<dependency>

Lines 62-67 Link Here

(-)a/compapp.projects.base/src/org/netbeans/modules/compapp/projects/base/IcanproProject.java (+7 lines)
62	import org.openide.util.Utilities;	62	import org.openide.util.Utilities;
63	import org.openide.util.lookup.Lookups;	63	import org.openide.util.lookup.Lookups;
64	import org.netbeans.spi.project.AuxiliaryConfiguration;	64	import org.netbeans.spi.project.AuxiliaryConfiguration;
		65	import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;
65	import org.netbeans.spi.project.support.ant.EditableProperties;	66	import org.netbeans.spi.project.support.ant.EditableProperties;
66	import org.w3c.dom.Element;	67	import org.w3c.dom.Element;
67	import org.w3c.dom.Node;	68	import org.w3c.dom.Node;
Lines 72-77 Link Here
72	* Represents one ejb module project	73	* Represents one ejb module project
73	* @author Chris Webster	74	* @author Chris Webster
74	*/	75	*/
		76	@AntBasedProjectRegistration(
		77	type=IcanproProjectType.TYPE,
		78	iconResource="org/netbeans/modules/compapp/projects/base/ui/resources/icanproProjectIcon.gif",
		79	sharedNamespace=IcanproProjectType.PROJECT_CONFIGURATION_NAMESPACE,
		80	privateNamespace=IcanproProjectType.PRIVATE_CONFIGURATION_NAMESPACE
		81	)
75	public final class IcanproProject implements Project, AntProjectListener {	82	public final class IcanproProject implements Project, AntProjectListener {
76		83
77	private static final Icon PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/compapp/projects/base/ui/resources/icanproProjectIcon.gif")); // NOI18N	84	private static final Icon PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/compapp/projects/base/ui/resources/icanproProjectIcon.gif")); // NOI18N





package org.netbeans.modules.compapp.projects.base;

import java.io.IOException;
import org.netbeans.api.project.Project;
import org.netbeans.spi.project.support.ant.AntBasedProjectType;
import org.netbeans.spi.project.support.ant.AntProjectHelper;

/**
 * Factory for EJB Module projects
 * @author Chris Webster
 */
public class IcanproProjectType implements IcanproConstants {
public class IcanproProjectType implements AntBasedProjectType, IcanproConstants {
    public static final String TYPE = "org.netbeans.modules.compapp.projects.base";
    private static final String PROJECT_CONFIGURATION_NAME = "data";
    public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-icanpro/1";
    static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-icanpro-private/1";
    private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-icanpro-private/1";
    
    
    public IcanproProjectType() {
        int i = 0;
    }
    
    public String getType() {
        return TYPE;
    }
    
    public Project createProject(AntProjectHelper helper) throws IOException {
        if (null == helper)
            throw new IllegalArgumentException("helper");
        return new IcanproProject(helper);
    }

    public String getPrimaryConfigurationDataElementName(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
    }
    
    public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
    }
    
}

Lines 201-207 Link Here

(-)a/compapp.projects.jbi/nbproject/project.xml (-1 / +1 lines)
201	<compile-dependency/>	201	<compile-dependency/>
202	<run-dependency>	202	<run-dependency>
203	<release-version>1</release-version>	203	<release-version>1</release-version>
204	<specification-version>1.11.1</specification-version>	204	<specification-version>1.30</specification-version>
205	</run-dependency>	205	</run-dependency>
206	</dependency>	206	</dependency>
207	<dependency>	207	<dependency>

Lines 103-108 Link Here

(-)a/compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/JbiProject.java (-12 / +7 lines)
103	*	103	*
104	* @author Chris Webster	104	* @author Chris Webster
105	*/	105	*/
		106	@AntBasedProjectRegistration(
		107	type=JbiProjectType.TYPE,
		108	iconResource="org/netbeans/modules/compapp/projects/jbi/ui/resources/composite_application_project.png",
		109	sharedNamespace=JbiProjectType.PROJECT_CONFIGURATION_NAMESPACE,
		110	privateNamespace=JbiProjectType.PRIVATE_CONFIGURATION_NAMESPACE
		111	)
106	public final class JbiProject implements Project, AntProjectListener, ProjectPropertyProvider {	112	public final class JbiProject implements Project, AntProjectListener, ProjectPropertyProvider {
107	private static final Icon PROJECT_ICON = new ImageIcon(	113	private static final Icon PROJECT_ICON = new ImageIcon(
108	ImageUtilities.loadImage(	114	ImageUtilities.loadImage(
Lines 163-169 Link Here
163	private final ReferenceHelper refHelper;	169	private final ReferenceHelper refHelper;
164	private final GeneratedFilesHelper genFilesHelper;	170	private final GeneratedFilesHelper genFilesHelper;
165	private final Lookup lookup;	171	private final Lookup lookup;
166	private AntBasedProjectType abpt;
167	private JbiLogicalViewProvider lvp;	172	private JbiLogicalViewProvider lvp;
168	private FileChangeListener casaFileListener;	173	private FileChangeListener casaFileListener;
169		174
Lines 178-187 Link Here
178	*	183	*
179	* @throws IOException DOCUMENT ME!	184	* @throws IOException DOCUMENT ME!
180	*/	185	*/
181	public JbiProject(final AntProjectHelper helper, AntBasedProjectType abpt)	186	public JbiProject(final AntProjectHelper helper)
182	throws IOException {	187	throws IOException {
183	this.helper = helper;	188	this.helper = helper;
184	this.abpt = abpt;
185	eval = createEvaluator();	189	eval = createEvaluator();
186		190
187	AuxiliaryConfiguration aux = helper.createAuxiliaryConfiguration();	191	AuxiliaryConfiguration aux = helper.createAuxiliaryConfiguration();
Lines 196-210 Link Here
196	// CasaHelper.registerCasaFileListener(JbiProject.this);	200	// CasaHelper.registerCasaFileListener(JbiProject.this);
197	// }	201	// }
198	// });	202	// });
199	}
200
201	/**
202	* DOCUMENT ME!
203	*
204	* @return DOCUMENT ME!
205	*/
206	public AntBasedProjectType getAntBasedProjectType() {
207	return abpt;
208	}	203	}
209		204
210	/**	205	/**





package org.netbeans.modules.compapp.projects.jbi;

import org.netbeans.api.project.Project;

import org.netbeans.spi.project.support.ant.AntBasedProjectType;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.modules.compapp.projects.jbi.JbiProject;
import org.openide.util.NbBundle;

import java.io.IOException;


/**
 * Factory for EJB Module projects
 *
 * @author Chris Webster
 */
public final class JbiProjectType {
public final class JbiProjectType implements AntBasedProjectType {
    /**
     * DOCUMENT ME!
     */
    public static final String TYPE = "org.netbeans.modules.compapp.projects.jbi"; // NOI18N
    private static final String PROJECT_CONFIGURATION_NAME = "data"; // NOI18N

    /**
     * DOCUMENT ME!
     */
    public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-jbi/1"; // NOI18N
    static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-jbi-private/1"; // NOI18N
    private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-jbi-private/1"; // NOI18N

    /**
     * Creates a new JbiProjectType object.
     */
    public JbiProjectType() {
        int i = 0;
    }

    /**
     * DOCUMENT ME!
     *
     * @return DOCUMENT ME!
     */
    public String getType() {
        return TYPE;
    }

    /**
     * DOCUMENT ME!
     *
     * @param helper DOCUMENT ME!
     *
     * @return DOCUMENT ME!
     *
     * @throws IOException DOCUMENT ME!
     * @throws IllegalArgumentException DOCUMENT ME!
     */
    public Project createProject(AntProjectHelper helper)
        throws IOException {
        if (null == helper) {
            throw new IllegalArgumentException(NbBundle.getMessage(JbiProjectType.class, "MSG_helper")); // NOI18N
        }

        return new JbiProject(helper, this);
    }

    /**
     * DOCUMENT ME!
     *
     * @param shared DOCUMENT ME!
     *
     * @return DOCUMENT ME!
     */
    public String getPrimaryConfigurationDataElementName(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
    }

    /**
     * DOCUMENT ME!
     *
     * @param shared DOCUMENT ME!
     *
     * @return DOCUMENT ME!
     */
    public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
    }
}

Lines 169-175 Link Here

(-)a/j2ee.archive/nbproject/project.xml (-1 / +1 lines)
169	<compile-dependency/>	169	<compile-dependency/>
170	<run-dependency>	170	<run-dependency>
171	<release-version>1</release-version>	171	<release-version>1</release-version>
172	<specification-version>1.12.1</specification-version>	172	<specification-version>1.30</specification-version>
173	</run-dependency>	173	</run-dependency>
174	</dependency>	174	</dependency>
175	<dependency>	175	<dependency>

Lines 77-82 Link Here

(-)a/j2ee.archive/src/org/netbeans/modules/j2ee/archive/project/ArchiveProject.java (+7 lines)
77	import org.netbeans.spi.project.AuxiliaryConfiguration;	77	import org.netbeans.spi.project.AuxiliaryConfiguration;
78	import org.netbeans.spi.project.ant.AntArtifactProvider;	78	import org.netbeans.spi.project.ant.AntArtifactProvider;
79	import org.netbeans.spi.project.support.LookupProviderSupport;	79	import org.netbeans.spi.project.support.LookupProviderSupport;
		80	import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;
80	import org.netbeans.spi.project.support.ant.AntProjectHelper;	81	import org.netbeans.spi.project.support.ant.AntProjectHelper;
81	import org.netbeans.spi.project.support.ant.GeneratedFilesHelper;	82	import org.netbeans.spi.project.support.ant.GeneratedFilesHelper;
82	import org.netbeans.spi.project.support.ant.PropertyEvaluator;	83	import org.netbeans.spi.project.support.ant.PropertyEvaluator;
Lines 102-107 Link Here
102	import org.w3c.dom.NodeList;	103	import org.w3c.dom.NodeList;
103	import org.w3c.dom.Text;	104	import org.w3c.dom.Text;
104		105
		106	@AntBasedProjectRegistration(
		107	iconResource="org/netbeans/modules/j2ee/archive/project/resources/packaged_archive_16.png",
		108	type=ArchiveProjectType.TYPE,
		109	sharedNamespace=ArchiveProjectType.PROJECT_CONFIGURATION_NS,
		110	privateNamespace=ArchiveProjectType.PRIVATE_CONFIGURATION_NS
		111	)
105	public class ArchiveProject implements org.netbeans.api.project.Project {	112	public class ArchiveProject implements org.netbeans.api.project.Project {
106		113
107	private final AuxiliaryConfiguration aux;	114	private final AuxiliaryConfiguration aux;





package org.netbeans.modules.j2ee.archive.project;

public class ArchiveProjectType {
import org.netbeans.api.project.Project;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.support.ant.AntBasedProjectType;

@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class)
public class ArchiveProjectType implements AntBasedProjectType {
    
    private static final String CONFIGURATION_NAME ="data";            //NOI18N
    public static final String PROJECT_CONFIGURATION_NS ="http://www.netbeans.org/ns/archive-project/1";                     //NOI18N
    static final String PRIVATE_CONFIGURATION_NS = "http://www.netbeans.org/ns/archive-project-private/1";             //NOI18N

    public static final String TYPE = "org.netbeans.modules.j2ee.archive.project";                        //NOI18N

    /** Creates a new instance of DeployableArchive */
    public ArchiveProjectType() {
    }

    public String getType() {
        return TYPE;
    }

    public Project createProject(AntProjectHelper helper) throws IOException {
        return new ArchiveProject(helper);
    }

    public String getPrimaryConfigurationDataElementName(boolean shared) {
        return CONFIGURATION_NAME;
    }
    
    public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NS : PRIVATE_CONFIGURATION_NS;
    }
}

Lines 236-242 Link Here

(-)a/j2ee.clientproject/nbproject/project.xml (-1 / +1 lines)
236	<compile-dependency/>	236	<compile-dependency/>
237	<run-dependency>	237	<run-dependency>
238	<release-version>1</release-version>	238	<release-version>1</release-version>
239	<specification-version>1.23</specification-version>	239	<specification-version>1.30</specification-version>
240	</run-dependency>	240	</run-dependency>
241	</dependency>	241	</dependency>
242	<dependency>	242	<dependency>

Lines 105-110 Link Here

(-)a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProject.java (-1 / +8 lines)
105	import org.netbeans.spi.project.ant.AntBuildExtenderFactory;	105	import org.netbeans.spi.project.ant.AntBuildExtenderFactory;
106	import org.netbeans.spi.project.ant.AntBuildExtenderImplementation;	106	import org.netbeans.spi.project.ant.AntBuildExtenderImplementation;
107	import org.netbeans.spi.project.support.LookupProviderSupport;	107	import org.netbeans.spi.project.support.LookupProviderSupport;
		108	import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;
108	import org.netbeans.spi.project.support.ant.AntProjectEvent;	109	import org.netbeans.spi.project.support.ant.AntProjectEvent;
109	import org.netbeans.spi.project.support.ant.AntProjectHelper;	110	import org.netbeans.spi.project.support.ant.AntProjectHelper;
110	import org.netbeans.spi.project.support.ant.AntProjectListener;	111	import org.netbeans.spi.project.support.ant.AntProjectListener;
Lines 147-152 Link Here
147	* Represents one plain Application Client project.	148	* Represents one plain Application Client project.
148	* @author Jesse Glick, et al.	149	* @author Jesse Glick, et al.
149	*/	150	*/
		151	@AntBasedProjectRegistration(
		152	iconResource="org/netbeans/modules/j2ee/clientproject/ui/resources/appclient.gif",
		153	type=AppClientProjectType.TYPE,
		154	sharedNamespace=AppClientProjectType.PROJECT_CONFIGURATION_NAMESPACE,
		155	privateNamespace=AppClientProjectType.PRIVATE_CONFIGURATION_NAMESPACE
		156	)
150	public final class AppClientProject implements Project, AntProjectListener, FileChangeListener {	157	public final class AppClientProject implements Project, AntProjectListener, FileChangeListener {
151		158
152	private static final Icon CAR_PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/j2ee/clientproject/ui/resources/appclient.gif")); // NOI18N	159	private static final Icon CAR_PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/j2ee/clientproject/ui/resources/appclient.gif")); // NOI18N
Lines 181-187 Link Here
181	// use AntBuildExtender to enable Ant Extensibility	188	// use AntBuildExtender to enable Ant Extensibility
182	private AntBuildExtender buildExtender;	189	private AntBuildExtender buildExtender;
183		190
184	AppClientProject(AntProjectHelper helper) throws IOException {	191	public AppClientProject(AntProjectHelper helper) throws IOException {
185	this.helper = helper;	192	this.helper = helper;
186	eval = createEvaluator();	193	eval = createEvaluator();
187	aux = helper.createAuxiliaryConfiguration();	194	aux = helper.createAuxiliaryConfiguration();





package org.netbeans.modules.j2ee.clientproject;

import java.io.IOException;
import org.netbeans.api.project.Project;
import org.netbeans.spi.project.support.ant.AntBasedProjectType;
import org.netbeans.spi.project.support.ant.AntProjectHelper;

/**
 * Factory for simple J2SE projects.
 * @author Jesse Glick
 */
public final class AppClientProjectType {
public final class AppClientProjectType implements AntBasedProjectType {
    
    public static final String TYPE = "org.netbeans.modules.j2ee.clientproject"; // NOI18N
    private static final String PROJECT_CONFIGURATION_NAME = "data"; // NOI18N
    public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/car-project/1"; // NOI18N
    private static final String PRIVATE_CONFIGURATION_NAME = "data"; // NOI18N
    static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/car-project-private/1"; // NOI18N
    
    /** Do nothing, just a service. */
    public AppClientProjectType() {}
    
    public String getType() {
        return TYPE;
    }
    
    public Project createProject(AntProjectHelper helper) throws IOException {
        return new AppClientProject(helper);
    }

    public String getPrimaryConfigurationDataElementName(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
    }
    
    public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
    }
    
}

Lines 210-216 Link Here

(-)a/j2ee.earproject/nbproject/project.xml (-1 / +1 lines)
210	<compile-dependency/>	210	<compile-dependency/>
211	<run-dependency>	211	<run-dependency>
212	<release-version>1</release-version>	212	<release-version>1</release-version>
213	<specification-version>1.23</specification-version>	213	<specification-version>1.30</specification-version>
214	</run-dependency>	214	</run-dependency>
215	</dependency>	215	</dependency>
216	<dependency>	216	<dependency>

Lines 87-93 Link Here

(-)a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProject.java (-6 / +10 lines)
87	import org.netbeans.spi.project.ant.AntBuildExtenderFactory;	87	import org.netbeans.spi.project.ant.AntBuildExtenderFactory;
88	import org.netbeans.spi.project.ant.AntBuildExtenderImplementation;	88	import org.netbeans.spi.project.ant.AntBuildExtenderImplementation;
89	import org.netbeans.spi.project.support.LookupProviderSupport;	89	import org.netbeans.spi.project.support.LookupProviderSupport;
90	import org.netbeans.spi.project.support.ant.AntBasedProjectType;	90	import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;
91	import org.netbeans.spi.project.support.ant.AntProjectEvent;	91	import org.netbeans.spi.project.support.ant.AntProjectEvent;
92	import org.netbeans.spi.project.support.ant.AntProjectHelper;	92	import org.netbeans.spi.project.support.ant.AntProjectHelper;
93	import org.netbeans.spi.project.support.ant.AntProjectListener;	93	import org.netbeans.spi.project.support.ant.AntProjectListener;
Lines 123-128 Link Here
123	*	123	*
124	* @author vince kraemer	124	* @author vince kraemer
125	*/	125	*/
		126	@AntBasedProjectRegistration(
		127	iconResource="org/netbeans/modules/j2ee/earproject/ui/resources/projectIcon.gif",
		128	type=EarProjectType.TYPE,
		129	sharedNamespace=EarProjectType.PROJECT_CONFIGURATION_NAMESPACE,
		130	privateNamespace=EarProjectType.PRIVATE_CONFIGURATION_NAMESPACE
		131	)
126	public final class EarProject implements Project, AntProjectListener {	132	public final class EarProject implements Project, AntProjectListener {
127		133
128	private static final Icon EAR_PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/j2ee/earproject/ui/resources/projectIcon.gif")); // NOI18N	134	private static final Icon EAR_PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/j2ee/earproject/ui/resources/projectIcon.gif")); // NOI18N
Lines 135-141 Link Here
135	private final Lookup lookup;	141	private final Lookup lookup;
136	private final ProjectEar appModule;	142	private final ProjectEar appModule;
137	private final Ear ear;	143	private final Ear ear;
138	private final AntBasedProjectType abpt;
139	private final UpdateHelper updateHelper;	144	private final UpdateHelper updateHelper;
140	private final UpdateProjectImpl updateProject;	145	private final UpdateProjectImpl updateProject;
141	private final ClassPathProviderImpl cpProvider;	146	private final ClassPathProviderImpl cpProvider;
Lines 144-152 Link Here
144	private AntBuildExtender buildExtender;	149	private AntBuildExtender buildExtender;
145	public ClassPathSupport cs;	150	public ClassPathSupport cs;
146		151
147	EarProject(final AntProjectHelper helper, AntBasedProjectType abpt) throws IOException {	152	public EarProject(final AntProjectHelper helper) throws IOException {
148	this.helper = helper;	153	this.helper = helper;
149	this.abpt = abpt;
150	eval = createEvaluator();	154	eval = createEvaluator();
151	AuxiliaryConfiguration aux = helper.createAuxiliaryConfiguration();	155	AuxiliaryConfiguration aux = helper.createAuxiliaryConfiguration();
152	refHelper = new ReferenceHelper(helper, aux, helper.getStandardPropertyEvaluator());	156	refHelper = new ReferenceHelper(helper, aux, helper.getStandardPropertyEvaluator());
Lines 222-230 Link Here
222	new ProjectEarProvider(),	226	new ProjectEarProvider(),
223	appModule, //implements J2eeModuleProvider	227	appModule, //implements J2eeModuleProvider
224	new EarActionProvider(this, updateHelper),	228	new EarActionProvider(this, updateHelper),
225	new J2eeArchiveLogicalViewProvider(this, updateHelper, evaluator(), refHelper, abpt),	229	new J2eeArchiveLogicalViewProvider(this, updateHelper, evaluator(), refHelper),
226	new MyIconBaseProvider(),	230	new MyIconBaseProvider(),
227	new CustomizerProviderImpl(this, helper, refHelper, abpt),	231	new CustomizerProviderImpl(this, helper, refHelper),
228	LookupMergerSupport.createClassPathProviderMerger(cpProvider),	232	LookupMergerSupport.createClassPathProviderMerger(cpProvider),
229	new ProjectXmlSavedHookImpl(),	233	new ProjectXmlSavedHookImpl(),
230	UILookupMergerSupport.createProjectOpenHookMerger(new ProjectOpenedHookImpl()),	234	UILookupMergerSupport.createProjectOpenHookMerger(new ProjectOpenedHookImpl()),





package org.netbeans.modules.j2ee.earproject;

import java.io.IOException;
import org.netbeans.api.project.Project;
import org.netbeans.spi.project.support.ant.AntBasedProjectType;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
/**
 * Factory for Enterprise Applications
 * @see WebProjectType
 * @author vince kraemer
 */
public final class EarProjectType {
public final class EarProjectType implements AntBasedProjectType {

    public static final String TYPE = "org.netbeans.modules.j2ee.earproject";
    private static final String PROJECT_CONFIGURATION_NAME = "data";
    public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-earproject/2";
    static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-earproject-private/1";
    private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-earproject-private/1";
    
    /** Do nothing, just a service. */
    public EarProjectType() {}
    
    public String getType() {
        return TYPE;
    }
    
    public Project createProject(AntProjectHelper helper) throws IOException {
        if (null == helper) {
            throw new IllegalArgumentException("helper");
        }
        return new EarProject(helper, this);
    }

    public String getPrimaryConfigurationDataElementName(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
    }
    
    public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
    }
    
}




import org.netbeans.spi.java.project.support.ui.BrokenReferencesSupport;
import org.netbeans.spi.java.project.support.ui.PackageView;
import org.netbeans.spi.project.ActionProvider;
import org.netbeans.spi.project.support.ant.AntBasedProjectType;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.support.ant.EditableProperties;
import org.netbeans.spi.project.support.ant.PropertyEvaluator;

    protected final ReferenceHelper resolver;
    private final List<? extends Action> specialActions =
            Collections.singletonList(SystemAction.get(AddModuleAction.class));
    private final AntBasedProjectType abpt;
    private final ChangeSupport changeSupport = new ChangeSupport(this);
    
    public J2eeArchiveLogicalViewProvider(EarProject project, UpdateHelper helper,
            PropertyEvaluator evaluator, ReferenceHelper resolver) {
            AntBasedProjectType abpt) {
        this.project = project;
        assert project != null;
        this.helper = helper;

        this.evaluator = evaluator;
        assert evaluator != null;
        this.resolver = resolver;
        this.abpt = abpt;
    }
    
    public Node createLogicalView() {




import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.modules.j2ee.earproject.EarProject;
import org.netbeans.spi.project.support.ant.AntBasedProjectType;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.support.ant.ReferenceHelper;
import org.netbeans.spi.project.ui.CustomizerProvider;

    private final EarProject project;
    private final AntProjectHelper antProjectHelper;   
    private final ReferenceHelper refHelper;
    private final AntBasedProjectType abpt;
    
    private static Map<Project, Dialog> project2Dialog = new HashMap<Project, Dialog>();
    
    public static final String CUSTOMIZER_FOLDER_PATH = "Projects/org-netbeans-modules-j2ee-earproject/Customizer"; //NO18N
     
    public CustomizerProviderImpl(EarProject project, AntProjectHelper antProjectHelper, ReferenceHelper refHelper) {
        this.project = project;
        this.antProjectHelper = antProjectHelper;
        this.refHelper = refHelper;
        this.abpt = abpt;
    }
    
    public void showCustomizer() {

Lines 280-286 Link Here

(-)a/j2ee.ejbjarproject/nbproject/project.xml (-1 / +1 lines)
280	<compile-dependency/>	280	<compile-dependency/>
281	<run-dependency>	281	<run-dependency>
282	<release-version>1</release-version>	282	<release-version>1</release-version>
283	<specification-version>1.23</specification-version>	283	<specification-version>1.30</specification-version>
284	</run-dependency>	284	</run-dependency>
285	</dependency>	285	</dependency>
286	<dependency>	286	<dependency>

Lines 159-164 Link Here

(-)a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProject.java (-1 / +8 lines)
159	import org.netbeans.spi.java.project.support.ExtraSourceJavadocSupport;	159	import org.netbeans.spi.java.project.support.ExtraSourceJavadocSupport;
160	import org.netbeans.spi.java.project.support.LookupMergerSupport;	160	import org.netbeans.spi.java.project.support.LookupMergerSupport;
161	import org.netbeans.spi.project.support.LookupProviderSupport;	161	import org.netbeans.spi.project.support.LookupProviderSupport;
		162	import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;
162	import org.netbeans.spi.project.support.ant.PropertyUtils;	163	import org.netbeans.spi.project.support.ant.PropertyUtils;
163	import org.netbeans.spi.project.ui.support.UILookupMergerSupport;	164	import org.netbeans.spi.project.ui.support.UILookupMergerSupport;
164	import org.netbeans.spi.queries.FileEncodingQueryImplementation;	165	import org.netbeans.spi.queries.FileEncodingQueryImplementation;
Lines 175-180 Link Here
175	* Represents one ejb module project	176	* Represents one ejb module project
176	* @author Chris Webster	177	* @author Chris Webster
177	*/	178	*/
		179	@AntBasedProjectRegistration(
		180	iconResource="org/netbeans/modules/j2ee/ejbjarproject/ui/resources/ejbjarProjectIcon.gif",
		181	type=EjbJarProjectType.TYPE,
		182	sharedNamespace=EjbJarProjectType.PROJECT_CONFIGURATION_NAMESPACE,
		183	privateNamespace=EjbJarProjectType.PRIVATE_CONFIGURATION_NAMESPACE
		184	)
178	public class EjbJarProject implements Project, AntProjectListener, FileChangeListener {	185	public class EjbJarProject implements Project, AntProjectListener, FileChangeListener {
179		186
180	private static final Icon PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/j2ee/ejbjarproject/ui/resources/ejbjarProjectIcon.gif")); // NOI18N	187	private static final Icon PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/j2ee/ejbjarproject/ui/resources/ejbjarProjectIcon.gif")); // NOI18N
Lines 268-274 Link Here
268	}	275	}
269	};*/	276	};*/
270		277
271	EjbJarProject(final AntProjectHelper helper) throws IOException {	278	public EjbJarProject(final AntProjectHelper helper) throws IOException {
272	this.helper = helper;	279	this.helper = helper;
273	eval = createEvaluator();	280	eval = createEvaluator();
274	aux = helper.createAuxiliaryConfiguration();	281	aux = helper.createAuxiliaryConfiguration();





package org.netbeans.modules.j2ee.ejbjarproject;

import java.io.IOException;
import org.netbeans.api.project.Project;
import org.netbeans.spi.project.support.ant.AntBasedProjectType;
import org.netbeans.spi.project.support.ant.AntProjectHelper;

/**
 * Factory for EJB Module projects
 * @author Chris Webster
 */
public final class EjbJarProjectType {
public final class EjbJarProjectType implements AntBasedProjectType {

    public static final String TYPE = "org.netbeans.modules.j2ee.ejbjarproject"; // NOI18N
    private static final String PROJECT_CONFIGURATION_NAME = "data"; // NOI18N
    public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-ejbjarproject/3"; // NOI18N
    static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-ejbjarproject-private/1"; // NOI18N
    private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-ejbjarproject-private/1"; // NOI18N
    
    public String getType() {
        return TYPE;
    }
    
    public Project createProject(AntProjectHelper helper) throws IOException {
        if (null == helper) {
            throw new IllegalArgumentException("helper"); // NOI18N
        }
        return new EjbJarProject(helper);
    }

    public String getPrimaryConfigurationDataElementName(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
    }
    
    public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
    }
    
}

Lines 98-103 Link Here

(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java (-1 / +10 lines)
98	import org.netbeans.spi.project.ant.AntBuildExtenderFactory;	98	import org.netbeans.spi.project.ant.AntBuildExtenderFactory;
99	import org.netbeans.spi.project.support.LookupProviderSupport;	99	import org.netbeans.spi.project.support.LookupProviderSupport;
100	import org.netbeans.spi.project.ant.AntBuildExtenderImplementation;	100	import org.netbeans.spi.project.ant.AntBuildExtenderImplementation;
		101	import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;
101	import org.netbeans.spi.project.support.ant.AntProjectEvent;	102	import org.netbeans.spi.project.support.ant.AntProjectEvent;
102	import org.netbeans.spi.project.support.ant.AntProjectHelper;	103	import org.netbeans.spi.project.support.ant.AntProjectHelper;
103	import org.netbeans.spi.project.support.ant.AntProjectListener;	104	import org.netbeans.spi.project.support.ant.AntProjectListener;
Lines 139-144 Link Here
139	* Represents one plain J2SE project.	140	* Represents one plain J2SE project.
140	* @author Jesse Glick, et al.	141	* @author Jesse Glick, et al.
141	*/	142	*/
		143	@AntBasedProjectRegistration(
		144	type=J2SEProjectType.TYPE,
		145	iconResource="org/netbeans/modules/java/j2seproject/ui/resources/j2seProject.png", // NOI18N
		146	sharedName=J2SEProjectType.PROJECT_CONFIGURATION_NAME,
		147	sharedNamespace= J2SEProjectType.PROJECT_CONFIGURATION_NAMESPACE,
		148	privateName=J2SEProjectType.PRIVATE_CONFIGURATION_NAME,
		149	privateNamespace= J2SEProjectType.PRIVATE_CONFIGURATION_NAMESPACE
		150	)
142	public final class J2SEProject implements Project, AntProjectListener {	151	public final class J2SEProject implements Project, AntProjectListener {
143		152
144	private static final Icon J2SE_PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/java/j2seproject/ui/resources/j2seProject.png")); // NOI18N	153	private static final Icon J2SE_PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/java/j2seproject/ui/resources/j2seProject.png")); // NOI18N
Lines 159-165 Link Here
159		168
160	private AntBuildExtender buildExtender;	169	private AntBuildExtender buildExtender;
161		170
162	J2SEProject(AntProjectHelper helper) throws IOException {	171	public J2SEProject(AntProjectHelper helper) throws IOException {
163	this.helper = helper;	172	this.helper = helper;
164	eval = createEvaluator();	173	eval = createEvaluator();
165	aux = helper.createAuxiliaryConfiguration();	174	aux = helper.createAuxiliaryConfiguration();





package org.netbeans.modules.java.j2seproject;

import java.io.IOException;
import javax.swing.Icon;
import org.netbeans.api.project.Project;
import org.netbeans.spi.project.support.ant.AntBasedProjectType2;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.openide.util.ImageUtilities;

/**
 * Constants.
 * @author Jesse Glick
 */
public final class J2SEProjectType {
public final class J2SEProjectType implements AntBasedProjectType2 {

    public static final String TYPE = "org.netbeans.modules.java.j2seproject"; // NOI18N
    static final String PROJECT_CONFIGURATION_NAME = "data"; // NOI18N
    public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2se-project/3"; // NOI18N
    static final String PRIVATE_CONFIGURATION_NAME = "data"; // NOI18N
    static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2se-project-private/1"; // NOI18N
    
    /** Do nothing, just a service. */
    public J2SEProjectType() {}
    
    public String getType() {
        return TYPE;
    }
    
    public Project createProject(AntProjectHelper helper) throws IOException {
        return new J2SEProject(helper);
    }

    public String getPrimaryConfigurationDataElementName(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
    }
    
    public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
    }

    public Icon getIcon() {
        return ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/java/j2seproject/ui/resources/j2seProject.png", true));
    }
    
}

Lines 163-169 Link Here

(-)a/mobility.project/nbproject/project.xml (-1 / +1 lines)
163	<compile-dependency/>	163	<compile-dependency/>
164	<run-dependency>	164	<run-dependency>
165	<release-version>1</release-version>	165	<release-version>1</release-version>
166	<specification-version>1.6.1</specification-version>	166	<specification-version>1.30</specification-version>
167	</run-dependency>	167	</run-dependency>
168	</dependency>	168	</dependency>
169	<dependency>	169	<dependency>

Lines 143-148 Link Here

(-)a/mobility.project/src/org/netbeans/modules/mobility/project/J2MEProject.java (-1 / +7 lines)
143	* Represents one plain J2ME project.	143	* Represents one plain J2ME project.
144	* @author Jesse Glick, Adam Sotona, Tim Boudreau	144	* @author Jesse Glick, Adam Sotona, Tim Boudreau
145	*/	145	*/
		146	@AntBasedProjectRegistration(
		147	type=J2MEProjectType.TYPE,
		148	iconResource="org/netbeans/modules/mobility/project/ui/resources/mobile-project.png",
		149	sharedNamespace=J2MEProjectType.PROJECT_CONFIGURATION_NAMESPACE,
		150	privateNamespace=J2MEProjectType.PRIVATE_CONFIGURATION_NAMESPACE
		151	)
146	public final class J2MEProject implements Project, AntProjectListener {	152	public final class J2MEProject implements Project, AntProjectListener {
147	final Icon J2ME_PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage(	153	final Icon J2ME_PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage(
148	"org/netbeans/modules/mobility/project/ui/resources/mobile-project.png" )); // NOI18N	154	"org/netbeans/modules/mobility/project/ui/resources/mobile-project.png" )); // NOI18N
Lines 396-402 Link Here
396	}	402	}
397		403
398		404
399	J2MEProject(AntProjectHelper helper) {	405	public J2MEProject(AntProjectHelper helper) {
400	rp = new RequestProcessor ("RP for " +	406	rp = new RequestProcessor ("RP for " +
401	helper.getProjectDirectory().getPath(), 2, true);	407	helper.getProjectDirectory().getPath(), 2, true);
402	this.helper = helper;	408	this.helper = helper;




 */

package org.netbeans.modules.mobility.project;
import org.netbeans.api.project.Project;
import org.netbeans.spi.project.support.ant.AntBasedProjectType;
import org.netbeans.spi.project.support.ant.AntProjectHelper;

/**
 * Factory for simple J2ME projects.
 * @author Jesse Glick, Adam Sotona
 */
public final class J2MEProjectType {
public final class J2MEProjectType implements AntBasedProjectType {
    
    public static final String TYPE = "org.netbeans.modules.kjava.j2meproject";  //NOI18N
    private static final String PROJECT_CONFIGURATION_NAME = "data";  //NOI18N
    public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2me-project";  //NOI18N
    static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2me-project-private";  //NOI18N
    private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2me-project-private";  //NOI18N
    
    public String getType() {
        return TYPE;
    }
    
    public Project createProject(final AntProjectHelper helper) {
        return new J2MEProject(helper);
    }
    
    public String getPrimaryConfigurationDataElementName(final boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
    }
    
    public String getPrimaryConfigurationDataElementNamespace(final boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
    }
    
}

Lines 141-147 Link Here

(-)a/php.project/nbproject/project.xml (-1 / +1 lines)
141	<compile-dependency/>	141	<compile-dependency/>
142	<run-dependency>	142	<run-dependency>
143	<release-version>1</release-version>	143	<release-version>1</release-version>
144	<specification-version>1.21</specification-version>	144	<specification-version>1.30</specification-version>
145	</run-dependency>	145	</run-dependency>
146	</dependency>	146	</dependency>
147	<dependency>	147	<dependency>

Lines 61-66 Link Here

(-)a/php.project/src/org/netbeans/modules/php/project/PhpProject.java (-1 / +8 lines)
61	import org.netbeans.modules.php.project.ui.customizer.CustomizerProviderImpl;	61	import org.netbeans.modules.php.project.ui.customizer.CustomizerProviderImpl;
62	import org.netbeans.modules.php.project.ui.customizer.PhpProjectProperties;	62	import org.netbeans.modules.php.project.ui.customizer.PhpProjectProperties;
63	import org.netbeans.spi.project.AuxiliaryConfiguration;	63	import org.netbeans.spi.project.AuxiliaryConfiguration;
		64	import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;
64	import org.netbeans.spi.project.support.ant.AntProjectHelper;	65	import org.netbeans.spi.project.support.ant.AntProjectHelper;
65	import org.netbeans.spi.project.support.ant.FilterPropertyProvider;	66	import org.netbeans.spi.project.support.ant.FilterPropertyProvider;
66	import org.netbeans.spi.project.support.ant.ProjectXmlSavedHook;	67	import org.netbeans.spi.project.support.ant.ProjectXmlSavedHook;
Lines 89-94 Link Here
89	/**	90	/**
90	* @author ads, Tomas Mysik	91	* @author ads, Tomas Mysik
91	*/	92	*/
		93	@AntBasedProjectRegistration(
		94	type=PhpProjectType.TYPE,
		95	iconResource="org/netbeans/modules/php/project/ui/resources/phpProject.png",
		96	sharedNamespace=PhpProjectType.PROJECT_CONFIGURATION_NAMESPACE,
		97	privateNamespace=PhpProjectType.PRIVATE_CONFIGURATION_NAMESPACE
		98	)
92	public class PhpProject implements Project {	99	public class PhpProject implements Project {
93		100
94	public static final String USG_LOGGER_NAME = "org.netbeans.ui.metrics.php"; //NOI18N	101	public static final String USG_LOGGER_NAME = "org.netbeans.ui.metrics.php"; //NOI18N
Lines 112-118 Link Here
112	// @GuardedBy(this)	119	// @GuardedBy(this)
113	private FileObject seleniumDirectory;	120	private FileObject seleniumDirectory;
114		121
115	PhpProject(AntProjectHelper helper) {	122	public PhpProject(AntProjectHelper helper) {
116	assert helper != null;	123	assert helper != null;
117		124
118	this.helper = helper;	125	this.helper = helper;




 */
package org.netbeans.modules.php.project;

import java.io.IOException;

import org.netbeans.api.project.Project;
import org.netbeans.spi.project.support.ant.AntBasedProjectType;
import org.netbeans.spi.project.support.ant.AntProjectHelper;


/**
 * @author ads
 */
public final class PhpProjectType {
public final class PhpProjectType implements AntBasedProjectType {

    public static final String TYPE = "org.netbeans.modules.php.project"; // NOI18N
    public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/php-project/1"; // NOI18N
    static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/php-project-private/1"; // NOI18N

    private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/php-project-private/1"; // NOI18N
    private static final String PRIVATE_CONFIGURATION_NAME = "data"; // NOI18N

    public Project createProject(AntProjectHelper helper) throws IOException {
        assert helper != null;
        return new PhpProject(helper);
    }

    public String getPrimaryConfigurationDataElementName( boolean shared ) {
        /*
         * Copied from MakeProjectType.
         */
        return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
    }

    public String getPrimaryConfigurationDataElementNamespace( boolean shared ) {
        /*
         * Copied from MakeProjectType.
         */
        return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
    }

    public String getType() {
        return TYPE;
    }
}





    <changes>
        
        <change id="antbasedprojectregistration">
            <api name="general"/>
            <summary>Register Ant based projects with @annotation</summary>
            <version major="1" minor="30"/>
            <date day="4" month="2" year="2009"/>
            <author login="jtulach"/>
            <compatibility addition="yes" binary="compatible" deletion="no" deprecation="no" modification="no" semantic="compatible" source="compatible"/>
            <description>
                <p>
                  Introducing <code>AntBasedProjectRegistration</code> to
                  simplify registering Ant based projects. Just write the
                  project class and annotate it.
                </p>
            </description>
            <class package="org.netbeans.spi.project.support.ant" name="AntBasedProjectRegistration"/>
            <issue number="153655"/>
        </change>
        
        <change id="SourcesHelper-minimalSubfolders">

Lines 1-6 Link Here

(-)a/project.ant/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.project.ant/1	2	OpenIDE-Module: org.netbeans.modules.project.ant/1
3	OpenIDE-Module-Specification-Version: 1.28	3	OpenIDE-Module-Specification-Version: 1.30
4	OpenIDE-Module-Layer: org/netbeans/modules/project/ant/resources/mf-layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/project/ant/resources/mf-layer.xml
5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/project/ant/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/project/ant/Bundle.properties
6	OpenIDE-Module-Install: org/netbeans/modules/project/ant/AntProjectModule.class	6	OpenIDE-Module-Install: org/netbeans/modules/project/ant/AntProjectModule.class

Lines 46-51 Link Here

(-)a/project.ant/nbproject/project.properties (+1 lines)
46		46
47	javac.compilerargs=-Xlint -Xlint:-serial	47	javac.compilerargs=-Xlint -Xlint:-serial
48	javac.source=1.5	48	javac.source=1.5
		49	cp.extra=${nb_all}/apisupport.harness/external/openjdk-javac-6-b12.jar
49	javadoc.arch=${basedir}/arch.xml	50	javadoc.arch=${basedir}/arch.xml
50	javadoc.apichanges=${basedir}/apichanges.xml	51	javadoc.apichanges=${basedir}/apichanges.xml
51		52




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 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]"
 *
 * 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.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2009 Sun Microsystems, Inc.
 */

package org.netbeans.modules.project.ant;

import java.io.IOException;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.util.Map;
import javax.swing.Icon;
import org.netbeans.api.project.Project;
import org.netbeans.spi.project.support.ant.AntBasedProjectType;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.Parameters;

/** Generic implementation of {@link AntBasedGenericType} that feeds itself
 * from an layer data.
 *
 * @author Jaroslav Tulach <jtulach@netbeans.org>
 */
final class AntBasedGenericType implements AntBasedProjectType {
    private final String iconResource;
    private final String type;
    private final String className;
    private final String methodName;
    private final String[] configNames;
    private final String[] configNamespaces;

    public AntBasedGenericType(Map map) {
        iconResource = (String)map.get("iconResource"); // NOI18N
        type = (String)map.get("type"); // NOI18N
        className = (String)map.get("className"); // NOI18N
        methodName = (String)map.get("methodName"); // NOI18N
        configNames = new String[] {
            (String)map.get("sharedName"), // NOI18N
            (String)map.get("privateName"), // NOI18N
        };
        configNamespaces = new String[] {
            (String)map.get("sharedNamespace"), // NOI18N
            (String)map.get("privateNamespace"), // NOI18N
        };
        Parameters.notNull("iconResource", iconResource); // NOI18N
        Parameters.notNull("type", type); // NOI18N
        Parameters.notNull("className", className); // NOI18N
        Parameters.notNull("sharedName", configNames[0]); // NOI18N
        Parameters.notNull("privateName", configNames[1]); // NOI18N
        Parameters.notNull("sharedNamespace", configNamespaces[0]); // NOI18N
        Parameters.notNull("privateNamespace", configNamespaces[1]); // NOI18N
    }

    public Icon getIcon() {
        return ImageUtilities.image2Icon(ImageUtilities.loadImage(iconResource, true));
    }

    public String getType() {
        return type;
    }

    public String getPrimaryConfigurationDataElementName(boolean shared) {
        return shared ? configNames[0] : configNames[1];
    }

    public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
        return shared ? configNamespaces[0] : configNamespaces[1];
    }


    public Project createProject(AntProjectHelper helper) throws IOException {
        ClassLoader l = Lookup.getDefault().lookup(ClassLoader.class);
        if (l == null) {
            l = Thread.currentThread().getContextClassLoader();
        }
        if (l == null) {
            l = AntBasedGenericType.class.getClassLoader();
        }
        try {
            Class<?> clazz = l.loadClass(className);
            if (methodName != null) {
                Method m = clazz.getDeclaredMethod(methodName, AntProjectHelper.class);
                return (Project)m.invoke(null, helper);
            } else {
                Constructor c = clazz.getConstructor(AntProjectHelper.class);
                return (Project) c.newInstance(helper);
            }
        } catch (RuntimeException ex) {
            throw ex;
        } catch (Exception ex) {
            throw (IllegalArgumentException)new IllegalArgumentException().initCause(ex);
        }
    }
}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2008 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]"
 *
 * 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.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2008 Sun Microsystems, Inc.
 */

package org.netbeans.modules.project.ant;

import java.util.Set;
import javax.annotation.processing.Processor;
import javax.annotation.processing.RoundEnvironment;
import javax.annotation.processing.SupportedAnnotationTypes;
import javax.annotation.processing.SupportedSourceVersion;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.TypeMirror;
import org.netbeans.api.project.Project;
import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;
import org.netbeans.spi.project.support.ant.AntBasedProjectType;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.openide.filesystems.annotations.LayerBuilder.File;
import org.openide.filesystems.annotations.LayerGeneratingProcessor;
import org.openide.filesystems.annotations.LayerGenerationException;
import org.openide.util.lookup.ServiceProvider;

/**
 * processor for {@link AntBasedProjectRegistration} annotation.
 * @author Jaroslav Tulach
 */
@ServiceProvider(service=Processor.class)
@SupportedSourceVersion(SourceVersion.RELEASE_6)
@SupportedAnnotationTypes("org.netbeans.spi.project.support.ant.AntBasedProjectRegistration")//NOI18N
public class AntBasedProcessor extends LayerGeneratingProcessor {

    @Override
    protected boolean handleProcess(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) throws LayerGenerationException {
        if (roundEnv.processingOver()) {
            return false;
        }
        TypeMirror antHelper = processingEnv.getElementUtils().getTypeElement(AntProjectHelper.class.getName()).asType();
        TypeMirror project = processingEnv.getElementUtils().getTypeElement(Project.class.getName()).asType();
        for (Element e : roundEnv.getElementsAnnotatedWith(AntBasedProjectRegistration.class)) {
            AntBasedProjectRegistration reg = e.getAnnotation(AntBasedProjectRegistration.class);
            String name;
            String classname;
            String methodname;
            switch (e.getKind()) {
                case CLASS:
                    classname = processingEnv.getElementUtils().getBinaryName((TypeElement)e).toString();
                    name = classname.replace('.', '-');
                    methodname = null;
                    if (!e.getModifiers().contains(Modifier.PUBLIC)) {
                        throw new LayerGenerationException("Class needs to be public"); // NOI18N
                    }
                    if (!processingEnv.getTypeUtils().isAssignable(e.asType(), project)) {
                        throw new LayerGenerationException("Class needs to extend Project"); // NOI18N
                    }
                    boolean found = false;
                    for (Element cns : processingEnv.getElementUtils().getAllMembers((TypeElement)e)) {
                        if (cns.getKind() != ElementKind.CONSTRUCTOR) {
                            continue;
                        }
                        ExecutableElement exec = (ExecutableElement)cns;
                        if (!exec.getModifiers().contains(Modifier.PUBLIC)) {
                            continue;
                        }
                        if (exec.getParameters().size() != 1) {
                            continue;
                        }
                        if (exec.getParameters().get(0).asType().equals(antHelper)) {
                            found = true;
                            break;
                        }
                    }
                    if (!found) {
                        throw new LayerGenerationException("There needs to be public constructor taking AntProjectHelper parameter"); // NOI18N
                    }

                    break;
                case METHOD:
                    classname = processingEnv.getElementUtils().getBinaryName((TypeElement)e.getEnclosingElement()).toString();
                    methodname = ((ExecutableElement) e).getSimpleName().toString();
                    name = (classname + "." + methodname).replace('.', '-');
                    
                    if (!e.getEnclosingElement().getModifiers().contains(Modifier.PUBLIC)) {
                        throw new LayerGenerationException("Class needs to be public"); // NOI18N
                    }

                    ExecutableElement exec = (ExecutableElement)e;
                    if (
                        !exec.getModifiers().contains(Modifier.PUBLIC) ||
                        !exec.getModifiers().contains(Modifier.STATIC) ||
                        exec.getParameters().size() != 1 ||
                        !exec.getParameters().get(0).asType().equals(antHelper)
                    ) {
                        throw new LayerGenerationException("The method needs to be public, static and take AntProjectHelper argument"); // NOI18N
                    }
                    if (!processingEnv.getTypeUtils().isAssignable(exec.getReturnType(), project)) {
                        throw new LayerGenerationException("Method needs to return Project"); // NOI18N
                    }

                    break;
                default:
                    throw new IllegalArgumentException(e.toString());
            }

            File f = layer(e).
                file("Services/AntBasedProjectTypes/" + reg.type().replace('.', '-') + ".instance").
                stringvalue("type", reg.type()).
                stringvalue("iconResource", reg.iconResource()).
                stringvalue("sharedName", reg.sharedName()).
                stringvalue("sharedNamespace", reg.sharedNamespace()).
                stringvalue("privateName", reg.privateName()).
                stringvalue("privateNamespace", reg.privateNamespace()).
                stringvalue("className", classname).
                stringvalue("instanceClass", AntBasedProjectType.class.getName()).
                methodvalue("instanceCreate", AntBasedProjectFactorySingleton.class.getName(), "create");

            if (methodname != null) {
                f = f.stringvalue("methodName", methodname);
            }
            f.write();
        }
        return true;
    }

}




import org.netbeans.spi.project.ProjectFactory2;
import org.netbeans.spi.project.ProjectState;
import org.netbeans.spi.project.support.ant.AntBasedProjectType;
import org.netbeans.spi.project.support.ant.AntBasedProjectType2;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;

                    if (type != null) {
                        AntBasedProjectType provider = findAntBasedProjectType(type);
                        if (provider != null) {
                            if (provider instanceof AntBasedGenericType) {
                                return new ProjectManager.Result(((AntBasedGenericType)provider).getIcon());
                            } else {
                                //put special icon?
                                return new ProjectManager.Result(null);

        }
        assert HELPER_CALLBACK != null;
    }

    public static AntBasedProjectType create(Map map) {
        return new AntBasedGenericType(map);
    }


}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2007 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.spi.project.support.ant;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.netbeans.api.project.Project;

/** Registers a {@link Project} implementation as an
 * {@link org.netbeans.spi.project.support.ant.AntBasedProjectType} extension.
 * Just write a project with constructor that takes one
 * {@link AntProjectHelper} argument and annotate the class with this annotation.
 * As an alternative you can annotate a factory method with the same parameter.
 *
 * @author Jaroslav Tulach
 * @since 1.30
 */
@Retention(RetentionPolicy.SOURCE)
@Target({ ElementType.TYPE, ElementType.METHOD })
public @interface AntBasedProjectRegistration {
    /**
     * icon of the project type represented by the given implementation of the interface.
     * @return the {@link ClassLoader#getResource(java.lang.String)} path to the icon
     */
    public String iconResource();


    /**
     * Get a unique type identifier for this kind of project.
     * No two registered {@link AntBasedProjectType} instances may share the same type.
     * The type is stored in <code>nbproject/project.xml</code> in the <code>type</code> element.
     * It is forbidden for the result of this method to change from call to call.
     * @return the project type
     */
    String type();

    /**
     * Get the simple name of the XML element that should be used to store
     * the project's specific configuration data in <code>nbproject/project.xml</code>
     * (inside <code>&lt;configuration&gt;</code>).
     * 
     * @return a simple name; <samp>data</samp> is recommended but not required
     */
    String sharedName() default "data";

    /**
     * Get the namespace of the XML element that should be used to store
     * the project's specific configuration data in <code>nbproject/project.xml</code>
     * (inside <code>&lt;configuration&gt;</code>).
     * 
     * @return an XML namespace, e.g. <samp>http://www.netbeans.org/ns/j2se-project</samp>
     *         or <samp>http://www.netbeans.org/ns/j2se-project-private</samp>
     */
    String sharedNamespace();

    /**
     * Get the simple name of the XML element that should be used to store
     * the project's specific configuration data in <code>nbproject/private/private.xml</code>
     * (inside <code>&lt;project-private&gt;</code>).
     * 
     * @return a simple name; <samp>data</samp> is recommended but not required
     */
    String privateName() default "data";

    /**
     * Get the namespace of the XML element that should be used to store
     * the project's specific configuration data in <code>nbproject/private/private.xml</code>
     * (inside <code>&lt;project-private&gt;</code>).
     * 
     * @return an XML namespace, e.g. <samp>http://www.netbeans.org/ns/j2se-project</samp>
     *         or <samp>http://www.netbeans.org/ns/j2se-project-private</samp>
     */
    String privateNamespace();
}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2007 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.spi.project.support.ant;

import javax.swing.Icon;

/**
 * extension of {@link org.netbeans.spi.project.support.ant.AntBasedProjectType}
 * that provides an icon for the project without actually creating an project instance for it.
 * @author mkleint
 * @since org.netbeans.modules.project.ant 1.28
 */
public interface AntBasedProjectType2 extends AntBasedProjectType {

    /**
     * icon of the project type represented by the given implementation of the interface.
     * @return
     */
    public Icon getIcon();

}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2007 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.spi.project.support.ant;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Collection;
import java.util.Iterator;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.project.TestUtil;
import org.netbeans.junit.NbTestCase;
import org.openide.filesystems.FileObject;
import org.openide.util.Lookup;
import org.openide.util.lookup.Lookups;
import org.openide.util.test.AnnotationProcessorTestUtils;
import org.openide.util.test.MockLookup;

/**
 * That that a project registered by annotation is really found.
 * @author Jaroslav Tulach
 */
public class AntBasedProjectRegistrationTest extends NbTestCase {
    
    public AntBasedProjectRegistrationTest(String name) {
        super(name);
    }
    
    private FileObject scratch;
    private FileObject projdir;
    private ProjectManager pm;
    
    protected @Override void setUp() throws Exception {
        super.setUp();
        MockLookup.init();
        assertEquals("No factory has been used yet", 0, AnnotatedProject.factoryCalls);
        Collection<? extends AntBasedProjectType> all = Lookups.forPath("Services/AntBasedProjectTypes").lookupAll(AntBasedProjectType.class);
        assertEquals("Two found", 2, all.size());
        Iterator<? extends AntBasedProjectType> it = all.iterator();
        if ("testFactory".equals(getName())) {
            it.next();
        }
        AntBasedProjectType t = it.next();
        MockLookup.setInstances(t);
        scratch = TestUtil.makeScratchDir(this);
        projdir = scratch.createFolder("proj");
        ProjectGenerator.createProject(projdir, t.getType());
        pm = ProjectManager.getDefault();
    }

    protected @Override void tearDown() throws Exception {
        scratch = null;
        projdir = null;
        pm = null;
        super.tearDown();
    }
    
    public void testFindProject() throws Exception {
        Project p = pm.findProject(projdir);
        assertNotNull("Annotation project found", p.getLookup().lookup(AnnotatedProject.class));
    }

    public void testFactory() throws Exception {
        Project p = pm.findProject(projdir);
        assertNotNull("Annotation project found", p.getLookup().lookup(AnnotatedProject.class));
        assertEquals(1, AnnotatedProject.factoryCalls);
        AnnotatedProject.factoryCalls = 0;
    }

    public void testTypeNeedsToBeProject() throws Exception {
        String prj =
                "import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;" +
                "import org.netbeans.spi.project.support.ant.AntProjectHelper;" +
                "@AntBasedProjectRegistration(" +
                "  iconResource=\"noicon\"," +
                "  type=\"test\"," +
                "  privateNamespace=\"urn:test:private\"," +
                "  sharedNamespace=\"urn:test:shared\"" +
                ")" +
                "public final class Prj extends Object {" +
                "  public Prj(AntProjectHelper h) {" +
                "  }" +
                "}" +
                "";
        AnnotationProcessorTestUtils.makeSource(getWorkDir(), "x.Prj", prj);
        ByteArrayOutputStream out = new ByteArrayOutputStream();
        boolean res = AnnotationProcessorTestUtils.runJavac(getWorkDir(), null, getWorkDir(), null, out);
        assertFalse("Compilation failed", res);
        if (!out.toString().contains("extend Project")) {
            fail(out.toString());
        }
    }

    public void testReturnTypeNeedsToBeProject() throws Exception {
        String prj =
                "import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;" +
                "import org.netbeans.spi.project.support.ant.AntProjectHelper;" +
                "" +
                "public final class Prj extends Object {" +
                "  @AntBasedProjectRegistration(" +
                "    iconResource=\"noicon\"," +
                "    type=\"test\"," +
                "    privateNamespace=\"urn:test:private\"," +
                "    sharedNamespace=\"urn:test:shared\"" +
                "  )" +
                "  public static String factory(AntProjectHelper h) {" +
                "    return null;" +
                "  }" +
                "}" +
                "";
        AnnotationProcessorTestUtils.makeSource(getWorkDir(), "x.Prj", prj);
        ByteArrayOutputStream out = new ByteArrayOutputStream();
        boolean res = AnnotationProcessorTestUtils.runJavac(getWorkDir(), null, getWorkDir(), null, out);
        assertFalse("Compilation failed", res);
        if (!out.toString().contains("return Project")) {
            fail(out.toString());
        }
    }

    @AntBasedProjectRegistration(
        iconResource="noicon",
        type="test",
        privateNamespace="urn:test:private",
        sharedNamespace="urn:test:shared"
    )
    public static final class AnnotatedProject extends AntBasedTestUtil.TestAntBasedProject {
        static int factoryCalls;
        
        public AnnotatedProject(AntProjectHelper h) throws IOException {
            super(h, null);
        }

        @Override
        public Lookup getLookup() {
            return Lookups.singleton(this);
        }

        @AntBasedProjectRegistration(
            iconResource = "noicon",
            type = "test.factory",
            privateNamespace = "urn:test:private",
            sharedNamespace = "urn:test:shared"
        )
        public static Project factoryMethod(AntProjectHelper h) throws IOException {
            factoryCalls++;
            return new AnnotatedProject(h);
        }
    }
    
}




        
    }
    
    public static class TestAntBasedProject implements Project {
        
        private final AntProjectHelper helper;
        private final ReferenceHelper refHelper;
        private final GeneratedFilesHelper genFilesHelper;
        private final Lookup l;
        
        protected TestAntBasedProject(AntProjectHelper helper, AntBuildExtenderImplementation ext) throws IOException {
            if (helper.getProjectDirectory().getFileObject("nbproject/broken") != null) {
                throw new IOException("broken");
            }

Lines 115-121 Link Here

(-)a/sql.project/nbproject/project.xml (-1 / +1 lines)
115	<compile-dependency/>	115	<compile-dependency/>
116	<run-dependency>	116	<run-dependency>
117	<release-version>1</release-version>	117	<release-version>1</release-version>
118	<specification-version>1.12.21</specification-version>	118	<specification-version>1.30</specification-version>
119	</run-dependency>	119	</run-dependency>
120	</dependency>	120	</dependency>
121	<dependency>	121	<dependency>




import org.netbeans.modules.compapp.projects.base.ui.IcanproCustomizerProvider;
import org.netbeans.modules.compapp.projects.base.ui.customizer.IcanproProjectProperties;
import org.netbeans.modules.compapp.projects.base.queries.IcanproProjectEncodingQueryImpl;
import org.netbeans.modules.sql.project.SQLproConstants;
import org.netbeans.modules.sql.project.ui.SQLproLogicalViewProvider;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;

import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.Mutex;
import org.openide.util.Utilities;
import org.openide.util.lookup.Lookups;
import org.w3c.dom.Element;
import org.w3c.dom.Node;

import java.nio.charset.UnsupportedCharsetException;
import java.util.logging.Logger;
import org.netbeans.api.queries.FileEncodingQuery;
import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;




 * Represents one sql module project
 * @author Chris Webster
 */
@AntBasedProjectRegistration(
    type=SQLproProjectType.TYPE,
    iconResource="org/netbeans/modules/sql/project/ui/resources/sqlproProjectIcon.gif",
    sharedNamespace=SQLproProjectType.PROJECT_CONFIGURATION_NAMESPACE,
    privateNamespace=SQLproProjectType.PRIVATE_CONFIGURATION_NAMESPACE
)
public final class SQLproProject implements Project, AntProjectListener {

    private static final Icon PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/sql/project/ui/resources/sqlproProjectIcon.gif")); // NOI18N





package org.netbeans.modules.sql.project;

import java.io.IOException;
import org.netbeans.api.project.Project;
import org.netbeans.spi.project.support.ant.AntBasedProjectType;
import org.netbeans.spi.project.support.ant.AntProjectHelper;

/**
 * Factory for EJB Module projects
 * @author Chris Webster
 */
public class SQLproProjectType {
public class SQLproProjectType implements AntBasedProjectType {
    public static final String TYPE = "org.netbeans.modules.sql.project";
    public static final String PROJECT_CONFIGURATION_NAME = "data";
    public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-sqlpro/1";
    public static final String PRIVATE_CONFIGURATION_NAME = "data";
    public static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-sqlpro-private/1";
    
    
    public SQLproProjectType() {
        int i = 0;
    }
    
    public String getType() {
        return TYPE;
    }
    
    public Project createProject(AntProjectHelper helper) throws IOException {
        if (null == helper)
            throw new IllegalArgumentException("helper");
        return new SQLproProject(helper);
    }

    public String getPrimaryConfigurationDataElementName(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
    }
    
    public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
    }
    
}

Lines 275-281 Link Here

(-)a/web.project/nbproject/project.xml (-1 / +1 lines)
275	<compile-dependency/>	275	<compile-dependency/>
276	<run-dependency>	276	<run-dependency>
277	<release-version>1</release-version>	277	<release-version>1</release-version>
278	<specification-version>1.25</specification-version>	278	<specification-version>1.30</specification-version>
279	</run-dependency>	279	</run-dependency>
280	</dependency>	280	</dependency>
281	<dependency>	281	<dependency>





import java.io.IOException;
import java.util.Collection;
import javax.swing.Icon;
import org.netbeans.api.project.Project;
import org.netbeans.modules.web.project.spi.WebProjectImplementationFactory;
import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;

public final class WebProjectType {
public final class WebProjectType implements AntBasedProjectType2 {

    public static final String TYPE = "org.netbeans.modules.web.project";
    private static final String PROJECT_CONFIGURATION_NAME = "data";

            "http://www.netbeans.org/ns/web-project/3"};

    /** Do nothing, just a service. */
    private WebProjectType() {}
    
    public String getType() {
        return TYPE;
    }
    @AntBasedProjectRegistration(
        iconResource="org/netbeans/modules/web/project/ui/resources/webProjectIcon.gif", // NOI18N
        type=TYPE,
        sharedName=PROJECT_CONFIGURATION_NAME,
        sharedNamespace=PROJECT_CONFIGURATION_NAMESPACE,
        privateName=PRIVATE_CONFIGURATION_NAME,
        privateNamespace=PRIVATE_CONFIGURATION_NAMESPACE
    )
    public static Project createProject(AntProjectHelper helper) throws IOException {
        for(WebProjectImplementationFactory factory : getProjectFactories()) {
            if (factory.acceptProject(helper)) {
                //delegate project completely to another implementation

        return new WebProject(helper);
    }

    private static Collection<? extends WebProjectImplementationFactory> getProjectFactories() {
        return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
    }
    
    public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
    }

    private Collection<? extends WebProjectImplementationFactory> getProjectFactories() {
        return Lookup.getDefault().lookupAll(WebProjectImplementationFactory.class);
    }

    public Icon getIcon() {
        return ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/web/project/ui/resources/webProjectIcon.gif", true));
    }
}

Lines 90-96 Link Here

(-)a/xslt.project/nbproject/project.xml (-1 / +1 lines)
90	<compile-dependency/>	90	<compile-dependency/>
91	<run-dependency>	91	<run-dependency>
92	<release-version>1</release-version>	92	<release-version>1</release-version>
93	<specification-version>1.12.22</specification-version>	93	<specification-version>1.30</specification-version>
94	</run-dependency>	94	</run-dependency>
95	</dependency>	95	</dependency>
96	<dependency>	96	<dependency>

Lines 51-56 Link Here

(-)a/xslt.project/src/org/netbeans/modules/xslt/project/XsltproProject.java (-1 / +7 lines)
51	import org.netbeans.spi.java.project.support.ui.BrokenReferencesSupport;	51	import org.netbeans.spi.java.project.support.ui.BrokenReferencesSupport;
52	import org.netbeans.spi.project.AuxiliaryConfiguration;	52	import org.netbeans.spi.project.AuxiliaryConfiguration;
53	import org.netbeans.spi.project.SubprojectProvider;	53	import org.netbeans.spi.project.SubprojectProvider;
		54	import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;
54	import org.netbeans.spi.project.support.ant.AntProjectEvent;	55	import org.netbeans.spi.project.support.ant.AntProjectEvent;
55	import org.netbeans.spi.project.support.ant.AntProjectHelper;	56	import org.netbeans.spi.project.support.ant.AntProjectHelper;
56	import org.netbeans.spi.project.support.ant.AntProjectListener;	57	import org.netbeans.spi.project.support.ant.AntProjectListener;
Lines 73-79 Link Here
73	import org.openide.util.ImageUtilities;	74	import org.openide.util.ImageUtilities;
74	import org.openide.util.Lookup;	75	import org.openide.util.Lookup;
75	import org.openide.util.Mutex;	76	import org.openide.util.Mutex;
76	import org.openide.util.Utilities;
77	import org.openide.util.lookup.Lookups;	77	import org.openide.util.lookup.Lookups;
78	import org.w3c.dom.Element;	78	import org.w3c.dom.Element;
79	import org.w3c.dom.Node;	79	import org.w3c.dom.Node;
Lines 86-91 Link Here
86	* @author Vitaly Bychkov	86	* @author Vitaly Bychkov
87	* @version 1.0	87	* @version 1.0
88	*/	88	*/
		89	@AntBasedProjectRegistration(
		90	type=XsltproProjectType.TYPE,
		91	iconResource=XSLT_PROJECT_ICON,
		92	sharedNamespace=XsltproProjectType.PROJECT_CONFIGURATION_NAMESPACE,
		93	privateNamespace=XsltproProjectType.PRIVATE_CONFIGURATION_NAMESPACE
		94	)
89	public class XsltproProject implements Project, AntProjectListener {	95	public class XsltproProject implements Project, AntProjectListener {
90		96
91	private static final Icon PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage(XSLT_PROJECT_ICON)); // NOI18N	97	private static final Icon PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage(XSLT_PROJECT_ICON)); // NOI18N




 */
package org.netbeans.modules.xslt.project;

import java.io.IOException;
import org.netbeans.api.project.Project;
import org.netbeans.spi.project.support.ant.AntBasedProjectType;
import org.netbeans.spi.project.support.ant.AntProjectHelper;

/**
 * Factory for EJB Module projects
 * @author Chris Webster
 * @author Vitaly Bychkov
 * @version 1.0
 */
public class XsltproProjectType {
public class XsltproProjectType implements AntBasedProjectType {
    public static final String TYPE = "org.netbeans.modules.xslt.project";
    public static final String PROJECT_CONFIGURATION_NAME = "data";
    public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-xsltpro/1";
    public static final String PRIVATE_CONFIGURATION_NAME = "data";
    public static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-xsltpro-private/1";
    
    public XsltproProjectType() {
    }

    public String getType() {
        return TYPE;
    }

    public Project createProject(AntProjectHelper helper) throws IOException {
        if (helper == null) {
            throw new IllegalArgumentException("AntProjectHelper shouldn't be null");
        }
        return new XsltproProject(helper);
    }

    public String getPrimaryConfigurationDataElementName(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
    }

    public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
        return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
    }
    
}

Return to bug 153655

Lines 56-61 Link Here

(-)a/ant.freeform/src/org/netbeans/modules/ant/freeform/FreeformProject.java (-1 / +10 lines)
56	import org.netbeans.modules.ant.freeform.ui.View;	56	import org.netbeans.modules.ant.freeform.ui.View;
57	import org.netbeans.spi.project.AuxiliaryConfiguration;	57	import org.netbeans.spi.project.AuxiliaryConfiguration;
58	import org.netbeans.spi.project.support.LookupProviderSupport;	58	import org.netbeans.spi.project.support.LookupProviderSupport;
		59	import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;
59	import org.netbeans.spi.project.support.ant.AntProjectHelper;	60	import org.netbeans.spi.project.support.ant.AntProjectHelper;
60	import org.netbeans.spi.project.support.ant.PropertyEvaluator;	61	import org.netbeans.spi.project.support.ant.PropertyEvaluator;
61	import org.netbeans.spi.project.support.ant.PropertyUtils;	62	import org.netbeans.spi.project.support.ant.PropertyUtils;
Lines 64-70 Link Here
64	import org.openide.util.ImageUtilities;	65	import org.openide.util.ImageUtilities;
65	import org.openide.util.Lookup;	66	import org.openide.util.Lookup;
66	import org.openide.util.Mutex;	67	import org.openide.util.Mutex;
67	import org.openide.util.Utilities;
68	import org.openide.util.lookup.Lookups;	68	import org.openide.util.lookup.Lookups;
69	import org.w3c.dom.Element;	69	import org.w3c.dom.Element;
70	import org.w3c.dom.NodeList;	70	import org.w3c.dom.NodeList;
Lines 73-78 Link Here
73	* One freeform project.	73	* One freeform project.
74	* @author Jesse Glick	74	* @author Jesse Glick
75	*/	75	*/
		76	@AntBasedProjectRegistration(
		77	type=FreeformProjectType.TYPE,
		78	iconResource="org/netbeans/modules/ant/freeform/resources/freeform-project.png",
		79	sharedName=FreeformProjectType.NAME_SHARED,
		80	privateName=FreeformProjectType.NAME_SHARED,
		81	sharedNamespace=FreeformProjectType.NS_GENERAL_1,
		82	privateNamespace=FreeformProjectType.NS_GENERAL_PRIVATE
		83	)
76	public final class FreeformProject implements Project {	84	public final class FreeformProject implements Project {
77		85
78	public static final Lookup.Result<ProjectNature> PROJECT_NATURES = Lookup.getDefault().lookupResult(ProjectNature.class);	86	public static final Lookup.Result<ProjectNature> PROJECT_NATURES = Lookup.getDefault().lookupResult(ProjectNature.class);
Lines 146-151 Link Here
146	return eval;	154	return eval;
147	}	155	}
148		156
		157	@Override
149	public String toString() {	158	public String toString() {
150	return "FreeformProject[" + getProjectDirectory() + "]"; // NOI18N	159	return "FreeformProject[" + getProjectDirectory() + "]"; // NOI18N
151	}	160	}

Lines 41-82 Link Here

(-)a/ant.freeform/src/org/netbeans/modules/ant/freeform/FreeformProjectType.java (-30 / +2 lines)
41		41
42	package org.netbeans.modules.ant.freeform;	42	package org.netbeans.modules.ant.freeform;
43		43
44	import java.io.IOException;
45	import org.netbeans.api.project.Project;
46	import org.netbeans.spi.project.support.ant.AntBasedProjectType;
47	import org.netbeans.spi.project.support.ant.AntProjectHelper;
48
49	/**	44	/**
50	* Freeform project type.	45	* Freeform project type.
51	* @author Jesse Glick	46	* @author Jesse Glick
52	*/	47	*/
53	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class)	48	public final class FreeformProjectType {
54	public final class FreeformProjectType implements AntBasedProjectType {
55
56	public static final String TYPE = "org.netbeans.modules.ant.freeform";	49	public static final String TYPE = "org.netbeans.modules.ant.freeform";
57	public static final String NS_GENERAL_1 = "http://www.netbeans.org/ns/freeform-project/1"; // NOI18N	50	public static final String NS_GENERAL_1 = "http://www.netbeans.org/ns/freeform-project/1"; // NOI18N
58	public static final String NS_GENERAL = org.netbeans.modules.ant.freeform.spi.support.Util.NAMESPACE;	51	public static final String NS_GENERAL = org.netbeans.modules.ant.freeform.spi.support.Util.NAMESPACE;
59	public static final String NAME_SHARED = "general-data"; // NOI18N	52	public static final String NAME_SHARED = "general-data"; // NOI18N
60	private static final String NS_GENERAL_PRIVATE = "http://www.netbeans.org/ns/freeform-project-private/1"; // NOI18N	53	static final String NS_GENERAL_PRIVATE = "http://www.netbeans.org/ns/freeform-project-private/1"; // NOI18N
61
62	/** Default constructor for lookup. */
63	public FreeformProjectType() {}
64
65	public Project createProject(AntProjectHelper helper) throws IOException {
66	return new FreeformProject(helper);
67	}
68
69	public String getPrimaryConfigurationDataElementName(boolean shared) {
70	return NAME_SHARED;
71	}
72
73	public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
74	// No private.xml defined anyway.
75	return shared ? /* old! for FreeformProjectGenerator */ NS_GENERAL_1 : NS_GENERAL_PRIVATE;
76	}
77
78	public String getType() {
79	return TYPE; // NOI18N
80	}
81
82	}	54	}

Lines 41-88 Link Here

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/NbModuleProjectType.java (-35 / +5 lines)
41		41
42	package org.netbeans.modules.apisupport.project;	42	package org.netbeans.modules.apisupport.project;
43		43
44	import java.io.IOException;
45	import javax.swing.Icon;
46	import org.netbeans.api.project.Project;
47	import org.netbeans.spi.project.support.ant.AntBasedProjectType2;
48	import org.netbeans.spi.project.support.ant.AntProjectHelper;
49	import org.openide.util.ImageUtilities;
50
51	/**	44	/**
52	* Factory for NetBeans module projects.	45	* Constants.
53	* @author Jesse Glick	46	* @author Jesse Glick
54	*/	47	*/
55	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class)	48	public final class NbModuleProjectType {
56	public final class NbModuleProjectType implements AntBasedProjectType2 {
57		49
58	static final String TYPE = "org.netbeans.modules.apisupport.project"; // NOI18N	50	static final String TYPE = "org.netbeans.modules.apisupport.project"; // NOI18N
59	static final String NAME_SHARED = "data"; // NOI18N	51	static final String NAME_SHARED = "data"; // NOI18N
60	public static final String NAMESPACE_SHARED = "http://www.netbeans.org/ns/nb-module-project/3"; // NOI18N	52	public static final String NAMESPACE_SHARED = "http://www.netbeans.org/ns/nb-module-project/3"; // NOI18N
61	public static final String NAMESPACE_SHARED_2 = "http://www.netbeans.org/ns/nb-module-project/2"; // NOI18N	53	public static final String NAMESPACE_SHARED_2 = "http://www.netbeans.org/ns/nb-module-project/2"; // NOI18N
62	private static final String NAME_PRIVATE = "data"; // NOI18N	54	static final String NAME_PRIVATE = "data"; // NOI18N
63	private static final String NAMESPACE_PRIVATE = "http://www.netbeans.org/ns/nb-module-project-private/1"; // NOI18N	55	static final String NAMESPACE_PRIVATE = "http://www.netbeans.org/ns/nb-module-project-private/1"; // NOI18N
64		56
65	/** Default constructor for lookup. */	57	private NbModuleProjectType() {}
66	public NbModuleProjectType() {}
67
68	public String getType() {
69	return TYPE;
70	}
71
72	public Project createProject(AntProjectHelper helper) throws IOException {
73	return new NbModuleProject(helper);
74	}
75
76	public String getPrimaryConfigurationDataElementName(boolean shared) {
77	return shared ? NAME_SHARED : NAME_PRIVATE;
78	}
79
80	public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
81	return shared ? NAMESPACE_SHARED : NAMESPACE_PRIVATE;
82	}
83
84	public Icon getIcon() {
85	return ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/apisupport/project/resources/module.png", true));
86	}
87
88	}	58	}

Lines 18-59 Link Here

(-)a/bpel.project/src/org/netbeans/modules/bpel/project/BpelproProjectType.java (-29 / +1 lines)
18	*/	18	*/
19	package org.netbeans.modules.bpel.project;	19	package org.netbeans.modules.bpel.project;
20		20
21	import java.io.IOException;
22	import org.netbeans.api.project.Project;
23	import org.netbeans.spi.project.support.ant.AntBasedProjectType;
24	import org.netbeans.spi.project.support.ant.AntProjectHelper;
25
26	/**	21	/**
27	* Factory for EJB Module projects	22	* Factory for EJB Module projects
28	* @author Chris Webster	23	* @author Chris Webster
29	*/	24	*/
30	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class)	25	public class BpelproProjectType {
31	public class BpelproProjectType implements AntBasedProjectType {
32	public static final String TYPE = "org.netbeans.modules.bpel.project";	26	public static final String TYPE = "org.netbeans.modules.bpel.project";
33	public static final String PROJECT_CONFIGURATION_NAME = "data";	27	public static final String PROJECT_CONFIGURATION_NAME = "data";
34	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-bpelpro/1";	28	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-bpelpro/1";
35	public static final String PRIVATE_CONFIGURATION_NAME = "data";	29	public static final String PRIVATE_CONFIGURATION_NAME = "data";
36	public static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-bpelpro-private/1";	30	public static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-bpelpro-private/1";
37
38	public BpelproProjectType() {
39	int i = 0;
40	}
41
42	public String getType() {
43	return TYPE;
44	}
45
46	public Project createProject(AntProjectHelper helper) throws IOException {
47	if (null == helper)
48	throw new IllegalArgumentException("helper");
49	return new BpelproProject(helper);
50	}
51
52	public String getPrimaryConfigurationDataElementName(boolean shared) {
53	return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
54	}
55
56	public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
57	return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
58	}
59	}	31	}

Lines 41-83 Link Here

(-)a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/MakeProjectType.java (-30 / +2 lines)
41		41
42	package org.netbeans.modules.cnd.makeproject;	42	package org.netbeans.modules.cnd.makeproject;
43		43
44	import java.io.IOException;
45	import org.netbeans.api.project.Project;
46	import org.netbeans.spi.project.support.ant.AntBasedProjectType;
47	import org.netbeans.spi.project.support.ant.AntProjectHelper;
48
49	/**	44	/**
50	* Factory for simple Make projects.	45	* Factory for simple Make projects.
51	*/	46	*/
52	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class)	47	public final class MakeProjectType {
53	public final class MakeProjectType implements AntBasedProjectType {
54		48
55	public static final String TYPE = "org.netbeans.modules.cnd.makeproject"; // NOI18N	49	public static final String TYPE = "org.netbeans.modules.cnd.makeproject"; // NOI18N
56	private static final String PROJECT_CONFIGURATION_NAME = "data"; // NOI18N
57	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/make-project/1"; // NOI18N	50	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/make-project/1"; // NOI18N
58	private static final String PRIVATE_CONFIGURATION_NAME = "data"; // NOI18N	51	static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/make-project-private/1"; // NOI18N
59	private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/make-project-private/1"; // NOI18N
60	public static final String MAKE_DEP_PROJECTS = "make-dep-projects"; // NOI18N	52	public static final String MAKE_DEP_PROJECTS = "make-dep-projects"; // NOI18N
61	public static final String MAKE_DEP_PROJECT = "make-dep-project"; // NOI18N	53	public static final String MAKE_DEP_PROJECT = "make-dep-project"; // NOI18N
62	public static final String SOURCE_ENCODING_TAG = "sourceEncoding"; // NOI18N	54	public static final String SOURCE_ENCODING_TAG = "sourceEncoding"; // NOI18N
63
64	/** Do nothing, just a service. */
65	public MakeProjectType() {}
66
67	public String getType() {
68	return TYPE;
69	}
70
71	public Project createProject(AntProjectHelper helper) throws IOException {
72	return new MakeProject(helper);
73	}
74
75	public String getPrimaryConfigurationDataElementName(boolean shared) {
76	return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
77	}
78
79	public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
80	return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
81	}
82
83	}	55	}

Lines 20-63 Link Here

(-)a/compapp.projects.base/src/org/netbeans/modules/compapp/projects/base/IcanproProjectType.java (-34 / +2 lines)
20		20
21	package org.netbeans.modules.compapp.projects.base;	21	package org.netbeans.modules.compapp.projects.base;
22		22
23	import java.io.IOException;
24	import org.netbeans.api.project.Project;
25	import org.netbeans.spi.project.support.ant.AntBasedProjectType;
26	import org.netbeans.spi.project.support.ant.AntProjectHelper;
27
28	/**	23	/**
29	* Factory for EJB Module projects	24	* Factory for EJB Module projects
30	* @author Chris Webster	25	* @author Chris Webster
31	*/	26	*/
32	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class)	27	public class IcanproProjectType implements IcanproConstants {
33	public class IcanproProjectType implements AntBasedProjectType, IcanproConstants {
34	public static final String TYPE = "org.netbeans.modules.compapp.projects.base";	28	public static final String TYPE = "org.netbeans.modules.compapp.projects.base";
35	private static final String PROJECT_CONFIGURATION_NAME = "data";
36	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-icanpro/1";	29	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-icanpro/1";
37	private static final String PRIVATE_CONFIGURATION_NAME = "data";	30	static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-icanpro-private/1";
38	private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-icanpro-private/1";
39
40
41	public IcanproProjectType() {
42	int i = 0;
43	}
44
45	public String getType() {
46	return TYPE;
47	}
48
49	public Project createProject(AntProjectHelper helper) throws IOException {
50	if (null == helper)
51	throw new IllegalArgumentException("helper");
52	return new IcanproProject(helper);
53	}
54
55	public String getPrimaryConfigurationDataElementName(boolean shared) {
56	return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
57	}
58
59	public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
60	return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
61	}
62
63	}	31	}

Lines 585-591 Link Here

(-)a/compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/customizer/JbiProjectProperties.java (-2 lines)
585	private HashMap<String, PropertyInfo> properties;	585	private HashMap<String, PropertyInfo> properties;
586	private AntProjectHelper antProjectHelper;	586	private AntProjectHelper antProjectHelper;
587	private ReferenceHelper refHelper;	587	private ReferenceHelper refHelper;
588	private AntBasedProjectType abpt;
589	private List<VisualClassPathItem> bindingList = new Vector();	588	private List<VisualClassPathItem> bindingList = new Vector();
590	private List<AntArtifact> sunresourceProjs;	589	private List<AntArtifact> sunresourceProjs;
591	javax.swing.text.Document DIST_JAR_MODEL;	590	javax.swing.text.Document DIST_JAR_MODEL;
Lines 604-610 Link Here
604	this.properties = new HashMap<String, PropertyInfo>();	603	this.properties = new HashMap<String, PropertyInfo>();
605	this.antProjectHelper = antProjectHelper;	604	this.antProjectHelper = antProjectHelper;
606	this.refHelper = refHelper;	605	this.refHelper = refHelper;
607	this.abpt = project.getAntBasedProjectType();
608	read();	606	read();
609		607
610	PropertyEvaluator evaluator = antProjectHelper.getStandardPropertyEvaluator();	608	PropertyEvaluator evaluator = antProjectHelper.getStandardPropertyEvaluator();

Lines 41-77 Link Here

(-)a/j2ee.archive/src/org/netbeans/modules/j2ee/archive/project/ArchiveProjectType.java (-31 / +2 lines)
41		41
42	package org.netbeans.modules.j2ee.archive.project;	42	package org.netbeans.modules.j2ee.archive.project;
43		43
44	import java.io.IOException;	44	public class ArchiveProjectType {
45	import org.netbeans.api.project.Project;
46	import org.netbeans.spi.project.support.ant.AntProjectHelper;
47	import org.netbeans.spi.project.support.ant.AntBasedProjectType;
48
49	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class)
50	public class ArchiveProjectType implements AntBasedProjectType {
51
52	private static final String CONFIGURATION_NAME ="data"; //NOI18N
53	public static final String PROJECT_CONFIGURATION_NS ="http://www.netbeans.org/ns/archive-project/1"; //NOI18N	45	public static final String PROJECT_CONFIGURATION_NS ="http://www.netbeans.org/ns/archive-project/1"; //NOI18N
54	private static final String PRIVATE_CONFIGURATION_NS = "http://www.netbeans.org/ns/archive-project-private/1"; //NOI18N	46	static final String PRIVATE_CONFIGURATION_NS = "http://www.netbeans.org/ns/archive-project-private/1"; //NOI18N
55
56	public static final String TYPE = "org.netbeans.modules.j2ee.archive.project"; //NOI18N	47	public static final String TYPE = "org.netbeans.modules.j2ee.archive.project"; //NOI18N
57
58	/** Creates a new instance of DeployableArchive */
59	public ArchiveProjectType() {
60	}
61
62	public String getType() {
63	return TYPE;
64	}
65
66	public Project createProject(AntProjectHelper helper) throws IOException {
67	return new ArchiveProject(helper);
68	}
69
70	public String getPrimaryConfigurationDataElementName(boolean shared) {
71	return CONFIGURATION_NAME;
72	}
73
74	public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
75	return shared ? PROJECT_CONFIGURATION_NS : PRIVATE_CONFIGURATION_NS;
76	}
77	}	48	}

Lines 41-81 Link Here

(-)a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProjectType.java (-29 / +2 lines)
41		41
42	package org.netbeans.modules.j2ee.clientproject;	42	package org.netbeans.modules.j2ee.clientproject;
43		43
44	import java.io.IOException;
45	import org.netbeans.api.project.Project;
46	import org.netbeans.spi.project.support.ant.AntBasedProjectType;
47	import org.netbeans.spi.project.support.ant.AntProjectHelper;
48
49	/**	44	/**
50	* Factory for simple J2SE projects.	45	* Factory for simple J2SE projects.
51	* @author Jesse Glick	46	* @author Jesse Glick
52	*/	47	*/
53	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class)	48	public final class AppClientProjectType {
54	public final class AppClientProjectType implements AntBasedProjectType {
55
56	public static final String TYPE = "org.netbeans.modules.j2ee.clientproject"; // NOI18N	49	public static final String TYPE = "org.netbeans.modules.j2ee.clientproject"; // NOI18N
57	private static final String PROJECT_CONFIGURATION_NAME = "data"; // NOI18N	50	private static final String PROJECT_CONFIGURATION_NAME = "data"; // NOI18N
58	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/car-project/1"; // NOI18N	51	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/car-project/1"; // NOI18N
59	private static final String PRIVATE_CONFIGURATION_NAME = "data"; // NOI18N	52	private static final String PRIVATE_CONFIGURATION_NAME = "data"; // NOI18N
60	private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/car-project-private/1"; // NOI18N	53	static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/car-project-private/1"; // NOI18N
61
62	/** Do nothing, just a service. */
63	public AppClientProjectType() {}
64
65	public String getType() {
66	return TYPE;
67	}
68
69	public Project createProject(AntProjectHelper helper) throws IOException {
70	return new AppClientProject(helper);
71	}
72
73	public String getPrimaryConfigurationDataElementName(boolean shared) {
74	return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
75	}
76
77	public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
78	return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
79	}
80
81	}	54	}

Lines 41-84 Link Here

(-)a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectType.java (-33 / +2 lines)
41		41
42	package org.netbeans.modules.j2ee.earproject;	42	package org.netbeans.modules.j2ee.earproject;
43		43
44	import java.io.IOException;
45	import org.netbeans.api.project.Project;
46	import org.netbeans.spi.project.support.ant.AntBasedProjectType;
47	import org.netbeans.spi.project.support.ant.AntProjectHelper;
48	/**	44	/**
49	* Factory for Enterprise Applications	45	* Factory for Enterprise Applications
50	* @see WebProjectType	46	* @see WebProjectType
51	* @author vince kraemer	47	* @author vince kraemer
52	*/	48	*/
53	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class)	49	public final class EarProjectType {
54	public final class EarProjectType implements AntBasedProjectType {
55
56	public static final String TYPE = "org.netbeans.modules.j2ee.earproject";	50	public static final String TYPE = "org.netbeans.modules.j2ee.earproject";
57	private static final String PROJECT_CONFIGURATION_NAME = "data";
58	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-earproject/2";	51	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-earproject/2";
59	private static final String PRIVATE_CONFIGURATION_NAME = "data";	52	static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-earproject-private/1";
60	private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-earproject-private/1";
61
62	/** Do nothing, just a service. */
63	public EarProjectType() {}
64
65	public String getType() {
66	return TYPE;
67	}
68
69	public Project createProject(AntProjectHelper helper) throws IOException {
70	if (null == helper) {
71	throw new IllegalArgumentException("helper");
72	}
73	return new EarProject(helper, this);
74	}
75
76	public String getPrimaryConfigurationDataElementName(boolean shared) {
77	return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
78	}
79
80	public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
81	return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
82	}
83
84	}	53	}

Lines 41-81 Link Here

(-)a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProjectType.java (-31 / +2 lines)
41		41
42	package org.netbeans.modules.j2ee.ejbjarproject;	42	package org.netbeans.modules.j2ee.ejbjarproject;
43		43
44	import java.io.IOException;
45	import org.netbeans.api.project.Project;
46	import org.netbeans.spi.project.support.ant.AntBasedProjectType;
47	import org.netbeans.spi.project.support.ant.AntProjectHelper;
48
49	/**	44	/**
50	* Factory for EJB Module projects	45	* Factory for EJB Module projects
51	* @author Chris Webster	46	* @author Chris Webster
52	*/	47	*/
53	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class)	48	public final class EjbJarProjectType {
54	public final class EjbJarProjectType implements AntBasedProjectType {
55
56	public static final String TYPE = "org.netbeans.modules.j2ee.ejbjarproject"; // NOI18N	49	public static final String TYPE = "org.netbeans.modules.j2ee.ejbjarproject"; // NOI18N
57	private static final String PROJECT_CONFIGURATION_NAME = "data"; // NOI18N
58	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-ejbjarproject/3"; // NOI18N	50	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-ejbjarproject/3"; // NOI18N
59	private static final String PRIVATE_CONFIGURATION_NAME = "data"; // NOI18N	51	static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-ejbjarproject-private/1"; // NOI18N
60	private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-ejbjarproject-private/1"; // NOI18N
61
62	public String getType() {
63	return TYPE;
64	}
65
66	public Project createProject(AntProjectHelper helper) throws IOException {
67	if (null == helper) {
68	throw new IllegalArgumentException("helper"); // NOI18N
69	}
70	return new EjbJarProject(helper);
71	}
72
73	public String getPrimaryConfigurationDataElementName(boolean shared) {
74	return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
75	}
76
77	public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
78	return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
79	}
80
81	}	52	}

Lines 41-87 Link Here

(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectType.java (-39 / +5 lines)
41		41
42	package org.netbeans.modules.java.j2seproject;	42	package org.netbeans.modules.java.j2seproject;
43		43
44	import java.io.IOException;
45	import javax.swing.Icon;
46	import org.netbeans.api.project.Project;
47	import org.netbeans.spi.project.support.ant.AntBasedProjectType2;
48	import org.netbeans.spi.project.support.ant.AntProjectHelper;
49	import org.openide.util.ImageUtilities;
50
51	/**	44	/**
52	* Factory for simple J2SE projects.	45	* Constants.
53	* @author Jesse Glick
54	*/	46	*/
55	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class)	47	public final class J2SEProjectType {
56	public final class J2SEProjectType implements AntBasedProjectType2 {
57
58	public static final String TYPE = "org.netbeans.modules.java.j2seproject"; // NOI18N	48	public static final String TYPE = "org.netbeans.modules.java.j2seproject"; // NOI18N
59	private static final String PROJECT_CONFIGURATION_NAME = "data"; // NOI18N	49	static final String PROJECT_CONFIGURATION_NAME = "data"; // NOI18N
60	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2se-project/3"; // NOI18N	50	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2se-project/3"; // NOI18N
61	private static final String PRIVATE_CONFIGURATION_NAME = "data"; // NOI18N	51	static final String PRIVATE_CONFIGURATION_NAME = "data"; // NOI18N
62	private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2se-project-private/1"; // NOI18N	52	static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2se-project-private/1"; // NOI18N
63
64	/** Do nothing, just a service. */
65	public J2SEProjectType() {}
66
67	public String getType() {
68	return TYPE;
69	}
70
71	public Project createProject(AntProjectHelper helper) throws IOException {
72	return new J2SEProject(helper);
73	}
74
75	public String getPrimaryConfigurationDataElementName(boolean shared) {
76	return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
77	}
78
79	public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
80	return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
81	}
82
83	public Icon getIcon() {
84	return ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/java/j2seproject/ui/resources/j2seProject.png", true));
85	}
86
87	}	53	}

Lines 40-76 Link Here

(-)a/mobility.project/src/org/netbeans/modules/mobility/project/J2MEProjectType.java (-26 / +2 lines)
40	*/	40	*/
41		41
42	package org.netbeans.modules.mobility.project;	42	package org.netbeans.modules.mobility.project;
43	import org.netbeans.api.project.Project;
44	import org.netbeans.spi.project.support.ant.AntBasedProjectType;
45	import org.netbeans.spi.project.support.ant.AntProjectHelper;
46
47	/**	43	/**
48	* Factory for simple J2ME projects.	44	* Factory for simple J2ME projects.
49	* @author Jesse Glick, Adam Sotona	45	* @author Jesse Glick, Adam Sotona
50	*/	46	*/
51	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class, position=100)	47	public final class J2MEProjectType {
52	public final class J2MEProjectType implements AntBasedProjectType {
53		48
54	public static final String TYPE = "org.netbeans.modules.kjava.j2meproject"; //NOI18N	49	public static final String TYPE = "org.netbeans.modules.kjava.j2meproject"; //NOI18N
55	private static final String PROJECT_CONFIGURATION_NAME = "data"; //NOI18N
56	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2me-project"; //NOI18N	50	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2me-project"; //NOI18N
57	private static final String PRIVATE_CONFIGURATION_NAME = "data"; //NOI18N	51	static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2me-project-private"; //NOI18N
58	private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2me-project-private"; //NOI18N
59
60	public String getType() {
61	return TYPE;
62	}
63
64	public Project createProject(final AntProjectHelper helper) {
65	return new J2MEProject(helper);
66	}
67
68	public String getPrimaryConfigurationDataElementName(final boolean shared) {
69	return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
70	}
71
72	public String getPrimaryConfigurationDataElementNamespace(final boolean shared) {
73	return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
74	}
75
76	}	52	}

Lines 40-85 Link Here

(-)a/php.project/src/org/netbeans/modules/php/project/PhpProjectType.java (-36 / +3 lines)
40	*/	40	*/
41	package org.netbeans.modules.php.project;	41	package org.netbeans.modules.php.project;
42		42
43	import java.io.IOException;
44
45	import org.netbeans.api.project.Project;
46	import org.netbeans.spi.project.support.ant.AntBasedProjectType;
47	import org.netbeans.spi.project.support.ant.AntProjectHelper;
48
49
50	/**	43	/**
51	* @author ads	44	* @author ads
52	*/	45	*/
53	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class)	46	public final class PhpProjectType {
54	public final class PhpProjectType implements AntBasedProjectType {
55		47
56	public static final String TYPE = PhpProjectType.class.getPackage().getName();	48	public static final String TYPE = "org.netbeans.modules.php.project"; // NOI18N
57	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/php-project/1"; // NOI18N	49	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/php-project/1"; // NOI18N
58	private static final String PROJECT_CONFIGURATION_NAME = "data"; // NOI18N	50	static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/php-project-private/1"; // NOI18N
59		51
60	private static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/php-project-private/1"; // NOI18N
61	private static final String PRIVATE_CONFIGURATION_NAME = "data"; // NOI18N
62
63	public Project createProject(AntProjectHelper helper) throws IOException {
64	assert helper != null;
65	return new PhpProject(helper);
66	}
67
68	public String getPrimaryConfigurationDataElementName( boolean shared ) {
69	/*
70	* Copied from MakeProjectType.
71	*/
72	return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
73	}
74
75	public String getPrimaryConfigurationDataElementNamespace( boolean shared ) {
76	/*
77	* Copied from MakeProjectType.
78	*/
79	return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
80	}
81
82	public String getType() {
83	return TYPE;
84	}
85	}	52	}

Lines 105-126 Link Here

(-)a/project.ant/apichanges.xml (-10 / +10 lines)
105		105
106	<changes>	106	<changes>
107		107
108	<change id="antbasedprojecttype2">	108	<change id="antbasedprojectregistration">
109	<api name="general"/>	109	<api name="general"/>
110	<summary>Provide project icon without actually loading the project type</summary>	110	<summary>Register Ant based projects with @annotation</summary>
111	<version major="1" minor="28"/>	111	<version major="1" minor="30"/>
112	<date day="13" month="1" year="2009"/>	112	<date day="4" month="2" year="2009"/>
113	<author login="mkleint"/>	113	<author login="jtulach"/>
114	<compatibility addition="yes" binary="compatible" deletion="no" deprecation="no" modification="no" semantic="compatible" source="compatible"/>	114	<compatibility addition="yes" binary="compatible" deletion="no" deprecation="no" modification="no" semantic="compatible" source="compatible"/>
115	<description>	115	<description>
116	<p>	116	<p>
117	Introducing <code>AntBasedProjectType2</code> that extends <code>AntBasedProjectType</code>	117	Introducing <code>AntBasedProjectRegistration</code> to
118	and adds <code>geticon()</code> method to allow showing the icon without actually loading the	118	simplify registering Ant based projects. Just write the
119	project. Related to <code>org.netbeans.spi.project.ProjectFactory2</code> changes in the Project API module.	119	project class and annotate it.
120	</p>	120	</p>
121	</description>	121	</description>
122	<class package="org.netbeans.spi.project.support.ant" name="AntBasedProjectType2"/>	122	<class package="org.netbeans.spi.project.support.ant" name="AntBasedProjectRegistration"/>
123	<issue number="153923"/>	123	<issue number="153655"/>
124	</change>	124	</change>
125		125
126	<change id="SourcesHelper-minimalSubfolders">	126	<change id="SourcesHelper-minimalSubfolders">

Added Link Here

(-)bd8aef593115 (+129 lines)
1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*
4	* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
5	*
6	* The contents of this file are subject to the terms of either the GNU
7	* General Public License Version 2 only ("GPL") or the Common
8	* Development and Distribution License("CDDL") (collectively, the
9	* "License"). You may not use this file except in compliance with the
10	* License. You can obtain a copy of the License at
11	* http://www.netbeans.org/cddl-gplv2.html
12	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
13	* specific language governing permissions and limitations under the
14	* License. When distributing the software, include this License Header
15	* Notice in each file and include the License file at
16	* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
17	* particular file as subject to the "Classpath" exception as provided
18	* by Sun in the GPL Version 2 section of the License file that
19	* accompanied this code. If applicable, add the following below the
20	* License Header, with the fields enclosed by brackets [] replaced by
21	* your own identifying information:
22	* "Portions Copyrighted [year] [name of copyright owner]"
23	*
24	* If you wish your version of this file to be governed by only the CDDL
25	* or only the GPL Version 2, indicate your decision by adding
26	* "[Contributor] elects to include this software in this distribution
27	* under the [CDDL or GPL Version 2] license." If you do not indicate a
28	* single choice of license, a recipient has the option to distribute
29	* your version of this file under either the CDDL, the GPL Version 2 or
30	* to extend the choice of license to its licensees as provided above.
31	* However, if you add GPL Version 2 code and therefore, elected the GPL
32	* Version 2 license, then the option applies only if the new code is
33	* made subject to such option by the copyright holder.
34	*
35	* Contributor(s):
36	*
37	* Portions Copyrighted 2009 Sun Microsystems, Inc.
38	*/
39
40	package org.netbeans.modules.project.ant;
41
42	import java.io.IOException;
43	import java.lang.reflect.Constructor;
44	import java.lang.reflect.Method;
45	import java.util.Map;
46	import javax.swing.Icon;
47	import org.netbeans.api.project.Project;
48	import org.netbeans.spi.project.support.ant.AntBasedProjectType;
49	import org.netbeans.spi.project.support.ant.AntProjectHelper;
50	import org.openide.util.ImageUtilities;
51	import org.openide.util.Lookup;
52	import org.openide.util.Parameters;
53
54	/** Generic implementation of {@link AntBasedGenericType} that feeds itself
55	* from an layer data.
56	*
57	* @author Jaroslav Tulach <jtulach@netbeans.org>
58	*/
59	final class AntBasedGenericType implements AntBasedProjectType {
60	private final String iconResource;
61	private final String type;
62	private final String className;
63	private final String methodName;
64	private final String[] configNames;
65	private final String[] configNamespaces;
66
67	public AntBasedGenericType(Map map) {
68	iconResource = (String)map.get("iconResource"); // NOI18N
69	type = (String)map.get("type"); // NOI18N
70	className = (String)map.get("className"); // NOI18N
71	methodName = (String)map.get("methodName"); // NOI18N
72	configNames = new String[] {
73	(String)map.get("sharedName"), // NOI18N
74	(String)map.get("privateName"), // NOI18N
75	};
76	configNamespaces = new String[] {
77	(String)map.get("sharedNamespace"), // NOI18N
78	(String)map.get("privateNamespace"), // NOI18N
79	};
80	Parameters.notNull("iconResource", iconResource); // NOI18N
81	Parameters.notNull("type", type); // NOI18N
82	Parameters.notNull("className", className); // NOI18N
83	Parameters.notNull("sharedName", configNames[0]); // NOI18N
84	Parameters.notNull("privateName", configNames[1]); // NOI18N
85	Parameters.notNull("sharedNamespace", configNamespaces[0]); // NOI18N
86	Parameters.notNull("privateNamespace", configNamespaces[1]); // NOI18N
87	}
88
89	public Icon getIcon() {
90	return ImageUtilities.image2Icon(ImageUtilities.loadImage(iconResource, true));
91	}
92
93	public String getType() {
94	return type;
95	}
96
97	public String getPrimaryConfigurationDataElementName(boolean shared) {
98	return shared ? configNames[0] : configNames[1];
99	}
100
101	public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
102	return shared ? configNamespaces[0] : configNamespaces[1];
103	}
104
105
106	public Project createProject(AntProjectHelper helper) throws IOException {
107	ClassLoader l = Lookup.getDefault().lookup(ClassLoader.class);
108	if (l == null) {
109	l = Thread.currentThread().getContextClassLoader();
110	}
111	if (l == null) {
112	l = AntBasedGenericType.class.getClassLoader();
113	}
114	try {
115	Class<?> clazz = l.loadClass(className);
116	if (methodName != null) {
117	Method m = clazz.getDeclaredMethod(methodName, AntProjectHelper.class);
118	return (Project)m.invoke(null, helper);
119	} else {
120	Constructor c = clazz.getConstructor(AntProjectHelper.class);
121	return (Project) c.newInstance(helper);
122	}
123	} catch (RuntimeException ex) {
124	throw ex;
125	} catch (Exception ex) {
126	throw (IllegalArgumentException)new IllegalArgumentException().initCause(ex);
127	}
128	}
129	}

Added Link Here

(-)bd8aef593115 (+164 lines)
1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*
4	* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
5	*
6	* The contents of this file are subject to the terms of either the GNU
7	* General Public License Version 2 only ("GPL") or the Common
8	* Development and Distribution License("CDDL") (collectively, the
9	* "License"). You may not use this file except in compliance with the
10	* License. You can obtain a copy of the License at
11	* http://www.netbeans.org/cddl-gplv2.html
12	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
13	* specific language governing permissions and limitations under the
14	* License. When distributing the software, include this License Header
15	* Notice in each file and include the License file at
16	* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
17	* particular file as subject to the "Classpath" exception as provided
18	* by Sun in the GPL Version 2 section of the License file that
19	* accompanied this code. If applicable, add the following below the
20	* License Header, with the fields enclosed by brackets [] replaced by
21	* your own identifying information:
22	* "Portions Copyrighted [year] [name of copyright owner]"
23	*
24	* If you wish your version of this file to be governed by only the CDDL
25	* or only the GPL Version 2, indicate your decision by adding
26	* "[Contributor] elects to include this software in this distribution
27	* under the [CDDL or GPL Version 2] license." If you do not indicate a
28	* single choice of license, a recipient has the option to distribute
29	* your version of this file under either the CDDL, the GPL Version 2 or
30	* to extend the choice of license to its licensees as provided above.
31	* However, if you add GPL Version 2 code and therefore, elected the GPL
32	* Version 2 license, then the option applies only if the new code is
33	* made subject to such option by the copyright holder.
34	*
35	* Contributor(s):
36	*
37	* Portions Copyrighted 2008 Sun Microsystems, Inc.
38	*/
39
40	package org.netbeans.modules.project.ant;
41
42	import java.util.Set;
43	import javax.annotation.processing.Processor;
44	import javax.annotation.processing.RoundEnvironment;
45	import javax.annotation.processing.SupportedAnnotationTypes;
46	import javax.annotation.processing.SupportedSourceVersion;
47	import javax.lang.model.SourceVersion;
48	import javax.lang.model.element.Element;
49	import javax.lang.model.element.ElementKind;
50	import javax.lang.model.element.ExecutableElement;
51	import javax.lang.model.element.Modifier;
52	import javax.lang.model.element.TypeElement;
53	import javax.lang.model.type.TypeMirror;
54	import org.netbeans.api.project.Project;
55	import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;
56	import org.netbeans.spi.project.support.ant.AntBasedProjectType;
57	import org.netbeans.spi.project.support.ant.AntProjectHelper;
58	import org.openide.filesystems.annotations.LayerBuilder.File;
59	import org.openide.filesystems.annotations.LayerGeneratingProcessor;
60	import org.openide.filesystems.annotations.LayerGenerationException;
61	import org.openide.util.lookup.ServiceProvider;
62
63	/**
64	* processor for {@link AntBasedProjectRegistration} annotation.
65	* @author Jaroslav Tulach
66	*/
67	@ServiceProvider(service=Processor.class)
68	@SupportedSourceVersion(SourceVersion.RELEASE_6)
69	@SupportedAnnotationTypes("org.netbeans.spi.project.support.ant.AntBasedProjectRegistration")//NOI18N
70	public class AntBasedProcessor extends LayerGeneratingProcessor {
71
72	@Override
73	protected boolean handleProcess(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) throws LayerGenerationException {
74	if (roundEnv.processingOver()) {
75	return false;
76	}
77	TypeMirror antHelper = processingEnv.getElementUtils().getTypeElement(AntProjectHelper.class.getName()).asType();
78	TypeMirror project = processingEnv.getElementUtils().getTypeElement(Project.class.getName()).asType();
79	for (Element e : roundEnv.getElementsAnnotatedWith(AntBasedProjectRegistration.class)) {
80	AntBasedProjectRegistration reg = e.getAnnotation(AntBasedProjectRegistration.class);
81	String name;
82	String classname;
83	String methodname;
84	switch (e.getKind()) {
85	case CLASS:
86	classname = processingEnv.getElementUtils().getBinaryName((TypeElement)e).toString();
87	name = classname.replace('.', '-');
88	methodname = null;
89	if (!e.getModifiers().contains(Modifier.PUBLIC)) {
90	throw new LayerGenerationException("Class needs to be public"); // NOI18N
91	}
92	if (!processingEnv.getTypeUtils().isAssignable(e.asType(), project)) {
93	throw new LayerGenerationException("Class needs to extend Project"); // NOI18N
94	}
95	boolean found = false;
96	for (Element cns : processingEnv.getElementUtils().getAllMembers((TypeElement)e)) {
97	if (cns.getKind() != ElementKind.CONSTRUCTOR) {
98	continue;
99	}
100	ExecutableElement exec = (ExecutableElement)cns;
101	if (!exec.getModifiers().contains(Modifier.PUBLIC)) {
102	continue;
103	}
104	if (exec.getParameters().size() != 1) {
105	continue;
106	}
107	if (exec.getParameters().get(0).asType().equals(antHelper)) {
108	found = true;
109	break;
110	}
111	}
112	if (!found) {
113	throw new LayerGenerationException("There needs to be public constructor taking AntProjectHelper parameter"); // NOI18N
114	}
115
116	break;
117	case METHOD:
118	classname = processingEnv.getElementUtils().getBinaryName((TypeElement)e.getEnclosingElement()).toString();
119	methodname = ((ExecutableElement) e).getSimpleName().toString();
120	name = (classname + "." + methodname).replace('.', '-');
121
122	if (!e.getEnclosingElement().getModifiers().contains(Modifier.PUBLIC)) {
123	throw new LayerGenerationException("Class needs to be public"); // NOI18N
124	}
125
126	ExecutableElement exec = (ExecutableElement)e;
127	if (
128	!exec.getModifiers().contains(Modifier.PUBLIC) \|\|
129	!exec.getModifiers().contains(Modifier.STATIC) \|\|
130	exec.getParameters().size() != 1 \|\|
131	!exec.getParameters().get(0).asType().equals(antHelper)
132	) {
133	throw new LayerGenerationException("The method needs to be public, static and take AntProjectHelper argument"); // NOI18N
134	}
135	if (!processingEnv.getTypeUtils().isAssignable(exec.getReturnType(), project)) {
136	throw new LayerGenerationException("Method needs to return Project"); // NOI18N
137	}
138
139	break;
140	default:
141	throw new IllegalArgumentException(e.toString());
142	}
143
144	File f = layer(e).
145	file("Services/AntBasedProjectTypes/" + reg.type().replace('.', '-') + ".instance").
146	stringvalue("type", reg.type()).
147	stringvalue("iconResource", reg.iconResource()).
148	stringvalue("sharedName", reg.sharedName()).
149	stringvalue("sharedNamespace", reg.sharedNamespace()).
150	stringvalue("privateName", reg.privateName()).
151	stringvalue("privateNamespace", reg.privateNamespace()).
152	stringvalue("className", classname).
153	stringvalue("instanceClass", AntBasedProjectType.class.getName()).
154	methodvalue("instanceCreate", AntBasedProjectFactorySingleton.class.getName(), "create");
155
156	if (methodname != null) {
157	f = f.stringvalue("methodName", methodname);
158	}
159	f.write();
160	}
161	return true;
162	}
163
164	}

Lines 69-75 Link Here

(-)a/project.ant/src/org/netbeans/modules/project/ant/AntBasedProjectFactorySingleton.java (-4 / +8 lines)
69	import org.netbeans.spi.project.ProjectFactory2;	69	import org.netbeans.spi.project.ProjectFactory2;
70	import org.netbeans.spi.project.ProjectState;	70	import org.netbeans.spi.project.ProjectState;
71	import org.netbeans.spi.project.support.ant.AntBasedProjectType;	71	import org.netbeans.spi.project.support.ant.AntBasedProjectType;
72	import org.netbeans.spi.project.support.ant.AntBasedProjectType2;
73	import org.netbeans.spi.project.support.ant.AntProjectHelper;	72	import org.netbeans.spi.project.support.ant.AntProjectHelper;
74	import org.openide.filesystems.FileObject;	73	import org.openide.filesystems.FileObject;
75	import org.openide.filesystems.FileUtil;	74	import org.openide.filesystems.FileUtil;
Lines 187-194 Link Here
187	if (type != null) {	186	if (type != null) {
188	AntBasedProjectType provider = findAntBasedProjectType(type);	187	AntBasedProjectType provider = findAntBasedProjectType(type);
189	if (provider != null) {	188	if (provider != null) {
190	if (provider instanceof AntBasedProjectType2) {	189	if (provider instanceof AntBasedGenericType) {
191	return new ProjectManager.Result(((AntBasedProjectType2)provider).getIcon());	190	return new ProjectManager.Result(((AntBasedGenericType)provider).getIcon());
192	} else {	191	} else {
193	//put special icon?	192	//put special icon?
194	return new ProjectManager.Result(null);	193	return new ProjectManager.Result(null);
Lines 385-389 Link Here
385	}	384	}
386	assert HELPER_CALLBACK != null;	385	assert HELPER_CALLBACK != null;
387	}	386	}
388		387
		388	public static AntBasedProjectType create(Map map) {
		389	return new AntBasedGenericType(map);
		390	}
		391
		392
389	}	393	}

Added Link Here

(-)bd8aef593115 (+115 lines)
1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*
4	* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
5	*
6	* The contents of this file are subject to the terms of either the GNU
7	* General Public License Version 2 only ("GPL") or the Common
8	* Development and Distribution License("CDDL") (collectively, the
9	* "License"). You may not use this file except in compliance with the
10	* License. You can obtain a copy of the License at
11	* http://www.netbeans.org/cddl-gplv2.html
12	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
13	* specific language governing permissions and limitations under the
14	* License. When distributing the software, include this License Header
15	* Notice in each file and include the License file at
16	* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
17	* particular file as subject to the "Classpath" exception as provided
18	* by Sun in the GPL Version 2 section of the License file that
19	* accompanied this code. If applicable, add the following below the
20	* License Header, with the fields enclosed by brackets [] replaced by
21	* your own identifying information:
22	* "Portions Copyrighted [year] [name of copyright owner]"
23	*
24	* Contributor(s):
25	*
26	* The Original Software is NetBeans. The Initial Developer of the Original
27	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
28	* Microsystems, Inc. All Rights Reserved.
29	*
30	* If you wish your version of this file to be governed by only the CDDL
31	* or only the GPL Version 2, indicate your decision by adding
32	* "[Contributor] elects to include this software in this distribution
33	* under the [CDDL or GPL Version 2] license." If you do not indicate a
34	* single choice of license, a recipient has the option to distribute
35	* your version of this file under either the CDDL, the GPL Version 2 or
36	* to extend the choice of license to its licensees as provided above.
37	* However, if you add GPL Version 2 code and therefore, elected the GPL
38	* Version 2 license, then the option applies only if the new code is
39	* made subject to such option by the copyright holder.
40	*/
41
42	package org.netbeans.spi.project.support.ant;
43
44	import java.lang.annotation.ElementType;
45	import java.lang.annotation.Retention;
46	import java.lang.annotation.RetentionPolicy;
47	import java.lang.annotation.Target;
48	import org.netbeans.api.project.Project;
49
50	/** Registers a {@link Project} implementation as an
51	* {@link org.netbeans.spi.project.support.ant.AntBasedProjectType} extension.
52	* Just write a project with constructor that takes one
53	* {@link AntProjectHelper} argument and annotate the class with this annotation.
54	* As an alternative you can annotate a factory method with the same parameter.
55	*
56	* @author Jaroslav Tulach
57	* @since 1.30
58	*/
59	@Retention(RetentionPolicy.SOURCE)
60	@Target({ ElementType.TYPE, ElementType.METHOD })
61	public @interface AntBasedProjectRegistration {
62	/**
63	* icon of the project type represented by the given implementation of the interface.
64	* @return the {@link ClassLoader#getResource(java.lang.String)} path to the icon
65	*/
66	public String iconResource();
67
68
69	/**
70	* Get a unique type identifier for this kind of project.
71	* No two registered {@link AntBasedProjectType} instances may share the same type.
72	* The type is stored in <code>nbproject/project.xml</code> in the <code>type</code> element.
73	* It is forbidden for the result of this method to change from call to call.
74	* @return the project type
75	*/
76	String type();
77
78	/**
79	* Get the simple name of the XML element that should be used to store
80	* the project's specific configuration data in <code>nbproject/project.xml</code>
81	* (inside <code><configuration></code>).
82	*
83	* @return a simple name; <samp>data</samp> is recommended but not required
84	*/
85	String sharedName() default "data";
86
87	/**
88	* Get the namespace of the XML element that should be used to store
89	* the project's specific configuration data in <code>nbproject/project.xml</code>
90	* (inside <code><configuration></code>).
91	*
92	* @return an XML namespace, e.g. <samp>http://www.netbeans.org/ns/j2se-project</samp>
93	* or <samp>http://www.netbeans.org/ns/j2se-project-private</samp>
94	*/
95	String sharedNamespace();
96
97	/**
98	* Get the simple name of the XML element that should be used to store
99	* the project's specific configuration data in <code>nbproject/private/private.xml</code>
100	* (inside <code><project-private></code>).
101	*
102	* @return a simple name; <samp>data</samp> is recommended but not required
103	*/
104	String privateName() default "data";
105
106	/**
107	* Get the namespace of the XML element that should be used to store
108	* the project's specific configuration data in <code>nbproject/private/private.xml</code>
109	* (inside <code><project-private></code>).
110	*
111	* @return an XML namespace, e.g. <samp>http://www.netbeans.org/ns/j2se-project</samp>
112	* or <samp>http://www.netbeans.org/ns/j2se-project-private</samp>
113	*/
114	String privateNamespace();
115	}

Removed Link Here

(-)a/project.ant/src/org/netbeans/spi/project/support/ant/AntBasedProjectType2.java (-60 lines)
1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*
4	* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
5	*
6	* The contents of this file are subject to the terms of either the GNU
7	* General Public License Version 2 only ("GPL") or the Common
8	* Development and Distribution License("CDDL") (collectively, the
9	* "License"). You may not use this file except in compliance with the
10	* License. You can obtain a copy of the License at
11	* http://www.netbeans.org/cddl-gplv2.html
12	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
13	* specific language governing permissions and limitations under the
14	* License. When distributing the software, include this License Header
15	* Notice in each file and include the License file at
16	* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
17	* particular file as subject to the "Classpath" exception as provided
18	* by Sun in the GPL Version 2 section of the License file that
19	* accompanied this code. If applicable, add the following below the
20	* License Header, with the fields enclosed by brackets [] replaced by
21	* your own identifying information:
22	* "Portions Copyrighted [year] [name of copyright owner]"
23	*
24	* Contributor(s):
25	*
26	* The Original Software is NetBeans. The Initial Developer of the Original
27	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
28	* Microsystems, Inc. All Rights Reserved.
29	*
30	* If you wish your version of this file to be governed by only the CDDL
31	* or only the GPL Version 2, indicate your decision by adding
32	* "[Contributor] elects to include this software in this distribution
33	* under the [CDDL or GPL Version 2] license." If you do not indicate a
34	* single choice of license, a recipient has the option to distribute
35	* your version of this file under either the CDDL, the GPL Version 2 or
36	* to extend the choice of license to its licensees as provided above.
37	* However, if you add GPL Version 2 code and therefore, elected the GPL
38	* Version 2 license, then the option applies only if the new code is
39	* made subject to such option by the copyright holder.
40	*/
41
42	package org.netbeans.spi.project.support.ant;
43
44	import javax.swing.Icon;
45
46	/**
47	* extension of {@link org.netbeans.spi.project.support.ant.AntBasedProjectType}
48	* that provides an icon for the project without actually creating an project instance for it.
49	* @author mkleint
50	* @since org.netbeans.modules.project.ant 1.28
51	*/
52	public interface AntBasedProjectType2 extends AntBasedProjectType {
53
54	/**
55	* icon of the project type represented by the given implementation of the interface.
56	* @return
57	*/
58	public Icon getIcon();
59
60	}

Added Link Here

(-)bd8aef593115 (+189 lines)
1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*
4	* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
5	*
6	* The contents of this file are subject to the terms of either the GNU
7	* General Public License Version 2 only ("GPL") or the Common
8	* Development and Distribution License("CDDL") (collectively, the
9	* "License"). You may not use this file except in compliance with the
10	* License. You can obtain a copy of the License at
11	* http://www.netbeans.org/cddl-gplv2.html
12	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
13	* specific language governing permissions and limitations under the
14	* License. When distributing the software, include this License Header
15	* Notice in each file and include the License file at
16	* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
17	* particular file as subject to the "Classpath" exception as provided
18	* by Sun in the GPL Version 2 section of the License file that
19	* accompanied this code. If applicable, add the following below the
20	* License Header, with the fields enclosed by brackets [] replaced by
21	* your own identifying information:
22	* "Portions Copyrighted [year] [name of copyright owner]"
23	*
24	* Contributor(s):
25	*
26	* The Original Software is NetBeans. The Initial Developer of the Original
27	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
28	* Microsystems, Inc. All Rights Reserved.
29	*
30	* If you wish your version of this file to be governed by only the CDDL
31	* or only the GPL Version 2, indicate your decision by adding
32	* "[Contributor] elects to include this software in this distribution
33	* under the [CDDL or GPL Version 2] license." If you do not indicate a
34	* single choice of license, a recipient has the option to distribute
35	* your version of this file under either the CDDL, the GPL Version 2 or
36	* to extend the choice of license to its licensees as provided above.
37	* However, if you add GPL Version 2 code and therefore, elected the GPL
38	* Version 2 license, then the option applies only if the new code is
39	* made subject to such option by the copyright holder.
40	*/
41
42	package org.netbeans.spi.project.support.ant;
43
44	import java.io.ByteArrayOutputStream;
45	import java.io.IOException;
46	import java.util.Collection;
47	import java.util.Iterator;
48	import org.netbeans.api.project.Project;
49	import org.netbeans.api.project.ProjectManager;
50	import org.netbeans.api.project.TestUtil;
51	import org.netbeans.junit.NbTestCase;
52	import org.openide.filesystems.FileObject;
53	import org.openide.util.Lookup;
54	import org.openide.util.lookup.Lookups;
55	import org.openide.util.test.AnnotationProcessorTestUtils;
56	import org.openide.util.test.MockLookup;
57
58	/**
59	* That that a project registered by annotation is really found.
60	* @author Jaroslav Tulach
61	*/
62	public class AntBasedProjectRegistrationTest extends NbTestCase {
63
64	public AntBasedProjectRegistrationTest(String name) {
65	super(name);
66	}
67
68	private FileObject scratch;
69	private FileObject projdir;
70	private ProjectManager pm;
71
72	protected @Override void setUp() throws Exception {
73	super.setUp();
74	MockLookup.init();
75	assertEquals("No factory has been used yet", 0, AnnotatedProject.factoryCalls);
76	Collection<? extends AntBasedProjectType> all = Lookups.forPath("Services/AntBasedProjectTypes").lookupAll(AntBasedProjectType.class);
77	assertEquals("Two found", 2, all.size());
78	Iterator<? extends AntBasedProjectType> it = all.iterator();
79	if ("testFactory".equals(getName())) {
80	it.next();
81	}
82	AntBasedProjectType t = it.next();
83	MockLookup.setInstances(t);
84	scratch = TestUtil.makeScratchDir(this);
85	projdir = scratch.createFolder("proj");
86	ProjectGenerator.createProject(projdir, t.getType());
87	pm = ProjectManager.getDefault();
88	}
89
90	protected @Override void tearDown() throws Exception {
91	scratch = null;
92	projdir = null;
93	pm = null;
94	super.tearDown();
95	}
96
97	public void testFindProject() throws Exception {
98	Project p = pm.findProject(projdir);
99	assertNotNull("Annotation project found", p.getLookup().lookup(AnnotatedProject.class));
100	}
101
102	public void testFactory() throws Exception {
103	Project p = pm.findProject(projdir);
104	assertNotNull("Annotation project found", p.getLookup().lookup(AnnotatedProject.class));
105	assertEquals(1, AnnotatedProject.factoryCalls);
106	AnnotatedProject.factoryCalls = 0;
107	}
108
109	public void testTypeNeedsToBeProject() throws Exception {
110	String prj =
111	"import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;" +
112	"import org.netbeans.spi.project.support.ant.AntProjectHelper;" +
113	"@AntBasedProjectRegistration(" +
114	" iconResource=\"noicon\"," +
115	" type=\"test\"," +
116	" privateNamespace=\"urn:test:private\"," +
117	" sharedNamespace=\"urn:test:shared\"" +
118	")" +
119	"public final class Prj extends Object {" +
120	" public Prj(AntProjectHelper h) {" +
121	" }" +
122	"}" +
123	"";
124	AnnotationProcessorTestUtils.makeSource(getWorkDir(), "x.Prj", prj);
125	ByteArrayOutputStream out = new ByteArrayOutputStream();
126	boolean res = AnnotationProcessorTestUtils.runJavac(getWorkDir(), null, getWorkDir(), null, out);
127	assertFalse("Compilation failed", res);
128	if (!out.toString().contains("extend Project")) {
129	fail(out.toString());
130	}
131	}
132
133	public void testReturnTypeNeedsToBeProject() throws Exception {
134	String prj =
135	"import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;" +
136	"import org.netbeans.spi.project.support.ant.AntProjectHelper;" +
137	"" +
138	"public final class Prj extends Object {" +
139	" @AntBasedProjectRegistration(" +
140	" iconResource=\"noicon\"," +
141	" type=\"test\"," +
142	" privateNamespace=\"urn:test:private\"," +
143	" sharedNamespace=\"urn:test:shared\"" +
144	" )" +
145	" public static String factory(AntProjectHelper h) {" +
146	" return null;" +
147	" }" +
148	"}" +
149	"";
150	AnnotationProcessorTestUtils.makeSource(getWorkDir(), "x.Prj", prj);
151	ByteArrayOutputStream out = new ByteArrayOutputStream();
152	boolean res = AnnotationProcessorTestUtils.runJavac(getWorkDir(), null, getWorkDir(), null, out);
153	assertFalse("Compilation failed", res);
154	if (!out.toString().contains("return Project")) {
155	fail(out.toString());
156	}
157	}
158
159	@AntBasedProjectRegistration(
160	iconResource="noicon",
161	type="test",
162	privateNamespace="urn:test:private",
163	sharedNamespace="urn:test:shared"
164	)
165	public static final class AnnotatedProject extends AntBasedTestUtil.TestAntBasedProject {
166	static int factoryCalls;
167
168	public AnnotatedProject(AntProjectHelper h) throws IOException {
169	super(h, null);
170	}
171
172	@Override
173	public Lookup getLookup() {
174	return Lookups.singleton(this);
175	}
176
177	@AntBasedProjectRegistration(
178	iconResource = "noicon",
179	type = "test.factory",
180	privateNamespace = "urn:test:private",
181	sharedNamespace = "urn:test:shared"
182	)
183	public static Project factoryMethod(AntProjectHelper h) throws IOException {
184	factoryCalls++;
185	return new AnnotatedProject(h);
186	}
187	}
188
189	}

Lines 157-170 Link Here

(-)a/project.ant/test/unit/src/org/netbeans/spi/project/support/ant/AntBasedTestUtil.java (-2 / +2 lines)
157		157
158	}	158	}
159		159
160	private static final class TestAntBasedProject implements Project {	160	public static class TestAntBasedProject implements Project {
161		161
162	private final AntProjectHelper helper;	162	private final AntProjectHelper helper;
163	private final ReferenceHelper refHelper;	163	private final ReferenceHelper refHelper;
164	private final GeneratedFilesHelper genFilesHelper;	164	private final GeneratedFilesHelper genFilesHelper;
165	private final Lookup l;	165	private final Lookup l;
166		166
167	TestAntBasedProject(AntProjectHelper helper, AntBuildExtenderImplementation ext) throws IOException {	167	protected TestAntBasedProject(AntProjectHelper helper, AntBuildExtenderImplementation ext) throws IOException {
168	if (helper.getProjectDirectory().getFileObject("nbproject/broken") != null) {	168	if (helper.getProjectDirectory().getFileObject("nbproject/broken") != null) {
169	throw new IOException("broken");	169	throw new IOException("broken");
170	}	170	}

Lines 44-50 Link Here

(-)a/sql.project/src/org/netbeans/modules/sql/project/SQLproProject.java (-2 / +7 lines)
44	import org.netbeans.modules.compapp.projects.base.ui.IcanproCustomizerProvider;	44	import org.netbeans.modules.compapp.projects.base.ui.IcanproCustomizerProvider;
45	import org.netbeans.modules.compapp.projects.base.ui.customizer.IcanproProjectProperties;	45	import org.netbeans.modules.compapp.projects.base.ui.customizer.IcanproProjectProperties;
46	import org.netbeans.modules.compapp.projects.base.queries.IcanproProjectEncodingQueryImpl;	46	import org.netbeans.modules.compapp.projects.base.queries.IcanproProjectEncodingQueryImpl;
47	import org.netbeans.modules.sql.project.SQLproConstants;
48	import org.netbeans.modules.sql.project.ui.SQLproLogicalViewProvider;	47	import org.netbeans.modules.sql.project.ui.SQLproLogicalViewProvider;
49	import java.beans.PropertyChangeListener;	48	import java.beans.PropertyChangeListener;
50	import java.beans.PropertyChangeSupport;	49	import java.beans.PropertyChangeSupport;
Lines 80-86 Link Here
80	import org.openide.util.ImageUtilities;	79	import org.openide.util.ImageUtilities;
81	import org.openide.util.Lookup;	80	import org.openide.util.Lookup;
82	import org.openide.util.Mutex;	81	import org.openide.util.Mutex;
83	import org.openide.util.Utilities;
84	import org.openide.util.lookup.Lookups;	82	import org.openide.util.lookup.Lookups;
85	import org.w3c.dom.Element;	83	import org.w3c.dom.Element;
86	import org.w3c.dom.Node;	84	import org.w3c.dom.Node;
Lines 91-96 Link Here
91	import java.nio.charset.UnsupportedCharsetException;	89	import java.nio.charset.UnsupportedCharsetException;
92	import java.util.logging.Logger;	90	import java.util.logging.Logger;
93	import org.netbeans.api.queries.FileEncodingQuery;	91	import org.netbeans.api.queries.FileEncodingQuery;
		92	import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;
94		93
95		94
96		95
Lines 98-103 Link Here
98	* Represents one sql module project	97	* Represents one sql module project
99	* @author Chris Webster	98	* @author Chris Webster
100	*/	99	*/
		100	@AntBasedProjectRegistration(
		101	type=SQLproProjectType.TYPE,
		102	iconResource="org/netbeans/modules/sql/project/ui/resources/sqlproProjectIcon.gif",
		103	sharedNamespace=SQLproProjectType.PROJECT_CONFIGURATION_NAMESPACE,
		104	privateNamespace=SQLproProjectType.PRIVATE_CONFIGURATION_NAMESPACE
		105	)
101	public final class SQLproProject implements Project, AntProjectListener {	106	public final class SQLproProject implements Project, AntProjectListener {
102		107
103	private static final Icon PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/sql/project/ui/resources/sqlproProjectIcon.gif")); // NOI18N	108	private static final Icon PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/sql/project/ui/resources/sqlproProjectIcon.gif")); // NOI18N

Lines 32-75 Link Here

(-)a/sql.project/src/org/netbeans/modules/sql/project/SQLproProjectType.java (-31 / +1 lines)
32		32
33	package org.netbeans.modules.sql.project;	33	package org.netbeans.modules.sql.project;
34		34
35	import java.io.IOException;
36	import org.netbeans.api.project.Project;
37	import org.netbeans.spi.project.support.ant.AntBasedProjectType;
38	import org.netbeans.spi.project.support.ant.AntProjectHelper;
39
40	/**	35	/**
41	* Factory for EJB Module projects	36	* Factory for EJB Module projects
42	* @author Chris Webster	37	* @author Chris Webster
43	*/	38	*/
44	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class)	39	public class SQLproProjectType {
45	public class SQLproProjectType implements AntBasedProjectType {
46	public static final String TYPE = "org.netbeans.modules.sql.project";	40	public static final String TYPE = "org.netbeans.modules.sql.project";
47	public static final String PROJECT_CONFIGURATION_NAME = "data";	41	public static final String PROJECT_CONFIGURATION_NAME = "data";
48	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-sqlpro/1";	42	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-sqlpro/1";
49	public static final String PRIVATE_CONFIGURATION_NAME = "data";	43	public static final String PRIVATE_CONFIGURATION_NAME = "data";
50	public static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-sqlpro-private/1";	44	public static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-sqlpro-private/1";
51
52
53	public SQLproProjectType() {
54	int i = 0;
55	}
56
57	public String getType() {
58	return TYPE;
59	}
60
61	public Project createProject(AntProjectHelper helper) throws IOException {
62	if (null == helper)
63	throw new IllegalArgumentException("helper");
64	return new SQLproProject(helper);
65	}
66
67	public String getPrimaryConfigurationDataElementName(boolean shared) {
68	return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
69	}
70
71	public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
72	return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
73	}
74
75	}	45	}

Lines 43-58 Link Here

(-)a/web.project/src/org/netbeans/modules/web/project/WebProjectType.java (-21 / +13 lines)
43		43
44	import java.io.IOException;	44	import java.io.IOException;
45	import java.util.Collection;	45	import java.util.Collection;
46	import javax.swing.Icon;
47	import org.netbeans.api.project.Project;	46	import org.netbeans.api.project.Project;
48	import org.netbeans.modules.web.project.spi.WebProjectImplementationFactory;	47	import org.netbeans.modules.web.project.spi.WebProjectImplementationFactory;
49	import org.netbeans.spi.project.support.ant.AntBasedProjectType2;	48	import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;
50	import org.netbeans.spi.project.support.ant.AntProjectHelper;	49	import org.netbeans.spi.project.support.ant.AntProjectHelper;
51	import org.openide.util.ImageUtilities;
52	import org.openide.util.Lookup;	50	import org.openide.util.Lookup;
53		51
54	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class)	52	public final class WebProjectType {
55	public final class WebProjectType implements AntBasedProjectType2 {
56		53
57	public static final String TYPE = "org.netbeans.modules.web.project";	54	public static final String TYPE = "org.netbeans.modules.web.project";
58	private static final String PROJECT_CONFIGURATION_NAME = "data";	55	private static final String PROJECT_CONFIGURATION_NAME = "data";
Lines 66-78 Link Here
66	"http://www.netbeans.org/ns/web-project/3"};	63	"http://www.netbeans.org/ns/web-project/3"};
67		64
68	/** Do nothing, just a service. */	65	/** Do nothing, just a service. */
69	public WebProjectType() {}	66	private WebProjectType() {}
70		67
71	public String getType() {	68	public String getType() {
72	return TYPE;	69	return TYPE;
73	}	70	}
74		71	@AntBasedProjectRegistration(
75	public Project createProject(AntProjectHelper helper) throws IOException {	72	iconResource="org/netbeans/modules/web/project/ui/resources/webProjectIcon.gif", // NOI18N
		73	type=TYPE,
		74	sharedName=PROJECT_CONFIGURATION_NAME,
		75	sharedNamespace=PROJECT_CONFIGURATION_NAMESPACE,
		76	privateName=PRIVATE_CONFIGURATION_NAME,
		77	privateNamespace=PRIVATE_CONFIGURATION_NAMESPACE
		78	)
		79	public static Project createProject(AntProjectHelper helper) throws IOException {
76	for(WebProjectImplementationFactory factory : getProjectFactories()) {	80	for(WebProjectImplementationFactory factory : getProjectFactories()) {
77	if (factory.acceptProject(helper)) {	81	if (factory.acceptProject(helper)) {
78	//delegate project completely to another implementation	82	//delegate project completely to another implementation
Lines 82-100 Link Here
82	return new WebProject(helper);	86	return new WebProject(helper);
83	}	87	}
84		88
85	public String getPrimaryConfigurationDataElementName(boolean shared) {	89	private static Collection<? extends WebProjectImplementationFactory> getProjectFactories() {
86	return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
87	}
88
89	public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
90	return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
91	}
92
93	private Collection<? extends WebProjectImplementationFactory> getProjectFactories() {
94	return Lookup.getDefault().lookupAll(WebProjectImplementationFactory.class);	90	return Lookup.getDefault().lookupAll(WebProjectImplementationFactory.class);
95	}	91	}
96
97	public Icon getIcon() {
98	return ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/web/project/ui/resources/webProjectIcon.gif", true));
99	}
100	}	92	}

Lines 18-62 Link Here

(-)a/xslt.project/src/org/netbeans/modules/xslt/project/XsltproProjectType.java (-30 / +1 lines)
18	*/	18	*/
19	package org.netbeans.modules.xslt.project;	19	package org.netbeans.modules.xslt.project;
20		20
21	import java.io.IOException;
22	import org.netbeans.api.project.Project;
23	import org.netbeans.spi.project.support.ant.AntBasedProjectType;
24	import org.netbeans.spi.project.support.ant.AntProjectHelper;
25
26	/**	21	/**
27	* Factory for EJB Module projects	22	* Factory for EJB Module projects
28	* @author Chris Webster	23	* @author Chris Webster
29	* @author Vitaly Bychkov	24	* @author Vitaly Bychkov
30	* @version 1.0	25	* @version 1.0
31	*/	26	*/
32	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.project.support.ant.AntBasedProjectType.class)	27	public class XsltproProjectType {
33	public class XsltproProjectType implements AntBasedProjectType {
34	public static final String TYPE = "org.netbeans.modules.xslt.project";	28	public static final String TYPE = "org.netbeans.modules.xslt.project";
35	public static final String PROJECT_CONFIGURATION_NAME = "data";	29	public static final String PROJECT_CONFIGURATION_NAME = "data";
36	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-xsltpro/1";	30	public static final String PROJECT_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-xsltpro/1";
37	public static final String PRIVATE_CONFIGURATION_NAME = "data";	31	public static final String PRIVATE_CONFIGURATION_NAME = "data";
38	public static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-xsltpro-private/1";	32	public static final String PRIVATE_CONFIGURATION_NAMESPACE = "http://www.netbeans.org/ns/j2ee-xsltpro-private/1";
39
40	public XsltproProjectType() {
41	}
42
43	public String getType() {
44	return TYPE;
45	}
46
47	public Project createProject(AntProjectHelper helper) throws IOException {
48	if (helper == null) {
49	throw new IllegalArgumentException("AntProjectHelper shouldn't be null");
50	}
51	return new XsltproProject(helper);
52	}
53
54	public String getPrimaryConfigurationDataElementName(boolean shared) {
55	return shared ? PROJECT_CONFIGURATION_NAME : PRIVATE_CONFIGURATION_NAME;
56	}
57
58	public String getPrimaryConfigurationDataElementNamespace(boolean shared) {
59	return shared ? PROJECT_CONFIGURATION_NAMESPACE : PRIVATE_CONFIGURATION_NAMESPACE;
60	}
61
62	}	33	}