[pkg-java] r8711 - in trunk/solr/debian: . patches

Jan-Pascal van Best janpascal-guest at alioth.debian.org
Wed Jul 1 18:53:13 UTC 2009 

Author: janpascal-guest
Date: 2009-07-01 18:53:11 +0000 (Wed, 01 Jul 2009)
New Revision: 8711

Added:
   trunk/solr/debian/patches/08_disable-tests-that-need-network-access.dpatch
   trunk/solr/debian/patches/16_fix-failed-SolrInfoMBeanTest.dpatch
   trunk/solr/debian/patches/22_fix-compile-error-with-ambiguous-assert.dpatch
Modified:
   trunk/solr/debian/control
   trunk/solr/debian/patches/00list
   trunk/solr/debian/patches/05_use-debian-java-libraries.dpatch
Log:
added dependencies and some patches to make building with pbuilder work

Modified: trunk/solr/debian/control
===================================================================
--- trunk/solr/debian/control	2009-07-01 18:50:49 UTC (rev 8710)
+++ trunk/solr/debian/control	2009-07-01 18:53:11 UTC (rev 8711)
@@ -10,9 +10,10 @@
 Build-Depends: cdbs, debhelper (>= 4.1.0), dpatch (>= 2.0), po-debconf,
  openjdk-6-jdk (>= 6b11-5),
  ant (>= 1.7.0), ant-optional (>= 1.7.0), 
- junit (>= 3.8.1.1), libeasymock-java (>= 2.4),
+ junit4 (>= 4.6), libeasymock-java (>= 2.4),
  libcommons-codec-java (>= 1.3),
  libcommons-csv-java (>= 0.1-SNAPSHOT+svn558885),
+ libcommons-httpclient-java (>= 3.1),
  libcommons-fileupload-java (>= 1.2),
  libcommons-io-java (>= 1.3.1),
  liblucene2-java (>= 2.4.0),
@@ -30,7 +31,7 @@
  libcommons-csv-java (>= 0.1-SNAPSHOT+svn558885),
  libcommons-fileupload-java (>= 1.2),
  libcommons-io-java (>= 1.3.1),
- libservlet2.4-java (>= 5.0.30),
+ libservlet2.5-java (>= 6.0.20),
  liblucene2-java (>= 2.4.0),
  libxpp3-java (>= 1.1.3.4.0),
  libtomcat6-java (>= 6.0.20)

Modified: trunk/solr/debian/patches/00list
===================================================================
--- trunk/solr/debian/patches/00list	2009-07-01 18:50:49 UTC (rev 8710)
+++ trunk/solr/debian/patches/00list	2009-07-01 18:53:11 UTC (rev 8711)
@@ -4,5 +4,6 @@
 08_disable-tests-that-need-network-access.dpatch
 10_contrib-dataimporthandler-use-debian-libs.dpatch
 15_fix-failed-test-with-new-jetty.dpatch
+16_fix-failed-SolrInfoMBeanTest.dpatch
 20_remove-dependency-on-javanet-staxutils-SOLR-851.dpatch
 22_fix-compile-error-with-ambiguous-assert.dpatch

Modified: trunk/solr/debian/patches/05_use-debian-java-libraries.dpatch
===================================================================
--- trunk/solr/debian/patches/05_use-debian-java-libraries.dpatch	2009-07-01 18:50:49 UTC (rev 8710)
+++ trunk/solr/debian/patches/05_use-debian-java-libraries.dpatch	2009-07-01 18:53:11 UTC (rev 8711)
@@ -8,8 +8,8 @@
 
 @DPATCH@
 diff -urNad solr~/build.xml solr/build.xml
---- solr~/build.xml	2009-07-01 10:51:58.000000000 +0200
-+++ solr/build.xml	2009-07-01 10:52:16.000000000 +0200
+--- solr~/build.xml	2008-09-12 17:01:54.000000000 +0200
++++ solr/build.xml	2009-07-01 15:26:50.000000000 +0200
 @@ -22,7 +22,7 @@
    <import file="common-build.xml"/>
    
@@ -24,7 +24,7 @@
    <path id="compile.classpath">
      <fileset dir="${lib}">
 -      <include name="*.jar" />
-+      <include name="servlet-api.jar" />
++      <include name="servlet-api-2.5.jar" />
 +      <include name="lucene-core.jar" />
 +      <include name="lucene-analyzers.jar" />
 +      <include name="lucene-highlighter.jar" />
@@ -44,24 +44,27 @@
      </fileset>
      <pathelement location="${dest}/common"/>
    </path>
-@@ -305,7 +321,7 @@
+@@ -304,9 +320,8 @@
+       <include name="*.jar" />
      </fileset>
      <fileset dir="${lib}">
-       <include name="commons-io-*.jar" />
+-      <include name="commons-io-*.jar" />
 -      <include name="*stax-*.jar" />
+-      <include name="wstx-*.jar" />
++      <include name="commons-io.jar" />
 +      <include name="commons-httpclient.jar" />
-       <include name="wstx-*.jar" />
      </fileset>
      <pathelement location="${dest}/common"/>
-@@ -318,8 +334,14 @@
+   </path>
+@@ -318,8 +333,14 @@
      <pathelement location="${dest}/core"/>
      
      <!-- jetty -->
 -    <fileset dir="example/lib">
 -      <include name="**/*.jar" />
 +    <fileset dir="/usr/share/java">
-+      <include name="jetty6.jar" />
-+      <include name="jetty6-util.jar" />
++      <include name="jetty.jar" />
++      <include name="jetty-util.jar" />
 +      <include name="jsp-api-2.1.jar" />
 +      <include name="el-api-2.1.jar" />
 +      <include name="jasper.jar" />
@@ -70,7 +73,7 @@
      </fileset>
    </path>
      
-@@ -520,10 +542,6 @@
+@@ -520,10 +541,6 @@
           webxml="${src}/webapp/web/WEB-INF/web.xml"
           filesetmanifest="skip"
           manifest="${dest}/META-INF/MANIFEST.MF">
@@ -81,7 +84,7 @@
         <lib dir="${dist}">
           <include name="${fullname}-core-${version}.jar" />
           <include name="${fullname}-common-${version}.jar" />
-@@ -598,7 +616,6 @@
+@@ -598,7 +615,6 @@
        <fileset dir="${lib}">
          <include name="commons-codec-*.jar"/>
          <include name="commons-io-*.jar"/>

Added: trunk/solr/debian/patches/08_disable-tests-that-need-network-access.dpatch
===================================================================
--- trunk/solr/debian/patches/08_disable-tests-that-need-network-access.dpatch	                        (rev 0)
+++ trunk/solr/debian/patches/08_disable-tests-that-need-network-access.dpatch	2009-07-01 18:53:11 UTC (rev 8711)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_disable-tests-that-need-network-access.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disable tests that need network access, because they fail for (some of)
+## DP: the autobuilders
+
+ at 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 @@
+     }
+   }
+   
+-
++/* Disabled for Debian builds because this test needs network access
+   public void testStreamURL() throws Exception
+   {
+     boolean ok = false;
+@@ -117,7 +117,7 @@
+     assertEquals( 1, streams.size() );
+     assertEquals( txt, IOUtils.toString( streams.get(0).getStream() ) );
+   }
+-  
++*/ 
+   public void testUrlParamParsing()
+   {
+     String[][] teststr = new String[][] {


Property changes on: trunk/solr/debian/patches/08_disable-tests-that-need-network-access.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/solr/debian/patches/16_fix-failed-SolrInfoMBeanTest.dpatch
===================================================================
--- trunk/solr/debian/patches/16_fix-failed-SolrInfoMBeanTest.dpatch	                        (rev 0)
+++ trunk/solr/debian/patches/16_fix-failed-SolrInfoMBeanTest.dpatch	2009-07-01 18:53:11 UTC (rev 8711)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 16_fix-failed-SolrInfoMBeanTest.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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 @@
+     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 );
+       


Property changes on: trunk/solr/debian/patches/16_fix-failed-SolrInfoMBeanTest.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/solr/debian/patches/22_fix-compile-error-with-ambiguous-assert.dpatch
===================================================================
--- trunk/solr/debian/patches/22_fix-compile-error-with-ambiguous-assert.dpatch	                        (rev 0)
+++ trunk/solr/debian/patches/22_fix-compile-error-with-ambiguous-assert.dpatch	2009-07-01 18:53:11 UTC (rev 8711)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 22_fix-compile-error-with-ambiguous-assert.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad solr~/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java
+--- solr~/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java	2008-08-27 15:03:44.000000000 +0200
++++ solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java	2009-07-01 12:01:33.000000000 +0200
+@@ -122,7 +122,7 @@
+         break;
+       count++;
+     }
+-    Assert.assertEquals(2, local.get());
++    Assert.assertEquals(2, (long)local.get());
+     Assert.assertEquals(4, count);
+   }
+ 


Property changes on: trunk/solr/debian/patches/22_fix-compile-error-with-ambiguous-assert.dpatch
___________________________________________________________________
Added: svn:executable
   + *

More information about the pkg-java-commits mailing list