[370256] Component interfaces for EJB 3.x beans are created with wrong package declaration if default package is changed in wizardv201202011700R3_2_5_patches

4 files changed, 20 insertions, 6 deletions

diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/LocalComponentInterfaceTemplate.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/LocalComponentInterfaceTemplate.java
index 066e68e5..aac73a35 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/LocalComponentInterfaceTemplate.java
+++ b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/LocalComponentInterfaceTemplate.java
@@ -23,10 +23,10 @@ public class LocalComponentInterfaceTemplate
     final StringBuffer stringBuffer = new StringBuffer();
      CreateSessionBeanTemplateModel model = (CreateSessionBeanTemplateModel) argument; 
     
-	if (model.getJavaPackageName() != null && model.getJavaPackageName().length() > 0) {
+	if (model.getLocalComponentPackage() != null && model.getLocalComponentPackage().length() > 0) {
 
     stringBuffer.append(TEXT_1);
-    stringBuffer.append( model.getJavaPackageName() );
+    stringBuffer.append(model.getLocalComponentPackage());
     stringBuffer.append(TEXT_2);
     
 	}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/RemoteComponentInterfaceTemplate.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/RemoteComponentInterfaceTemplate.java
index 34da65ac..554ea82b 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/RemoteComponentInterfaceTemplate.java
+++ b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/RemoteComponentInterfaceTemplate.java
@@ -23,10 +23,10 @@ public class RemoteComponentInterfaceTemplate
     final StringBuffer stringBuffer = new StringBuffer();
      CreateSessionBeanTemplateModel model = (CreateSessionBeanTemplateModel) argument; 
     
-	if (model.getJavaPackageName() != null && model.getJavaPackageName().length() > 0) {
+	if (model.getRemoteComponentPackage() != null && model.getRemoteComponentPackage().length() > 0) {
 
     stringBuffer.append(TEXT_1);
-    stringBuffer.append( model.getJavaPackageName() );
+    stringBuffer.append(model.getRemoteComponentPackage());
     stringBuffer.append(TEXT_2);
     
 	}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/localComponentInterface.javajet b/plugins/org.eclipse.jst.j2ee.ejb/templates/localComponentInterface.javajet
index aeb246bf..debf3137 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/localComponentInterface.javajet
+++ b/plugins/org.eclipse.jst.j2ee.ejb/templates/localComponentInterface.javajet
@@ -2,7 +2,14 @@
 	class="LocalComponentInterfaceTemplate" 
 %>
 <% CreateSessionBeanTemplateModel model = (CreateSessionBeanTemplateModel) argument; %>
-<%@ include file="_package.template" %>
+<%
+	if (model.getLocalComponentPackage() != null && model.getLocalComponentPackage().length() > 0) {
+%>
+package <%=model.getLocalComponentPackage()%>;
+<%
+	}
+%>
+
 import javax.ejb.EJBLocalObject;
 
 public interface <%= model.getLocalComponentClassSimpleName() %> extends EJBLocalObject {
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/templates/remoteComponentInterface.javajet b/plugins/org.eclipse.jst.j2ee.ejb/templates/remoteComponentInterface.javajet
index 6c256bbf..3ded02d3 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb/templates/remoteComponentInterface.javajet
+++ b/plugins/org.eclipse.jst.j2ee.ejb/templates/remoteComponentInterface.javajet
@@ -2,7 +2,14 @@
 	class="RemoteComponentInterfaceTemplate" 
 %>
 <% CreateSessionBeanTemplateModel model = (CreateSessionBeanTemplateModel) argument; %>
-<%@ include file="_package.template" %>
+<%
+	if (model.getRemoteComponentPackage() != null && model.getRemoteComponentPackage().length() > 0) {
+%>
+package <%=model.getRemoteComponentPackage()%>;
+<%
+	}
+%>
+
 import javax.ejb.EJBObject;
 
 public interface <%= model.getRemoteComponentClassSimpleName() %> extends EJBObject {