Attachment #179852 for bug #325644

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




import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;

import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
import org.eclipse.jst.j2ee.project.EarUtilities;
import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;

			IVirtualComponent earComponent = ComponentCore.createComponent(associatedEARProject);
			
			IContainer underlyingFolder = earComponent.getRootFolder().getUnderlyingFolder();
			String uriMapping = getUtilityJar().getName();
			String earLib = EarUtilities.getEARLibDir(earComponent);
			IFolder libDirFolder = null;
 			if(earLib != null && earLib.length() > 0) {
 				uriMapping = (new Path(earLib)).append(uriMapping).toString(); 
 				if(underlyingFolder.isAccessible()) {
 					libDirFolder = getWorkspaceRoot().getFolder(underlyingFolder.getFullPath().append(earLib));
 				} else {
 					libDirFolder = getWorkspaceRoot().getFolder(associatedEARProject.getFullPath().append(earLib));
 				}
 			}
			if(underlyingFolder.isAccessible()) {
				copiedJarFile = underlyingFolder.getFile(new Path(uriMapping));
			} else {
				copiedJarFile = associatedEARProject.getFile(uriMapping);
			}
 			if (copiedJarFile.exists()) {
				if (isOverwriteIfNecessary())
					copiedJarFile.delete(true, true, new SubProgressMonitor(monitor, 1));

					status.add(J2EEPlugin.createErrorStatus(0, NLS.bind(EARCreationResourceHandler.CopyArchiveIntoProjectOperation_Found_existing_file_0_, copiedJarFile), null));
					return status;
				}
			}
 			
 			// Create EAR's library directory folder if it doesn't exist
 			if(libDirFolder != null && (!libDirFolder.exists() || !libDirFolder.isAccessible())) {
 				mkdirs(libDirFolder);
 			}
 			
			FileInputStream fileInputStream = null;
			ByteArrayOutputStream bos = null;
			ByteArrayInputStream jarFileInputStream = null;


				addLibraryToClasspath(associatedEARProject, copiedJarFile, monitor);
				
				createVirtualArchiveComponent(associatedEARProject, uriMapping, copiedJarFile, monitor);
				
				
			} catch (FileNotFoundException e) {




package org.eclipse.jst.j2ee.application.internal.operations;

import java.io.File;
import java.lang.reflect.InvocationTargetException;

import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.resources.IProject;

			importModel.setProperty(IJavaUtilityJarImportDataModelProperties.EAR_PROJECT_NAME, getAssociatedEARProjectName());

			status.add(importModel.getDefaultOperation().execute(new SubProgressMonitor(monitor, 1), info)); 
			
			IProject associatedEARProject = getWorkspaceRoot().getProject(getAssociatedEARProjectName());
 			IProject utilityJarProject = getWorkspaceRoot().getProject(newProjectName);
			linkArchiveToEAR(associatedEARProject, getUtilityJar().getName(), utilityJarProject, new SubProgressMonitor(monitor, 1));
			
		} catch (InvocationTargetException e) {
			status.add(J2EEPlugin.createErrorStatus(0, e.getMessage(), e));
			J2EEPlugin.logError(0, e.getMessage(), e);
		} catch (InterruptedException e) {
			status.add(J2EEPlugin.createErrorStatus(0, e.getMessage(), e));
			J2EEPlugin.logError(0, e.getMessage(), e);
		} catch (CoreException e) {
			status.add(J2EEPlugin.createErrorStatus(0, e.getMessage(), e));
			J2EEPlugin.logError(0, e.getMessage(), e);




import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.JavaCore;

				createUtilityProject.setProperty(IProjectCreationPropertiesNew.USER_DEFINED_LOCATION, projectRoot);
			}
 			
			createUtilityProject.setProperty(IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR, true);
			createUtilityProject.setProperty(IJ2EEFacetProjectCreationDataModelProperties.EAR_PROJECT_NAME, getAssociatedEARProjectName());
			
			status.add(createUtilityProject.getDefaultOperation().execute(monitor, info));

			IVirtualComponent utilComponent = ComponentCore.createComponent(project);
			status.add(removeRootMapping(utilComponent, "/src", monitor)); //$NON-NLS-1$
			
			/* Create the /<archive> mapping */
			status.add(createVirtualArchiveComponent(project, getUtilityJar().getName(), project.getFile(getUtilityJar().getName()), monitor));
			 
			/* Make this project a utility jar project for the EAR */
			IProject associatedEARProject = getWorkspaceRoot().getProject(getAssociatedEARProjectName());			
			status.add(linkArchiveToEAR(associatedEARProject, getUtilityJar().getName(), utilityJarProject, new SubProgressMonitor(monitor, 1)));

		} catch (Exception e) {
			status.add(J2EEPlugin.createErrorStatus(0, EARCreationResourceHandler.J2EEUtilityJarListImportOperation_UI_2, e));
		}		 




import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.operations.AbstractOperation;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IPathVariableManager;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;


		IVirtualComponent utilcomponent = ComponentCore.createArchiveComponent(targetProject, VirtualArchiveComponent.LIBARCHIVETYPE + IPath.SEPARATOR + utilityJarIFile.getProjectRelativePath().toString());

		IPath uriMappingPath = null;
		String uri = uriMapping;
		String deployPath = null;
		if(uriMapping != null) {
			uriMappingPath = new Path(uriMapping);
			uri = uriMappingPath.lastSegment();
			if(uriMappingPath.segmentCount() > 1)
				deployPath = uriMappingPath.removeLastSegments(1).toString();
		}
		
		addArchiveProjectToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earcomponent);
		addArchiveProjectToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, Collections.singletonList(utilcomponent));
		Map uriMap = new HashMap();
		uriMap.put(utilcomponent, uri);
		addArchiveProjectToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, uriMap);
		if(deployPath != null && deployPath.length() > 0) {
			Map deployMap = new HashMap();
			deployMap.put(utilcomponent, deployPath);
			addArchiveProjectToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH_MAP, deployMap);
		}
		return  addArchiveProjectToEARDataModel.getDefaultOperation().execute(monitor, null);
	}
	

    	
    	return baseLocation != null ? (baseLocation + File.separator + proposedProjectName) : null;
    }
    
	protected static void mkdirs(final IFolder folder) throws CoreException {
		if (!folder.exists()) {
			if (folder.getParent() instanceof IFolder) {
				mkdirs((IFolder) folder.getParent());
			}
			folder.create(true, true, null);
		}
	}

}

Lines 69-74 Link Here

(-)earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarImportDataModelProvider.java (+1 lines)
69	nestedModel = (IDataModel) nestedModels.get(i);	69	nestedModel = (IDataModel) nestedModels.get(i);
70	try {	70	try {
71	nestedModel.setProperty(IJ2EEFacetProjectCreationDataModelProperties.EAR_PROJECT_NAME, propertyValue);	71	nestedModel.setProperty(IJ2EEFacetProjectCreationDataModelProperties.EAR_PROJECT_NAME, propertyValue);
		72	nestedModel.setProperty(IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR, true);
72	} catch (Exception e) {	73	} catch (Exception e) {
73	J2EEPlugin.logError(e);	74	J2EEPlugin.logError(e);
74	}	75	}




import java.lang.reflect.InvocationTargetException;

import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
import org.eclipse.jst.j2ee.project.EarUtilities;
import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;

public class LinkArchiveIntoProjectOperation extends J2EEUtilityJarImportAssistantOperation {


		IProject project = getWorkspaceRoot().getProject(getAssociatedEARProjectName());

		try {
			IVirtualComponent earComponent = ComponentCore.createComponent(project);
			IContainer underlyingFolder = earComponent.getRootFolder().getUnderlyingFolder();
			String uriMapping = getUtilityJar().getName();
			String earLib = EarUtilities.getEARLibDir(earComponent);
			IFolder libDirFolder = null;
 			if(earLib != null && earLib.length() > 0) {
 				uriMapping = (new Path(earLib)).append(uriMapping).toString();
 				if(underlyingFolder.isAccessible()) {
 					libDirFolder = getWorkspaceRoot().getFolder(underlyingFolder.getFullPath().append(earLib));
 				} else {
 					libDirFolder = getWorkspaceRoot().getFolder(project.getFullPath().append(earLib));
 				}
 			}
 			
 			IFile linkedJarFile = null;
 			if(underlyingFolder.isAccessible()) {				
				linkedJarFile = underlyingFolder.getFile(new Path(uriMapping));
			} else {
				linkedJarFile = project.getFile(uriMapping);
			}
 			
			if (linkedJarFile.exists()) {
				if (isOverwriteIfNecessary())
					linkedJarFile.delete(true, true, new SubProgressMonitor(monitor, 1));

					return status;
				}
			}
 			
 			// Create EAR's library directory folder if it doesn't exist
 			if(libDirFolder != null && (!libDirFolder.exists() || !libDirFolder.isAccessible())) {
 				mkdirs(libDirFolder);
 			}
 			
			status.add(createLinkedArchive(project, linkedJarFile.getProjectRelativePath().toString(), getUtilityJar(), linkedPathVariable, monitor));

			addLibraryToClasspath(project, linkedJarFile, monitor);
			
			createVirtualArchiveComponent(project, uriMapping, linkedJarFile, monitor);

		} catch (CoreException e) {
			status.add(J2EEPlugin.createErrorStatus(0, e.getMessage(), e));

Return to bug 325644

Lines 20-26 Link Here

(-)earproject/org/eclipse/jst/j2ee/application/internal/operations/CreateProjectWithLinkedJarOperation.java (-8 / +1 lines)
20	import org.eclipse.core.runtime.IStatus;	20	import org.eclipse.core.runtime.IStatus;
21	import org.eclipse.core.runtime.MultiStatus;	21	import org.eclipse.core.runtime.MultiStatus;
22	import org.eclipse.core.runtime.Status;	22	import org.eclipse.core.runtime.Status;
23	import org.eclipse.core.runtime.SubProgressMonitor;
24	import org.eclipse.jdt.core.IJavaProject;	23	import org.eclipse.jdt.core.IJavaProject;
25	import org.eclipse.jdt.core.IPackageFragmentRoot;	24	import org.eclipse.jdt.core.IPackageFragmentRoot;
26	import org.eclipse.jdt.core.JavaCore;	25	import org.eclipse.jdt.core.JavaCore;
Lines 63-68 Link Here
63	createUtilityProject.setProperty(IProjectCreationPropertiesNew.USER_DEFINED_LOCATION, projectRoot);	62	createUtilityProject.setProperty(IProjectCreationPropertiesNew.USER_DEFINED_LOCATION, projectRoot);
64	}	63	}
65		64
		65	createUtilityProject.setProperty(IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR, true);
66	createUtilityProject.setProperty(IJ2EEFacetProjectCreationDataModelProperties.EAR_PROJECT_NAME, getAssociatedEARProjectName());	66	createUtilityProject.setProperty(IJ2EEFacetProjectCreationDataModelProperties.EAR_PROJECT_NAME, getAssociatedEARProjectName());
67		67
68	status.add(createUtilityProject.getDefaultOperation().execute(monitor, info));	68	status.add(createUtilityProject.getDefaultOperation().execute(monitor, info));
Lines 81-93 Link Here
81	IVirtualComponent utilComponent = ComponentCore.createComponent(project);	81	IVirtualComponent utilComponent = ComponentCore.createComponent(project);
82	status.add(removeRootMapping(utilComponent, "/src", monitor)); //$NON-NLS-1$	82	status.add(removeRootMapping(utilComponent, "/src", monitor)); //$NON-NLS-1$
83		83
84	/* Create the /<archive> mapping */
85	status.add(createVirtualArchiveComponent(project, getUtilityJar().getName(), project.getFile(getUtilityJar().getName()), monitor));
86
87	/* Make this project a utility jar project for the EAR */
88	IProject associatedEARProject = getWorkspaceRoot().getProject(getAssociatedEARProjectName());
89	status.add(linkArchiveToEAR(associatedEARProject, getUtilityJar().getName(), utilityJarProject, new SubProgressMonitor(monitor, 1)));
90
91	} catch (Exception e) {	84	} catch (Exception e) {
92	status.add(J2EEPlugin.createErrorStatus(0, EARCreationResourceHandler.J2EEUtilityJarListImportOperation_UI_2, e));	85	status.add(J2EEPlugin.createErrorStatus(0, EARCreationResourceHandler.J2EEUtilityJarListImportOperation_UI_2, e));
93	}	86	}

Lines 19-24 Link Here

(-)earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarImportAssistantOperation.java (-1 / +26 lines)
19	import org.eclipse.core.commands.ExecutionException;	19	import org.eclipse.core.commands.ExecutionException;
20	import org.eclipse.core.commands.operations.AbstractOperation;	20	import org.eclipse.core.commands.operations.AbstractOperation;
21	import org.eclipse.core.resources.IFile;	21	import org.eclipse.core.resources.IFile;
		22	import org.eclipse.core.resources.IFolder;
22	import org.eclipse.core.resources.IPathVariableManager;	23	import org.eclipse.core.resources.IPathVariableManager;
23	import org.eclipse.core.resources.IProject;	24	import org.eclipse.core.resources.IProject;
24	import org.eclipse.core.resources.IResource;	25	import org.eclipse.core.resources.IResource;
Lines 106-116 Link Here
106		107
107	IVirtualComponent utilcomponent = ComponentCore.createArchiveComponent(targetProject, VirtualArchiveComponent.LIBARCHIVETYPE + IPath.SEPARATOR + utilityJarIFile.getProjectRelativePath().toString());	108	IVirtualComponent utilcomponent = ComponentCore.createArchiveComponent(targetProject, VirtualArchiveComponent.LIBARCHIVETYPE + IPath.SEPARATOR + utilityJarIFile.getProjectRelativePath().toString());
108		109
		110	IPath uriMappingPath = null;
		111	String uri = uriMapping;
		112	String deployPath = null;
		113	if(uriMapping != null) {
		114	uriMappingPath = new Path(uriMapping);
		115	uri = uriMappingPath.lastSegment();
		116	if(uriMappingPath.segmentCount() > 1)
		117	deployPath = uriMappingPath.removeLastSegments(1).toString();
		118	}
		119
109	addArchiveProjectToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earcomponent);	120	addArchiveProjectToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earcomponent);
110	addArchiveProjectToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, Collections.singletonList(utilcomponent));	121	addArchiveProjectToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, Collections.singletonList(utilcomponent));
111	Map uriMap = new HashMap();	122	Map uriMap = new HashMap();
112	uriMap.put(utilcomponent, uriMapping);	123	uriMap.put(utilcomponent, uri);
113	addArchiveProjectToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, uriMap);	124	addArchiveProjectToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, uriMap);
		125	if(deployPath != null && deployPath.length() > 0) {
		126	Map deployMap = new HashMap();
		127	deployMap.put(utilcomponent, deployPath);
		128	addArchiveProjectToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH_MAP, deployMap);
		129	}
114	return addArchiveProjectToEARDataModel.getDefaultOperation().execute(monitor, null);	130	return addArchiveProjectToEARDataModel.getDefaultOperation().execute(monitor, null);
115	}	131	}
116		132
Lines 191-195 Link Here
191		207
192	return baseLocation != null ? (baseLocation + File.separator + proposedProjectName) : null;	208	return baseLocation != null ? (baseLocation + File.separator + proposedProjectName) : null;
193	}	209	}
		210
		211	protected static void mkdirs(final IFolder folder) throws CoreException {
		212	if (!folder.exists()) {
		213	if (folder.getParent() instanceof IFolder) {
		214	mkdirs((IFolder) folder.getParent());
		215	}
		216	folder.create(true, true, null);
		217	}
		218	}
194		219
195	}	220	}

Lines 11-17 Link Here

(-)earproject/org/eclipse/jst/j2ee/application/internal/operations/CreateProjectWithExtractedJarOperation.java (-12 lines)
11	package org.eclipse.jst.j2ee.application.internal.operations;	11	package org.eclipse.jst.j2ee.application.internal.operations;
12		12
13	import java.io.File;	13	import java.io.File;
14	import java.lang.reflect.InvocationTargetException;
15		14
16	import org.eclipse.core.commands.ExecutionException;	15	import org.eclipse.core.commands.ExecutionException;
17	import org.eclipse.core.resources.IProject;	16	import org.eclipse.core.resources.IProject;
Lines 66-82 Link Here
66	importModel.setProperty(IJavaUtilityJarImportDataModelProperties.EAR_PROJECT_NAME, getAssociatedEARProjectName());	65	importModel.setProperty(IJavaUtilityJarImportDataModelProperties.EAR_PROJECT_NAME, getAssociatedEARProjectName());
67		66
68	status.add(importModel.getDefaultOperation().execute(new SubProgressMonitor(monitor, 1), info));	67	status.add(importModel.getDefaultOperation().execute(new SubProgressMonitor(monitor, 1), info));
69
70	IProject associatedEARProject = getWorkspaceRoot().getProject(getAssociatedEARProjectName());
71	IProject utilityJarProject = getWorkspaceRoot().getProject(newProjectName);
72	linkArchiveToEAR(associatedEARProject, getUtilityJar().getName(), utilityJarProject, new SubProgressMonitor(monitor, 1));
73
74	} catch (InvocationTargetException e) {
75	status.add(J2EEPlugin.createErrorStatus(0, e.getMessage(), e));
76	J2EEPlugin.logError(0, e.getMessage(), e);
77	} catch (InterruptedException e) {
78	status.add(J2EEPlugin.createErrorStatus(0, e.getMessage(), e));
79	J2EEPlugin.logError(0, e.getMessage(), e);
80	} catch (CoreException e) {	68	} catch (CoreException e) {
81	status.add(J2EEPlugin.createErrorStatus(0, e.getMessage(), e));	69	status.add(J2EEPlugin.createErrorStatus(0, e.getMessage(), e));
82	J2EEPlugin.logError(0, e.getMessage(), e);	70	J2EEPlugin.logError(0, e.getMessage(), e);