[nobug]removed global multiple modules preference, commited for NA
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentCreationWizardPage.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentCreationWizardPage.java
index 039e38e..338d46b 100644
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentCreationWizardPage.java
+++ b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentCreationWizardPage.java
@@ -53,6 +53,7 @@
createAnnotationsGroup(advanced);
// createDefaultBean(advanced);
+ super.createMultipleModulesComposite(advanced);
}
/**
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBClientComponentDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBClientComponentDataModelProvider.java
index d20eace..5f9792a 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBClientComponentDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EJBClientComponentDataModelProvider.java
@@ -48,7 +48,7 @@
} else if(propertyName.equals(COMPONENT_DEPLOY_NAME)){
return getStringProperty(COMPONENT_NAME); //$NON-NLS-1$
} else if( propertyName.equals(JAVASOURCE_FOLDER)){
- if(isProjMultiComponents)
+ if(model.getBooleanProperty(SUPPORT_MULTIPLE_MODULES))
return getStringProperty(COMPONENT_NAME)+"/"+"ejbModule"; //$NON-NLS-1$ //$NON-NLS-2$
else
return "/"+"ejbModule";//$NON-NLS-2$
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbComponentCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbComponentCreationDataModelProvider.java
index a45dae2..7fdd0e7 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbComponentCreationDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbComponentCreationDataModelProvider.java
@@ -20,6 +20,7 @@
import org.eclipse.jst.j2ee.ejb.datamodel.properties.IEjbComponentCreationDataModelProperties;
import org.eclipse.jst.j2ee.internal.J2EEConstants;
import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
+import org.eclipse.jst.j2ee.internal.common.CreationConstants;
import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBCreationResourceHandler;
import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
@@ -152,20 +153,20 @@
} else if (propertyName.equals(CREATE_DEFAULT_SESSION_BEAN)) {
return Boolean.FALSE;
} else if (propertyName.equals(DD_FOLDER)) {
- if(isProjMultiComponents)
- return IPath.SEPARATOR + getModuleName()+IPath.SEPARATOR + "ejbModule"+IPath.SEPARATOR + J2EEConstants.META_INF;
+ if(model.getBooleanProperty(SUPPORT_MULTIPLE_MODULES))
+ return IPath.SEPARATOR + getModuleName()+IPath.SEPARATOR + CreationConstants.DEFAULT_EJB_SOURCE_FOLDER+IPath.SEPARATOR + J2EEConstants.META_INF;
else
- return IPath.SEPARATOR + "ejbModule"+IPath.SEPARATOR + J2EEConstants.META_INF;
+ return IPath.SEPARATOR + CreationConstants.DEFAULT_EJB_SOURCE_FOLDER +IPath.SEPARATOR + J2EEConstants.META_INF;
}else if (propertyName.equals(JAVASOURCE_FOLDER)) {
- if(isProjMultiComponents)
- return IPath.SEPARATOR + getModuleName()+IPath.SEPARATOR + "ejbModule";
+ if(model.getBooleanProperty(SUPPORT_MULTIPLE_MODULES))
+ return IPath.SEPARATOR + getModuleName()+IPath.SEPARATOR + CreationConstants.DEFAULT_EJB_SOURCE_FOLDER;
else
- return IPath.SEPARATOR + "ejbModule";
+ return IPath.SEPARATOR + CreationConstants.DEFAULT_EJB_SOURCE_FOLDER;
} else if (propertyName.equals(MANIFEST_FOLDER)) {
- if(isProjMultiComponents)
- return IPath.SEPARATOR + this.getModuleName()+IPath.SEPARATOR + "ejbModule"+IPath.SEPARATOR + J2EEConstants.META_INF;
+ if(model.getBooleanProperty(SUPPORT_MULTIPLE_MODULES))
+ return IPath.SEPARATOR + this.getModuleName()+IPath.SEPARATOR + CreationConstants.DEFAULT_EJB_SOURCE_FOLDER+IPath.SEPARATOR + J2EEConstants.META_INF;
else
- return IPath.SEPARATOR + "ejbModule"+IPath.SEPARATOR + J2EEConstants.META_INF;
+ return IPath.SEPARATOR + CreationConstants.DEFAULT_EJB_SOURCE_FOLDER+IPath.SEPARATOR + J2EEConstants.META_INF;
} else {
return super.getDefaultProperty(propertyName);
}
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbComponentCreationOperation.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbComponentCreationOperation.java
index 895ad6b..1a10861 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbComponentCreationOperation.java
+++ b/plugins/org.eclipse.jst.j2ee.ejb/ejbarchive/org/eclipse/jst/j2ee/internal/ejb/archiveoperations/EjbComponentCreationOperation.java
@@ -43,7 +43,7 @@
component.create(0, null);
//create and link ejbModule Source Folder
IVirtualFolder ejbModule = component.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$
- ejbModule.createLink(new Path("/" + getModuleName() + "/ejbModule"), 0, null); //$NON-NLS-1$ //$NON-NLS-2$
+ ejbModule.createLink(new Path(model.getStringProperty(JAVASOURCE_FOLDER)), 0, null); //$NON-NLS-1$ //$NON-NLS-2$
//create and link META-INF folder
IVirtualFolder metaInfFolder = ejbModule.getFolder(J2EEConstants.META_INF);
@@ -55,7 +55,7 @@
component.create(0, null);
//create and link ejbModule Source Folder
IVirtualFolder ejbModule = component.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$
- ejbModule.createLink(new Path("/ejbModule"), 0, null); //$NON-NLS-1$ //$NON-NLS-2$
+ ejbModule.createLink(new Path(model.getStringProperty(JAVASOURCE_FOLDER)), 0, null); //$NON-NLS-1$ //$NON-NLS-2$
//create and link META-INF folder
IVirtualFolder metaInfFolder = ejbModule.getFolder(J2EEConstants.META_INF);
