Author: janpascal-guest
Date: 2009-07-02 07:30:02 +0000 (Thu, 02 Jul 2009)
New Revision: 8749
Modified:
trunk/solr/debian/patches/01_remove-all-jarfiles.dpatch
trunk/solr/debian/patches/04_fix-lucene-lock-directory.dpatch
trunk/solr/debian/patches/08_disable-tests-that-need-network-access.dpatch
trunk/solr/debian/patches/16_fix-failed-SolrInfoMBeanTest.dpatch
Log:
Updated patches for solr-1.3.0
Modified: trunk/solr/debian/patches/01_remove-all-jarfiles.dpatch
===================================================================
--- trunk/solr/debian/patches/01_remove-all-jarfiles.dpatch 2009-07-02
06:53:06 UTC (rev 8748)
+++ trunk/solr/debian/patches/01_remove-all-jarfiles.dpatch 2009-07-02
07:30:02 UTC (rev 8749)
@@ -19,7 +19,7 @@
case "$OPERATION" in
-patch)
- echo "Removing jar files under $DIRECTORY..."
+ echo "Removing jar files under \"$DIRECTORY\" ..."
find $DIRECTORY -name \*.jar -exec rm {} \;
;;
-unpatch)
Modified: trunk/solr/debian/patches/04_fix-lucene-lock-directory.dpatch
===================================================================
--- trunk/solr/debian/patches/04_fix-lucene-lock-directory.dpatch
2009-07-02 06:53:06 UTC (rev 8748)
+++ trunk/solr/debian/patches/04_fix-lucene-lock-directory.dpatch
2009-07-02 07:30:02 UTC (rev 8749)
@@ -8,14 +8,14 @@
## DP: instead.
@DPATCH@
-diff -urNad trunk~/src/java/org/apache/solr/core/SolrCore.java
trunk/src/java/org/apache/solr/core/SolrCore.java
---- trunk~/src/java/org/apache/solr/core/SolrCore.java 2006-12-16
22:34:15.000000000 +0100
-+++ trunk/src/java/org/apache/solr/core/SolrCore.java 2007-06-01
11:45:34.000000000 +0200
-@@ -125,6 +125,7 @@
-
+diff -urNad solr~/src/java/org/apache/solr/core/SolrCore.java
solr/src/java/org/apache/solr/core/SolrCore.java
+--- solr~/src/java/org/apache/solr/core/SolrCore.java 2009-07-02
09:27:02.000000000 +0200
++++ solr/src/java/org/apache/solr/core/SolrCore.java 2009-07-02
09:27:03.000000000 +0200
+@@ -275,6 +275,7 @@
+ // currently only called with SolrCore.class lock held
void initIndex() {
try {
+ System.setProperty( "org.apache.lucene.lockDir", dataDir );
File dirFile = new File(getIndexDir());
boolean indexExists = dirFile.canRead();
-
+ boolean firstTime = dirs.add(dirFile.getCanonicalPath());
Modified:
trunk/solr/debian/patches/08_disable-tests-that-need-network-access.dpatch
===================================================================
--- trunk/solr/debian/patches/08_disable-tests-that-need-network-access.dpatch
2009-07-02 06:53:06 UTC (rev 8748)
+++ trunk/solr/debian/patches/08_disable-tests-that-need-network-access.dpatch
2009-07-02 07:30:02 UTC (rev 8749)
@@ -6,10 +6,28 @@
## DP: the autobuilders
@DPATCH@
-diff -urNad
1.2.0+ds2~/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
1.2.0+ds2/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
---- 1.2.0+ds2~/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
2007-05-30 17:51:02.000000000 +0200
-+++ 1.2.0+ds2/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
2009-06-24 13:55:39.000000000 +0200
-@@ -93,7 +93,7 @@
+diff -urNad solr~/src/test/org/apache/solr/common/util/ContentStreamTest.java
solr/src/test/org/apache/solr/common/util/ContentStreamTest.java
+--- solr~/src/test/org/apache/solr/common/util/ContentStreamTest.java
2009-07-02 09:27:43.000000000 +0200
++++ solr/src/test/org/apache/solr/common/util/ContentStreamTest.java
2009-07-02 09:27:44.000000000 +0200
+@@ -55,7 +55,7 @@
+ assertTrue( IOUtils.contentEquals( new FileReader( file ),
stream.getReader() ) );
+ }
+
+-
++/* Disabled for Debian build because this test needs network access
+ public void testURLStream() throws IOException
+ {
+ String content = null;
+@@ -87,4 +87,5 @@
+ stream = new ContentStreamBase.URLStream( url );
+ assertTrue( IOUtils.contentEquals( new StringReader( content ),
stream.getReader() ) );
+ }
++*/
+ }
+diff -urNad solr~/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
solr/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
+--- solr~/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
2009-07-02 09:27:43.000000000 +0200
++++ solr/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
2009-07-02 09:27:44.000000000 +0200
+@@ -95,7 +95,7 @@
}
}
@@ -18,7 +36,7 @@
public void testStreamURL() throws Exception
{
boolean ok = false;
-@@ -117,7 +117,7 @@
+@@ -121,7 +121,7 @@
assertEquals( 1, streams.size() );
assertEquals( txt, IOUtils.toString( streams.get(0).getStream() ) );
}
@@ -27,21 +45,3 @@
public void testUrlParamParsing()
{
String[][] teststr = new String[][] {
-diff -urNad
1.2.0+ds2~/src/test/org/apache/solr/common/util/ContentStreamTest.java
1.2.0+ds2/src/test/org/apache/solr/common/util/ContentStreamTest.java
---- 1.2.0+ds2~/src/test/org/apache/solr/common/util/ContentStreamTest.java
2007-05-30 17:51:03.000000000 +0200
-+++ 1.2.0+ds2/src/test/org/apache/solr/common/util/ContentStreamTest.java
2009-06-24 13:55:59.000000000 +0200
-@@ -56,7 +56,7 @@
- assertTrue( IOUtils.contentEquals( new FileReader( file ),
stream.getReader() ) );
- }
-
--
-+/* Disabled for Debian build because this test needs network access
- public void testURLStream() throws IOException
- {
- String content = null;
-@@ -88,4 +88,5 @@
- stream = new ContentStreamBase.URLStream( url );
- assertTrue( IOUtils.contentEquals( new StringReader( content ),
stream.getReader() ) );
- }
-+*/
- }
Modified: trunk/solr/debian/patches/16_fix-failed-SolrInfoMBeanTest.dpatch
===================================================================
--- trunk/solr/debian/patches/16_fix-failed-SolrInfoMBeanTest.dpatch
2009-07-02 06:53:06 UTC (rev 8748)
+++ trunk/solr/debian/patches/16_fix-failed-SolrInfoMBeanTest.dpatch
2009-07-02 07:30:02 UTC (rev 8749)
@@ -2,18 +2,18 @@
## 16_fix-failed-SolrInfoMBeanTest.dpatch by Jan-Pascal van Best
<[email protected]>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: See upstream issue SOLR-1253
@DPATCH@
diff -urNad solr~/src/test/org/apache/solr/SolrInfoMBeanTest.java
solr/src/test/org/apache/solr/SolrInfoMBeanTest.java
---- solr~/src/test/org/apache/solr/SolrInfoMBeanTest.java 2009-07-01
20:15:25.000000000 +0200
-+++ solr/src/test/org/apache/solr/SolrInfoMBeanTest.java 2009-07-01
20:27:13.000000000 +0200
-@@ -82,7 +82,7 @@
+--- solr~/src/test/org/apache/solr/SolrInfoMBeanTest.java 2009-07-02
09:28:07.000000000 +0200
++++ solr/src/test/org/apache/solr/SolrInfoMBeanTest.java 2009-07-02
09:28:09.000000000 +0200
+@@ -81,7 +81,7 @@
String path = pckgname.replace('.', '/');
Enumeration<URL> resources = cld.getResources(path);
while (resources.hasMoreElements()) {
- directories.add(new
File(URLDecoder.decode(resources.nextElement().getPath(), "UTF-8")));
+ directories.add(new File(resources.nextElement().getPath()));
}
- System.out.println( "Directories: " + directories );
+ ArrayList<Class> classes = new ArrayList<Class>();
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
