incubator-bloodhound-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From and...@apache.org
Subject svn commit: r1440491 - in /incubator/bloodhound/trunk/bloodhound_search: ./ bhsearch/ bhsearch/search_resources/ bhsearch/tests/
Date Wed, 30 Jan 2013 16:01:23 GMT
Author: andrej
Date: Wed Jan 30 16:01:23 2013
New Revision: 1440491

URL: http://svn.apache.org/viewvc?rev=1440491&view=rev
Log:
move resource sepcific modules to separate folder as preparation to #361

Added:
    incubator/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/
    incubator/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/__init__.py
    incubator/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/base.py
      - copied unchanged from r1440458, incubator/bloodhound/trunk/bloodhound_search/bhsearch/base.py
    incubator/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/milestone_search.py
      - copied, changed from r1440458, incubator/bloodhound/trunk/bloodhound_search/bhsearch/milestone_search.py
    incubator/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/ticket_search.py
      - copied, changed from r1440458, incubator/bloodhound/trunk/bloodhound_search/bhsearch/ticket_search.py
    incubator/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/wiki_search.py
      - copied, changed from r1440458, incubator/bloodhound/trunk/bloodhound_search/bhsearch/wiki_search.py
Removed:
    incubator/bloodhound/trunk/bloodhound_search/bhsearch/base.py
    incubator/bloodhound/trunk/bloodhound_search/bhsearch/milestone_search.py
    incubator/bloodhound/trunk/bloodhound_search/bhsearch/ticket_search.py
    incubator/bloodhound/trunk/bloodhound_search/bhsearch/wiki_search.py
Modified:
    incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/api.py
    incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/index_with_whoosh.py
    incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/milestone_search.py
    incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/real_index_view.py
    incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/ticket_search.py
    incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/wiki_search.py
    incubator/bloodhound/trunk/bloodhound_search/setup.py

Added: incubator/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/__init__.py
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/__init__.py?rev=1440491&view=auto
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/__init__.py (added)
+++ incubator/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/__init__.py Wed
Jan 30 16:01:23 2013
@@ -0,0 +1,19 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.

Copied: incubator/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/milestone_search.py
(from r1440458, incubator/bloodhound/trunk/bloodhound_search/bhsearch/milestone_search.py)
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/milestone_search.py?p2=incubator/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/milestone_search.py&p1=incubator/bloodhound/trunk/bloodhound_search/bhsearch/milestone_search.py&r1=1440458&r2=1440491&rev=1440491&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_search/bhsearch/milestone_search.py (original)
+++ incubator/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/milestone_search.py
Wed Jan 30 16:01:23 2013
@@ -21,7 +21,7 @@
 r"""Milestone specifics for Bloodhound Search plugin."""
 from bhsearch.api import IIndexParticipant, BloodhoundSearchApi, IndexFields, \
     ISearchParticipant
-from bhsearch.base import BaseIndexer
+from bhsearch.search_resources.base import BaseIndexer
 from trac.ticket import IMilestoneChangeListener, Milestone
 from trac.config import ListOption
 from trac.core import implements, Component

Copied: incubator/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/ticket_search.py
(from r1440458, incubator/bloodhound/trunk/bloodhound_search/bhsearch/ticket_search.py)
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/ticket_search.py?p2=incubator/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/ticket_search.py&p1=incubator/bloodhound/trunk/bloodhound_search/bhsearch/ticket_search.py&r1=1440458&r2=1440491&rev=1440491&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_search/bhsearch/ticket_search.py (original)
+++ incubator/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/ticket_search.py
Wed Jan 30 16:01:23 2013
@@ -21,7 +21,7 @@
 r"""Ticket specifics for Bloodhound Search plugin."""
 from bhsearch.api import ISearchParticipant, BloodhoundSearchApi, \
     IIndexParticipant, IndexFields
-from bhsearch.base import BaseIndexer
+from bhsearch.search_resources.base import BaseIndexer
 from genshi.builder import tag
 from trac.ticket.api import ITicketChangeListener
 from trac.ticket import Ticket

Copied: incubator/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/wiki_search.py
(from r1440458, incubator/bloodhound/trunk/bloodhound_search/bhsearch/wiki_search.py)
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/wiki_search.py?p2=incubator/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/wiki_search.py&p1=incubator/bloodhound/trunk/bloodhound_search/bhsearch/wiki_search.py&r1=1440458&r2=1440491&rev=1440491&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_search/bhsearch/wiki_search.py (original)
+++ incubator/bloodhound/trunk/bloodhound_search/bhsearch/search_resources/wiki_search.py
Wed Jan 30 16:01:23 2013
@@ -21,7 +21,7 @@
 r"""Wiki specifics for Bloodhound Search plugin."""
 from bhsearch.api import ISearchParticipant, BloodhoundSearchApi, \
     IIndexParticipant, IndexFields
-from bhsearch.base import BaseIndexer
+from bhsearch.search_resources.base import BaseIndexer
 from trac.core import implements, Component
 from trac.config import ListOption
 from trac.wiki import IWikiChangeListener, WikiSystem, WikiPage

Modified: incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/api.py
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/api.py?rev=1440491&r1=1440490&r2=1440491&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/api.py (original)
+++ incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/api.py Wed Jan 30 16:01:23
2013
@@ -23,7 +23,7 @@ import shutil
 from bhsearch.api import BloodhoundSearchApi, ASC
 from bhsearch.query_parser import DefaultQueryParser
 from bhsearch.tests.utils import BaseBloodhoundSearchTest
-from bhsearch.ticket_search import TicketSearchParticipant
+from bhsearch.search_resources.ticket_search import TicketSearchParticipant
 
 from bhsearch.whoosh_backend import WhooshBackend
 from trac.test import EnvironmentStub

Modified: incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/index_with_whoosh.py
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/index_with_whoosh.py?rev=1440491&r1=1440490&r2=1440491&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/index_with_whoosh.py (original)
+++ incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/index_with_whoosh.py Wed Jan
30 16:01:23 2013
@@ -24,10 +24,10 @@ import shutil
 from bhsearch.api import BloodhoundSearchApi
 from bhsearch.milestone_search import MilestoneIndexer
 from bhsearch.tests.utils import BaseBloodhoundSearchTest
-from bhsearch.ticket_search import TicketIndexer
+from bhsearch.search_resources.ticket_search import TicketIndexer
 
 from bhsearch.whoosh_backend import WhooshBackend
-from bhsearch.wiki_search import WikiIndexer
+from bhsearch.search_resources.wiki_search import WikiIndexer
 from trac.test import EnvironmentStub
 from trac.ticket.api import TicketSystem
 

Modified: incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/milestone_search.py
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/milestone_search.py?rev=1440491&r1=1440490&r2=1440491&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/milestone_search.py (original)
+++ incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/milestone_search.py Wed Jan
30 16:01:23 2013
@@ -22,7 +22,7 @@ import unittest
 import tempfile
 
 from bhsearch.api import BloodhoundSearchApi
-from bhsearch.milestone_search import MilestoneSearchParticipant
+from bhsearch.search_resources.milestone_search import MilestoneSearchParticipant
 from bhsearch.query_parser import DefaultQueryParser
 from bhsearch.tests.utils import BaseBloodhoundSearchTest
 from bhsearch.whoosh_backend import WhooshBackend

Modified: incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/real_index_view.py
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/real_index_view.py?rev=1440491&r1=1440490&r2=1440491&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/real_index_view.py (original)
+++ incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/real_index_view.py Wed Jan
30 16:01:23 2013
@@ -18,10 +18,8 @@
 #  specific language governing permissions and limitations
 #  under the License.
 import unittest
-from bhsearch.query_parser import DefaultQueryParser
-from bhsearch.web_ui import BloodhoundSearchModule, RequestParameters
+from bhsearch.web_ui import RequestParameters
 import os
-from bhsearch.api import BloodhoundSearchApi
 from bhsearch.tests.utils import BaseBloodhoundSearchTest
 
 from bhsearch.whoosh_backend import WhooshBackend

Modified: incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/ticket_search.py
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/ticket_search.py?rev=1440491&r1=1440490&r2=1440491&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/ticket_search.py (original)
+++ incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/ticket_search.py Wed Jan 30
16:01:23 2013
@@ -21,7 +21,7 @@ import unittest
 import tempfile
 
 from bhsearch.tests.utils import BaseBloodhoundSearchTest
-from bhsearch.ticket_search import TicketIndexer
+from bhsearch.search_resources.ticket_search import TicketIndexer
 
 from trac.test import EnvironmentStub
 

Modified: incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/wiki_search.py
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/wiki_search.py?rev=1440491&r1=1440490&r2=1440491&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/wiki_search.py (original)
+++ incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/wiki_search.py Wed Jan 30
16:01:23 2013
@@ -25,7 +25,7 @@ from bhsearch.api import BloodhoundSearc
 from bhsearch.query_parser import DefaultQueryParser
 from bhsearch.tests.utils import BaseBloodhoundSearchTest
 from bhsearch.whoosh_backend import WhooshBackend
-from bhsearch.wiki_search import WikiIndexer, WikiSearchParticipant
+from bhsearch.search_resources.wiki_search import WikiIndexer, WikiSearchParticipant
 
 from trac.test import EnvironmentStub
 from trac.wiki import WikiSystem, WikiPage

Modified: incubator/bloodhound/trunk/bloodhound_search/setup.py
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_search/setup.py?rev=1440491&r1=1440490&r2=1440491&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_search/setup.py (original)
+++ incubator/bloodhound/trunk/bloodhound_search/setup.py Wed Jan 30 16:01:23 2013
@@ -109,36 +109,26 @@ PKG_INFO = {'bhsearch' : ('bhsearch',   
                           ),
             }
 
-#ENTRY_POINTS = r"""
-#               [trac.plugins]
-#               bhsearch.web_ui = bhsearch.web_ui
-#               bhsearch.api = bhsearch.api
-#               bhsearch.admin = bhsearch.admin
-#               bhsearch.ticket_search = bhsearch.ticket_search
-#               bhsearch.query_parser = bhsearch.query_parser
-#               bhsearch.whoosh_backend = bhsearch.whoosh_backend
-#               """
 ENTRY_POINTS = {
-        'trac.plugins': [
-            'bhsearch.web_ui = bhsearch.web_ui',
-            'bhsearch.api = bhsearch.api',
-            'bhsearch.admin = bhsearch.admin',
-            'bhsearch.ticket_search = bhsearch.ticket_search',
-            'bhsearch.wiki_search = bhsearch.wiki_search',
-            'bhsearch.milestone_search = bhsearch.milestone_search',
-            'bhsearch.query_parser = bhsearch.query_parser',
-            'bhsearch.whoosh_backend = bhsearch.whoosh_backend',
-        ],
+    'trac.plugins': [
+        'bhsearch.web_ui = bhsearch.web_ui',
+        'bhsearch.api = bhsearch.api',
+        'bhsearch.admin = bhsearch.admin',
+        'bhsearch.search_resources.ticket_search =\
+            bhsearch.search_resources.ticket_search',
+        'bhsearch.search_resources.wiki_search = \
+            bhsearch.search_resources.wiki_search',
+        'bhsearch.search_resources.milestone_search = \
+            bhsearch.search_resources.milestone_search',
+        'bhsearch.query_parser = bhsearch.query_parser',
+        'bhsearch.whoosh_backend = bhsearch.whoosh_backend',
+    ],
     }
-#bhsearch.whoosh_backend = bhsearch.whoosh_backend
-#bhsearch.ticket_search = bhsearch.ticket_search
-
 setup(
     name=DIST_NM,
     version=latest,
     description=DESC.split('\n', 1)[0],
     requires = ['trac'],
-#    tests_require = ['dutest>=0.2.4', 'TracXMLRPC'],
     install_requires = [
         'setuptools>=0.6b1',
         'Trac>=0.11',



Mime
View raw message