[104364] fix for ear deployable return all comp types: committed for JL

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 b0c86fd..11cb525 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

@@ -434,8 +434,7 @@
             return null;
         if(moduleName.endsWith(IJ2EEModuleConstants.JAR_EXT) || moduleName.endsWith(IJ2EEModuleConstants.WAR_EXT) || moduleName.endsWith(IJ2EEModuleConstants.RAR_EXT))
             moduleName = moduleName.substring(0, (moduleName.length()- IJ2EEModuleConstants.JAR_EXT.length()));
-        List references = getJ2EEModuleReferences();
-		references.addAll(getUtilityModuleReferences());
+        List references = getComponentReferences();
 		for(int i = 0; i < references.size(); i++) {
 			IVirtualReference ref = (IVirtualReference)references.get(i);
 			IVirtualComponent component = ref.getReferencedComponent();

diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployable.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployable.java
index bca5f07..2745379 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployable.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployable.java

@@ -51,12 +51,13 @@
 		try {
 			earEdit = EARArtifactEdit.getEARArtifactEditForRead(component);
 			if (earEdit != null) {
-				List components = earEdit.getJ2EEModuleReferences();
+				List components = earEdit.getComponentReferences();
 				for (Iterator iter = components.iterator(); iter.hasNext();) {
 					IVirtualReference reference = (IVirtualReference) iter.next();
 					IVirtualComponent virtualComp = reference.getReferencedComponent();
 					Object module = FlexibleProjectServerUtil.getModule(virtualComp);
-					modules.add(module);
+					if (module!=null)
+						modules.add(module);
 				}
 			}
 		} catch (Exception e) {