Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/dom.js URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/dom.js?rev=434591&r1=434590&r2=434591&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/dom.js (original) +++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/dom.js Thu Aug 24 18:37:40 2006 @@ -288,11 +288,11 @@ var mtype = "text/xml"; var xml = '<?xml version="1.0"?>'+str; var url = "data:"+mtype+";charset=utf-8,"+encodeURIComponent(xml); - var req = new XMLHttpRequest(); - req.open("GET", url, false); - req.overrideMimeType(mtype); - req.send(null); - return req.responseXML; + var request = new XMLHttpRequest(); + request.open("GET", url, false); + request.overrideMimeType(mtype); + request.send(null); + return request.responseXML; */ }else if(document.createElement){ // FIXME: this may change all tags to uppercase!
Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/iCalendar.js URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/iCalendar.js?rev=434591&r1=434590&r2=434591&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/iCalendar.js (original) +++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/iCalendar.js Thu Aug 24 18:37:40 2006 @@ -179,8 +179,8 @@ dojo.iCalendar.VFREEBUSY = function () {} dojo.iCalendar.VTIMEZONE = function () {} -var _ = function (n, oc, req) { - return {name: n, required: (req) ? true : false, +var _ = function (n, oc, request) { + return {name: n, required: (request) ? true : false, occurance: (oc == '*' || !oc) ? -1 : oc} } Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java?rev=434591&r1=434590&r2=434591&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java Thu Aug 24 18:37:40 2006 @@ -99,7 +99,7 @@ tag = new IncludeTag(); controlRequestDispatcher = MockControl.createNiceControl(RequestDispatcher.class); - // use always matcher as we can not determine the excact objects used in mock.include(req, res) call + // use always matcher as we can not determine the excact objects used in mock.include(request, response) call controlRequestDispatcher.setDefaultMatcher(MockControl.ALWAYS_MATCHER); mockRequestDispatcher = (RequestDispatcher) controlRequestDispatcher.getMock();
