Attachment 111731 Details for Bug 246291 – patch for 155 (including patch for 237139)

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch for 155 (including patch for 237139)

J2EEFlexProj_246291_237139_patch.txt (text/plain), 4.48 KB, created by Janelle Carroll

on 2008-09-04 17:50:06 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Janelle Carroll

Created: 2008-09-04 17:50:06 EDT

Size: 4.48 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.j2ee
>Index: j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEFlexProjDeployable.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEFlexProjDeployable.java,v
>retrieving revision 1.63.2.2.2.4
>diff -u -r1.63.2.2.2.4 J2EEFlexProjDeployable.java
>--- j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEFlexProjDeployable.java	16 May 2008 16:01:43 -0000	1.63.2.2.2.4
>+++ j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEFlexProjDeployable.java	4 Sep 2008 21:44:25 -0000
>@@ -77,6 +77,7 @@
> 	private IContainer[] cachedOutputContainers;
> 	private HashMap cachedOutputMappings;
> 	private HashMap cachedSourceOutputPairs;
>+	private boolean isSingleJavaOutputNonSource = false;
> 
> 	/**
> 	 * Constructor for J2EEFlexProjDeployable.
>@@ -666,6 +667,7 @@
> 	 *    <code>false</code> otherwise
> 	 */
> 	public boolean isSingleRootStructure() {
>+		isSingleJavaOutputNonSource = false;
> 		StructureEdit edit = null;
> 		try {
> 			edit = StructureEdit.getStructureEditForRead(getProject());
>@@ -720,11 +722,36 @@
> 				}
> 				// Ensure there are only source folder component resource mappings to the root content folder
> 				if (isRootResourceMapping(resourceMaps,false)) {
>+					IContainer[] javaOutputFolders = getJavaOutputFolders();
> 					// Verify only one java outputfolder
>-					if (getJavaOutputFolders().length==1) {
>-						// At this point for utility projects, this project is optimized, we can just use the output folder
>-						if (J2EEProjectUtilities.isUtilityProject(getProject()))
>+					if (javaOutputFolders.length==1) {
>+						// By the time we get here we know: for any folders defined as source in the 
>+						// .component file that they are also java source folders.
>+						if (! isSourceContainer(javaOutputFolders[0].getFullPath())) {
>+							// The single output folder is NOT a source folder so this is single-rooted. Since the
>+							// output folder (something like classes or bin) is not a source folder, JDT copies all files
>+							// (including non Java files) to this folder, so every resource needed at runtime is located 
>+							// in a single directory.
>+							isSingleJavaOutputNonSource = true;
> 							return true;
>+						} else {
>+// Don't implement at this time. Currently, we claim single-rooted when ejbModlule is the output folder.  However,
>+// we know this is not true because it cannot contain non Java files unless it is the only source folder. But, fixing
>+// at this time would break all current users.
>+//							// The single output folder IS a source folder. If there is more than one source folder
>+//							// then this cannot be single-rooted because JDT does NOTcopy non Java resources into the
>+//							// output folder when it is a source folder.
>+//							if (getSourceContainers().length > 1) {
>+//								return false;
>+//							} else {
>+//								// There is only one source folder and since the output folder is a source folder
>+//								// this is single-rooted.
>+//								return true;
>+//							}
>+						}
>+//						// At this point for utility projects, this project is optimized, we can just use the output folder
>+//						if (J2EEProjectUtilities.isUtilityProject(getProject()))
>+//							return true;
> 						// Verify the java output folder is the same as one of the content roots
> 						IPath javaOutputPath = getJavaOutputFolders()[0].getProjectRelativePath();
> 						IContainer[] rootFolders = component.getRootFolder().getUnderlyingFolders();
>@@ -832,8 +859,12 @@
> 	 */
> 	private IModuleResource[] getOptimizedMembers() throws CoreException {
> 		if (component != null) {
>-			// For java utility modules, we can just use the output container, at this point we know there is only one
>-			if (J2EEProjectUtilities.isUtilityProject(getProject())) {
>+			if (isSingleJavaOutputNonSource) {
>+				// We determined when testing for a single root structure that this project has
>+				// one output folder and that output folder is not a source folder. Since the
>+				// output folder (for example, classes or bin) is not a source folder, JDT copies all files
>+				// (including non Java files) to this folder, so every resource needed at runtime is located 
>+				// in that single output directory.
> 				return getModuleResources(Path.EMPTY, getJavaOutputFolders()[0]);
> 			}
> 			// For J2EE modules, we use the contents of the content root

Actions: View | Diff

Attachments on bug 246291: 111731 | 112208