svn commit: r1518925 - in /ofbiz/trunk: ./ applications/content/ applications/content/config/ applications/content/lib/ applications/content/servicede
Locked
svn commit: r1518925 - in /ofbiz/trunk: ./ applications/content/ applications/content/config/ applications/content/lib/ applications/content/servicede
 
|
Author: jacopoc
Date: Fri Aug 30 09:45:33 2013 New Revision: 1518925 URL: http://svn.apache.org/r1518925 Log: Extracted from the OFBiz content component the dependencies on Lucene and created a new specialpurpose/lucene component in order to simplify the integration of components based on Lucene/Solr and to simplify the management of conflicts caused by different versions of Solr/Lucene jars. In this way it will be easier to compare the ootb Lucene integration with custom ones (based on Lucene/Solr/etc...) and to switch between them. Added: ofbiz/trunk/specialpurpose/lucene/ (with props) ofbiz/trunk/specialpurpose/lucene/build.xml (with props) ofbiz/trunk/specialpurpose/lucene/config/ ofbiz/trunk/specialpurpose/lucene/config/search.properties (with props) ofbiz/trunk/specialpurpose/lucene/lib/ ofbiz/trunk/specialpurpose/lucene/lib/lucene-analyzers-common-4.0.0.jar (props changed) - copied unchanged from r1518211, ofbiz/trunk/applications/content/lib/lucene-analyzers-common-4.0.0.jar ofbiz/trunk/specialpurpose/lucene/lib/lucene-core-4.0.0.jar (props changed) - copied unchanged from r1518211, ofbiz/trunk/applications/content/lib/lucene-core-4.0.0.jar ofbiz/trunk/specialpurpose/lucene/lib/lucene-queryparser-4.0.0.jar (props changed) - copied unchanged from r1518211, ofbiz/trunk/applications/content/lib/lucene-queryparser-4.0.0.jar ofbiz/trunk/specialpurpose/lucene/ofbiz-component.xml (with props) ofbiz/trunk/specialpurpose/lucene/servicedef/ ofbiz/trunk/specialpurpose/lucene/servicedef/services.xml (with props) ofbiz/trunk/specialpurpose/lucene/src/ ofbiz/trunk/specialpurpose/lucene/src/org/ ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/ ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/ ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/ ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/ContentDocument.java (contents, props changed) - copied, changed from r1518219, ofbiz/trunk/applications/content/src/org/ofbiz/content/search/ContentDocument.java ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/SearchEvents.java (contents, props changed) - copied, changed from r1518211, ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchEvents.java ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/SearchServices.java (contents, props changed) - copied, changed from r1518211, ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchServices.java ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/SearchWorker.java (contents, props changed) - copied, changed from r1518211, ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/test/ ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/test/LuceneTests.java - copied unchanged from r1518211, ofbiz/trunk/applications/content/src/org/ofbiz/content/test/LuceneTests.java ofbiz/trunk/specialpurpose/lucene/testdef/ ofbiz/trunk/specialpurpose/lucene/testdef/data/ ofbiz/trunk/specialpurpose/lucene/testdef/data/LuceneTestsData.xml - copied unchanged from r1518211, ofbiz/trunk/applications/content/testdef/data/LuceneTestsData.xml ofbiz/trunk/specialpurpose/lucene/testdef/lucenetests.xml - copied, changed from r1518211, ofbiz/trunk/applications/content/testdef/lucenetests.xml ofbiz/trunk/specialpurpose/lucene/webapp/ ofbiz/trunk/specialpurpose/lucene/webapp/content/ ofbiz/trunk/specialpurpose/lucene/webapp/content/AdminSearch.ftl (contents, props changed) - copied, changed from r1518211, ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/ ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/ ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/AdvancedSearchPrep.groovy (contents, props changed) - copied, changed from r1518211, ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/cms/AdvancedSearchPrep.groovy ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy (contents, props changed) - copied, changed from r1518211, ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/cms/Search.groovy ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/controller.xml (with props) ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/web.xml (with props) ofbiz/trunk/specialpurpose/lucene/webapp/content/error/ ofbiz/trunk/specialpurpose/lucene/webapp/content/error/error.jsp (with props) ofbiz/trunk/specialpurpose/lucene/webapp/content/index.jsp (with props) ofbiz/trunk/specialpurpose/lucene/widget/ ofbiz/trunk/specialpurpose/lucene/widget/LuceneForms.xml (with props) ofbiz/trunk/specialpurpose/lucene/widget/LuceneMenus.xml (with props) ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml (with props) Removed: ofbiz/trunk/applications/content/config/search.properties ofbiz/trunk/applications/content/lib/lucene-analyzers-common-4.0.0.jar ofbiz/trunk/applications/content/lib/lucene-core-4.0.0.jar ofbiz/trunk/applications/content/lib/lucene-queryparser-4.0.0.jar ofbiz/trunk/applications/content/src/org/ofbiz/content/search/ContentDocument.java ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchEvents.java ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchServices.java ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java ofbiz/trunk/applications/content/src/org/ofbiz/content/test/LuceneTests.java ofbiz/trunk/applications/content/testdef/ ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/cms/AdvancedSearchPrep.groovy ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/cms/Search.groovy ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl Modified: ofbiz/trunk/.classpath ofbiz/trunk/LICENSE ofbiz/trunk/applications/content/config/ContentUiLabels.xml ofbiz/trunk/applications/content/ofbiz-component.xml ofbiz/trunk/applications/content/servicedef/services.xml ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml ofbiz/trunk/applications/content/webapp/content/WEB-INF/web.xml ofbiz/trunk/applications/content/widget/cms/CMSForms.xml ofbiz/trunk/applications/content/widget/cms/CMSMenus.xml ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml ofbiz/trunk/specialpurpose/LICENSE ofbiz/trunk/specialpurpose/build.xml ofbiz/trunk/specialpurpose/component-load.xml Modified: ofbiz/trunk/.classpath URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1518925&r1=1518924&r2=1518925&view=diff ============================================================================== --- ofbiz/trunk/.classpath (original) +++ ofbiz/trunk/.classpath Fri Aug 30 09:45:33 2013 @@ -4,9 +4,6 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="applications/content/lib/fontbox-1.7.1.jar"/> <classpathentry kind="lib" path="applications/content/lib/jempbox-1.7.1.jar"/> - <classpathentry kind="lib" path="applications/content/lib/lucene-analyzers-common-4.0.0.jar"/> - <classpathentry kind="lib" path="applications/content/lib/lucene-core-4.0.0.jar"/> - <classpathentry kind="lib" path="applications/content/lib/lucene-queryparser-4.0.0.jar"/> <classpathentry kind="lib" path="applications/content/lib/pdfbox-1.7.1.jar"/> <classpathentry kind="lib" path="applications/content/lib/dom4j-1.6.1.jar"/> <classpathentry kind="lib" path="applications/content/lib/poi-3.8-20120326.jar"/> @@ -161,6 +158,9 @@ <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/ebaycalls.jar"/> <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/ebaysdkcore.jar"/> <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/helper.jar"/> + <classpathentry kind="lib" path="specialpurpose/lucene/lib/lucene-analyzers-common-4.0.0.jar"/> + <classpathentry kind="lib" path="specialpurpose/lucene/lib/lucene-core-4.0.0.jar"/> + <classpathentry kind="lib" path="specialpurpose/lucene/lib/lucene-queryparser-4.0.0.jar"/> <classpathentry excluding="org/ofbiz/accounting/thirdparty/cybersource/**|org/ofbiz/accounting/thirdparty/verisign/**|org/ofbiz/accounting/thirdparty/worldpay/**|org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java|org/ofbiz/accounting/thirdparty/orbital/**|org/ofbiz/accounting/thirdparty/securepay/**|org/ofbiz/accounting/thirdparty/ideal/**" kind="src" path="applications/accounting/src"/> <classpathentry excluding="org/ofbiz/content/openoffice/|org/ofbiz/content/report/" kind="src" path="applications/content/src"/> <classpathentry kind="src" path="applications/manufacturing/src"/> Modified: ofbiz/trunk/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1518925&r1=1518924&r2=1518925&view=diff ============================================================================== --- ofbiz/trunk/LICENSE (original) +++ ofbiz/trunk/LICENSE Fri Aug 30 09:45:33 2013 @@ -105,9 +105,6 @@ framework/testtools/lib/org.springframew framework/testtools/lib/org.springframework.web-3.1.0.M2.jar applications/content/lib/fontbox-1.7.1.jar applications/content/lib/jempbox-1.7.1.jar -applications/content/lib/lucene-analyzers-common-4.0.0.jar -applications/content/lib/lucene-core-4.0.0.jar -applications/content/lib/lucene-queryparser-4.0.0.jar applications/content/lib/pdfbox-1.7.1.jar applications/content/lib/poi-3.8-20120326.jar applications/content/lib/poi-ooxml-3.8-20120326.jar Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=1518925&r1=1518924&r2=1518925&view=diff ============================================================================== --- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original) +++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Fri Aug 30 09:45:33 2013 @@ -3389,17 +3389,6 @@ <value xml:lang="zh">模æ¿</value> <value xml:lang="zh_TW">ç¯æ¬</value> </property> - <property key="ContentTestPermission"> - <value xml:lang="da">Test tilladelse</value> - <value xml:lang="en">Test Permission</value> - <value xml:lang="fr">Tester l'autorisation</value> - <value xml:lang="it">Test Permesso</value> - <value xml:lang="ja">権éããã¹ã</value> - <value xml:lang="pt">Permissão de teste</value> - <value xml:lang="vi">Kiá»m tra quyá»n</value> - <value xml:lang="zh">æµè¯æé</value> - <value xml:lang="zh_TW">測試æ¬é</value> - </property> <property key="ContentText"> <value xml:lang="ar">Ùص</value> <value xml:lang="da">Tekst</value> Modified: ofbiz/trunk/applications/content/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/ofbiz-component.xml?rev=1518925&r1=1518924&r2=1518925&view=diff ============================================================================== --- ofbiz/trunk/applications/content/ofbiz-component.xml (original) +++ ofbiz/trunk/applications/content/ofbiz-component.xml Fri Aug 30 09:45:33 2013 @@ -64,8 +64,6 @@ under the License. <service-resource type="eca" loader="main" location="servicedef/secas.xml"/> <service-resource type="mca" loader="main" location="servicedef/mca.xml"/> - <test-suite loader="main" location="testdef/lucenetests.xml"/> - <webapp name="content" title="Content" server="default-server" Modified: ofbiz/trunk/applications/content/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services.xml?rev=1518925&r1=1518924&r2=1518925&view=diff ============================================================================== --- ofbiz/trunk/applications/content/servicedef/services.xml (original) +++ ofbiz/trunk/applications/content/servicedef/services.xml Fri Aug 30 09:45:33 2013 @@ -648,13 +648,6 @@ <attribute name="fieldValue0" type="String" mode="IN" optional="true"/> </service> - <service name="indexTree" auth="true" engine="java" validate="true" transaction-timeout="7200" - location="org.ofbiz.content.search.SearchServices" invoke="indexTree"> - <description>Index content under publish point</description> - <attribute mode="IN" name="contentId" optional="false" type="String"/> - <attribute mode="OUT" name="badIndexList" optional="true" type="List"/> - <attribute mode="OUT" name="goodIndexCount" optional="true" type="Integer"/> - </service> <service name="resequence" auth="true" engine="java" validate="true" transaction-timeout="7200" location="org.ofbiz.content.ContentManagementServices" invoke="resequence"> <description>Reorder sequence numbers in ContentAssoc entities for a given parent id</description> Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml?rev=1518925&r1=1518924&r2=1518925&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Fri Aug 30 09:45:33 2013 @@ -1651,7 +1651,6 @@ under the License. <request-map uri="UserPermissions"><security auth="true" https="true"/><response name="success" type="view" value="UserPermissions"/></request-map> <request-map uri="CMSContentFind"><security auth="true" https="true"/><response name="success" type="view" value="CMSContentFind"/></request-map> <request-map uri="CMSContentEdit"><security auth="true" https="true"/><response name="success" type="view" value="CMSContentEdit"/></request-map> - <request-map uri="CMSContentAdd"><security auth="true" https="true"/><response name="success" type="view" value="CMSContentAdd"/></request-map> <request-map uri="CMSSites"><security auth="true" https="true"/><response name="success" type="view" value="CMSSites"/></request-map> <request-map uri="updateSiteRoles"> <security https="true" auth="true"/> @@ -1717,22 +1716,6 @@ under the License. <response name="success" type="view" value="CMSContentEdit"/> <response name="error" type="view" value="EditAddContent"/> </request-map> - <request-map uri="AdminSearch"><security https="true" auth="true"/><response name="success" type="view" value="AdminSearch"/></request-map> - <request-map uri="AdminIndex"><security https="true" auth="true"/><response name="success" type="view" value="AdminIndex"/></request-map> - <request-map uri="indexTree"> - <security https="true" auth="true"/> - <event invoke="indexTree" path="org.ofbiz.content.search.SearchEvents" type="java"/> - <response name="success" type="view" value="AdminIndex"/> - <response name="error" type="view" value="AdminIndex"/> - </request-map> - - - <request-map uri="TestPermission"> - <security https="true" auth="true"/> - <event type="service" invoke="checkContentPermission"/> - <response name="success" type="view" value="TestPermission"/> - <response name="error" type="view" value="TestPermission"/> - </request-map> <!-- ================ CompDoc Requests ================= --> <!-- ================ SimpleContent Requests ================= --> @@ -2048,15 +2031,11 @@ under the License. <view-map name="CMSContentFind" page="component://content/widget/cms/CMSScreens.xml#CMSContentFind" type="screen"/> <view-map name="CMSContentEdit" page="component://content/widget/cms/CMSScreens.xml#CMSContentEdit" type="screen"/> - <view-map name="CMSContentAdd" page="component://content/widget/cms/CMSScreens.xml#CMSContentAdd" type="screen"/> <view-map name="UserPermissions" page="component://content/widget/contentsetup/ContentSetupScreens.xml#UserPermissions" type="screen"/> <view-map name="CMSSites" page="component://content/widget/cms/CMSScreens.xml#CMSSites" type="screen"/> <view-map name="addSubSite" page="component://content/widget/cms/CMSScreens.xml#addSubSite" type="screen"/> <view-map name="EditAddContent" page="component://content/widget/cms/CMSScreens.xml#EditAddContent" type="screen"/> - <view-map name="AdminSearch" page="component://content/widget/cms/CMSScreens.xml#AdminSearch" type="screen"/> - <view-map name="AdminIndex" page="component://content/widget/cms/CMSScreens.xml#AdminIndex" type="screen"/> <view-map name="EditAddSubContent" page="component://content/widget/cms/CMSScreens.xml#EditAddSubContent" type="screen"/> - <view-map name="TestPermission" page="component://content/widget/cms/CMSScreens.xml#TestPermission" type="screen"/> <view-map name="ListContentRevisions" page="component://content/widget/compdoc/CompDocScreens.xml#ListContentRevisions" type="screen"/> <view-map name="EditContentRevision" page="component://content/widget/compdoc/CompDocScreens.xml#EditContentRevision" type="screen"/> Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/web.xml?rev=1518925&r1=1518924&r2=1518925&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/WEB-INF/web.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/web.xml Fri Aug 30 09:45:33 2013 @@ -39,6 +39,11 @@ under the License. <param-value>component://content/widget/CommonScreens.xml</param-value> <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description> </context-param> + <context-param> + <param-name>cmsDecoratorLocation</param-name> + <param-value>component://content/widget/CommonScreens.xml</param-value> + <description>The location of the cms decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description> + </context-param> <filter> <filter-name>ContextFilter</filter-name> Modified: ofbiz/trunk/applications/content/widget/cms/CMSForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSForms.xml?rev=1518925&r1=1518924&r2=1518925&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/cms/CMSForms.xml (original) +++ ofbiz/trunk/applications/content/widget/cms/CMSForms.xml Fri Aug 30 09:45:33 2013 @@ -387,34 +387,6 @@ under the License. <form name="EditAddBioImage" target="persistBioImage" title="" type="upload" extends="EditAddImageMaster" header-row-style="header-row" default-table-style="basic-table"> </form> - <form name="AdminIndex" target="AdminIndex" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> - <field name="indexContentIds" position="1"><text size="50"/></field> - <field name="submitButton" title="${uiLabelMap.ContentIndexEnteredIds}" widget-style="smallSubmit" position="2"><submit button-type="button"/></field> - </form> - - <form name="AdminIndexAll" target="indexTree" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> - <field name="contentId" title=" " position="1"><text size="50" default-value="WebStoreCONTENT"/></field> - <field name="submitButton" title="${uiLabelMap.ContentIndexAll}" widget-style="smallSubmit" position="2"><submit button-type="button"/></field> - </form> - - <form name="searchQuery" target="AdminSearch" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> - <field name="queryLine"><text size="60"/></field> - <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - <form name="searchList" type="list" target="" list-name="queryResults" paginate-target="/AdminSearch" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <field name="editContent" title=" "> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="CMSContentEdit"> - <parameter param-name="contentId"/> - <parameter param-name="drDataResourceId" from-field="dataResourceId"/> - <parameter param-name="contentIdTo"/> - </hyperlink> - </field> - <field name="contentId"><display/></field> - <field name="dataResourceId"><display/></field> - <field name="contentName"><display/></field> - </form> - <form name="EditAddContentStuff" target="persistContentStuff" title="" type="upload" default-map-name="currentValue" header-row-style="header-row" default-table-style="basic-table"> <field name="contentAssocTitle" title="${uiLabelMap.ContentAssoc}" title-style="h1" map-name="dummy"> @@ -620,45 +592,4 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> </form> - <form name="TestPermission" target="TestPermission" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <field name="contentId"> - <text/> - </field> - <field name="partyId"> - <text/> - </field> - <field name="userLoginId"> - <text/> - </field> - <field name="targetOperationString"> - <drop-down allow-empty="true"> - <entity-options description="${description}" - entity-name="ContentOperation" key-field-name="contentOperationId"/> - </drop-down> - </field> - <field name="displayFailCond"> - <hidden value="true"/> - </field> - <field name="displayPassCond"> - <hidden value="true"/> - </field> - <!-- - <field name="contentPurposeString"> - <drop-down allow-empty="true"> - <entity-options description="${description}" - entity-name="ContentPurposeType" key-field-name="contentPurposeTypeId"/> - </drop-down> - </field> - <field name="roleTypeString"> - <drop-down allow-empty="true"> - <entity-options description="${description}" - entity-name="RoleType" key-field-name="roleTypeId"/> - </drop-down> - </field> - --> - <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"> - <submit button-type="button"/> - </field> - </form> </forms> Modified: ofbiz/trunk/applications/content/widget/cms/CMSMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSMenus.xml?rev=1518925&r1=1518924&r2=1518925&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/cms/CMSMenus.xml (original) +++ ofbiz/trunk/applications/content/widget/cms/CMSMenus.xml Fri Aug 30 09:45:33 2013 @@ -33,46 +33,5 @@ under the License. <parameter param-name="forumId" from-field="subsites.forumId"/> </link> </menu-item> - - <menu-item name="index" title="${uiLabelMap.ContentIndex}" > - <link id="index" target="AdminIndex"> - </link> - </menu-item> - - <menu-item name="search" title="${uiLabelMap.CommonFind}" > - <link id="search" target="AdminSearch"> - </link> - </menu-item> - - - </menu> - - <menu name="content" default-menu-item-name="content" default-permission-operation="HAS_AUTHOR_ROLE|CONTENT_ADMIN" - default-permission-entity-action="_ADMIN" default-associated-content-id="${userLogin.userLoginId}" selected-menuitem-context-field-name="tabButtonItem" - title="" type="simple"> - - - <menu-item name="contentfind" title="${uiLabelMap.ContentContent}" > - <link id="CMSContentFind" target="CMSContentFind" > - <parameter param-name="listSize" from-field="content.listSize"/> - <parameter param-name="highIndex" from-field="content.highIndex"/> - <parameter param-name="lowIndex" from-field="content.lowIndex"/> - <parameter param-name="viewSize" from-field="content.viewSize"/> - <parameter param-name="viewIndex" from-field="content.viewIndex"/> - <parameter param-name="queryString" from-field="content.queryString"/> - </link> - </menu-item> - <menu-item name="contentedit" title="${uiLabelMap.CommonEdit}" > - <link id="CMSContentEdit" target="CMSContentEdit"> - <parameter param-name="contentId" from-field="content.currentValue.contentId"/> - <parameter param-name="dataResourceId" from-field="content.currentValue.dataResourceId"/> - </link> - </menu-item> - <menu-item name="contentadd" title="${uiLabelMap.CommonAdd}" > - <link id="CMSContentAdd" target="CMSContentAdd"> - </link> - </menu-item> - </menu> - </menus> Modified: ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml?rev=1518925&r1=1518924&r2=1518925&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml Fri Aug 30 09:45:33 2013 @@ -34,7 +34,7 @@ under the License. <set field="currentCMSMenuItemName" value="contentfind" to-scope="user"/> </actions> <widgets> - <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="commonCmsDecorator" location="${parameters.cmsDecoratorLocation}"> <decorator-section name="body"> <section> <widgets> @@ -77,7 +77,7 @@ under the License. <set field="menuContext.contentTarget" value="CMSContentEdit?contentId=${contentId}&drDataResourceId=${dataResourceId}"/> </actions> <widgets> - <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="commonCmsDecorator" location="${parameters.cmsDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditCMSContent}"> <platform-specific> @@ -90,24 +90,6 @@ under the License. </section> </screen> - <screen name="CMSContentAdd"> - <section> - <actions> - <script location="component://content/webapp/content/WEB-INF/actions/cms/GetMenuContext.groovy"/> - <set field="titleProperty" value="PageTitleEditContent"/> - </actions> - <widgets> - <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <screenlet title="${uiLabelMap.PageTitleEditContent}"> - <include-form name="EditContent" location="component://content/widget/cms/CMSForms.xml"/> - </screenlet> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="EditAddContent"> <section> <actions> @@ -136,7 +118,7 @@ under the License. <set field="enableEdit" value="true"/> </actions> <widgets> - <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="commonCmsDecorator" location="${parameters.cmsDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ContentCMSEditPage}"> <link text="${uiLabelMap.ContentGoToFind}" target="CMSContentFind?VIEW_INDEX=${CMSContentFindViewIndex}&${CMSContentFindQueryString}"/> @@ -171,7 +153,7 @@ under the License. <set field="currentCMSMenuItemName" value="EditAddContent" to-scope="user"/> </actions> <widgets> - <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="commonCmsDecorator" location="${parameters.cmsDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ContentCMSAddSubContent}"> <link text="${uiLabelMap.ContentGoToFind}" target="CMSContentFind?VIEW_INDEX=${CMSContentFindViewIndex}&${CMSContentFindQueryString}"/> @@ -183,52 +165,6 @@ under the License. </section> </screen> - <screen name="AdminSearch"> - <section> - <actions> - <script location="component://content/webapp/content/WEB-INF/actions/cms/GetMenuContext.groovy"/> - <script location="component://content/webapp/content/WEB-INF/actions/cms/AdvancedSearchPrep.groovy"/> - <script location="component://content/webapp/content/WEB-INF/actions/cms/Search.groovy"/> - <set field="titleProperty" value="ContentCMSSearchPage"/> - <set field="currentCMSMenuItemName" value="search" to-scope="user"/> - <property-map map-name="uiLabelMap" resource="ProductUiLabels"/> - </actions> - <widgets> - <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <screenlet title="${uiLabelMap.ContentCMSSearchPage}"> - <platform-specific> - <html><html-template location="component://content/webapp/content/cms/AdminSearch.ftl"/></html> - </platform-specific> - <include-form name="searchList" location="component://content/widget/cms/CMSForms.xml"/> - </screenlet> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - - - <screen name="AdminIndex"> - <section> - <actions> - <script location="component://content/webapp/content/WEB-INF/actions/cms/GetMenuContext.groovy"/> - <set field="titleProperty" value="ContentCMSSearchPage"/> - <set field="currentCMSMenuItemName" value="index" to-scope="user"/> - </actions> - <widgets> - <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <screenlet title="${uiLabelMap.ContentCMSSearchPage}"> - <include-form name="AdminIndex" location="component://content/widget/cms/CMSForms.xml"/> - <include-form name="AdminIndexAll" location="component://content/widget/cms/CMSForms.xml"/> - </screenlet> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="CMSSites"> <section> <actions> @@ -241,7 +177,7 @@ under the License. <script location="component://content/webapp/content/WEB-INF/actions/cms/MostRecentPrep.groovy"/> </actions> <widgets> - <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="commonCmsDecorator" location="${parameters.cmsDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ContentCMSSearchPage}"> <platform-specific> @@ -261,7 +197,7 @@ under the License. <set field="titleProperty" value="PageTitleSearchContent"/> </actions> <widgets> - <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="commonCmsDecorator" location="${parameters.cmsDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleSearchContent}"> <platform-specific> @@ -273,21 +209,4 @@ under the License. </widgets> </section> </screen> - <screen name="TestPermission"> - <section> - <actions> - <script location="component://content/webapp/content/WEB-INF/actions/cms/GetMenuContext.groovy"/> - <set field="titleProperty" value="ContentTestPermission"/> - </actions> - <widgets> - <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <screenlet title="${uiLabelMap.ContentTestPermission}"> - <include-form name="TestPermission" location="component://content/widget/cms/CMSForms.xml"/> - </screenlet> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> </screens> Modified: ofbiz/trunk/specialpurpose/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/LICENSE?rev=1518925&r1=1518924&r2=1518925&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/LICENSE (original) +++ ofbiz/trunk/specialpurpose/LICENSE Fri Aug 30 09:45:33 2013 @@ -13,6 +13,9 @@ The following libraries are licensed und specialpurpose/birt/lib/axis-ant-1.4.jar specialpurpose/birt/lib/axis-1.4.jar specialpurpose/googlecheckout/lib/checkout-sdk-0.8.8.jar +specialpurpose/lucene/lib/lucene-analyzers-common-4.0.0.jar +specialpurpose/lucene/lib/lucene-core-4.0.0.jar +specialpurpose/lucene/lib/lucene-queryparser-4.0.0.jar ========================================================================= Apache License Modified: ofbiz/trunk/specialpurpose/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/build.xml?rev=1518925&r1=1518924&r2=1518925&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/build.xml (original) +++ ofbiz/trunk/specialpurpose/build.xml Fri Aug 30 09:45:33 2013 @@ -24,6 +24,7 @@ files=" appserver/build.xml, jetty/build.xml, + lucene/build.xml, ecommerce/build.xml, pos/build.xml, hhfacility/build.xml, Modified: ofbiz/trunk/specialpurpose/component-load.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/component-load.xml?rev=1518925&r1=1518924&r2=1518925&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/component-load.xml (original) +++ ofbiz/trunk/specialpurpose/component-load.xml Fri Aug 30 09:45:33 2013 @@ -21,6 +21,7 @@ under the License. <component-loader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/component-loader.xsd"> <load-component component-location="appserver"/> + <load-component component-location="lucene"/> <load-component component-location="ecommerce"/> <load-component component-location="pos"/> <load-component component-location="hhfacility"/> Propchange: ofbiz/trunk/specialpurpose/lucene/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 30 09:45:33 2013 @@ -0,0 +1 @@ +build Added: ofbiz/trunk/specialpurpose/lucene/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/build.xml?rev=1518925&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/lucene/build.xml (added) +++ ofbiz/trunk/specialpurpose/lucene/build.xml Fri Aug 30 09:45:33 2013 @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="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. +--> + +<project name="OFBiz - Lucene Component" default="jar" basedir=""> + <import file="../../common.xml"/> + + <!-- ================================================================== --> + <!-- Initialization of all property settings --> + <!-- ================================================================== --> + + <property environment="env"/> + <property name="desc" value="Lucene Component"/> + <property name="name" value="lucene"/> + <property name="component-name" value="lucene"/> + <property name="ofbiz.home.dir" value="../../"/> + <property name="src.dir" value="src"/> + <property name="dtd.dir" value="dtd"/> + <property name="lib.dir" value="lib"/> + <property name="build.dir" value="build"/> + + <path id="local.class.path"> + <fileset dir="${lib.dir}" includes="*.jar"/> + <fileset dir="../../framework/base/lib" includes="*.jar"/> + <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/> + <fileset dir="../../framework/base/build/lib" includes="*.jar"/> + <fileset dir="../../framework/entity/lib" includes="*.jar"/> + <fileset dir="../../framework/entity/build/lib" includes="*.jar"/> + <fileset dir="../../framework/security/build/lib" includes="*.jar"/> + <fileset dir="../../framework/service/lib" includes="*.jar"/> + <fileset dir="../../framework/service/build/lib" includes="*.jar"/> + <fileset dir="../../framework/minilang/build/lib" includes="*.jar"/> + <fileset dir="../../framework/widget/build/lib" includes="*.jar"/> + <fileset dir="../../framework/webapp/lib" includes="*.jar"/> + <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/> + <fileset dir="../../applications/content/build/lib" includes="*.jar"/> + </path> + +</project> Propchange: ofbiz/trunk/specialpurpose/lucene/build.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/lucene/build.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/lucene/build.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/specialpurpose/lucene/config/search.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/config/search.properties?rev=1518925&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/lucene/config/search.properties (added) +++ ofbiz/trunk/specialpurpose/lucene/config/search.properties Fri Aug 30 09:45:33 2013 @@ -0,0 +1,20 @@ +############################################################################### +# 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. +############################################################################### + +defaultIndex=runtime/data/indexes Propchange: ofbiz/trunk/specialpurpose/lucene/config/search.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/lucene/config/search.properties ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/lucene/config/search.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: ofbiz/trunk/specialpurpose/lucene/lib/lucene-analyzers-common-4.0.0.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Propchange: ofbiz/trunk/specialpurpose/lucene/lib/lucene-core-4.0.0.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Propchange: ofbiz/trunk/specialpurpose/lucene/lib/lucene-queryparser-4.0.0.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/specialpurpose/lucene/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/ofbiz-component.xml?rev=1518925&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/lucene/ofbiz-component.xml (added) +++ ofbiz/trunk/specialpurpose/lucene/ofbiz-component.xml Fri Aug 30 09:45:33 2013 @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="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. +--> +<ofbiz-component name="lucene" enabled="true" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd"> + <!-- define resource loaders; most common is to use the component resource loader --> + <resource-loader name="main" type="component"/> + + <!-- place the config directory on the classpath to access configuration files --> + <classpath type="dir" location="config"/> + + <!-- load single or multiple external libraries --> + <classpath type="jar" location="build/lib/*"/> + <classpath type="jar" location="lib/*"/> + + <!-- service resources: model(s), eca(s) and group definitions --> + <service-resource type="model" loader="main" location="servicedef/services.xml"/> + + <test-suite loader="main" location="testdef/lucenetests.xml"/> + + <!-- this overrides the content application in order to add the index management screens --> + <webapp name="content" + title="Lucene" + server="default-server" + location="webapp/content" + base-permission="OFBTOOLS,CONTENTMGR" + mount-point="/content"/> +</ofbiz-component> Propchange: ofbiz/trunk/specialpurpose/lucene/ofbiz-component.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/lucene/ofbiz-component.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/lucene/ofbiz-component.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/specialpurpose/lucene/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/servicedef/services.xml?rev=1518925&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/lucene/servicedef/services.xml (added) +++ ofbiz/trunk/specialpurpose/lucene/servicedef/services.xml Fri Aug 30 09:45:33 2013 @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="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. +--> +<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd"> + <description>Lucene Services</description> + <vendor></vendor> + <version>1.0</version> + + <service name="indexTree" auth="true" engine="java" validate="true" transaction-timeout="7200" + location="org.ofbiz.content.search.SearchServices" invoke="indexTree"> + <description>Index content under publish point</description> + <attribute mode="IN" name="contentId" optional="false" type="String"/> + <attribute mode="OUT" name="badIndexList" optional="true" type="List"/> + <attribute mode="OUT" name="goodIndexCount" optional="true" type="Integer"/> + </service> + +</services> \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/lucene/servicedef/services.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/lucene/servicedef/services.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/lucene/servicedef/services.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Copied: ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/ContentDocument.java (from r1518219, ofbiz/trunk/applications/content/src/org/ofbiz/content/search/ContentDocument.java) URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/ContentDocument.java?p2=ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/ContentDocument.java&p1=ofbiz/trunk/applications/content/src/org/ofbiz/content/search/ContentDocument.java&r1=1518219&r2=1518925&rev=1518925&view=diff ============================================================================== (empty) Propchange: ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/ContentDocument.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/ContentDocument.java ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/ContentDocument.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/SearchEvents.java (from r1518211, ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchEvents.java) URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/SearchEvents.java?p2=ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/SearchEvents.java&p1=ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchEvents.java&r1=1518211&r2=1518925&rev=1518925&view=diff ============================================================================== (empty) Propchange: ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/SearchEvents.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/SearchEvents.java ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/SearchEvents.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/SearchServices.java (from r1518211, ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchServices.java) URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/SearchServices.java?p2=ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/SearchServices.java&p1=ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchServices.java&r1=1518211&r2=1518925&rev=1518925&view=diff ============================================================================== (empty) Propchange: ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/SearchServices.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/SearchServices.java ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/SearchServices.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/SearchWorker.java (from r1518211, ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java) URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/SearchWorker.java?p2=ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/SearchWorker.java&p1=ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java&r1=1518211&r2=1518925&rev=1518925&view=diff ============================================================================== (empty) Propchange: ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/SearchWorker.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/SearchWorker.java ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/SearchWorker.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: ofbiz/trunk/specialpurpose/lucene/testdef/lucenetests.xml (from r1518211, ofbiz/trunk/applications/content/testdef/lucenetests.xml) URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/testdef/lucenetests.xml?p2=ofbiz/trunk/specialpurpose/lucene/testdef/lucenetests.xml&p1=ofbiz/trunk/applications/content/testdef/lucenetests.xml&r1=1518211&r2=1518925&rev=1518925&view=diff ============================================================================== --- ofbiz/trunk/applications/content/testdef/lucenetests.xml (original) +++ ofbiz/trunk/specialpurpose/lucene/testdef/lucenetests.xml Fri Aug 30 09:45:33 2013 @@ -1,29 +1,29 @@ <?xml version="1.0" encoding="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. - --> +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. +--> <test-suite suite-name="lucenetests" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd"> <test-case case-name="lucene-tests-data-load"> - <entity-xml action="load" entity-xml-url="component://content/testdef/data/LuceneTestsData.xml"/> + <entity-xml action="load" entity-xml-url="component://lucene/testdef/data/LuceneTestsData.xml"/> </test-case> <test-case case-name="lucene-tests"><junit-test-suite class-name="org.ofbiz.content.test.LuceneTests"/></test-case> Copied: ofbiz/trunk/specialpurpose/lucene/webapp/content/AdminSearch.ftl (from r1518211, ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl) URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/webapp/content/AdminSearch.ftl?p2=ofbiz/trunk/specialpurpose/lucene/webapp/content/AdminSearch.ftl&p1=ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl&r1=1518211&r2=1518925&rev=1518925&view=diff ============================================================================== (empty) Propchange: ofbiz/trunk/specialpurpose/lucene/webapp/content/AdminSearch.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/lucene/webapp/content/AdminSearch.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/specialpurpose/lucene/webapp/content/AdminSearch.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/AdvancedSearchPrep.groovy (from r1518211, ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/cms/AdvancedSearchPrep.groovy) URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/AdvancedSearchPrep.groovy?p2=ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/AdvancedSearchPrep.groovy&p1=ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/cms/AdvancedSearchPrep.groovy&r1=1518211&r2=1518925&rev=1518925&view=diff ============================================================================== (empty) Propchange: ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/AdvancedSearchPrep.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/AdvancedSearchPrep.groovy ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/AdvancedSearchPrep.groovy ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy (from r1518211, ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/cms/Search.groovy) URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy?p2=ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy&p1=ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/cms/Search.groovy&r1=1518211&r2=1518925&rev=1518925&view=diff ============================================================================== (empty) Propchange: ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/controller.xml?rev=1518925&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/controller.xml (added) +++ ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/controller.xml Fri Aug 30 09:45:33 2013 @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="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. +--> +<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> + <!-- The controller elements that are common to all OFBiz components + can be found in the following xml file. A component can override the + elements found in the common-controller.xml file. --> + <include location="component://content/webapp/content/WEB-INF/controller.xml"/> + + <description>Lucene Component Site Configuration File</description> + + <!-- Request Mappings --> + <request-map uri="AdminSearch"><security https="true" auth="true"/><response name="success" type="view" value="AdminSearch"/></request-map> + <request-map uri="AdminIndex"><security https="true" auth="true"/><response name="success" type="view" value="AdminIndex"/></request-map> + <request-map uri="indexTree"> + <security https="true" auth="true"/> + <event invoke="indexTree" path="org.ofbiz.content.search.SearchEvents" type="java"/> + <response name="success" type="view" value="AdminIndex"/> + <response name="error" type="view" value="AdminIndex"/> + </request-map> + + <!-- View Mappings --> + <view-map name="AdminSearch" page="component://lucene/widget/LuceneScreens.xml#AdminSearch" type="screen"/> + <view-map name="AdminIndex" page="component://lucene/widget/LuceneScreens.xml#AdminIndex" type="screen"/> +</site-conf> \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/controller.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/controller.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/controller.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/web.xml?rev=1518925&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/web.xml (added) +++ ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/web.xml Fri Aug 30 09:45:33 2013 @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> + +<!-- +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. +--> + +<web-app> + <display-name>Open For Business - Lucene Component</display-name> + <description>Lucene Component of the Open For Business Project</description> + + <!-- context-param> + <param-name>webSiteId</param-name> + <param-value>luceneSite</param-value> + <description>A unique ID used to look up the WebSite entity</description> + </context-param--> + <context-param> + <param-name>localDispatcherName</param-name><param-value>lucene</param-value> + <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description> + </context-param> + <context-param> + <param-name>entityDelegatorName</param-name><param-value>default</param-value> + <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description> + </context-param> + <context-param> + <param-name>mainDecoratorLocation</param-name> + <param-value>component://content/widget/CommonScreens.xml</param-value> + <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description> + </context-param> + <context-param> + <param-name>cmsDecoratorLocation</param-name> + <param-value>component://lucene/widget/LuceneScreens.xml</param-value> + <description>The location of the cms decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description> + </context-param> + <context-param> + <param-name>compressHTML</param-name> + <param-value>false</param-value> + <description>Remove unnecessary whitespace from HTML output.</description> + </context-param> + + <filter> + <filter-name>ContextFilter</filter-name> + <display-name>ContextFilter</display-name> + <filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class> + <init-param><param-name>disableContextSecurity</param-name><param-value>N</param-value></init-param> + <init-param> + <param-name>allowedPaths</param-name> + <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> + </init-param> + <init-param><param-name>errorCode</param-name><param-value>403</param-value></init-param> + <init-param><param-name>redirectPath</param-name><param-value>/control/main</param-value></init-param> + </filter> + <filter-mapping><filter-name>ContextFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping> + + <listener><listener-class>org.ofbiz.webapp.control.ControlEventListener</listener-class></listener> + <listener><listener-class>org.ofbiz.webapp.control.LoginEventListener</listener-class></listener> + <!-- NOTE: not all app servers support mounting implementations of the HttpSessionActivationListener interface --> + <!-- <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> --> + + <servlet> + <servlet-name>ControlServlet</servlet-name> + <display-name>ControlServlet</display-name> + <description>Main Control Servlet</description> + <servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping><servlet-name>ControlServlet</servlet-name><url-pattern>/control/*</url-pattern></servlet-mapping> + + <session-config><session-timeout>60</session-timeout><!-- in minutes --></session-config> + + <welcome-file-list> + <welcome-file>index.jsp</welcome-file> + <welcome-file>index.html</welcome-file> + <welcome-file>index.htm</welcome-file> + </welcome-file-list> +</web-app> \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/web.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/web.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/web.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/specialpurpose/lucene/webapp/content/error/error.jsp URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/webapp/content/error/error.jsp?rev=1518925&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/lucene/webapp/content/error/error.jsp (added) +++ ofbiz/trunk/specialpurpose/lucene/webapp/content/error/error.jsp Fri Aug 30 09:45:33 2013 @@ -0,0 +1,52 @@ +<%-- +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. +--%> +<%@ page import="org.ofbiz.base.util.*" %> +<html> +<head> +<title>Open For Business Message</title> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> +</head> + +<% String errorMsg = (String) request.getAttribute("_ERROR_MESSAGE_"); %> + +<body bgcolor="#FFFFFF"> +<div align="center"> + <br/> + <table width="100%" border="1" height="200"> + <tr> + <td> + <table width="100%" border="0" height="200"> + <tr bgcolor="#CC6666"> + <td height="45"> + <div align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="4" color="#FFFFFF"><b>:ERROR MESSAGE:</b></font></div> + </td> + </tr> + <tr> + <td> + <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><%=UtilFormatOut.replaceString(errorMsg, "\n", "<br/>")%></font></div> + </td> + </tr> + </table> + </td> + </tr> + </table> +</div> +<div align="center"></div> +</body> +</html> \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/lucene/webapp/content/error/error.jsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/lucene/webapp/content/error/error.jsp ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/lucene/webapp/content/error/error.jsp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/specialpurpose/lucene/webapp/content/index.jsp URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/webapp/content/index.jsp?rev=1518925&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/lucene/webapp/content/index.jsp (added) +++ ofbiz/trunk/specialpurpose/lucene/webapp/content/index.jsp Fri Aug 30 09:45:33 2013 @@ -0,0 +1,19 @@ +<%-- +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. +--%> +<%response.sendRedirect("control/main");%> \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/lucene/webapp/content/index.jsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/lucene/webapp/content/index.jsp ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/lucene/webapp/content/index.jsp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/specialpurpose/lucene/widget/LuceneForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/widget/LuceneForms.xml?rev=1518925&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/lucene/widget/LuceneForms.xml (added) +++ ofbiz/trunk/specialpurpose/lucene/widget/LuceneForms.xml Fri Aug 30 09:45:33 2013 @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="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. +--> +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> + + <form name="AdminIndex" target="AdminIndex" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> + <field name="indexContentIds" position="1"><text size="50"/></field> + <field name="submitButton" title="${uiLabelMap.ContentIndexEnteredIds}" widget-style="smallSubmit" position="2"><submit button-type="button"/></field> + </form> + + <form name="AdminIndexAll" target="indexTree" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> + <field name="contentId" title=" " position="1"><text size="50" default-value="WebStoreCONTENT"/></field> + <field name="submitButton" title="${uiLabelMap.ContentIndexAll}" widget-style="smallSubmit" position="2"><submit button-type="button"/></field> + </form> + + <form name="searchList" type="list" target="" list-name="queryResults" paginate-target="/AdminSearch" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <field name="editContent" title=" "> + <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="CMSContentEdit"> + <parameter param-name="contentId"/> + <parameter param-name="drDataResourceId" from-field="dataResourceId"/> + <parameter param-name="contentIdTo"/> + </hyperlink> + </field> + <field name="contentId"><display/></field> + <field name="dataResourceId"><display/></field> + <field name="contentName"><display/></field> + </form> + +</forms> \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/lucene/widget/LuceneForms.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/lucene/widget/LuceneForms.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/lucene/widget/LuceneForms.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/specialpurpose/lucene/widget/LuceneMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/widget/LuceneMenus.xml?rev=1518925&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/lucene/widget/LuceneMenus.xml (added) +++ ofbiz/trunk/specialpurpose/lucene/widget/LuceneMenus.xml Fri Aug 30 09:45:33 2013 @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="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. +--> +<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> + + <menu name="cms" default-menu-item-name="content" default-permission-operation="HAS_AUTHOR_ROLE|CONTENT_ADMIN" + default-permission-entity-action="_ADMIN" default-associated-content-id="${userLogin.userLoginId}" + selected-menuitem-context-field-name="currentCMSMenuItemName" title="" type="simple" + menu-container-style="button-bar tab-bar" default-selected-style="selected"> + + <menu-item name="contentfind" title="${uiLabelMap.ContentContent}" > + <link id="contentfind" target="CMSContentFind"/> + </menu-item> + + <menu-item name="subsites" title="${uiLabelMap.ContentSubSites}" > + <link id="sites" target="CMSSites"> + <parameter param-name="forumId" from-field="subsites.forumId"/> + </link> + </menu-item> + + <menu-item name="index" title="${uiLabelMap.ContentIndex}" > + <link id="index" target="AdminIndex"/> + </menu-item> + + <menu-item name="search" title="${uiLabelMap.CommonFind}" > + <link id="search" target="AdminSearch"/> + </menu-item> + </menu> + +</menus> \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/lucene/widget/LuceneMenus.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/lucene/widget/LuceneMenus.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/lucene/widget/LuceneMenus.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml?rev=1518925&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml (added) +++ ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml Fri Aug 30 09:45:33 2013 @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="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. +--> +<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> + + <screen name="commonCmsDecorator"> + <section> + <actions> + <set field="currentCMSMenuItemName" from-field="currentCMSMenuItemName" from-scope="user"/> + <set field="headerItem" value="CMS"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="pre-body"> + <section> + <condition> + <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + </condition> + <widgets> + <include-menu name="cms" location="component://lucene/widget/LuceneMenus.xml"/> + </widgets> + </section> + </decorator-section> + <decorator-section name="body"> + <section> + <condition> + <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + </condition> + <widgets> + <decorator-section-include name="body"/> + </widgets> + <fail-widgets> + <label style="h3">${uiLabelMap.ContentUpdatePermissionError}</label> + </fail-widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="AdminSearch"> + <section> + <actions> + <script location="component://content/webapp/content/WEB-INF/actions/cms/GetMenuContext.groovy"/> + <script location="component://lucene/webapp/content/WEB-INF/actions/AdvancedSearchPrep.groovy"/> + <script location="component://lucene/webapp/content/WEB-INF/actions/Search.groovy"/> + <set field="titleProperty" value="ContentCMSSearchPage"/> + <set field="currentCMSMenuItemName" value="search" to-scope="user"/> + <property-map map-name="uiLabelMap" resource="ProductUiLabels"/> + </actions> + <widgets> + <decorator-screen name="commonCmsDecorator"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.ContentCMSSearchPage}"> + <platform-specific> + <html><html-template location="component://lucene/webapp/content/AdminSearch.ftl"/></html> + </platform-specific> + <include-form name="searchList" location="component://lucene/widget/LuceneForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="AdminIndex"> + <section> + <actions> + <script location="component://content/webapp/content/WEB-INF/actions/cms/GetMenuContext.groovy"/> + <set field="titleProperty" value="ContentCMSSearchPage"/> + <set field="currentCMSMenuItemName" value="index" to-scope="user"/> + </actions> + <widgets> + <decorator-screen name="commonCmsDecorator"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.ContentCMSSearchPage}"> + <include-form name="AdminIndex" location="component://lucene/widget/LuceneForms.xml"/> + <include-form name="AdminIndexAll" location="component://lucene/widget/LuceneForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + +</screens> \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |