305306 Incorrect deployment of variable based dependencies in EAR

diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/EARComponentArchiveLoadAdapter.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/EARComponentArchiveLoadAdapter.java
index ded4413..8dae176 100644
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/EARComponentArchiveLoadAdapter.java
+++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/EARComponentArchiveLoadAdapter.java

@@ -82,7 +82,7 @@
 			}
 			try {
 				IArchive nestedModuleArchive = JavaEEArchiveUtilities.INSTANCE.openArchive(referencedComponent);
-				String sPath = reference.getArchiveName();
+				String sPath = new Path(reference.getArchiveName()).lastSegment();
 				String srtp = reference.getRuntimePath().toString();
 				if (srtp.startsWith("" + IPath.SEPARATOR)) srtp = srtp.substring(1);
 				String spt = srtp + IPath.SEPARATOR + sPath;

diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java
index d351360..849e8f4 100644
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java

@@ -362,7 +362,8 @@
 	
 	protected void addUtilMember(IVirtualComponent parent, IVirtualReference reference, IPath runtimePath) {
 		IModuleFile mf = null;
-		final String archiveName = reference.getArchiveName();
+		final String archiveName2 = reference.getArchiveName();
+		final String archiveName = new Path(archiveName2).lastSegment();
 		final IVirtualComponent virtualComp = reference.getReferencedComponent();
 		final IPath archivePath = ((VirtualArchiveComponent)virtualComp).getWorkspaceRelativePath();
 		if (archivePath != null) { //In Workspace