[130205] commited for NA

3 files changed, 18 insertions, 2 deletions

diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentLoadStrategyImpl.java
index d05b9acdf..261230f23 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentLoadStrategyImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentLoadStrategyImpl.java
@@ -60,7 +60,15 @@ public class WebComponentLoadStrategyImpl extends ComponentLoadStrategyImpl {
 				String uri = iLibModule.getRuntimePath().makeRelative().toString() + "/" + diskFile.getName(); //$NON-NLS-1$
 				addExternalFile(uri, diskFile);
 			} else {
-				String uri = iLibModule.getRuntimePath().makeRelative().toString() + "/" + looseComponent.getName() + ".jar";  //$NON-NLS-1$//$NON-NLS-2$
+				String name = ""; //$NON-NLS-1$
+				String archiveName = iLibModule.getArchiveName();
+				if( archiveName != null && archiveName != "" )  //$NON-NLS-1$
+					name = archiveName;
+				
+				else
+					name = looseComponent.getName() + ".jar" ;  //$NON-NLS-1$
+					
+				String uri = iLibModule.getRuntimePath().makeRelative().toString() + "/" + name;  //$NON-NLS-1$
 				try {
 					Archive utilJAR = J2EEProjectUtilities.asArchive(uri, looseComponent.getProject(), isExportSource());
 					if (utilJAR == null)
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentLoadStrategyImpl.java
index 4f25d47cb..95c3ed3bb 100644
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentLoadStrategyImpl.java
+++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentLoadStrategyImpl.java
@@ -68,8 +68,9 @@ public class EARComponentLoadStrategyImpl extends ComponentLoadStrategyImpl {
 					} else if (J2EEProjectUtilities.isUtilityProject(referencedComponent.getProject())) {
 						try {
 							if (!referencedComponent.isBinary()) {
-								String uri = referencedComponent.getName() + ".jar"; //$NON-NLS-1$
+								String uri = earArtifactEdit.getModuleURI(referencedComponent);
 								Archive archive = J2EEProjectUtilities.asArchive(uri, referencedComponent.getProject(), exportSource);
+								archive.setURI( uri );
 								filesHolder.addFile(archive);
 							}
 						} catch (OpenFailureException e) {
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java
index d14e95c22..e0e7fc65f 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java
@@ -413,6 +413,13 @@ public class EARArtifactEdit extends EnterpriseArtifactEdit implements IArtifact
 							return moduleComp.getName()+IJ2EEModuleConstants.WAR_EXT;
 						if (J2EEProjectUtilities.isJCAProject(moduleComp.getProject()))
 							return moduleComp.getName()+IJ2EEModuleConstants.RAR_EXT;
+						if (J2EEProjectUtilities.isUtilityProject(moduleComp.getProject())){
+							String uri =  ref.getArchiveName();
+							if( uri == null || uri.length() < 0 ){
+								uri = moduleComp.getName()+IJ2EEModuleConstants.JAR_EXT;
+							}
+							return uri;
+						}
 						return moduleComp.getName()+IJ2EEModuleConstants.JAR_EXT;
 					}