# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: /home/vbk/release55d # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: web/project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java *** /home/vbk/release55d/web/project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java Base (1.94.6.3.2.8) --- /home/vbk/release55d/web/project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java Locally Modified (Based On 1.94.6.3.2.8) *************** *** 247,253 **** --- 247,255 ---- private static String serverId; private static String cp; + public static final String JAVA_SOURCE_BASED= "java.source.based"; + public WebProjectProperties(WebProject project, UpdateHelper updateHelper, PropertyEvaluator evaluator, ReferenceHelper refHelper) { this.project = project; this.updateHelper = updateHelper; Index: web/project/src/org/netbeans/modules/web/project/api/WebProjectCreateData.java *** /home/vbk/release55d/web/project/src/org/netbeans/modules/web/project/api/WebProjectCreateData.java Base (1.1.2.2) --- /home/vbk/release55d/web/project/src/org/netbeans/modules/web/project/api/WebProjectCreateData.java Locally Modified (Based On 1.1.2.2) *************** *** 51,56 **** --- 51,57 ---- private FileObject docBase; private FileObject libFolder; private String buildfile; + private boolean javaSourceBased = true; /** * Creates a new instance of WebProjectCreateData *************** *** 315,321 **** --- 316,340 ---- // System.out.println(" buildfile: " + buildfile); // } + /** + * Indicate whether the project is being created from java sources. + * @param b should the user be able to extend this project with additional + * source elements + */ + public void setJavaSourceBased(boolean b) { + this.javaSourceBased = b; } + + /** + * Determine whether the project was created from java sources. + * @return if the project supports the addition of java source files + */ + public boolean getJavaSourceBased() { + return this.javaSourceBased; + } + + } Index: j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java *** /home/vbk/release55d/j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java Base (1.27.2.3.2.10) --- /home/vbk/release55d/j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java Locally Modified (Based On 1.27.2.3.2.10) *************** *** 150,155 **** --- 150,156 ---- public static final String ANT_DEPLOY_BUILD_SCRIPT = "nbproject/ant-deploy.xml"; // NOI18N + public static final String JAVA_SOURCE_BASED = "java.source.based"; public static final String[] WELL_KNOWN_PATHS = new String[] { "${" + JAVAC_CLASSPATH + "}", // NOI18N Index: j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java *** /home/vbk/release55d/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java Base (1.1.4.19) --- /home/vbk/release55d/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java Locally Modified (Based On 1.1.4.19) *************** *** 266,271 **** --- 266,273 ---- private final Properties additionalProperties; + public static final String JAVA_SOURCE_BASED = "java.source.based"; + AppClientProject getProject() { return project; } Index: j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectGenerator.java *** /home/vbk/release55d/j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectGenerator.java Base (1.1.2.6.2.14) --- /home/vbk/release55d/j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectGenerator.java Locally Modified (Based On 1.1.2.6.2.14) *************** *** 120,127 **** --- 120,159 ---- return h; } + /** + * Import project from source or exploded archive + * @param dir root directory of project + * @param name name of the project + * @param sourceFolders Array of folders that hold the projects source + * or exploded archive + * @param testFolders folders that hold test code for the project + * @param configFilesBase Folder that holds the projects config files + * like deployment descriptors + * @param libFolder the libraries associated with the project + * @param j2eeLevel spec revision level + * @param serverInstanceID id of target server + * @param fromJavaSources flag whether the project is from source or + * exploded archive of class files + * @throws java.io.IOException if something goes wrong + * @return The AntProjectHelper for the project + */ public static AntProjectHelper importProject(final File dir, final String name, final File[] sourceFolders, final File[] testFolders, + final File configFilesBase, final File libFolder, final String j2eeLevel, + String serverInstanceID, boolean fromJavaSources) throws IOException { + + AntProjectHelper retVal = importProject(dir,name,sourceFolders,testFolders, + configFilesBase,libFolder,j2eeLevel,serverInstanceID); + EditableProperties subEp = retVal.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); + subEp.setProperty(EjbJarProjectProperties.JAVA_SOURCE_BASED,fromJavaSources+""); // NOI18N + retVal.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH,subEp); + Project subP = ProjectManager.getDefault().findProject(retVal.getProjectDirectory()); + ProjectManager.getDefault().saveProject(subP); + return retVal; + } + + public static AntProjectHelper importProject(final File dir, final String name, + final File[] sourceFolders, final File[] testFolders, final File configFilesBase, final File libFolder, final String j2eeLevel, String serverInstanceID) throws IOException { assert sourceFolders != null && testFolders != null: "Package roots can't be null"; //NOI18N final FileObject dirFO = createProjectDir (dir); Index: web/project/src/org/netbeans/modules/web/project/api/WebProjectUtilities.java *** /home/vbk/release55d/web/project/src/org/netbeans/modules/web/project/api/WebProjectUtilities.java Base (1.2.2.5.2.18) --- /home/vbk/release55d/web/project/src/org/netbeans/modules/web/project/api/WebProjectUtilities.java Locally Modified (Based On 1.2.2.5.2.18) *************** *** 319,324 **** --- 319,325 ---- String buildfile = createData.getBuildfile(); String javaPlatformName = createData.getJavaPlatformName(); String sourceLevel = createData.getSourceLevel(); + boolean javaSourceBased = createData.getJavaSourceBased(); assert dir != null: "Project folder can't be null"; //NOI18N assert name != null: "Project name can't be null"; //NOI18N *************** *** 442,447 **** --- 443,450 ---- //(it would be nice to have a possibily to set this property in the wizard) ep.setProperty(WebProjectProperties.RESOURCE_DIR, DEFAULT_RESOURCE_FOLDER); + ep.setProperty(WebProjectProperties.JAVA_SOURCE_BASED,javaSourceBased+""); + UpdateHelper updateHelper = ((WebProject) p).getUpdateHelper(); PlatformUiSupport.storePlatform(ep, updateHelper, javaPlatformName, sourceLevel != null ? new SpecificationVersion(sourceLevel) : null); Index: j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java *** /home/vbk/release55d/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java Base (1.1.4.20) --- /home/vbk/release55d/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java Locally Modified (Based On 1.1.4.20) *************** *** 251,256 **** --- 251,284 ---- return h; } + /** + * Imports an existing Application client project into NetBeans project + * with a flag to specify whether the project contains java source files + * or was created from an exploded archive. + * @return the helper object permitting it to be further customized + * @param fromJavaSource indicate whether the project is "from" source or an exploded archive + * @param dir the top-level directory (need not yet exist but if it does it must be empty) - "nbproject" location + * @param name the name for the project + * @param sourceFolders top-level location(s) of java sources - must not be null + * @param testFolders top-level location(s) of test(s) - must not be null + * @param confFolder top-level location of configuration file(s) folder - must not be null + * @param libFolder top-level location of libraries + * @param j2eeLevel defined in org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule + * @param serverInstanceID provided by j2eeserver module + * @throws IOException in case something went wrong + */ + public static AntProjectHelper importProject(final File dir, final String name, + final File[] sourceFolders, final File[] testFolders, final File confFolder, + final File libFolder, String j2eeLevel, String serverInstanceID,boolean fromJavaSource) throws IOException { + AntProjectHelper h = importProject(dir,name,sourceFolders,testFolders, + confFolder,libFolder,j2eeLevel,serverInstanceID); + EditableProperties subEp = h.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); + subEp.setProperty(AppClientProjectProperties.JAVA_SOURCE_BASED,fromJavaSource+""); // NOI18N + h.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH,subEp); + Project subP = ProjectManager.getDefault().findProject(h.getProjectDirectory()); + ProjectManager.getDefault().saveProject(subP); + return h; + } private static AntProjectHelper createProject(FileObject dirFO, String name, String srcRoot, String testRoot, String configFiles, String libraries, String resources, String mainClass, String j2eeLevel,