Author: scabanovich Date: 2007-07-20 09:42:58 -0400 (Fri, 20 Jul 2007) New Revision: 2545 Modified: trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/clay/ShaleClayEntityRecognizer.java trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/dialog/ShaleDialogEntityRecognizer.java trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/spring/SpringBeansEntityRecognizer.java Log: EXIN-86 deprecated XMLEntityResolver removed Modified: trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/clay/ShaleClayEntityRecognizer.java =================================================================== --- trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/clay/ShaleClayEntityRecognizer.java 2007-07-20 13:25:41 UTC (rev 2544) +++ trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/clay/ShaleClayEntityRecognizer.java 2007-07-20 13:42:58 UTC (rev 2545) @@ -12,14 +12,14 @@ import org.eclipse.core.runtime.FileLocator; import org.jboss.tools.common.model.loaders.EntityRecognizer; -import org.jboss.tools.common.model.util.XMLEntityResolver; +import org.jboss.tools.common.xml.XMLEntityResolver; import org.jboss.tools.shale.ShaleModelPlugin; public class ShaleClayEntityRecognizer implements ShaleClayConstants, EntityRecognizer { static { try { - Class c = ShaleClayEntityRecognizer.class; + Class<?> c = ShaleClayEntityRecognizer.class; XMLEntityResolver.registerPublicEntity(DOC_PUBLICID, FileLocator.resolve(c.getResource("/meta/shale-clay-config_1_0.dtd")).toString()); } catch (Exception e) { ShaleModelPlugin.getPluginLog().logError(e); Modified: trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/dialog/ShaleDialogEntityRecognizer.java =================================================================== --- trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/dialog/ShaleDialogEntityRecognizer.java 2007-07-20 13:25:41 UTC (rev 2544) +++ trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/dialog/ShaleDialogEntityRecognizer.java 2007-07-20 13:42:58 UTC (rev 2545) @@ -12,14 +12,14 @@ import org.eclipse.core.runtime.FileLocator; import org.jboss.tools.common.model.loaders.EntityRecognizer; -import org.jboss.tools.common.model.util.XMLEntityResolver; +import org.jboss.tools.common.xml.XMLEntityResolver; import org.jboss.tools.shale.ShaleModelPlugin; public class ShaleDialogEntityRecognizer implements ShaleDialogConstants, EntityRecognizer { static { try { - Class c = ShaleDialogEntityRecognizer.class; + Class<?> c = ShaleDialogEntityRecognizer.class; XMLEntityResolver.registerPublicEntity(DOC_PUBLICID, FileLocator.resolve(c.getResource("/meta/shale-dialog-config_1_0.dtd")).toString()); } catch (Exception e) { ShaleModelPlugin.getPluginLog().logError(e); Modified: trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/spring/SpringBeansEntityRecognizer.java =================================================================== --- trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/spring/SpringBeansEntityRecognizer.java 2007-07-20 13:25:41 UTC (rev 2544) +++ trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/spring/SpringBeansEntityRecognizer.java 2007-07-20 13:42:58 UTC (rev 2545) @@ -12,14 +12,14 @@ import org.eclipse.core.runtime.FileLocator; import org.jboss.tools.common.model.loaders.EntityRecognizer; -import org.jboss.tools.common.model.util.XMLEntityResolver; +import org.jboss.tools.common.xml.XMLEntityResolver; import org.jboss.tools.shale.ShaleModelPlugin; public class SpringBeansEntityRecognizer implements SpringBeansConstants, EntityRecognizer { static { try { - Class c = SpringBeansEntityRecognizer.class; + Class<?> c = SpringBeansEntityRecognizer.class; XMLEntityResolver.registerPublicEntity(DOC_PUBLICID, FileLocator.resolve(c.getResource("/meta/spring-beans.dtd")).toString()); } catch (Exception e) { ShaleModelPlugin.getPluginLog().logError(e);