Solr
  1. Solr
  2. SOLR-3735

Relocate the example mime-to-extension mapping

    Details

    • Type: Improvement Improvement
    • Status: Closed
    • Priority: Minor Minor
    • Resolution: Fixed
    • Affects Version/s: 4.0-BETA, 4.0
    • Fix Version/s: 4.1, 6.0
    • Component/s: web gui
    • Labels:
      None

      Description

      A mime-to-extension mapping was added to VelocityResponseWriter recently. This really belongs in the templates themselves, not in VrW, as it is specific to the example search results not meant for all VrW templates.

      1. SOLR-3735.patch
        12 kB
        Erik Hatcher

        Activity

        Hide
        Erik Hatcher added a comment -

        Here's an initial draft patch, which upgrades Velocity to the latest official release as well as relocates the mime extension mapping. And I believe it fixes a bug that shows the wrong icon sometimes (if an unknown type but previous result had a known type).

        Show
        Erik Hatcher added a comment - Here's an initial draft patch, which upgrades Velocity to the latest official release as well as relocates the mime extension mapping. And I believe it fixes a bug that shows the wrong icon sometimes (if an unknown type but previous result had a known type).
        Hide
        Jan Høydahl added a comment -

        Thanks, I could not find an easy way to initialize that map inside of Velocity - this is ideed a better way.
        +1

        Show
        Jan Høydahl added a comment - Thanks, I could not find an easy way to initialize that map inside of Velocity - this is ideed a better way. +1
        Hide
        Robert Muir added a comment -

        What's the status on this issue... no updates in a while, is it going to make 4.0?

        Show
        Robert Muir added a comment - What's the status on this issue... no updates in a while, is it going to make 4.0?
        Hide
        Erik Hatcher added a comment -

        What's the status on this issue... no updates in a while, is it going to make 4.0?

        D'oh, sorry. I had the patch and everything. But I'm not going to be able to get this in this weekend. If Jan can commit that'd be great (he was the original author of the code I rearranged). But if this doesn't make it to 4.0, no big deal - no difference in behavior or view.

        Show
        Erik Hatcher added a comment - What's the status on this issue... no updates in a while, is it going to make 4.0? D'oh, sorry. I had the patch and everything. But I'm not going to be able to get this in this weekend. If Jan can commit that'd be great (he was the original author of the code I rearranged). But if this doesn't make it to 4.0, no big deal - no difference in behavior or view.
        Hide
        Erik Hatcher added a comment -

        I committed to trunk this change. I also upgraded Velocity from 1.6.4 to 1.7. I'm leaving this issue open for 4.1, with likely some more related changes coming soon. Maybe best to backport to 4.x when more substantial and visible changes are made in this area on trunk.

        Show
        Erik Hatcher added a comment - I committed to trunk this change. I also upgraded Velocity from 1.6.4 to 1.7. I'm leaving this issue open for 4.1, with likely some more related changes coming soon. Maybe best to backport to 4.x when more substantial and visible changes are made in this area on trunk.
        Hide
        Commit Tag Bot added a comment -

        [trunk commit] Erik Hatcher
        http://svn.apache.org/viewvc?view=revision&revision=1426746

        SOLR-3735: fix svn:eol-style setting on new Velocity SHA1 file

        Show
        Commit Tag Bot added a comment - [trunk commit] Erik Hatcher http://svn.apache.org/viewvc?view=revision&revision=1426746 SOLR-3735 : fix svn:eol-style setting on new Velocity SHA1 file
        Hide
        Uwe Schindler added a comment -

        Erik, I alsErik, I also added the new velocity version to the Maven poms. Will you backport this toSOLR-3725o added the new velocity version to the Maven poms. Will you backport this to 4.x?

        Show
        Uwe Schindler added a comment - Erik, I alsErik, I also added the new velocity version to the Maven poms. Will you backport this toSOLR-3725o added the new velocity version to the Maven poms. Will you backport this to 4.x?
        Hide
        Erik Hatcher added a comment -

        I also added the new velocity version to the Maven poms. Will you backport this to 4.x?

        Sorry about that oversight. Done on r1426916 on 4x now.

        Show
        Erik Hatcher added a comment - I also added the new velocity version to the Maven poms. Will you backport this to 4.x? Sorry about that oversight. Done on r1426916 on 4x now.
        Hide
        Commit Tag Bot added a comment -

        [branch_4x commit] Erik Hatcher
        http://svn.apache.org/viewvc?view=revision&revision=1426916

        SOLR-3735: fix maven POM for upgraded Velocity JAR

        Show
        Commit Tag Bot added a comment - [branch_4x commit] Erik Hatcher http://svn.apache.org/viewvc?view=revision&revision=1426916 SOLR-3735 : fix maven POM for upgraded Velocity JAR
        Hide
        Uwe Schindler added a comment -

        But you did not backport the fix itsself! Now we have different velocity versions in IVY vs. Maven! This issue is 5.x only!

        Show
        Uwe Schindler added a comment - But you did not backport the fix itsself! Now we have different velocity versions in IVY vs. Maven! This issue is 5.x only!
        Hide
        Erik Hatcher added a comment -

        Uwe - geez, sorry, you had me all flustered saying I needed to backport to 4.x, but I obviously got too flustered to realize that I had only made the change intentionally on trunk only. I have reverted the change on 4.x (hopefully properly).

        Show
        Erik Hatcher added a comment - Uwe - geez, sorry, you had me all flustered saying I needed to backport to 4.x, but I obviously got too flustered to realize that I had only made the change intentionally on trunk only. I have reverted the change on 4.x (hopefully properly).
        Hide
        Commit Tag Bot added a comment -

        [branch_4x commit] Erik Hatcher
        http://svn.apache.org/viewvc?view=revision&revision=1426953

        SOLR-3735: sorry, revert stupid last commit

        Show
        Commit Tag Bot added a comment - [branch_4x commit] Erik Hatcher http://svn.apache.org/viewvc?view=revision&revision=1426953 SOLR-3735 : sorry, revert stupid last commit
        Hide
        Uwe Schindler added a comment -

        No problem! I was just confused, my first idea was that you backported the whole thing but then i realized that you only merged my fix from yesterday

        Show
        Uwe Schindler added a comment - No problem! I was just confused, my first idea was that you backported the whole thing but then i realized that you only merged my fix from yesterday
        Hide
        Erik Hatcher added a comment -

        decided not to bother with this for 4.x, just trunk for now.

        Show
        Erik Hatcher added a comment - decided not to bother with this for 4.x, just trunk for now.
        Hide
        Erik Hatcher added a comment -

        went ahead and merged this to 4.x (4.1+) in order to minimize diffs (especially something minor like this) from trunk to 4x.

        Show
        Erik Hatcher added a comment - went ahead and merged this to 4.x (4.1+) in order to minimize diffs (especially something minor like this) from trunk to 4x.
        Hide
        Commit Tag Bot added a comment -

        [branch_4x commit] Erik Hatcher
        http://svn.apache.org/viewvc?view=revision&revision=1432410

        SOLR-3735: Relocate the example mime-to-extension mapping (merge from trunk)

        Show
        Commit Tag Bot added a comment - [branch_4x commit] Erik Hatcher http://svn.apache.org/viewvc?view=revision&revision=1432410 SOLR-3735 : Relocate the example mime-to-extension mapping (merge from trunk)
        Hide
        Commit Tag Bot added a comment -

        [trunk commit] Erik Hatcher
        http://svn.apache.org/viewvc?view=revision&revision=1432411

        SOLR-3735: merged to 4x, so adjust CHANGES

        Show
        Commit Tag Bot added a comment - [trunk commit] Erik Hatcher http://svn.apache.org/viewvc?view=revision&revision=1432411 SOLR-3735 : merged to 4x, so adjust CHANGES
        Hide
        Commit Tag Bot added a comment -

        [branch_4x commit] Steven Rowe
        http://svn.apache.org/viewvc?view=revision&revision=1432501

        SOLR-3735: Maven configuration: upgrade velocity dependency from 1.6.4 to 1.7

        Show
        Commit Tag Bot added a comment - [branch_4x commit] Steven Rowe http://svn.apache.org/viewvc?view=revision&revision=1432501 SOLR-3735 : Maven configuration: upgrade velocity dependency from 1.6.4 to 1.7

          People

          • Assignee:
            Erik Hatcher
            Reporter:
            Erik Hatcher
          • Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Development