Attachment 158608 Details for Bug 241668 – patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch

241668_patch.txt (text/plain), 16.37 KB, created by Kaloyan Raev

on 2010-02-09 11:57:50 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Kaloyan Raev

Created: 2010-02-09 11:57:50 EST

Size: 16.37 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.ejb.ui
>Index: ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/NewSessionBeanClassWizardPage.java
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/NewSessionBeanClassWizardPage.java,v
>retrieving revision 1.12
>diff -u -r1.12 NewSessionBeanClassWizardPage.java
>--- ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/NewSessionBeanClassWizardPage.java	23 Dec 2009 13:14:49 -0000	1.12
>+++ ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/NewSessionBeanClassWizardPage.java	9 Feb 2010 16:56:03 -0000
>@@ -17,6 +17,9 @@
> import static org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties.STATE_TYPE;
> import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.INTERFACES;
> 
>+import java.util.ArrayList;
>+import java.util.Arrays;
>+
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.layout.GridLayout;
>@@ -101,16 +104,14 @@
> 
> 	@Override
> 	protected String[] getValidationPropertyNames() {
>-		String[] retVal = null;
>-		String[] baseVals = super.getValidationPropertyNames();
>-		retVal = new String[baseVals.length + 2];
>-		for (int i = 0; i < baseVals.length; i++)
>-		{
>-			retVal[i] = baseVals[i];
>-		}
>-		retVal[baseVals.length] = LOCAL_BUSINESS_INTERFACE;
>-		retVal[baseVals.length + 1] = REMOTE_BUSINESS_INTERFACE;
>-		retVal[baseVals.length + 1] = INTERFACES;
>-		return retVal;
>+		ArrayList<String> names = new ArrayList<String>();
>+		names.addAll(Arrays.asList(super.getValidationPropertyNames()));
>+		
>+		names.add(STATE_TYPE);
>+		names.add(INTERFACES);
>+		names.add(LOCAL_BUSINESS_INTERFACE);
>+		names.add(REMOTE_BUSINESS_INTERFACE);
>+		
>+		return names.toArray(new String[0]);
> 	}
> }
>#P org.eclipse.jst.j2ee.ejb
>Index: ejb/org/eclipse/jst/j2ee/ejb/internal/operations/INewEnterpriseBeanClassDataModelProperties.java
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/INewEnterpriseBeanClassDataModelProperties.java,v
>retrieving revision 1.1
>diff -u -r1.1 INewEnterpriseBeanClassDataModelProperties.java
>--- ejb/org/eclipse/jst/j2ee/ejb/internal/operations/INewEnterpriseBeanClassDataModelProperties.java	15 Jan 2008 12:14:36 -0000	1.1
>+++ ejb/org/eclipse/jst/j2ee/ejb/internal/operations/INewEnterpriseBeanClassDataModelProperties.java	9 Feb 2010 16:56:05 -0000
>@@ -25,13 +25,13 @@
> 	 * Optional, String property of the EJB mapped name for the enterprise bean. 
> 	 */
> 	public static final String MAPPED_NAME = "INewEnterpriseBeanClassDataModelProperties.MAPPED_NAME"; //$NON-NLS-1$
>-	
>+
> 	/**
>-	 * Required, Integer property that determines the transaction type of the enterprise
>-	 * bean.
>+	 * Required, String property that determines the transaction type of the
>+	 * enterprise bean. Valid values are the string representation of the
>+	 * <code>TransactionType<code> enumeration.
> 	 * 
>-	 * @see NewSessionBeanClassDataModelProvider#TRANSACTION_TYPE_CONTAINER_INDEX
>-	 * @see NewSessionBeanClassDataModelProvider#TRANSACTION_TYPE_BEAN_INDEX
>+	 * @see TransactionType
> 	 */
> 	public static final String TRANSACTION_TYPE = "INewEnterpriseBeanClassDataModelProperties.TRANSACTION_TYPE"; //$NON-NLS-1$
> 	
>Index: ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateSessionBeanTemplateModel.java
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateSessionBeanTemplateModel.java,v
>retrieving revision 1.11
>diff -u -r1.11 CreateSessionBeanTemplateModel.java
>--- ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateSessionBeanTemplateModel.java	10 Jun 2009 20:18:31 -0000	1.11
>+++ ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateSessionBeanTemplateModel.java	9 Feb 2010 16:56:05 -0000
>@@ -31,6 +31,7 @@
> 
> 	public static final String QUALIFIED_STATELESS = "javax.ejb.Stateless"; //$NON-NLS-1$
> 	public static final String QUALIFIED_STATEFUL = "javax.ejb.Stateful"; //$NON-NLS-1$
>+	public static final String QUALIFIED_SINGLETON = "javax.ejb.Singleton"; //$NON-NLS-1$
> 	public static final String QUALIFIED_LOCAL = "javax.ejb.Local"; //$NON-NLS-1$
> 	public static final String QUALIFIED_REMOTE = "javax.ejb.Remote"; //$NON-NLS-1$
> 	public static final String QUALIFIED_REMOTE_HOME = "javax.ejb.RemoteHome"; //$NON-NLS-1$
>@@ -40,6 +41,7 @@
> 	
> 	public static final String STATELESS_ANNOTATION = "@Stateless"; //$NON-NLS-1$
> 	public static final String STATEFUL_ANNOTATION = "@Stateful"; //$NON-NLS-1$
>+	public static final String SINGLETON_ANNOTATION = "@Singleton"; //$NON-NLS-1$
> 
> 	protected BusinessInterface currentBusinessInterface = null;
> 	protected String localHomeClassName = null;
>@@ -56,12 +58,15 @@
> 		Collection<String> collection = super.getImports();
> 		
> 		String stateType = dataModel.getStringProperty(STATE_TYPE);
>-		if (stateType.equals(StateType.STATELESS.toString()))
>+		if (stateType.equals(StateType.STATELESS.toString())) {
> 			collection.add(QUALIFIED_STATELESS);
>-		else if (stateType.equals(StateType.STATEFUL.toString()))
>+		} else if (stateType.equals(StateType.STATEFUL.toString())) {
> 			collection.add(QUALIFIED_STATEFUL);
>-		else
>+		} else if (stateType.equals(StateType.SINGLETON.toString())) {
>+			collection.add(QUALIFIED_SINGLETON);
>+		} else {
> 			throw new IllegalStateException("illegal state type: " + stateType); //$NON-NLS-1$
>+		}
> 		
> 		if (!isContainerType()) {
> 			collection.add(QUALIFIED_TRANSACTION_MANAGEMENT);
>@@ -106,12 +111,15 @@
> 		String stateType = dataModel.getStringProperty(STATE_TYPE);
> 		
> 		String beanType;
>-		if (stateType.equals(StateType.STATELESS.toString()))
>+		if (stateType.equals(StateType.STATELESS.toString())) {
> 			beanType = STATELESS_ANNOTATION;
>-		else if (stateType.equals(StateType.STATEFUL.toString()))
>+		} else if (stateType.equals(StateType.STATEFUL.toString())) {
> 			beanType = STATEFUL_ANNOTATION;
>-		else 
>+		} else if (stateType.equals(StateType.SINGLETON.toString())) {
>+			beanType = SINGLETON_ANNOTATION;
>+		} else { 
> 			throw new IllegalStateException("illegal state type: " + stateType); //$NON-NLS-1$
>+		}
> 		
> 		return beanType;
> 	}
>Index: ejb/org/eclipse/jst/j2ee/ejb/internal/operations/StateType.java
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/StateType.java,v
>retrieving revision 1.1
>diff -u -r1.1 StateType.java
>--- ejb/org/eclipse/jst/j2ee/ejb/internal/operations/StateType.java	21 Apr 2008 14:52:21 -0000	1.1
>+++ ejb/org/eclipse/jst/j2ee/ejb/internal/operations/StateType.java	9 Feb 2010 16:56:05 -0000
>@@ -12,17 +12,30 @@
> 
> /**
>  * Enumerates the session state type values of a session bean. 
>+ * 
>+ * @since 3.0
>  */
> public enum StateType {
> 
> 	/**
>-	 * Represents the <code>Stateless</code> session state type. 
>+	 * Represents the <code>Stateless</code> session state type.
>+	 * 
>+	 * @since 3.0
> 	 */
> 	STATELESS,
> 	
> 	/**
> 	 * Represents the <code>Stateful</code> session state type.
>+	 * 
>+	 * @since 3.0
> 	 */
>-	STATEFUL;
>+	STATEFUL, 
>+	
>+	/**
>+	 * Represents the <code>Singleton</code> session state type.
>+	 * 
>+	 * @since 3.2
>+	 */
>+	SINGLETON;
> 
> }
>Index: ejb/org/eclipse/jst/j2ee/ejb/internal/operations/INewSessionBeanClassDataModelProperties.java
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/INewSessionBeanClassDataModelProperties.java,v
>retrieving revision 1.7
>diff -u -r1.7 INewSessionBeanClassDataModelProperties.java
>--- ejb/org/eclipse/jst/j2ee/ejb/internal/operations/INewSessionBeanClassDataModelProperties.java	4 Jul 2008 12:23:43 -0000	1.7
>+++ ejb/org/eclipse/jst/j2ee/ejb/internal/operations/INewSessionBeanClassDataModelProperties.java	9 Feb 2010 16:56:05 -0000
>@@ -62,13 +62,13 @@
> 	 * compatible remote home and components interfaces. The default is false.
> 	 */
> 	public static final String REMOTE_HOME = "INewSessionBeanClassDataModelProperties.REMOTE_HOME"; //$NON-NLS-1$
>-	
>+
> 	/**
>-	 * Required, Integer property that determines the state type of the session
>-	 * bean.
>+	 * Required, String property that determines the state type of the session
>+	 * bean. Valid values are the string representation of the
>+	 * <code>StateType<code> enumeration.
> 	 * 
>-	 * @see NewSessionBeanClassDataModelProvider#STATE_TYPE_STATELESS_INDEX
>-	 * @see NewSessionBeanClassDataModelProvider#STATE_TYPE_STATEFUL_INDEX
>+	 * @see StateType
> 	 */
> 	public static final String STATE_TYPE = "INewSessionBeanClassDataModelProperties.STATE_TYPE"; //$NON-NLS-1$
> 	
>Index: ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewSessionBeanClassDataModelProvider.java
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewSessionBeanClassDataModelProvider.java,v
>retrieving revision 1.18
>diff -u -r1.18 NewSessionBeanClassDataModelProvider.java
>--- ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewSessionBeanClassDataModelProvider.java	23 Dec 2009 13:14:52 -0000	1.18
>+++ ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewSessionBeanClassDataModelProvider.java	9 Feb 2010 16:56:05 -0000
>@@ -46,8 +46,10 @@
> import org.eclipse.jst.j2ee.ejb.internal.operations.BusinessInterface.BusinessInterfaceType;
> import org.eclipse.jst.j2ee.ejb.internal.plugin.EjbPlugin;
> import org.eclipse.jst.j2ee.internal.common.J2EECommonMessages;
>+import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
> import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider;
> import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBCreationResourceHandler;
>+import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
> import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
> import org.eclipse.osgi.util.NLS;
> import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
>@@ -55,14 +57,11 @@
> import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
> import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
> import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
>+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
> import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
> 
> public class NewSessionBeanClassDataModelProvider extends NewEnterpriseBeanClassDataModelProvider {
> 
>-
>-	public static final int STATE_TYPE_STATELESS_INDEX = 0;
>-	public static final int STATE_TYPE_STATEFUL_INDEX = 1;
>-
> 	private static final String LOCAL_SUFFIX = "Local"; //$NON-NLS-1$
> 	private static final String REMOTE_SUFFIX = "Remote"; //$NON-NLS-1$
> 	private static final String LOCAL_HOME_SUFFIX = "LocalHome"; //$NON-NLS-1$
>@@ -249,19 +248,30 @@
> 	public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
> 		if (propertyName.equals(STATE_TYPE)) {
> 			return DataModelPropertyDescriptor.createDescriptors(
>-					new String[] { 
>+					new String[] {
> 							StateType.STATELESS.toString(), 
>-							StateType.STATEFUL.toString()
>+							StateType.STATEFUL.toString(), 
>+							StateType.SINGLETON.toString()
> 					}, 
> 					new String[] {
> 							EJBCreationResourceHandler.STATE_TYPE_STATELESS, 
>-							EJBCreationResourceHandler.STATE_TYPE_STATEFUL
>-					});
>+							EJBCreationResourceHandler.STATE_TYPE_STATEFUL, 
>+							EJBCreationResourceHandler.STATE_TYPE_SINGLETON
>+					}
>+			);
> 		} 
> 		
> 		return super.getValidPropertyDescriptors(propertyName);
> 	}
> 
>+	private boolean ejb31OrLater() {
>+		IProject project = getTargetProject();
>+		IProjectFacetVersion facetVersion = JavaEEProjectUtilities.getProjectFacetVersion(project, IJ2EEFacetConstants.EJB);
>+		int version = J2EEVersionUtil.convertVersionStringToInt(facetVersion.getVersionString());
>+		int ejb31version = J2EEVersionUtil.convertVersionStringToInt(IJ2EEFacetConstants.EJB_31.getVersionString());
>+		return version >= ejb31version;
>+	}
>+
> 	private void updateBusinessInterfaces(String propertyName) {
> 		List<BusinessInterface> list = (List<BusinessInterface>) getProperty(INTERFACES);
> 		if (propertyName.equals(REMOTE)) {
>@@ -304,7 +314,9 @@
> 
> 	@Override
> 	public IStatus validate(String propertyName) {
>-		if (LOCAL_BUSINESS_INTERFACE.equals(propertyName)) {
>+		if (STATE_TYPE.equals(propertyName)) {
>+			return validateStateType();			
>+		} else if (LOCAL_BUSINESS_INTERFACE.equals(propertyName)) {
> 			if (getBooleanProperty(LOCAL)) {
> 				return validateEjbInterface(getStringProperty(propertyName));
> 			}
>@@ -324,6 +336,14 @@
> 		return super.validate(propertyName);
> 	}
> 
>+	protected IStatus validateStateType() {
>+		String value = getStringProperty(STATE_TYPE);
>+		if (StateType.SINGLETON.toString().equals(value) && !ejb31OrLater()) {
>+			return WTPCommonPlugin.createErrorStatus(EJBCreationResourceHandler.ERR_SINGLETON_ALLOWED_ONLY_FOR_31_AND_LATER);
>+		}
>+		return Status.OK_STATUS;
>+	}
>+
> 	protected IStatus validateEjbInterface(String fullyQualifiedName) {
> 		IStatus status = validateJavaTypeName(fullyQualifiedName);
> 		if (status.getSeverity() != IStatus.ERROR) {
>Index: property_files/ejbcreation.properties
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.j2ee.ejb/property_files/ejbcreation.properties,v
>retrieving revision 1.13
>diff -u -r1.13 ejbcreation.properties
>--- property_files/ejbcreation.properties	23 Dec 2009 13:14:53 -0000	1.13
>+++ property_files/ejbcreation.properties	9 Feb 2010 16:56:05 -0000
>@@ -127,11 +127,12 @@
> remove_client_jar_client_binary=
> EJB_Client_JAR_Creation_Error_=EJB client JAR Creation Error
> Cannot_Be_Binary_Project_For_Client_=Cannot create a new EJB client JAR for a binary project.
>-Cannot_Be_StandAlone_Project_For_Client_=Cannont create a new EJB client JAR for a stand-alone project.
>+Cannot_Be_StandAlone_Project_For_Client_=Cannot create a new EJB client JAR for a stand-alone project.
> TRANSACTION_TYPE_CONTAINER=Container
> TRANSACTION_TYPE_BEAN=Bean
> STATE_TYPE_STATELESS=Stateless
> STATE_TYPE_STATEFUL=Stateful
>+STATE_TYPE_SINGLETON=Singleton
> DESTINATION_TYPE_QUEUE=Queue
> DESTINATION_TYPE_TOPIC=Topic
> 
>@@ -147,4 +148,5 @@
> ERR_REMOTE_HOME_NOT_INTERFACE=The specified Remote Home interface is not valid.
> ERR_BEAN_ALREADY_EXISTS=Enterprise bean with the same Ejb Name already exists.
> WRN_BEAN_NAME_IS_EMPTY=Bean name is empty, the containter will use the name of the bean class.
>-WRN_NO_BUSINESS_INTERFACE=No business interface configured. Clients will not be able to access this bean. 
>+WRN_NO_BUSINESS_INTERFACE=No business interface configured. Clients will not be able to access this bean.
>+ERR_SINGLETON_ALLOWED_ONLY_FOR_31_AND_LATER=The 'Singleton' state type is allowed only for EJB projects with version 3.1 and later.  
>Index: ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EJBCreationResourceHandler.java
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EJBCreationResourceHandler.java,v
>retrieving revision 1.12
>diff -u -r1.12 EJBCreationResourceHandler.java
>--- ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EJBCreationResourceHandler.java	23 Dec 2009 13:14:53 -0000	1.12
>+++ ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EJBCreationResourceHandler.java	9 Feb 2010 16:56:05 -0000
>@@ -147,6 +147,7 @@
> 	public static String TRANSACTION_TYPE_BEAN;
> 	public static String STATE_TYPE_STATELESS;
> 	public static String STATE_TYPE_STATEFUL;
>+	public static String STATE_TYPE_SINGLETON;
> 	public static String DESTINATION_TYPE_QUEUE;
> 	public static String DESTINATION_TYPE_TOPIC;
> 	
>@@ -163,6 +164,7 @@
> 	public static String ERR_NO_MESSAGE_LISTENER_INTERFACE;
> 	public static String WRN_BEAN_NAME_IS_EMPTY;
> 	public static String WRN_NO_BUSINESS_INTERFACE;
>+	public static String ERR_SINGLETON_ALLOWED_ONLY_FOR_31_AND_LATER;
> 
> 
> 	static {

Actions: View | Diff

Attachments on bug 241668: 158608