svn commit: r1700599 - in /ofbiz/trunk/specialpurpose/solr: ofbiz-component.xml webapp/solr/WEB-INF/controller.xml

[shijh]

Author: shijh
Date: Tue Sep  1 15:37:20 2015
New Revision: 1700599

URL: http://svn.apache.org/r1700599
Log:
OFBIZ-5042 Apache Solr Implementation.
Add apache solr to secondary top menu and /solr/control/main request to accept the link from the menu.

Modified:
    ofbiz/trunk/specialpurpose/solr/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/solr/webapp/solr/WEB-INF/controller.xml

Modified: ofbiz/trunk/specialpurpose/solr/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/ofbiz-component.xml?rev=1700599&r1=1700598&r2=1700599&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/solr/ofbiz-component.xml Tue Sep  1 15:37:20 2015
@@ -36,11 +36,12 @@ under the License.
     <service-resource type="eca" loader="main" location="servicedef/secas.xml"/>
 
     <webapp name="solr"
-        title="solr"
+        title="Apache Solr Integration"
         server="default-server"
         location="webapp/solr"
         mount-point="/solr"
         base-permission="OFBTOOLS,CONTENTMGR"
-        app-bar-display="false" />
+        menu-name="secondary"
+        app-bar-display="true" />
 
 </ofbiz-component>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/WEB-INF/controller.xml?rev=1700599&r1=1700598&r2=1700599&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/WEB-INF/controller.xml Tue Sep  1 15:37:20 2015
@@ -38,4 +38,11 @@
         <response name="success" type="view" value="login"/>
         <response name="error" type="view" value="login"/>
     </request-map>
+    <request-map uri="main">
+        <security https="true" auth="false"/>
+        <event type="java" path="org.ofbiz.solr.control.OFBizSolrLoginWorker" invoke="extensionCheckLogin"/>
+        <response name="success" type="none"/>
+        <response name="error" type="view" value="login"/>
+    </request-map>
+
 </site-conf>
\ No newline at end of file