[jbosstools-commits] JBoss Tools SVN: r31151 - in trunk: jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: akazakov
Date: 2011-05-09 15:36:00 -0400 (Mon, 09 May 2011)
New Revision: 31151

Modified:
   trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java
   trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java
   trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLSyntaxValidator.java
Log:
Rolled back the fixes for WTP M7. To have AS and JSF compilable against M7.

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java	2011-05-09 19:04:21 UTC (rev 31150)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java	2011-05-09 19:36:00 UTC (rev 31151)
@@ -127,7 +127,7 @@
 					IServer server = (IServer) data;
 					ServerUIPlugin.editServer(server);
 				} catch (Exception e) {
-					Trace.trace(Trace.STRING_SEVERE, org.jboss.ide.eclipse.as.ui.Messages.ServerActionProvider_CouldNotOpenServerError, e);
+					Trace.trace(Trace.SEVERE, org.jboss.ide.eclipse.as.ui.Messages.ServerActionProvider_CouldNotOpenServerError, e);
 				}
 			}
 		});

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java	2011-05-09 19:04:21 UTC (rev 31150)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java	2011-05-09 19:36:00 UTC (rev 31151)
@@ -349,7 +349,7 @@
 							}
 						}
 					} catch (Exception e) {
-						Trace.trace(Trace.STRING_FINEST, Messages.ServerContentProvider_ErrorInServersViewAnimation, e);
+						Trace.trace(Trace.FINEST, Messages.ServerContentProvider_ErrorInServersViewAnimation, e);
 					}
 					display.timerExec(SLEEP, animator[0]);
 				}

Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLSyntaxValidator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLSyntaxValidator.java	2011-05-09 19:04:21 UTC (rev 31150)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLSyntaxValidator.java	2011-05-09 19:36:00 UTC (rev 31151)
@@ -19,6 +19,7 @@
 import java.io.StringReader;
 import java.util.ArrayList;
 
+import org.apache.xerces.xni.parser.XMLEntityResolver;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
 import org.eclipse.wst.validation.ValidationResult;
@@ -30,11 +31,10 @@
 import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
 import org.eclipse.wst.xml.core.internal.validation.eclipse.ErrorCustomizationPluginRegistryReader;
 import org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;
+import org.jboss.tools.common.xml.XMLEntityResolverImpl;
 import org.jboss.tools.jsf.JSFModelPlugin;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
 import org.xml.sax.SAXParseException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.ext.LexicalHandler;
@@ -224,7 +224,7 @@
 				this.entityResolver = entityResolver;
 			}
 
-			protected XMLReader createXMLReader(String uri) throws SAXNotRecognizedException, SAXNotSupportedException
+			protected XMLReader createXMLReader(String uri) throws Exception
 			{     
 				XMLReader reader = super.createXMLReader(uri);