Author: akazakov
Date: 2008-04-24 12:00:14 -0400 (Thu, 24 Apr 2008)
New Revision: 7742
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamEarProjectValidator.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/messages.properties
Log:
http://jira.jboss.com/jira/browse/JBIDE-2122 Fixed
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamEarProjectValidator.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamEarProjectValidator.java 2008-04-24
15:41:38 UTC (rev 7741)
+++
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamEarProjectValidator.java 2008-04-24
16:00:14 UTC (rev 7742)
@@ -40,7 +40,6 @@
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
import org.jboss.tools.seam.core.ISeamProject;
-import org.jboss.tools.seam.core.SeamCoreMessages;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -53,7 +52,8 @@
*/
public class SeamEarProjectValidator implements IValidatorJob {
- protected static final String INVALID_APPLICATION_XML_MESSAGE_ID =
"INVALID_APPLICATION_XML"; //$NON-NLS-1$
+ protected static final String INVALID_SEAM_JAR_MODULE_IN_APPLICATION_XML_MESSAGE_ID =
"INVALID_SEAM_JAR_MODULE_IN_APPLICATION_XML"; //$NON-NLS-1$
+ protected static final String INVALID_JAR_MODULE_IN_APPLICATION_XML_MESSAGE_ID =
"INVALID_JAR_MODULE_IN_APPLICATION_XML"; //$NON-NLS-1$
private IValidationErrorManager errorManager;
@@ -105,8 +105,8 @@
private static final String MODULE_NODE_NAME = "module";
private static final String JAVA_NODE_NAME = "java";
+ private static final String SEAM_JAR_NAME = "jboss-seam.jar";
private static final String[] JARS = new String[]{
- "jboss-seam",
"el-ri",
"jbpm",
"drools-core",
@@ -187,10 +187,14 @@
private void validateJarName(IResource file, String text, int offset) {
String jarName = text.trim();
for(int jarIndex=0; jarIndex<JARS.length; jarIndex++) {
+ int position = offset + text.indexOf(jarName);
+ int length = jarName.length();
+ if(SEAM_JAR_NAME.equals(jarName)) {
+ errorManager.addError(INVALID_SEAM_JAR_MODULE_IN_APPLICATION_XML_MESSAGE_ID,
IMessage.HIGH_SEVERITY, new String[]{}, length, position, file);
+ break;
+ }
if(jarName.startsWith(JARS[jarIndex])) {
- int position = offset + text.indexOf(jarName);
- int length = jarName.length();
- errorManager.addError(INVALID_APPLICATION_XML_MESSAGE_ID, IMessage.HIGH_SEVERITY, new
String[]{jarName}, length, position, file);
+ errorManager.addError(INVALID_JAR_MODULE_IN_APPLICATION_XML_MESSAGE_ID,
IMessage.NORMAL_SEVERITY, new String[]{jarName}, length, position, file);
break;
}
}
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/messages.properties
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/messages.properties 2008-04-24
15:41:38 UTC (rev 7741)
+++
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/messages.properties 2008-04-24
16:00:14 UTC (rev 7742)
@@ -60,7 +60,8 @@
INVALID_CONNECTION_NAME=Connection profiler "{0}" specified for Seam project
"{1}" does not exist. Please correct this property in "Seam settings"
page (Project->Properties->Seam Settings).
#Invalid ear application.xml
-INVALID_APPLICATION_XML=Invalid module "{0}"
+INVALID_SEAM_JAR_MODULE_IN_APPLICATION_XML=jboss-seam.el needs to be inside a
<module><ejb>jboss-seam.jar</ejb><module> to work correctly.
+INVALID_JAR_MODULE_IN_APPLICATION_XML=Having "{0}" listed as a java module in
application.xml can cause publishing errors. It is recommended to remove this module entry
from application.xml.
#Messages for Progress Monitor
SEARCHING_RESOURCES=project "{0}"; searching resources for validation.