[365653] ADD_TO_EAR property is blocking the EJB Client Jar generation
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetPostInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetPostInstallDelegate.java
index dd97644..0c3002a 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetPostInstallDelegate.java
+++ b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetPostInstallDelegate.java
@@ -97,11 +97,13 @@
moduleURI,
monitor );
}
-
+ }
+ final boolean createClient = model.getBooleanProperty(IEjbFacetInstallDataModelProperties.CREATE_CLIENT);
+ if (createClient)
+ {
// Create the Ejb Client View
- final boolean createClient = model.getBooleanProperty(IEjbFacetInstallDataModelProperties.CREATE_CLIENT);
String clientProjectName = (String) model.getProperty(IEjbFacetInstallDataModelProperties.CLIENT_NAME);
- if (createClient && clientProjectName != null && clientProjectName != "") { //$NON-NLS-1$
+ if (clientProjectName != null && clientProjectName != "") { //$NON-NLS-1$
IProject ejbClientProject = ProjectUtilities.getProject(clientProjectName);
if (ejbClientProject.exists())
return;
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/operations/IEjbFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/operations/IEjbFacetInstallDataModelProperties.java
index d3b4431..378952c 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/operations/IEjbFacetInstallDataModelProperties.java
+++ b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/operations/IEjbFacetInstallDataModelProperties.java
@@ -24,5 +24,6 @@
public static final String CREATE_CLIENT = "IEjbFacetInstallDataModelProperties.CREATE_CLIENT"; //$NON-NLS-1$
public static final String CLIENT_NAME = "IEjbFacetInstallDataModelProperties.CLIENT_NAME ";//$NON-NLS-1$
public static final String CLIENT_SOURCE_FOLDER = "IEjbFacetInstallDataModelProperties.CLIENT_SOURCE_FOLDER ";//$NON-NLS-1$
- public static final String CLIENT_URI = "IEjbFacetInstallDataModelProperties.CLIENT_URI ";//$NON-NLS-1$
+ public static final String CLIENT_URI = "IEjbFacetInstallDataModelProperties.CLIENT_URI ";//$NON-NLS-1$
+ public static final String ALLOW_EJB_CLIENT = "IEjbFacetInstallDataModelProperties.ALLOW_EJB_CLIENT ";//$NON-NLS-1$
}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetInstallDataModelProvider.java
index d18f947..bfc54da 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetInstallDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetInstallDataModelProvider.java
@@ -45,6 +45,7 @@
names.add(CLIENT_NAME);
names.add(CLIENT_SOURCE_FOLDER);
names.add(CLIENT_URI);
+ names.add(ALLOW_EJB_CLIENT);
return names;
}
@@ -123,7 +124,7 @@
} else if (CLIENT_URI.equals(propertyName)) {
return getBooleanProperty(CREATE_CLIENT);
} else if (CREATE_CLIENT.equals(propertyName)) {
- return getBooleanProperty(ADD_TO_EAR);
+ return getBooleanProperty(ADD_TO_EAR)|| getBooleanProperty(ALLOW_EJB_CLIENT);
} else if (GENERATE_DD.equals(propertyName)) {
return !getBooleanProperty(CREATE_CLIENT);
}
@@ -181,6 +182,10 @@
model.notifyPropertyChange(CONFIG_FOLDER, IDataModel.DEFAULT_CHG);
}
}
+ else if (ALLOW_EJB_CLIENT.equals(propertyName))
+ {
+ model.notifyPropertyChange(CREATE_CLIENT, IDataModel.DEFAULT_CHG);
+ }
return status;
}
