This patch removes the META-INF/services dir from xercesImpl.jar that
was causing conflicts with AppEngine and internal Tomcat. Also, rolls
back the changes made by now unnecessary c5916.

Patch by: amitmanjhi
Review by: rjrjr 



git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@5989 8db76d5a-ed1c-0410-87a9-c151d255dfc7

dev/core/build.xml

diff --git a/dev/core/build.xml b/dev/core/build.xml
index 658a48d..4bdbd75 100755
--- a/dev/core/build.xml
+++ b/dev/core/build.xml
@@ -65,7 +65,7 @@
           <include name="nekohtml/nekohtml-1.9.12.jar" />
           <include name="xalan/xalan-2.7.1.jar" />
           <include name="xerces/xerces-2_9_1/serializer.jar" />
-          <include name="xerces/xerces-2_9_1/xercesImpl.jar" />
+          <include name="xerces/xerces-2_9_1/xercesImpl-NoMetaInf.jar" />
           <include name="xerces/xerces-2_9_1/xml-apis.jar" />
           <include name="w3c/sac/sac-1.3.jar" />
           <!-- htmlunit dependencies not already included: END -->
@@ -119,7 +119,7 @@
           <zipfileset src="${gwt.tools.lib}/nekohtml/nekohtml-1.9.12.jar" />
           <zipfileset src="${gwt.tools.lib}/xalan/xalan-2.7.1.jar" />
           <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_9_1/serializer.jar" />
-          <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_9_1/xercesImpl.jar" />
+          <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_9_1/xercesImpl-NoMetaInf.jar" />
           <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_9_1/xml-apis.jar" />
           <zipfileset src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
           <!-- htmlunit dependencies not already included: END -->

dev/core/src/com/google/gwt/dev/shell/tomcat/EmbeddedTomcatServer.java

diff --git a/dev/core/src/com/google/gwt/dev/shell/tomcat/EmbeddedTomcatServer.java b/dev/core/src/com/google/gwt/dev/shell/tomcat/EmbeddedTomcatServer.java
index d4feab7..5a86612 100644
--- a/dev/core/src/com/google/gwt/dev/shell/tomcat/EmbeddedTomcatServer.java
+++ b/dev/core/src/com/google/gwt/dev/shell/tomcat/EmbeddedTomcatServer.java
@@ -177,15 +177,6 @@
     //
     File topWorkDir = new File(System.getProperty("user.dir"));
 
-    /*
-     * set property explicitly so that addition of the xercesImpl lib, when java
-     * 1.5 is used, does not affect tomcat.
-     */
-    if ("1.5".equals(System.getProperty("java.specification.version"))) {
-      System.setProperty("javax.xml.parsers.DocumentBuilderFactory",
-          "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl");
-    }
-    
     // Tell Tomcat its base directory so that it won't complain.
     //
     String catBase = System.getProperty("catalina.base");

eclipse/user/.classpath

diff --git a/eclipse/user/.classpath b/eclipse/user/.classpath
index 4bb3d4f..37be02a 100644
--- a/eclipse/user/.classpath
+++ b/eclipse/user/.classpath
@@ -20,7 +20,7 @@
 	<classpathentry kind="var" path="GWT_TOOLS/lib/selenium/selenium-java-client-driver.jar"/>
 	<classpathentry kind="var" path="GWT_TOOLS/lib/xalan/xalan-2.7.1.jar" />
 	<classpathentry kind="var" path="GWT_TOOLS/lib/xerces/xerces-2_9_1/serializer.jar" />
-	<classpathentry kind="var" path="GWT_TOOLS/lib/xerces/xerces-2_9_1/xercesImpl.jar" />
+	<classpathentry kind="var" path="GWT_TOOLS/lib/xerces/xerces-2_9_1/xercesImpl-NoMetaInf.jar" />
 	<classpathentry kind="var" path="GWT_TOOLS/lib/xerces/xerces-2_9_1/xml-apis.jar" />
 	<classpathentry kind="var" path="GWT_TOOLS/lib/w3c/sac/sac-1.3.jar"/>
 	<classpathentry kind="var" path="GWT_TOOLS/lib/w3c/flute/flute-1.3.jar"/>