Index: EntityWizardDescriptor.java
===================================================================
RCS file: /cvs/j2ee/persistence/src/org/netbeans/modules/j2ee/persistence/wizard/entity/Attic/EntityWizardDescriptor.java,v
retrieving revision 1.1.2.5.2.7
diff -u -B -b -r1.1.2.5.2.7 EntityWizardDescriptor.java
--- EntityWizardDescriptor.java	1 Jul 2006 05:12:49 -0000	1.1.2.5.2.7
+++ EntityWizardDescriptor.java	26 Jul 2006 13:36:33 -0000
@@ -28,6 +28,7 @@
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import org.netbeans.api.project.Project;
+import org.netbeans.modules.j2ee.persistence.dd.JavaPersistenceQLKeywords;
 import org.netbeans.modules.j2ee.persistence.provider.ProviderUtil;
 import org.netbeans.spi.project.ui.templates.support.Templates;
 import org.openide.WizardDescriptor;
@@ -72,6 +73,11 @@
         // p.getName not already in module
         if (wizardDescriptor == null) {
             return true;
+        }
+        String targetName = Templates.getTargetName(wizardDescriptor);
+        if (JavaPersistenceQLKeywords.isKeyword(targetName)) {
+            wizardDescriptor.putProperty("WizardPanel_errorMessage", NbBundle.getMessage(EntityWizardDescriptor.class, "ERR_SqlKeyword", targetName)); // NOI18N
+            return false;
         }
         if (org.netbeans.modules.j2ee.common.Util.isSourceLevel14orLower(project)) {
             wizardDescriptor.putProperty("WizardPanel_errorMessage",
Index: Bundle.properties
===================================================================
RCS file: /cvs/j2ee/persistence/src/org/netbeans/modules/j2ee/persistence/wizard/entity/Attic/Bundle.properties,v
retrieving revision 1.1.2.5.2.5
diff -u -B -b -r1.1.2.5.2.5 Bundle.properties
--- Bundle.properties	13 Jul 2006 12:49:19 -0000	1.1.2.5.2.5
+++ Bundle.properties	26 Jul 2006 13:36:33 -0000
@@ -18,6 +18,7 @@
 ERR_NoPersistenceUnit=There is no persistence unit in the project yet. You need a persistence unit to persist entity classes.
 ERR_NotSupportedJavaEEVersion=Entity classes are available only in Java EE 5.0 and higher.
 ERR_NeedProperSourceLevel=To create entity classes in this project, the Java source level must be at least 1.5.
+ERR_SqlKeyword={0} is a reserved Java Persistence QL keyword
 
 LBL_Browse=Browse...