Author: max.andersen(a)jboss.com Date: 2008-11-12 09:58:35 -0500 (Wed, 12 Nov 2008) New Revision: 11707 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.properties Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java Log: RESOLVED - issue JBIDE-3048: Hibernate validation exception. https://jira.jboss.org/jira/browse/JBIDE-3048 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2008-11-12 13:09:32 UTC (rev 11706) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2008-11-12 14:58:35 UTC (rev 11707) @@ -12,6 +12,7 @@ import java.io.File; import java.util.List; +import java.util.ResourceBundle; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; @@ -30,7 +31,7 @@ * */ public class HibernatePersistenceUnit extends GenericPersistenceUnit - implements Messages{ + implements Messages { private HibernateProperties hibernateProperties; @@ -73,18 +74,33 @@ int resType= res.getType(); if (resType != IResource.FILE) { Property prop = getProperty(BasicHibernateProperties.HIBERNATE_CONFIG_FILE); - IMessage message = new Message(Messages.class.getName(), IMessage.HIGH_SEVERITY, + IMessage message = new LocalMessage(Messages.class.getName(), IMessage.HIGH_SEVERITY, NOT_A_FILE, new String[]{configFile}, getResource()); message.setLineNo(prop.getValidationTextRange().getLineNumber()); messages.add(message); } } else { Property prop = getProperty(BasicHibernateProperties.HIBERNATE_CONFIG_FILE); - IMessage message = new Message(Messages.class.getName(), IMessage.HIGH_SEVERITY, - FILE_NOT_FOUND, new String[]{configFile}, getResource()); + IMessage message = new LocalMessage(Messages.class.getName(), IMessage.HIGH_SEVERITY, + CONFIG_FILE_NOT_FOUND, new String[]{configFile}, getResource()); message.setLineNo(prop.getValidationTextRange().getLineNumber()); messages.add(message); } } } + + /** + * Hack class needed to make JPA/Validation API pick up our classloader instead of its own. + * + * @author max + * + */ + static public class LocalMessage extends Message { + + public LocalMessage(String name, int highSeverity, String notAFile, + String[] strings, IResource resource) { + super(name, highSeverity, notAFile, strings, resource); + } + } + } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java 2008-11-12 13:09:32 UTC (rev 11706) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java 2008-11-12 14:58:35 UTC (rev 11707) @@ -16,8 +16,8 @@ */ public interface Messages { - String NOT_A_FILE = "not_a_file"; + String NOT_A_FILE = "NOT_A_FILE"; - String FILE_NOT_FOUND = "file_not_found"; + String CONFIG_FILE_NOT_FOUND = "CONFIG_FILE_NOT_FOUND"; } Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.properties =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.properties (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.properties 2008-11-12 14:58:35 UTC (rev 11707) @@ -0,0 +1,2 @@ +NOT_A_FILE= Resource \"{0}\" is not a file. +CONFIG_FILE_NOT_FOUND = Configuration file named \"{0}\" could not be found. \ No newline at end of file