You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2018/10/21 17:05:03 UTC
svn commit: r1844502 - in /tomcat/trunk:
java/org/apache/catalina/startup/Catalina.java
java/org/apache/catalina/startup/ContextConfig.java
webapps/docs/changelog.xml
Author: markt
Date: Sun Oct 21 17:05:03 2018
New Revision: 1844502
URL: http://svn.apache.org/viewvc?rev=1844502&view=rev
Log:
Ignore an attribute named source on Context elements provided by StandardContext. This is to suppress warnings generated by the Eclipse / Tomcat integration provided by Eclipse.
Based on a patch by mdfst13.
This closes #127.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1844502&r1=1844501&r2=1844502&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Sun Oct 21 17:05:03 2018
@@ -35,6 +35,7 @@ import org.apache.catalina.Container;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Server;
+import org.apache.catalina.core.StandardContext;
import org.apache.catalina.security.SecurityConfig;
import org.apache.juli.ClassLoaderLogManager;
import org.apache.juli.logging.Log;
@@ -280,9 +281,13 @@ public class Catalina {
digester.setValidating(false);
digester.setRulesValidation(true);
Map<Class<?>, List<String>> fakeAttributes = new HashMap<>();
- List<String> attrs = new ArrayList<>();
- attrs.add("className");
- fakeAttributes.put(Object.class, attrs);
+ List<String> objectAttrs = new ArrayList<>();
+ objectAttrs.add("className");
+ fakeAttributes.put(Object.class, objectAttrs);
+ // Ignore attribute added by Eclipse for its internal tracking
+ List<String> contextAttrs = new ArrayList<>();
+ contextAttrs.add("source");
+ fakeAttributes.put(StandardContext.class, contextAttrs);
digester.setFakeAttributes(fakeAttributes);
digester.setUseContextClassLoader(true);
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1844502&r1=1844501&r2=1844502&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Sun Oct 21 17:05:03 2018
@@ -424,9 +424,13 @@ public class ContextConfig implements Li
digester.setValidating(false);
digester.setRulesValidation(true);
Map<Class<?>, List<String>> fakeAttributes = new HashMap<>();
- List<String> attrs = new ArrayList<>();
- attrs.add("className");
- fakeAttributes.put(Object.class, attrs);
+ List<String> objectAttrs = new ArrayList<>();
+ objectAttrs.add("className");
+ fakeAttributes.put(Object.class, objectAttrs);
+ // Ignore attribute added by Eclipse for its internal tracking
+ List<String> contextAttrs = new ArrayList<>();
+ contextAttrs.add("source");
+ fakeAttributes.put(StandardContext.class, contextAttrs);
digester.setFakeAttributes(fakeAttributes);
RuleSet contextRuleSet = new ContextRuleSet("", false);
digester.addRuleSet(contextRuleSet);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1844502&r1=1844501&r2=1844502&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Oct 21 17:05:03 2018
@@ -114,6 +114,12 @@
<update>
Update the recommended minimum Tomcat Native version to 1.2.18. (markt)
</update>
+ <add>
+ Ignore an attribute named <code>source</code> on <code>Context</code>
+ elements provided by <code>StandardContext</code>. This is to suppress
+ warnings generated by the Eclipse / Tomcat integration provided by
+ Eclipse. Based on a patch by mdfst13. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org