[369985] 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 7812868..d86dd75 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2011 SAP AG and others.
+ * Copyright (c) 2007, 2012 SAP AG and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -32,10 +32,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 679b0d2..7bf3e08 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2011 SAP AG and others.
+ * Copyright (c) 2007, 2012 SAP AG and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -32,10 +32,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 {
