[223817] Updating messages

diff --git a/plugins/org.eclipse.jst.j2ee.ui/plugin.properties b/plugins/org.eclipse.jst.j2ee.ui/plugin.properties
index 301902b..8838828 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/plugin.properties
+++ b/plugins/org.eclipse.jst.j2ee.ui/plugin.properties

@@ -16,7 +16,7 @@
 ear.import.description_ui_=Import an external EAR file into an Enterprise Application project
 
 ear.export.description_ui_=Export an Enterprise Application project into an EAR file
-j2ee.category_ui_=J2EE
+j2ee.category_ui_=Java EE
 j2ee.actions.description_ui_=Actions for Java EE Development
 create.enterprise.application_ui_=Create an Enterprise Application
 create.client.module_ui_=Create an Application Client project

diff --git a/plugins/org.eclipse.jst.j2ee.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.ui/plugin.xml
index 60ec96d..efe83ba 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/plugin.xml
+++ b/plugins/org.eclipse.jst.j2ee.ui/plugin.xml

@@ -318,10 +318,10 @@
    <extension point="org.eclipse.ui.popupMenus">
       <objectContribution objectClass="org.eclipse.core.resources.IProject" adaptable="true" id="org.eclipse.jst.j2ee.ui.popupMenu">
          <menu label="%javaee.ui.popupMenu"  id="javeeUIPopupMenuCategory">
-            <separator name="slot1"/>
-            <separator name="slot2"/>
-            <separator name="slot3"/>
-            <separator name="slot4"/>
+            <separator name="slot1"/> <!-- New/featured Java EE actions  -->
+            <separator name="slot2"/> <!-- Create files category  -->
+            <separator name="slot3"/> <!-- Project creation(clients)  -->
+            <separator name="slot4"/> <!-- Legacy(J2EE) actions  -->
          </menu>
       </objectContribution>
         <!-- additional object contribution -->

diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ui.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ui.properties
index 69bc767..a08d9f3 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ui.properties
+++ b/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ui.properties

@@ -108,7 +108,7 @@
 101=Configure Application Client module settings.
 102=Content Folder:
 103=Target Runtime
-Entity_UI_=Entity Beans
+Entity_UI_=Entity Beans(1.x-2.x)
 Message_Driven_Beans_UI_=Message-Driven Beans
 Session_Beans_UI_=Session Beans
 EJB_Class_UI_=EJB Class: {0}

diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/messages.properties b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/messages.properties
index 3c6a17f..a37cec5 100644
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/messages.properties
+++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/messages.properties

@@ -5,7 +5,7 @@
 INFORM_INVALID_DEP_DESC_SELECTION=One or more Java EE projects selected already has a Deployment Descriptor.
 DEPLOYMENT_DESCRIPTOR=Deployment Descriptor: 
 SESSION_BEANS=Session Beans
-ENTITY_BEANS=Entity Beans
+ENTITY_BEANS=Entity Beans(1.x-2.x)
 MESSAGE_DRIVEN_BEANS=Message-Driven Beans
 ACTIVATION_CONFIG_PROPERTIES=Activation Config Properties
 ENTERPRISE_BEAN_CLASS_DESCRIPTION=Enterprise Bean Class - 

diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbEntity.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbEntity.java
index 6fdfc8b..aa47e54 100644
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbEntity.java
+++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbEntity.java

@@ -17,6 +17,7 @@
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
 import org.eclipse.jst.javaee.ejb.EJBJar;
+import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
 import org.eclipse.jst.jee.ui.internal.Messages;
 import org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode;
 import org.eclipse.swt.graphics.Image;
@@ -37,7 +38,10 @@
 
 	public List getChildren() {
 		List children = new ArrayList();
-		List entities = ((EJBJar) adapterNode).getEnterpriseBeans().getEntityBeans();
+		List entities = null;
+		 EnterpriseBeans enterpriseBeans = ((EJBJar) adapterNode).getEnterpriseBeans();
+		 if (enterpriseBeans != null)
+			 entities = enterpriseBeans.getEntityBeans();
 		if (entities != null && entities.size() >0){
 			children.addAll(entities);
 		}

diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbMessageDriven.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbMessageDriven.java
index f4145f7..2ea667e 100644
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbMessageDriven.java
+++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbMessageDriven.java

@@ -17,6 +17,7 @@
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
 import org.eclipse.jst.javaee.ejb.EJBJar;
+import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
 import org.eclipse.jst.jee.ui.internal.Messages;
 import org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode;
 import org.eclipse.swt.graphics.Image;
@@ -36,7 +37,10 @@
 
 	public List getChildren() {
 		List children = new ArrayList();
-		List msgBeans = ((EJBJar) adapterNode).getEnterpriseBeans().getMessageDrivenBeans();
+		List msgBeans = null;
+		EnterpriseBeans enterpriseBeans = ((EJBJar) adapterNode).getEnterpriseBeans();
+		 if (enterpriseBeans != null)
+			 msgBeans = enterpriseBeans.getMessageDrivenBeans();
 		if (msgBeans != null && msgBeans.size()>0){
 			children.addAll(msgBeans);
 		}

diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbSession.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbSession.java
index 5e39649..bfe7c85 100644
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbSession.java
+++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbSession.java

@@ -17,6 +17,7 @@
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
 import org.eclipse.jst.javaee.ejb.EJBJar;
+import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
 import org.eclipse.jst.jee.ui.internal.Messages;
 import org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode;
 import org.eclipse.swt.graphics.Image;
@@ -37,7 +38,11 @@
 
 	public List getChildren() {
 		List children = new ArrayList();
-		 List sessionBeans = ((EJBJar) adapterNode).getEnterpriseBeans().getSessionBeans();
+		List sessionBeans = null;
+		 EnterpriseBeans enterpriseBeans = ((EJBJar) adapterNode).getEnterpriseBeans();
+		 if (enterpriseBeans != null)
+			 sessionBeans = enterpriseBeans.getSessionBeans();
+		 
 		if (sessionBeans != null && sessionBeans.size()>0){
 			children.addAll(sessionBeans);
 		}