Qpid
  1. Qpid
  2. QPID-5365

Clean up file locations in Dispatch

    Details

    • Type: Improvement Improvement
    • Status: Resolved
    • Priority: Major Major
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: None
    • Component/s: Qpid Dispatch
    • Labels:
      None

      Description

      The attached patch makes the file locations consistent wrt the conventions outlined in QPID-5351 and otherwise removes redundancies, simplifies, and prepares for future additions.

      With this change, the tests and installs without error in my environment.

      1. relocations.patch
        133 kB
        Justin Ross

        Activity

        Hide
        Darryl L. Pierce added a comment - - edited

        Ted: Okay.

        Justin: I discussed the issue with a few people in the #fedora-devel channel on Freenode. There it was suggested to go under /usr/lib/[appname] since they're libraries, but not public libraries. That said, /usr/lib/qpid-dispatch and /usr/share/qpid-dispatch are equally represented, and in the packaging guidelines [1] I found it mentions /usr/share specifically. Not as a guideline, but the closest I found to such.

        [1] http://fedoraproject.org/wiki/Packaging:Python

        Show
        Darryl L. Pierce added a comment - - edited Ted: Okay. Justin: I discussed the issue with a few people in the #fedora-devel channel on Freenode. There it was suggested to go under /usr/lib/ [appname] since they're libraries, but not public libraries. That said, /usr/lib/qpid-dispatch and /usr/share/qpid-dispatch are equally represented, and in the packaging guidelines [1] I found it mentions /usr/share specifically. Not as a guideline, but the closest I found to such. [1] http://fedoraproject.org/wiki/Packaging:Python
        Hide
        ASF subversion and git services added a comment -

        Commit 1543905 from Ted Ross in branch 'dispatch/trunk'
        [ https://svn.apache.org/r1543905 ]

        QPID-5365 - More cleanup related to file locations.

        Show
        ASF subversion and git services added a comment - Commit 1543905 from Ted Ross in branch 'dispatch/trunk' [ https://svn.apache.org/r1543905 ] QPID-5365 - More cleanup related to file locations.
        Hide
        ASF subversion and git services added a comment -

        Commit 1543898 from Justin Ross in branch 'dispatch/trunk'
        [ https://svn.apache.org/r1543898 ]

        QPID-5365: Clean up file locations

        Show
        ASF subversion and git services added a comment - Commit 1543898 from Justin Ross in branch 'dispatch/trunk' [ https://svn.apache.org/r1543898 ] QPID-5365 : Clean up file locations
        Hide
        Ted Ross added a comment -

        Justin, Go ahead and commit the change.
        Darryl, Lets address the the private path issue on top of this update.

        Show
        Ted Ross added a comment - Justin, Go ahead and commit the change. Darryl, Lets address the the private path issue on top of this update.
        Hide
        Justin Ross added a comment -

        I think that's a good change to make, but this patch is against the current state of affairs. AFAICT, there haven't been any changes yet to address QPID-5335. There's no patch there either. The only associated change seems to be misattributed.

        And the next step: none of the qpid dispatch python code needs to be in site-packages, at least so far. All of it IMO can go to /usr/lib/qpid-dispatch.

        Finally, why /usr/lib/qpid-dispatch, out of curiosity? I was thinking /usr/share/qpid-dispatch made more sense. I'd love any pointers to guidelines you have.

        Show
        Justin Ross added a comment - I think that's a good change to make, but this patch is against the current state of affairs. AFAICT, there haven't been any changes yet to address QPID-5335 . There's no patch there either. The only associated change seems to be misattributed. And the next step: none of the qpid dispatch python code needs to be in site-packages, at least so far. All of it IMO can go to /usr/lib/qpid-dispatch. Finally, why /usr/ lib /qpid-dispatch, out of curiosity? I was thinking /usr/share/qpid-dispatch made more sense. I'd love any pointers to guidelines you have.
        Hide
        Darryl L. Pierce added a comment -

        We really can't nest the tools library within the package name for the router's private libraries. With QPID-5335, the two sets of Python code will be installed to two different locations.

        • qpid_dispatch under /usr/lib/qpid-dispatch/
        • the tools package to /usr/lib/python2.7/site-packages

        Python won't work with the same top level package in two different locations; i.e., if it tries to import qpid_dispatch/tools/foo but it has the private library in its path first, it will fail.

        Show
        Darryl L. Pierce added a comment - We really can't nest the tools library within the package name for the router's private libraries. With QPID-5335 , the two sets of Python code will be installed to two different locations. qpid_dispatch under /usr/lib/qpid-dispatch/ the tools package to /usr/lib/python2.7/site-packages Python won't work with the same top level package in two different locations; i.e., if it tries to import qpid_dispatch/tools/foo but it has the private library in its path first, it will fail.
        Hide
        Justin Ross added a comment -

        Ted, if you approve of this change, I can commit it. The patch may not handle some of the deletions well.

        Show
        Justin Ross added a comment - Ted, if you approve of this change, I can commit it. The patch may not handle some of the deletions well.
        Hide
        Justin Ross added a comment -

        Summary of changes:

        python/qpiddx -> python/qpid_dispatch
        To match the C code; "dx" is no longer used in the code

        qpid_dispatch/qdtoollibs -> qpid_dispatch/tools
        It's already qualified by its location

        router/router_engine.py -> router/engine.py
        It's already under router

        tools/disp.py -> qdtoollibs/display.py
        Avoid needless abbreviation

        README.md -> README
        Make it match the other top-level doc files; that it's markdown is
        incidental

        release.sh -> bin/release.sh
        There's another script I intend to add, so we'll need a place for
        such scripts

        Show
        Justin Ross added a comment - Summary of changes: python/qpiddx -> python/qpid_dispatch To match the C code; "dx" is no longer used in the code qpid_dispatch/qdtoollibs -> qpid_dispatch/tools It's already qualified by its location router/router_engine.py -> router/engine.py It's already under router tools/disp.py -> qdtoollibs/display.py Avoid needless abbreviation README.md -> README Make it match the other top-level doc files; that it's markdown is incidental release.sh -> bin/release.sh There's another script I intend to add, so we'll need a place for such scripts

          People

          • Assignee:
            Justin Ross
            Reporter:
            Justin Ross
          • Votes:
            0 Vote for this issue
            Watchers:
            4 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Development