commit | 2cdd84abb06ddb7fa0145acdebc5e8c31ed4df88 | [log] [tgz] |
---|---|---|
author | canderson <canderson> | Wed Feb 01 16:34:07 2012 +0000 |
committer | canderson <canderson> | Wed Feb 01 16:34:07 2012 +0000 |
tree | ed8d52ec5ad1277d31e0bca0d5e6766a870f7437 | |
parent | 5917c00b75cdfb6d139d7e0a859cb9386866b5c2 [diff] |
[370256] Component interfaces for EJB 3.x beans are created with wrong package declaration if default package is changed in wizard
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 066e68e..aac73a3 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 @@ 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 34da65a..554ea82 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 @@ 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 aeb246b..debf313 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 6c256bb..3ded02d 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 {