commit b00dc74495fc45c4ba4963e2efa62c86f1078bc8
author vbhadrir <vbhadrir> Wed Mar 30 21:46:34 2005 +0000
committer vbhadrir <vbhadrir> Wed Mar 30 21:46:34 2005 +0000
tree 2415b29fc825fe94d6f9db25401c478f70f26991
parent cd63ca9c6f83655cd65d5f8e759deb38ff87469a

[nobug] migration work + Committed for BLB

plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/internal/ejb/migration/EJBProjectMigratorStrategy.java

diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/internal/ejb/migration/EJBProjectMigratorStrategy.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/internal/ejb/migration/EJBProjectMigratorStrategy.java
index e50f4a3..5966829 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/internal/ejb/migration/EJBProjectMigratorStrategy.java
+++ b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/internal/ejb/migration/EJBProjectMigratorStrategy.java
@@ -71,8 +71,10 @@
 					IResource packageResource;
 					try {
 						packageResource = (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE) ? roots[i].getCorrespondingResource() : null;
-						if (packageResource != null && packageResource.getType() == IResource.FOLDER)
-							sourceFolders.add(packageResource);
+						if (packageResource != null && packageResource.getType() == IResource.FOLDER) {
+							if (project == packageResource.getProject())
+								sourceFolders.add(packageResource);
+						}
 					} catch (JavaModelException e) {
 						e.printStackTrace();
 					}
@@ -90,9 +92,9 @@
 	}
 
 	public IPath getRuntimeType(IResource resource, int type) {
-		if (resource.getName().equals(JAVA_SOURCE))
-			return (new Path(JAVA_SOURCE_DEPLOY_PATH_NAME));
-		return new Path("/");
+		//if (resource.getName().equals(JAVA_SOURCE))
+		 return (new Path(JAVA_SOURCE_DEPLOY_PATH_NAME));
+		//return new Path("/");
 	}
 
 
@@ -135,11 +137,12 @@
 							UtilityJARMapping jarMapping = (UtilityJARMapping) aIterator.next();
 							if (jarMapping.getUri().toLowerCase().equals(eJBClientName.toLowerCase())) {
 								clientJarProject = getProjectFromWorkspace(jarMapping.getProjectName());
-								utilityProjects.add(clientJarProject);
+								if (utilityProjects != null && !utilityProjects.contains(clientJarProject))
+									utilityProjects.add(clientJarProject);
 								continue;
 							}
 							IProject project = getProjectFromWorkspace(jarMapping.getProjectName());
-							if (project != null)
+							if (project != null && utilityProjects != null && (!utilityProjects.contains(clientJarProject)))
 								utilityProjects.add(project);
 						}
 
@@ -194,10 +197,15 @@
 	}
 
 	public String getComponentTypeName(String componentName) {
+		if (isUtilityProject())
+			return IModuleConstants.JST_UTILITY_MODULE;
 		return IModuleConstants.JST_EJB_MODULE;
 	}
 
 	public String getComponetTypeVersion(String componentName) {
+		if (isUtilityProject())
+			return null;
+
 		return J2EEVersionUtil.getJ2EETextVersion(getJ2EEVersion());
 	}
 
@@ -258,7 +266,7 @@
 
 
 	public boolean hasReferencedComponent(String componentName) {
-		boolean hasClientJar= hasEJBClientJar();
+		boolean hasClientJar = hasEJBClientJar();
 		boolean isClientJarProject = (project != getClientJarProject());
 		String clientJarName = getClientProjectName();
 		List list = Arrays.asList(getUtilityProjectNames());
@@ -289,4 +297,8 @@
 		else
 			return null;
 	}
+
+	private boolean isUtilityProject() {
+		return utilityProjects.contains(project);
+	}
 }