511339: Failed while installing EMF Parsley Web Server: Invalid name

specified 

Change-Id: I21aed46f47b75ca8089f93e73fca2c91697721c4
Signed-off-by: Vincenzo Caselli <vincenzo.caselli@rcp-vision.com>
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=511339

2 files changed, 8 insertions, 6 deletions

diff --git a/plugins/org.eclipse.emf.parsley.web.tools/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.web.tools/META-INF/MANIFEST.MF
index 19cd194a6..ff941e2fc 100644
--- a/plugins/org.eclipse.emf.parsley.web.tools/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.parsley.web.tools/META-INF/MANIFEST.MF
@@ -29,7 +29,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.wst.common.core,
  org.eclipse.jem.util,
  org.eclipse.wst.server.http.core,
- org.eclipse.emf.parsley.dsl.additional.builder
+ org.eclipse.emf.parsley.dsl.additional.builder,
+ org.eclipse.emf.parsley.wizards
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Import-Package: org.apache.log4j
diff --git a/plugins/org.eclipse.emf.parsley.web.tools/src/org/eclipse/emf/parsley/web/tools/ParsleyWebFacetInstallDelegate.java b/plugins/org.eclipse.emf.parsley.web.tools/src/org/eclipse/emf/parsley/web/tools/ParsleyWebFacetInstallDelegate.java
index f46899265..122d4257c 100644
--- a/plugins/org.eclipse.emf.parsley.web.tools/src/org/eclipse/emf/parsley/web/tools/ParsleyWebFacetInstallDelegate.java
+++ b/plugins/org.eclipse.emf.parsley.web.tools/src/org/eclipse/emf/parsley/web/tools/ParsleyWebFacetInstallDelegate.java
@@ -31,6 +31,7 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.parsley.dsl.additional.builder.builder.EmfParsleyDslPluginXmlNature;
 import org.eclipse.emf.parsley.web.tools.ParsleyWebFacetInstallConfig.PERSISTENCE_OPTION;
+import org.eclipse.emf.parsley.wizards.NewEmfParsleyProjectSupport;
 import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -90,13 +91,13 @@ public class ParsleyWebFacetInstallDelegate implements IDelegate {
 		addProjectNature(iProject, monitor, "org.eclipse.m2e.core.maven2Nature"); 
 
 		Properties replaceStrings;
-		String projectName = iProject.getName();
+		String mainPackage = NewEmfParsleyProjectSupport.getValidJavaName(iProject.getName());
 		IPackageFragment pack = JavaCore.create(iProject).getPackageFragmentRoot(iProject.getFolder("src"))
-				.createPackageFragment(projectName, true, monitor);
+				.createPackageFragment(mainPackage, true, monitor);
 		IFolder folder = iProject.getFolder(pack.getPath().removeFirstSegments(1));
 
 		replaceStrings = new Properties();
-		replaceStrings.setProperty("org.eclipse.emf.parsley.web.tools.servlets", projectName);
+		replaceStrings.setProperty("org.eclipse.emf.parsley.web.tools.servlets", mainPackage);
 		Utils.copyFile(iProject, monitor, "/templates/module.parsley",
 				iProject.getFolder("src").getFile("module.parsley"), replaceStrings);
 
@@ -110,13 +111,13 @@ public class ParsleyWebFacetInstallDelegate implements IDelegate {
 		String lastSegment = fullPath.segment(fullPath.segmentCount()-1);
 		lastSegment = lastSegment.substring(0, 1).toUpperCase() + lastSegment.substring(1,lastSegment.length());
 		replaceStrings.setProperty("ParsleyWebGuiceModule", lastSegment+"EmfParsleyGuiceModule");
-		replaceStrings.setProperty("org.eclipse.emf.parsley.web.tools.templates", projectName);
+		replaceStrings.setProperty("org.eclipse.emf.parsley.web.tools.templates", mainPackage);
 		Utils.copyFile(iProject, monitor, "/templates/ParsleyGuiceServletContextListener.java",
 				folder.getFile("ParsleyGuiceServletContextListener.java"), replaceStrings);
 
 		replaceStrings = new Properties();
 
-		replaceStrings.setProperty("org.eclipse.emf.parsley.web.tools.templates", projectName);
+		replaceStrings.setProperty("org.eclipse.emf.parsley.web.tools.templates", mainPackage);
 
 		Utils.copyFile(iProject, monitor, "/templates/ParsleyContextListener.java",
 				folder.getFile("ParsleyContextListener.java"), replaceStrings);