commited for NA

plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/FlexibileWebModuleCreationOperation.java

diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/FlexibileWebModuleCreationOperation.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/FlexibileWebModuleCreationOperation.java
index 966e4c2..50fa659 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/FlexibileWebModuleCreationOperation.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/FlexibileWebModuleCreationOperation.java
@@ -99,6 +99,7 @@
 
 		//.wtpmodule should be created when creating a project
 		//createInitialWTPModulesFile(); 
+		createModule();
 
 		if (((FlexibileWebModuleCreationDataModel) operationDataModel).getBooleanProperty(IAnnotationsDataModel.USE_ANNOTATIONS))
 			addAnnotationsBuilder();
@@ -120,7 +121,23 @@
 //			if(moduleCore != null)
 //				moduleCore.dispose();
 //		}     
-//    }
+//   }
+	
+    private void createModule() {
+    	ModuleCore moduleCore = null;
+		try {
+			IProject containingProject = getProject();
+			moduleCore = ModuleCore.getModuleCoreForWrite(containingProject);
+			moduleCore.prepareProjectModulesIfNecessary(); 
+			ProjectModules projectModules = moduleCore.getModuleModelRoot();
+			addContent(projectModules);
+			moduleCore.saveIfNecessary(null); 
+		} finally {
+			if(moduleCore != null)
+				moduleCore.dispose();
+		}     
+   }
+    
 	/**
 	 * @param projectModules
 	 */

plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/FlexibileJ2EEModuleCreationOperation.java

diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/FlexibileJ2EEModuleCreationOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/FlexibileJ2EEModuleCreationOperation.java
index a32d116..a28450a 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/FlexibileJ2EEModuleCreationOperation.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/FlexibileJ2EEModuleCreationOperation.java
@@ -52,7 +52,7 @@
 	protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
 		FlexibleJ2EEModuleCreationDataModel dataModel = (FlexibleJ2EEModuleCreationDataModel) operationDataModel;
 		createModule(monitor);
-		if (dataModel.getBooleanProperty(J2EEArtifactCreationDataModel.CREATE_DEFAULT_FILES)) {
+		if (dataModel.getBooleanProperty(FlexibleJ2EEModuleCreationDataModel.CREATE_DEFAULT_FILES)) {
 			createDeploymentDescriptor(monitor);
 			//J2EENature nature = (J2EENature) dataModel.getProjectDataModel().getProject().getNature(dataModel.getJ2EENatureID());
 			//createManifest(nature, monitor);