svn commit: r240188 - in /lenya/trunk/src: java/org/apache/lenya/lucene/ modules/search/config/ modules/search/java/ modules/search/java/src/ modules/search/java/src/org/ modules/search/java/src/org/apache/ modules/search/java/src/org/apache/lenya/ mod...

Author: andreas
Date: Fri Aug 26 01:13:10 2005
New Revision: 240188

URL: http://svn.apache.org/viewcvs?rev=240188&view=rev
Log:
Moved search-related files to search module.

Added:
    lenya/trunk/src/modules/search/config/usecase-search.xconf
    lenya/trunk/src/modules/search/config/usecase-searchAdmin-tab.xconf
    lenya/trunk/src/modules/search/config/usecase-searchAdmin.xconf
    lenya/trunk/src/modules/search/java/
    lenya/trunk/src/modules/search/java/src/
    lenya/trunk/src/modules/search/java/src/org/
    lenya/trunk/src/modules/search/java/src/org/apache/
    lenya/trunk/src/modules/search/java/src/org/apache/lenya/
    lenya/trunk/src/modules/search/java/src/org/apache/lenya/lucene/
      - copied from r240178, lenya/trunk/src/java/org/apache/lenya/lucene/
Removed:
    lenya/trunk/src/java/org/apache/lenya/lucene/
Modified:
    lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl

Added: lenya/trunk/src/modules/search/config/usecase-search.xconf
URL: 
http://svn.apache.org/viewcvs/lenya/trunk/src/modules/search/config/usecase-search.xconf?rev=240188&view=auto
==============================================================================
--- lenya/trunk/src/modules/search/config/usecase-search.xconf (added)
+++ lenya/trunk/src/modules/search/config/usecase-search.xconf Fri Aug 26 
01:13:10 2005
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed 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.
+-->
+
+<!-- $Id: doctypes.xconf 164635 2005-04-25 20:01:43Z tschlabach $ -->
+
+<xconf xpath="/cocoon/usecases" 
unless="/cocoon/usecases/component-instance[@name = 'search.search']">
+
+  <component-instance name="search.search" logger="lenya.search" 
class="org.apache.lenya.cms.search.usecases.Search">
+    <view template="usecases/search/search.jx"/>
+  </component-instance>
+  
+</xconf>

Added: lenya/trunk/src/modules/search/config/usecase-searchAdmin-tab.xconf
URL: 
http://svn.apache.org/viewcvs/lenya/trunk/src/modules/search/config/usecase-searchAdmin-tab.xconf?rev=240188&view=auto
==============================================================================
--- lenya/trunk/src/modules/search/config/usecase-searchAdmin-tab.xconf (added)
+++ lenya/trunk/src/modules/search/config/usecase-searchAdmin-tab.xconf Fri Aug 
26 01:13:10 2005
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed 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.
+-->
+
+<!-- $Id: doctypes.xconf 164635 2005-04-25 20:01:43Z tschlabach $ -->
+
+<xconf xpath="/cocoon/gui-manager/tab-group[@name = 'admin']"
+       unless="/cocoon/gui-manager/tab-group[@name = 'admin']/tab[@name = 
'search']">
+
+  <tab name="search" label="Search" usecase="admin.search"/>
+  
+</xconf>

Added: lenya/trunk/src/modules/search/config/usecase-searchAdmin.xconf
URL: 
http://svn.apache.org/viewcvs/lenya/trunk/src/modules/search/config/usecase-searchAdmin.xconf?rev=240188&view=auto
==============================================================================
--- lenya/trunk/src/modules/search/config/usecase-searchAdmin.xconf (added)
+++ lenya/trunk/src/modules/search/config/usecase-searchAdmin.xconf Fri Aug 26 
01:13:10 2005
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed 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.
+-->
+
+<!-- $Id: doctypes.xconf 164635 2005-04-25 20:01:43Z tschlabach $ -->
+
+<xconf xpath="/cocoon/usecases" 
unless="/cocoon/usecases/component-instance[@name = 'admin.search']">
+
+  <component-instance name="admin.search" logger="lenya.admin" 
class="org.apache.lenya.cms.usecase.DummyUsecase">
+    <view template="usecases/admin/search.jx" menu="true">
+      <tab group="admin" name="search"/>
+    </view>
+    <exit usecase="admin.search"/>
+  </component-instance>
+  
+</xconf>

Modified: lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl
URL: 
http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl?rev=240188&r1=240187&r2=240188&view=diff
==============================================================================
--- lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl (original)
+++ lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl Fri Aug 26 01:13:10 2005
@@ -379,12 +379,6 @@
       </view>
       <exit usecase="admin.serverStatus"/>
     </component-instance>
-    <component-instance name="admin.search" logger="lenya.admin" 
class="org.apache.lenya.cms.usecase.DummyUsecase">
-      <view template="usecases/admin/search.jx" menu="true">
-        <tab group="admin" name="search"/>
-      </view>
-      <exit usecase="admin.search"/>
-    </component-instance>
     <component-instance name="admin.sessions" logger="lenya.admin" 
class="org.apache.lenya.cms.ac.usecases.SessionViewer">
       <view template="usecases/admin/sessions.jx" menu="true">
         <tab group="admin" name="sessions"/>
@@ -399,14 +393,6 @@
     </component-instance>
     
     <!--+
-        | Search usecases
-        +-->
-
-    <component-instance name="search.search" logger="lenya.search" 
class="org.apache.lenya.cms.search.usecases.Search">
-      <view template="usecases/search/search.jx"/>
-    </component-instance>
-    
-    <!--+
         | Site area usecases
         +-->
 
@@ -579,7 +565,6 @@
       <tab name="groups" label="Groups" usecase="admin.groups"/>
       <tab name="ipRanges" label="IP Ranges" usecase="admin.ipRanges"/>
       <tab name="trash" label="Delete Trash" usecase="admin.emptyTrash"/>
-      <tab name="search" label="Search" usecase="admin.search"/>
       <tab name="serverStatus" label="Server Status" 
usecase="admin.serverStatus"/>
       <tab name="sessions" label="Sessions" usecase="admin.sessions"/>
       <tab name="siteOverview" label="Overview" usecase="admin.siteOverview"/>