You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2010/03/23 14:52:09 UTC
svn commit: r926575 - in /lucene/dev/trunk/solr: example/ example/lib/
example/lib/jsp-2.1/ src/test/org/apache/solr/servlet/
Author: markrmiller
Date: Tue Mar 23 13:52:08 2010
New Revision: 926575
URL: http://svn.apache.org/viewvc?rev=926575&view=rev
Log:
upgrade jetty to 6.1.22
Added:
lucene/dev/trunk/solr/example/lib/jetty-6.1.22.jar (with props)
lucene/dev/trunk/solr/example/lib/jetty-util-6.1.22.jar (with props)
lucene/dev/trunk/solr/example/lib/jsp-2.1/jsp-2.1-glassfish-9.1.1.B60.25.p2.jar (with props)
lucene/dev/trunk/solr/example/lib/jsp-2.1/jsp-2.1-jetty-6.1.22.jar (with props)
lucene/dev/trunk/solr/example/lib/jsp-2.1/jsp-api-2.1-glassfish-9.1.1.B60.25.p2.jar (with props)
lucene/dev/trunk/solr/example/lib/servlet-api-2.5-20081211.jar (with props)
Removed:
lucene/dev/trunk/solr/example/lib/jetty-6.1.3.jar
lucene/dev/trunk/solr/example/lib/jetty-util-6.1.3.jar
lucene/dev/trunk/solr/example/lib/jsp-2.1/ant-1.6.5.jar
lucene/dev/trunk/solr/example/lib/jsp-2.1/jsp-2.1.jar
lucene/dev/trunk/solr/example/lib/jsp-2.1/jsp-api-2.1.jar
lucene/dev/trunk/solr/example/lib/servlet-api-2.5-6.1.3.jar
Modified:
lucene/dev/trunk/solr/example/start.jar
lucene/dev/trunk/solr/src/test/org/apache/solr/servlet/CacheHeaderTest.java
Added: lucene/dev/trunk/solr/example/lib/jetty-6.1.22.jar
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/lib/jetty-6.1.22.jar?rev=926575&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/dev/trunk/solr/example/lib/jetty-6.1.22.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/dev/trunk/solr/example/lib/jetty-util-6.1.22.jar
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/lib/jetty-util-6.1.22.jar?rev=926575&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/dev/trunk/solr/example/lib/jetty-util-6.1.22.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/dev/trunk/solr/example/lib/jsp-2.1/jsp-2.1-glassfish-9.1.1.B60.25.p2.jar
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/lib/jsp-2.1/jsp-2.1-glassfish-9.1.1.B60.25.p2.jar?rev=926575&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/dev/trunk/solr/example/lib/jsp-2.1/jsp-2.1-glassfish-9.1.1.B60.25.p2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/dev/trunk/solr/example/lib/jsp-2.1/jsp-2.1-jetty-6.1.22.jar
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/lib/jsp-2.1/jsp-2.1-jetty-6.1.22.jar?rev=926575&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/dev/trunk/solr/example/lib/jsp-2.1/jsp-2.1-jetty-6.1.22.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/dev/trunk/solr/example/lib/jsp-2.1/jsp-api-2.1-glassfish-9.1.1.B60.25.p2.jar
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/lib/jsp-2.1/jsp-api-2.1-glassfish-9.1.1.B60.25.p2.jar?rev=926575&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/dev/trunk/solr/example/lib/jsp-2.1/jsp-api-2.1-glassfish-9.1.1.B60.25.p2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/dev/trunk/solr/example/lib/servlet-api-2.5-20081211.jar
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/lib/servlet-api-2.5-20081211.jar?rev=926575&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/dev/trunk/solr/example/lib/servlet-api-2.5-20081211.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: lucene/dev/trunk/solr/example/start.jar
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/start.jar?rev=926575&r1=926574&r2=926575&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/servlet/CacheHeaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/servlet/CacheHeaderTest.java?rev=926575&r1=926574&r2=926575&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/servlet/CacheHeaderTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/servlet/CacheHeaderTest.java Tue Mar 23 13:52:08 2010
@@ -46,7 +46,7 @@ public class CacheHeaderTest extends Cac
m.setQueryString(new NameValuePair[] { new NameValuePair("stream.file",f.getCanonicalPath())});
getClient().executeMethod(m);
assertEquals(200, m.getStatusCode());
- checkVetoHeaders(m);
+ checkVetoHeaders(m, true);
}
public void testCacheVetoException() throws Exception {
@@ -56,24 +56,27 @@ public class CacheHeaderTest extends Cac
new NameValuePair("qt", "standard") });
getClient().executeMethod(m);
assertFalse(m.getStatusCode() == 200);
- checkVetoHeaders(m);
+ checkVetoHeaders(m, false);
}
- protected void checkVetoHeaders(HttpMethodBase m) throws Exception {
+ protected void checkVetoHeaders(HttpMethodBase m, boolean checkExpires) throws Exception {
Header head = m.getResponseHeader("Cache-Control");
assertNotNull("We got no Cache-Control header", head);
- assertEquals("no-cache, no-store", head.getValue());
+ assertTrue("We got no no-cache in the Cache-Control header", head.getValue().contains("no-cache"));
+ assertTrue("We got no no-store in the Cache-Control header", head.getValue().contains("no-store"));
head = m.getResponseHeader("Pragma");
assertNotNull("We got no Pragma header", head);
assertEquals("no-cache", head.getValue());
- head = m.getResponseHeader("Expires");
- assertNotNull("We got no Expires header", head);
- Date d = DateUtil.parseDate(head.getValue());
- assertTrue("We got no Expires header far in the past", System
- .currentTimeMillis()
- - d.getTime() > 100000);
+ if (checkExpires) {
+ head = m.getResponseHeader("Expires");
+ assertNotNull("We got no Expires header:" + m.getResponseHeaders(), head);
+ Date d = DateUtil.parseDate(head.getValue());
+ assertTrue("We got no Expires header far in the past", System
+ .currentTimeMillis()
+ - d.getTime() > 100000);
+ }
}
protected void doLastModified(String method) throws Exception {