Author: jacopoc
Date: Tue Sep 17 06:04:51 2013
New Revision: 1523916
URL: http://svn.apache.org/r1523916
Log:
Backported the removal of Lucene dependent code from applications (there is now
a lucene component in specialpurpose).
Added:
ofbiz/branches/release13.07/runtime/indexes/ (with props)
Removed:
ofbiz/branches/release13.07/applications/content/config/search.properties
ofbiz/branches/release13.07/applications/content/lib/lucene-analyzers-common-4.0.0.jar
ofbiz/branches/release13.07/applications/content/lib/lucene-core-4.0.0.jar
ofbiz/branches/release13.07/applications/content/lib/lucene-queryparser-4.0.0.jar
ofbiz/branches/release13.07/applications/content/src/org/ofbiz/content/search/
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/.classpath
ofbiz/branches/release13.07/LICENSE
ofbiz/branches/release13.07/applications/content/build.xml
ofbiz/branches/release13.07/applications/content/config/ContentUiLabels.xml
ofbiz/branches/release13.07/applications/content/ofbiz-component.xml
ofbiz/branches/release13.07/applications/content/servicedef/services.xml
ofbiz/branches/release13.07/applications/content/src/org/ofbiz/content/test/LuceneTests.java
ofbiz/branches/release13.07/applications/content/webapp/content/WEB-INF/actions/cms/AdvancedSearchPrep.groovy
ofbiz/branches/release13.07/applications/content/webapp/content/WEB-INF/actions/cms/Search.groovy
ofbiz/branches/release13.07/applications/content/webapp/content/WEB-INF/controller.xml
ofbiz/branches/release13.07/applications/content/webapp/content/WEB-INF/web.xml
ofbiz/branches/release13.07/applications/content/webapp/content/cms/AdminSearch.ftl
ofbiz/branches/release13.07/applications/content/widget/cms/CMSForms.xml
ofbiz/branches/release13.07/applications/content/widget/cms/CMSMenus.xml
ofbiz/branches/release13.07/applications/content/widget/cms/CMSScreens.xml
ofbiz/branches/release13.07/applications/product/config/prodsearch.properties
ofbiz/branches/release13.07/build.xml
ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/engine/GroovyBaseScript.groovy
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1519999,1520319,1520321,1520326
Modified: ofbiz/branches/release13.07/.classpath
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/.classpath?rev=1523916&r1=1523915&r2=1523916&view=diff
==============================================================================
--- ofbiz/branches/release13.07/.classpath (original)
+++ ofbiz/branches/release13.07/.classpath Tue Sep 17 06:04:51 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"/>
Modified: ofbiz/branches/release13.07/LICENSE
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/LICENSE?rev=1523916&r1=1523915&r2=1523916&view=diff
==============================================================================
--- ofbiz/branches/release13.07/LICENSE (original)
+++ ofbiz/branches/release13.07/LICENSE Tue Sep 17 06:04:51 2013
@@ -105,10 +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-3.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/branches/release13.07/applications/content/build.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/content/build.xml?rev=1523916&r1=1523915&r2=1523916&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/content/build.xml (original)
+++ ofbiz/branches/release13.07/applications/content/build.xml Tue Sep 17
06:04:51 2013
@@ -60,11 +60,4 @@ under the License.
<test-jar/>
</target>
- <target name="clean-lucene-index">
- <delete verbose="on">
- <fileset dir="index/" includes="*">
- <exclude name="indexhere.txt"/>
- </fileset>
- </delete>
- </target>
</project>
Modified:
ofbiz/branches/release13.07/applications/content/config/ContentUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/content/config/ContentUiLabels.xml?rev=1523916&r1=1523915&r2=1523916&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/content/config/ContentUiLabels.xml
(original)
+++ ofbiz/branches/release13.07/applications/content/config/ContentUiLabels.xml
Tue Sep 17 06:04:51 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/branches/release13.07/applications/content/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/content/ofbiz-component.xml?rev=1523916&r1=1523915&r2=1523916&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/content/ofbiz-component.xml
(original)
+++ ofbiz/branches/release13.07/applications/content/ofbiz-component.xml Tue
Sep 17 06:04:51 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/branches/release13.07/applications/content/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/content/servicedef/services.xml?rev=1523916&r1=1523915&r2=1523916&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/content/servicedef/services.xml
(original)
+++ ofbiz/branches/release13.07/applications/content/servicedef/services.xml
Tue Sep 17 06:04:51 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/branches/release13.07/applications/content/src/org/ofbiz/content/test/LuceneTests.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/content/src/org/ofbiz/content/test/LuceneTests.java?rev=1523916&r1=1523915&r2=1523916&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/content/src/org/ofbiz/content/test/LuceneTests.java
(original)
+++
ofbiz/branches/release13.07/applications/content/src/org/ofbiz/content/test/LuceneTests.java
Tue Sep 17 06:04:51 2013
@@ -1,98 +0,0 @@
-/*
- 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.
- */
-
-package org.ofbiz.content.test;
-
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-
-import javolution.util.FastMap;
-
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.index.DirectoryReader;
-import org.apache.lucene.queryparser.classic.QueryParser;
-import org.apache.lucene.search.BooleanClause;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.TopScoreDocCollector;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.FSDirectory;
-import org.ofbiz.base.util.UtilGenerics;
-import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.content.search.SearchWorker;
-import org.ofbiz.entity.GenericValue;
-import org.ofbiz.service.testtools.OFBizTestCase;
-
-public class LuceneTests extends OFBizTestCase {
-
- protected GenericValue userLogin = null;
-
- public LuceneTests(String name) {
- super(name);
- }
-
- @Override
- protected void setUp() throws Exception {
- userLogin = delegator.findOne("UserLogin",
UtilMisc.toMap("userLoginId", "system"), false);
- }
-
- @Override
- protected void tearDown() throws Exception {
- }
-
- public void testCreateIndex() throws Exception {
- Map<String, Object> ctx = FastMap.newInstance();
- ctx.put("contentId", "WebStoreCONTENT");
- ctx.put("userLogin", userLogin);
- Map<String, Object> resp = dispatcher.runSync("indexTree", ctx);
-
- assertEquals(7, resp.get("goodIndexCount"));
-
- List<String> badIndexList =
UtilGenerics.checkList(resp.get("badIndexList"));
- assertEquals(8, badIndexList.size());
- }
-
- public void testSearchTermHand() throws Exception {
- Directory directory = FSDirectory.open(new
File(SearchWorker.getIndexPath(null)));
- DirectoryReader r = null;
- try {
- r = DirectoryReader.open(directory);
- } catch (Exception e) {
- // ignore
- }
-
- BooleanQuery combQuery = new BooleanQuery();
- String queryLine = "hand";
-
- IndexSearcher searcher = new IndexSearcher(r);
- Analyzer analyzer = new StandardAnalyzer(SearchWorker.LUCENE_VERSION);
-
- QueryParser parser = new QueryParser(SearchWorker.LUCENE_VERSION,
"content", analyzer);
- Query query = parser.parse(queryLine);
- combQuery.add(query, BooleanClause.Occur.MUST);
-
- TopScoreDocCollector collector = TopScoreDocCollector.create(10,
false);
- searcher.search(combQuery, collector);
-
- assertEquals("Only 1 result expected from the testdata", 1,
collector.getTotalHits());
- }
-}
Modified:
ofbiz/branches/release13.07/applications/content/webapp/content/WEB-INF/actions/cms/AdvancedSearchPrep.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/content/webapp/content/WEB-INF/actions/cms/AdvancedSearchPrep.groovy?rev=1523916&r1=1523915&r2=1523916&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/content/webapp/content/WEB-INF/actions/cms/AdvancedSearchPrep.groovy
(original)
+++
ofbiz/branches/release13.07/applications/content/webapp/content/WEB-INF/actions/cms/AdvancedSearchPrep.groovy
Tue Sep 17 06:04:51 2013
@@ -1,39 +0,0 @@
-/*
- * 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.
- */
-
-import org.ofbiz.product.catalog.*
-import org.ofbiz.product.feature.*
-import org.ofbiz.product.product.*
-
-productFeaturesByTypeMap = ParametricSearch.getAllFeaturesByType(delegator,
2000);
-productFeatureTypeIdsOrdered = new ArrayList(new
TreeSet(productFeaturesByTypeMap.keySet()));
-
-searchOperator = request.getParameter("SEARCH_OPERATOR");
-if (!"AND".equals(searchOperator) && !"OR".equals(searchOperator)) {
- searchOperator = "OR";
-}
-
-searchConstraintStrings =
ProductSearchSession.searchGetConstraintStrings(false, session, delegator);
-searchSortOrderString = ProductSearchSession.searchGetSortOrderString(false,
request);
-
-context.productFeaturesByTypeMap = productFeaturesByTypeMap;
-context.productFeatureTypeIdsOrdered = productFeatureTypeIdsOrdered;
-context.searchOperator = searchOperator;
-context.searchConstraintStrings = searchConstraintStrings;
-context.searchSortOrderString = searchSortOrderString;
Modified:
ofbiz/branches/release13.07/applications/content/webapp/content/WEB-INF/actions/cms/Search.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/content/webapp/content/WEB-INF/actions/cms/Search.groovy?rev=1523916&r1=1523915&r2=1523916&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/content/webapp/content/WEB-INF/actions/cms/Search.groovy
(original)
+++
ofbiz/branches/release13.07/applications/content/webapp/content/WEB-INF/actions/cms/Search.groovy
Tue Sep 17 06:04:51 2013
@@ -1,132 +0,0 @@
-/*
- * 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.
- */
-
-import org.apache.lucene.analysis.standard.StandardAnalyzer
-import org.apache.lucene.document.Document
-import org.apache.lucene.index.Term
-import org.apache.lucene.queryparser.classic.QueryParser
-import org.apache.lucene.store.FSDirectory
-import org.ofbiz.base.util.Debug
-import org.ofbiz.base.util.UtilHttp
-import org.ofbiz.content.search.SearchWorker
-import org.ofbiz.product.feature.ParametricSearch
-import org.apache.lucene.search.*
-import org.apache.lucene.store.Directory
-import org.apache.lucene.index.DirectoryReader
-
-paramMap = UtilHttp.getParameterMap(request);
-queryLine = paramMap.queryLine.toString();
-Debug.logInfo("in search, queryLine:" + queryLine, "");
-
-siteId = paramMap.lcSiteId;
-Debug.logInfo("in search, siteId:" + siteId, "");
-
-searchFeature1 = (String) paramMap.SEARCH_FEAT;
-searchFeature2 = (String) paramMap.SEARCH_FEAT2;
-searchFeature3 = (String) paramMap.SEARCH_FEAT3;
-
-featureIdByType = ParametricSearch.makeFeatureIdByTypeMap(paramMap);
-Debug.logInfo("in search, featureIdByType:" + featureIdByType, "");
-
-combQuery = new BooleanQuery();
-Directory directory = FSDirectory.open(new
File(SearchWorker.getIndexPath(null)));
-DirectoryReader reader = DirectoryReader.open(directory);
-
-try {
- Debug.logInfo("in search, indexPath:" + directory.toString(), "");
- searcher = new IndexSearcher(reader);
- Debug.logInfo("in search, searcher:" + searcher, "");
- analyzer = new StandardAnalyzer(SearchWorker.LUCENE_VERSION);
-} catch (java.io.FileNotFoundException e) {
- request.setAttribute("errorMsgReq", "No index file exists.");
- Debug.logError("in search, error:" + e.getMessage(), "");
- return;
-}
-
-if (queryLine || siteId) {
- Query query = null;
- if (queryLine) {
- QueryParser parser = new QueryParser(SearchWorker.LUCENE_VERSION,
"content", analyzer);
- query = parser.parse(queryLine);
- combQuery.add(query, BooleanClause.Occur.MUST);
- }
- Debug.logInfo("in search, combQuery(0):" + combQuery, "");
-
- if (siteId) {
- termQuery = new TermQuery(new Term("site", siteId.toString()));
- combQuery.add(termQuery, BooleanClause.Occur.MUST);
- Debug.logInfo("in search, termQuery:" + termQuery.toString(), "");
- }
- Debug.logInfo("in search, combQuery(1):" + combQuery, "");
-}
-
-if (searchFeature1 || searchFeature2 || searchFeature3 ||
!featureIdByType.isEmpty()) {
- featureQuery = new BooleanQuery();
- featuresRequired = BooleanClause.Occur.MUST;
- if ("any".equals(paramMap.any_or_all)) {
- featuresRequired = BooleanClause.Occur.SHOULD;
- }
-
- if (searchFeature1) {
- termQuery = new TermQuery(new Term("feature", searchFeature1));
- featureQuery.add(termQuery, featuresRequired);
- Debug.logInfo("in search searchFeature1, termQuery:" +
termQuery.toString(), "");
- }
-
- if (searchFeature2) {
- termQuery = new TermQuery(new Term("feature", searchFeature2));
- featureQuery.add(termQuery, featuresRequired);
- Debug.logInfo("in search searchFeature2, termQuery:" +
termQuery.toString(), "");
- }
-
- if (searchFeature3) {
- termQuery = new TermQuery(new Term("feature", searchFeature3));
- featureQuery.add(termQuery, featuresRequired);
- Debug.logInfo("in search searchFeature3, termQuery:" +
termQuery.toString(), "");
- }
-
- if (featureIdByType) {
- featureIdByType.each { key, value ->
- termQuery = new TermQuery(new Term("feature", value));
- featureQuery.add(termQuery, featuresRequired);
- Debug.logInfo("in search searchFeature3, termQuery:" +
termQuery.toString(), "");
- }
- combQuery.add(featureQuery, featuresRequired);
- }
-}
-if (searcher) {
- Debug.logInfo("in search searchFeature3, combQuery:" +
combQuery.toString(), "");
- TopScoreDocCollector collector = TopScoreDocCollector.create(100, false);
//defaulting to 100 results
- searcher.search(combQuery, collector);
- ScoreDoc[] hits = collector.topDocs().scoreDocs;
- Debug.logInfo("in search, hits:" + collector.getTotalHits(), "");
-
- contentList = [] as ArrayList;
- hitSet = [:] as HashSet;
- for (int start = 0; start < collector.getTotalHits(); start++) {
- Document doc = searcher.doc(hits[start].doc)
- contentId = doc.get("contentId");
- content = delegator.findOne("Content", [contentId : contentId], true);
- if (!hitSet.contains(contentId)) {
- contentList.add(content);
- hitSet.add(contentId);
- }
- }
- context.queryResults = contentList;
-}
Modified:
ofbiz/branches/release13.07/applications/content/webapp/content/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/content/webapp/content/WEB-INF/controller.xml?rev=1523916&r1=1523915&r2=1523916&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/content/webapp/content/WEB-INF/controller.xml
(original)
+++
ofbiz/branches/release13.07/applications/content/webapp/content/WEB-INF/controller.xml
Tue Sep 17 06:04:51 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/branches/release13.07/applications/content/webapp/content/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/content/webapp/content/WEB-INF/web.xml?rev=1523916&r1=1523915&r2=1523916&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/content/webapp/content/WEB-INF/web.xml
(original)
+++
ofbiz/branches/release13.07/applications/content/webapp/content/WEB-INF/web.xml
Tue Sep 17 06:04:51 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/branches/release13.07/applications/content/webapp/content/cms/AdminSearch.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/content/webapp/content/cms/AdminSearch.ftl?rev=1523916&r1=1523915&r2=1523916&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/content/webapp/content/cms/AdminSearch.ftl
(original)
+++
ofbiz/branches/release13.07/applications/content/webapp/content/cms/AdminSearch.ftl
Tue Sep 17 06:04:51 2013
@@ -1,144 +0,0 @@
-<#--
-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.
--->
-<hr />
- <form method="post" action="/content/control/AdminSearch"
name="searchQuery" style="margin: 0;">
-<table border="0" cellpadding="2" cellspacing="0">
-
-<tr>
-<td width="20%" align="right">
-<span class="tableheadtext">${uiLabelMap.ContentQueryLine}</span>
-</td>
-<td> </td>
-<td width="80%">
-<input type="text" class="inputBox" name="queryLine" size="60"/>
-</td>
-</tr>
-
-<tr>
-<td width="20%" align="right">
-<span class="tableheadtext">${uiLabelMap.CommonSelect}
${uiLabelMap.ContentCategory}</span>
-</td>
-<td> </td>
-<td width="80%">
-<select name="lcSiteId">
- <option value=""></option>
- <@listSiteIds contentId="WebStoreCONTENT" indentIndex=0/>
-</select>
-</td>
-</tr>
-
-
-<!-- category form -->
-<tr>
-<td>
- <table border="0" width="100%">
- <tr>
- <td align="right" valign="middle">
- <div>${uiLabelMap.ProductFeatures}:</div>
- </td>
- <td align="right" valign="middle">
- <div>
- ${uiLabelMap.CommonAll} <input type="radio" name="any_or_all"
value="all" checked="checked"/>
- ${uiLabelMap.CommonAny} <input type="radio" name="any_or_all"
value="any"/>
- </div>
- </td>
- </tr>
-<#--
- <tr>
- <td align="right" valign="middle">
- <div>Feature IDs:</div>
- </td>
- <td valign="middle">
- <div>
- <input type="text" class="inputBox" name="SEARCH_FEAT" size="15"
value="${requestParameters.SEARCH_FEAT?if_exists}"/>
- <input type="text" class="inputBox" name="SEARCH_FEAT2" size="15"
value="${requestParameters.SEARCH_FEAT?if_exists}"/>
- <input type="text" class="inputBox" name="SEARCH_FEAT3" size="15"
value="${requestParameters.SEARCH_FEAT?if_exists}"/>
- </div>
- </td>
- </tr>
--->
- <#list productFeatureTypeIdsOrdered as productFeatureTypeId>
- <#assign findPftMap =
Static["org.ofbiz.base.util.UtilMisc"].toMap("productFeatureTypeId",
productFeatureTypeId)>
- <#assign productFeatureType = delegator.findOne("ProductFeatureType",
findPftMap, true)>
- <#assign productFeatures =
productFeaturesByTypeMap[productFeatureTypeId]>
- <tr>
- <td align="right" valign="middle">
- <div>${(productFeatureType.description)?if_exists}:</div>
- </td>
- <td valign="middle">
- <div>
- <select name="pft_${productFeatureTypeId}">
- <option value="">- ${uiLabelMap.CommonAny} -</option>
- <#list productFeatures as productFeature>
- <option
value="${productFeature.productFeatureId}">${productFeature.description?default("No
Description")} [${productFeature.productFeatureId}]</option>
- </#list>
- </select>
- </div>
- </td>
- </tr>
- </#list>
- <#if searchConstraintStrings?has_content>
- <tr>
- <td align="right" valign="top">
- <div>${uiLabelMap.CommonLast} ${uiLabelMap.CommonSearch}:</div>
- </td>
- <td valign="top">
- <#list searchConstraintStrings as searchConstraintString>
- <div> - ${searchConstraintString}</div>
- </#list>
- <div>${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div>
- <div>
- ${uiLabelMap.CommonNew} ${uiLabelMap.CommonSearch} <input
type="radio" name="clearSearch" value="Y" checked="checked"/>
- ${uiLabelMap.CommonRefineSearch} <input type="radio"
name="clearSearch" value="N"/>
- </div>
- </td>
- </tr>
- </#if>
- </table>
- </td>
-</tr>
-<tr>
-<td width="20%" align="right">
- </td>
-<td> </td>
-<td width="80%" colspan="4">
-<input type="submit" class="smallSubmit" name="submitButton"
value="${uiLabelMap.CommonFind}"/>
-</td>
-
-</tr>
-</table>
-</form>
-
-
-<hr />
-
-<#macro listSiteIds contentId indentIndex=0>
- <#assign dummy=Static["org.ofbiz.base.util.Debug"].logInfo("in listSiteIds,
contentId:" + contentId,"")/>
- <#assign dummy=Static["org.ofbiz.base.util.Debug"].logInfo("in listSiteIds,
indentIndex:" + indentIndex,"")/>
- <#local indent = ""/>
- <#if 0 < indentIndex >
- <#list 0..(indentIndex - 1) as idx>
- <#local indent = indent + " "/>
- </#list>
- </#if>
-<@loopSubContent contentId=contentId viewIndex=0 viewSize=9999
contentAssocTypeId="SUBSITE" returnAfterPickWhen="1==1";>
- <option
value="${content.contentId?lower_case}">${indent}${content.description}</option>
- <@listSiteIds contentId=content.contentId indentIndex=indentIndex + 1 />
-</@loopSubContent>
-</#macro>
Modified:
ofbiz/branches/release13.07/applications/content/widget/cms/CMSForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/content/widget/cms/CMSForms.xml?rev=1523916&r1=1523915&r2=1523916&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/content/widget/cms/CMSForms.xml
(original)
+++ ofbiz/branches/release13.07/applications/content/widget/cms/CMSForms.xml
Tue Sep 17 06:04:51 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/branches/release13.07/applications/content/widget/cms/CMSMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/content/widget/cms/CMSMenus.xml?rev=1523916&r1=1523915&r2=1523916&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/content/widget/cms/CMSMenus.xml
(original)
+++ ofbiz/branches/release13.07/applications/content/widget/cms/CMSMenus.xml
Tue Sep 17 06:04:51 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/branches/release13.07/applications/content/widget/cms/CMSScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/content/widget/cms/CMSScreens.xml?rev=1523916&r1=1523915&r2=1523916&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/content/widget/cms/CMSScreens.xml
(original)
+++ ofbiz/branches/release13.07/applications/content/widget/cms/CMSScreens.xml
Tue Sep 17 06:04:51 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/branches/release13.07/applications/product/config/prodsearch.properties
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/config/prodsearch.properties?rev=1523916&r1=1523915&r2=1523916&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/product/config/prodsearch.properties
(original)
+++
ofbiz/branches/release13.07/applications/product/config/prodsearch.properties
Tue Sep 17 06:04:51 2013
@@ -20,7 +20,7 @@
# OFBiz Product Search Settings
####
-# Assign a weight to each product keyword source during indexing/keywork
inuduction
+# Assign a weight to each product keyword source during indexing/keyword
induction
index.weight.Product.productId=1
index.weight.Product.productName=1
index.weight.Product.internalName=1
Modified: ofbiz/branches/release13.07/build.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/build.xml?rev=1523916&r1=1523915&r2=1523916&view=diff
==============================================================================
--- ofbiz/branches/release13.07/build.xml (original)
+++ ofbiz/branches/release13.07/build.xml Tue Sep 17 06:04:51 2013
@@ -75,7 +75,7 @@ under the License.
<antcall target="clean-catalina"/>
<antcall target="clean-cache"/>
<antcall target="clean-tempfiles"/>
- <antcall target="clean-lucene-index"/>
+ <antcall target="clean-search-indexes"/>
<!-- FIXME: clean-downloads introduces some issues: with cobertura (on
Windows can't be deleted, not sure why),
but especially with postgresql drivers -->
<!-- antcall target="clean-downloads"/ -->
@@ -141,11 +141,11 @@ under the License.
</subant>
</target>
- <target name="clean-lucene-index"
- description="Remove lucene indexes created in
applications/content/index">
- <subant target="clean-lucene-index">
- <filelist dir="." files="applications/content/build.xml"/>
- </subant>
+ <target name="clean-search-indexes"
+ description="Remove search indexes (e.g. Lucene indexes) created
under runtime/indexes">
+ <delete includeemptydirs="true">
+ <fileset dir="./runtime/indexes" includes="**/*"
erroronmissingdir="false" />
+ </delete>
</target>
<target name="tests" depends="ofbiz-init">
Modified:
ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/engine/GroovyBaseScript.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/engine/GroovyBaseScript.groovy?rev=1523916&r1=1523915&r2=1523916&view=diff
==============================================================================
---
ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/engine/GroovyBaseScript.groovy
(original)
+++
ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/engine/GroovyBaseScript.groovy
Tue Sep 17 06:04:51 2013
@@ -57,6 +57,9 @@ abstract class GroovyBaseScript extends
// TODO: implement some clever i18n mechanism based on the userLogin
and locale in the binding
if (this.binding.getVariable('request')) {
// the script is invoked as an "event"
+ if (message) {
+
this.binding.getVariable('request').setAttribute("_EVENT_MESSAGE_", message)
+ }
return 'success';
} else {
// the script is invoked as a "service"
Propchange: ofbiz/branches/release13.07/runtime/indexes/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Sep 17 06:04:51 2013
@@ -0,0 +1 @@
+*
