svn commit: r1812583 - in /ofbiz/ofbiz-plugins/trunk/solr: webapp/solr/WEB-INF/controller.xml widget/SolrMenus.xml widget/SolrScreens.xml widget/forms/

[mbrohl]

Author: mbrohl
Date: Wed Oct 18 21:14:28 2017
New Revision: 1812583

URL: http://svn.apache.org/viewvc?rev=1812583&view=rev
Log:
Improved: Removed unfinished Solr query functionality from the
codebase which was introduced with (OFBIZ-6595) and r1736878.

There is no need for a self-implemented solr query form, this is
already provided by the Solr admin page which is accessible
through the menu.

Removes obsolete requests, screens and forms.

Removed:
    ofbiz/ofbiz-plugins/trunk/solr/widget/forms/
Modified:
    ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/WEB-INF/controller.xml
    ofbiz/ofbiz-plugins/trunk/solr/widget/SolrMenus.xml
    ofbiz/ofbiz-plugins/trunk/solr/widget/SolrScreens.xml

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/WEB-INF/controller.xml?rev=1812583&r1=1812582&r2=1812583&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/WEB-INF/controller.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/WEB-INF/controller.xml Wed Oct 18 21:14:28 2017
@@ -57,13 +57,8 @@ under the License.
         <security https="true" auth="false"/>
         <response name="success" type="view" value="main"/>
     </request-map>
-    <request-map uri="newquery">
-        <security https="true" auth="false"/>
-        <response name="success" type="view" value="newquery"/>
-    </request-map>
     
     <!-- view-maps -->
     <view-map name="main" type="screen" page="component://solr/widget/SolrScreens.xml#Main"/>
-    <view-map name="newquery" type="screen" page="component://solr/widget/SolrScreens.xml#NewQuery"/>
     
 </site-conf>
\ No newline at end of file

Modified: ofbiz/ofbiz-plugins/trunk/solr/widget/SolrMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/widget/SolrMenus.xml?rev=1812583&r1=1812582&r2=1812583&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/widget/SolrMenus.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/widget/SolrMenus.xml Wed Oct 18 21:14:28 2017
@@ -27,9 +27,6 @@ under the License.
         <menu-item name="main" title="${uiLabelMap.CommonMain}">
             <link target="main"/>
         </menu-item>
-        <menu-item name="query" title="${uiLabelMap.CommonQuery}">
-            <link target="newquery"/>
-        </menu-item>
     </menu>
     
 </menus>
\ No newline at end of file

Modified: ofbiz/ofbiz-plugins/trunk/solr/widget/SolrScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/widget/SolrScreens.xml?rev=1812583&r1=1812582&r2=1812583&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/widget/SolrScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/widget/SolrScreens.xml Wed Oct 18 21:14:28 2017
@@ -32,15 +32,4 @@ under the License.
         </section>
     </screen>
     
-    <screen name="NewQuery">
-        <section>
-            <widgets>
-                <decorator-screen name="SolrCommonDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <include-form name="NewQuery" location="component://solr/widget/forms/SolrForms.xml"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
 </screens>
\ No newline at end of file