[
https://issues.apache.org/jira/browse/SOLR-1395?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12922026#action_12922026
]
Mathias Walter edited comment on SOLR-1395 at 10/18/10 5:37 AM:
----------------------------------------------------------------
You should not include your modified web.xml into the patch.
was (Author: tolot27):
Patching trunk fails too:
{noformat}
patching file java/org/apache/solr/katta/ISolrDocumentFactory.java
patching file java/org/apache/solr/katta/ISolrServer.java
patching file java/org/apache/solr/katta/KattaClient.java
patching file java/org/apache/solr/katta/KattaResponse.java
patching file java/org/apache/solr/katta/ZipService.java
patching file java/org/apache/solr/katta/KattaMultiServer.java
patching file java/org/apache/solr/katta/KattaComponent.java
patching file java/org/apache/solr/katta/DocumentWritable.java
patching file java/org/apache/solr/katta/KattaSearchHandler.java
patching file java/org/apache/solr/katta/SolrKattaServer.java
patching file java/org/apache/solr/katta/DeployableSolrKattaServer.java
patching file java/org/apache/solr/katta/KattaRequest.java
patching file java/org/apache/solr/katta/SolrIndexer.java
patching file java/org/apache/solr/handler/KattaRequestHandler.java
patching file java/org/apache/solr/handler/component/SearchHandler.java
Hunk #1 FAILED at 230.
Hunk #2 FAILED at 257.
Hunk #3 FAILED at 315.
Hunk #4 FAILED at 346.
4 out of 4 hunks FAILED -- saving rejects to file
java/org/apache/solr/handler/component/SearchHandler.java.rej
patching file java/org/apache/solr/handler/component/SimpleSolrResponse.java
patching file java/org/apache/solr/handler/component/MultiShardHandler.java
patching file java/org/apache/solr/handler/component/HttpMultiShardHandler.java
patching file
java/org/apache/solr/handler/component/EmbeddedMultiShardHandler.java
patching file java/org/apache/solr/handler/component/QueryComponent.java
Hunk #1 FAILED at 36.
Hunk #2 FAILED at 175.
Hunk #3 FAILED at 382.
Hunk #4 FAILED at 404.
Hunk #5 FAILED at 442.
Hunk #6 FAILED at 548.
Hunk #7 FAILED at 594.
Hunk #8 FAILED at 641.
Hunk #9 FAILED at 656.
9 out of 9 hunks FAILED -- saving rejects to file
java/org/apache/solr/handler/component/QueryComponent.java.rej
patching file
java/org/apache/solr/handler/component/MultiEmbeddedSearchHandler.java
patching file
java/org/apache/solr/handler/component/AbstractMultiShardHandler.java
patching file solrj/org/apache/solr/client/solrj/request/QueryRequest.java
Hunk #1 FAILED at 34.
1 out of 1 hunk FAILED -- saving rejects to file
solrj/org/apache/solr/client/solrj/request/QueryRequest.java.rej
patching file webapp/web/WEB-INF/web.xml
Hunk #1 FAILED at 33.
1 out of 1 hunk FAILED -- saving rejects to file webapp/web/WEB-INF/web.xml.rej
{noformat}
I'll fix the patch.
BTW: You should not include web.xml into the patch.
> Integrate Katta
> ---------------
>
> Key: SOLR-1395
> URL: https://issues.apache.org/jira/browse/SOLR-1395
> Project: Solr
> Issue Type: New Feature
> Affects Versions: 1.4
> Reporter: Jason Rutherglen
> Priority: Minor
> Fix For: Next
>
> Attachments: back-end.log, front-end.log, hadoop-core-0.19.0.jar,
> katta-core-0.6-dev.jar, katta.node.properties, katta.zk.properties,
> log4j-1.2.13.jar, solr-1395-1431-3.patch, solr-1395-1431-4.patch,
> solr-1395-1431-katta0.6.patch, solr-1395-1431-katta0.6.patch,
> solr-1395-1431.patch, solr-1395-katta-0.6.2.patch, SOLR-1395.patch,
> SOLR-1395.patch, SOLR-1395.patch, test-katta-core-0.6-dev.jar,
> zkclient-0.1-dev.jar, zookeeper-3.2.1.jar
>
> Original Estimate: 336h
> Remaining Estimate: 336h
>
> We'll integrate Katta into Solr so that:
> * Distributed search uses Hadoop RPC
> * Shard/SolrCore distribution and management
> * Zookeeper based failover
> * Indexes may be built using Hadoop
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
