tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r980347 - in /tomcat/trunk: java/org/apache/catalina/startup/WebRuleSet.java webapps/docs/changelog.xml
Date Thu, 29 Jul 2010 07:52:07 GMT
Author: markt
Date: Thu Jul 29 07:52:07 2010
New Revision: 980347

URL: http://svn.apache.org/viewvc?rev=980347&view=rev
Log:
Fix copy/paste typo

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=980347&r1=980346&r2=980347&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java Thu Jul 29 07:52:07 2010
@@ -520,7 +520,7 @@ public class WebRuleSet extends RuleSetB
                 "setName", 0);
         digester.addCallMethod(fullPrefix + "/resource-env-ref/resource-env-ref-type",
                 "setType", 0);
-        configureInjectionRules(digester, "web-app/ejb-local-ref/");
+        configureInjectionRules(digester, "web-app/resource-env-ref/");
 
         //message-destination
         digester.addObjectCreate(fullPrefix + "/message-destination",

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=980347&r1=980346&r2=980347&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jul 29 07:52:07 2010
@@ -193,6 +193,10 @@
         Handle the edge cases where resources packaged in JARs have names that
         start with a single quote character or a double quote character. (markt)
       </fix>
+      <fix>
+        Correct copy and paste typo in web.xml parsing rules that mixed up
+        <code>local-ejb-ref</code> and <code>resource-env-ref</code>.
(markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message