You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/01/02 16:15:33 UTC
svn commit: r1554827 [2/2] - in
/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./
applications/accounting/
applications/accounting/script/org/ofbiz/accounting/test/
applications/accounting/src/org/ofbiz/accounting/test/
applications/account...
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/macros.xml?rev=1554827&r1=1554826&r2=1554827&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/macros.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/macros.xml Thu Jan 2 15:15:32 2014
@@ -57,7 +57,7 @@ under the License.
<pathelement location="${ofbiz.home.dir}/framework/base/lib/commons/commons-cli-1.0.jar"/>
<pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/antlr-2.7.6.jar"/>
<pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/asm-3.2.jar"/>
- <pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/groovy-all-2.1.9.jar"/>
+ <pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/groovy-all-2.2.1.jar"/>
</path>
<path id="rhino.class.path">
<pathelement location="${ofbiz.home.dir}/extension/rhino/lib/js-1.7.R1.jar"/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/LICENSE?rev=1554827&r1=1554826&r2=1554827&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/LICENSE (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/LICENSE Thu Jan 2 15:15:32 2014
@@ -16,9 +16,9 @@ specialpurpose/cmssite/template/docbook/
specialpurpose/cmssite/template/docbook/extensions/xalan27.jar
specialpurpose/cmssite/template/docbook/extensions/webhelpindexer.jar
specialpurpose/googlecheckout/lib/checkout-sdk-0.8.8.jar
-specialpurpose/lucene/lib/lucene-analyzers-common-4.5.1.jar
-specialpurpose/lucene/lib/lucene-core-4.5.1.jar
-specialpurpose/lucene/lib/lucene-queryparser-4.5.1.jar
+specialpurpose/lucene/lib/lucene-analyzers-common-4.6.0.jar
+specialpurpose/lucene/lib/lucene-core-4.6.0.jar
+specialpurpose/lucene/lib/lucene-queryparser-4.6.0.jar
=========================================================================
Apache License
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/ExampleScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/ExampleScreens.xml?rev=1554827&r1=1554826&r2=1554827&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/ExampleScreens.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/ExampleScreens.xml Thu Jan 2 15:15:32 2014
@@ -165,14 +165,14 @@ under the License.
<section>
<actions>
<set field="tabButtonItem" value="ExampleGeoLocationPointSet1"/>
- <set field="geoPoints[+0].lat" value="37.4419" type="Float"/>
- <set field="geoPoints[0].lon" value="-122.1419" type="Float"/>
- <set field="geoPoints[+1].lat" value="37.4819" type="Float"/>
- <set field="geoPoints[1].lon" value="-122.1519" type="Float"/>
- <set field="geoPoints[+2].lat" value="37.4719" type="Float"/>
- <set field="geoPoints[2].lon" value="-122.1319" type="Float"/>
- <set field="geoCenter.lat" value="37.4419" type="Float"/>
- <set field="geoCenter.lon" value="-122.1419" type="Float"/>
+ <set field="geoPoints[+0].lat" value="37.4419" type="Float" locale="en"/>
+ <set field="geoPoints[0].lon" value="-122.1419" type="Float" locale="en"/>
+ <set field="geoPoints[+1].lat" value="37.4819" type="Float" locale="en"/>
+ <set field="geoPoints[1].lon" value="-122.1519" type="Float" locale="en"/>
+ <set field="geoPoints[+2].lat" value="37.4719" type="Float" locale="en"/>
+ <set field="geoPoints[2].lon" value="-122.1319" type="Float" locale="en"/>
+ <set field="geoCenter.lat" value="37.4419" type="Float" locale="en"/>
+ <set field="geoCenter.lon" value="-122.1419" type="Float" locale="en"/>
<set field="geoCenter.zoom" value="13"/>
</actions>
<widgets>
@@ -184,14 +184,14 @@ under the License.
<section>
<actions>
<set field="tabButtonItem" value="ExampleGeoLocationPointSet2"/>
- <set field="geoPoints[+0].lat" value="37.4459" type="Float"/>
- <set field="geoPoints[0].lon" value="-122.1489" type="Float"/>
- <set field="geoPoints[+1].lat" value="37.4829" type="Float"/>
- <set field="geoPoints[1].lon" value="-122.1599" type="Float"/>
- <set field="geoPoints[+2].lat" value="37.4769" type="Float"/>
- <set field="geoPoints[2].lon" value="-122.1219" type="Float"/>
- <set field="geoCenter.lat" value="37.4419" type="Float"/>
- <set field="geoCenter.lon" value="-122.1419" type="Float"/>
+ <set field="geoPoints[+0].lat" value="37.4459" type="Float" locale="en"/>
+ <set field="geoPoints[0].lon" value="-122.1489" type="Float" locale="en"/>
+ <set field="geoPoints[+1].lat" value="37.4829" type="Float" locale="en"/>
+ <set field="geoPoints[1].lon" value="-122.1599" type="Float" locale="en"/>
+ <set field="geoPoints[+2].lat" value="37.4769" type="Float" locale="en"/>
+ <set field="geoPoints[2].lon" value="-122.1219" type="Float" locale="en"/>
+ <set field="geoCenter.lat" value="37.4419" type="Float" locale="en"/>
+ <set field="geoCenter.lon" value="-122.1419" type="Float" locale="en"/>
<set field="geoCenter.zoom" value="12"/>
</actions>
<widgets>
@@ -203,14 +203,14 @@ under the License.
<section>
<actions>
<set field="tabButtonItem" value="ExampleGeoLocationPointSet3"/>
- <set field="geoPoints[+0].lat" value="37.4379" type="Float"/>
- <set field="geoPoints[0].lon" value="-122.1119" type="Float"/>
- <set field="geoPoints[+1].lat" value="37.4819" type="Float"/>
- <set field="geoPoints[1].lon" value="-122.1519" type="Float"/>
- <set field="geoPoints[+2].lat" value="37.4229" type="Float"/>
- <set field="geoPoints[2].lon" value="-122.1369" type="Float"/>
- <set field="geoCenter.lat" value="37.4419" type="Float"/>
- <set field="geoCenter.lon" value="-122.1419" type="Float"/>
+ <set field="geoPoints[+0].lat" value="37.4379" type="Float" locale="en"/>
+ <set field="geoPoints[0].lon" value="-122.1119" type="Float" locale="en"/>
+ <set field="geoPoints[+1].lat" value="37.4819" type="Float" locale="en"/>
+ <set field="geoPoints[1].lon" value="-122.1519" type="Float" locale="en"/>
+ <set field="geoPoints[+2].lat" value="37.4229" type="Float" locale="en"/>
+ <set field="geoPoints[2].lon" value="-122.1369" type="Float" locale="en"/>
+ <set field="geoCenter.lat" value="37.4419" type="Float" locale="en"/>
+ <set field="geoCenter.lon" value="-122.1419" type="Float" locale="en"/>
<set field="geoCenter.zoom" value="11"/>
</actions>
<widgets>
@@ -239,14 +239,14 @@ under the License.
<widgets>
<section>
<actions>
- <set field="geoPoints[+0].lat" value="37.4459" type="Float"/>
- <set field="geoPoints[0].lon" value="-122.1489" type="Float"/>
- <set field="geoPoints[+1].lat" value="37.4829" type="Float"/>
- <set field="geoPoints[1].lon" value="-122.1599" type="Float"/>
- <set field="geoPoints[+2].lat" value="37.4769" type="Float"/>
- <set field="geoPoints[2].lon" value="-122.1219" type="Float"/>
- <set field="geoCenter.lat" value="37.4419" type="Float"/>
- <set field="geoCenter.lon" value="-122.1419" type="Float"/>
+ <set field="geoPoints[+0].lat" value="37.4459" type="Float" locale="en"/>
+ <set field="geoPoints[0].lon" value="-122.1489" type="Float" locale="en"/>
+ <set field="geoPoints[+1].lat" value="37.4829" type="Float" locale="en"/>
+ <set field="geoPoints[1].lon" value="-122.1599" type="Float" locale="en"/>
+ <set field="geoPoints[+2].lat" value="37.4769" type="Float" locale="en"/>
+ <set field="geoPoints[2].lon" value="-122.1219" type="Float" locale="en"/>
+ <set field="geoCenter.lat" value="37.4419" type="Float" locale="en"/>
+ <set field="geoCenter.lon" value="-122.1419" type="Float" locale="en"/>
<set field="geoCenter.zoom" value="12"/>
<set field="geoChart.id" value="chart1"/>
<set field="geoChart.dataSourceId" value="GEOPT_GOOGLE"/>
@@ -263,14 +263,14 @@ under the License.
<section>
<actions>
<set field="geoPoints" value=""/>
- <set field="geoPoints[+0].lat" value="37.4379" type="Float"/>
- <set field="geoPoints[0].lon" value="-122.1119" type="Float"/>
- <set field="geoPoints[+1].lat" value="37.4819" type="Float"/>
- <set field="geoPoints[1].lon" value="-122.1519" type="Float"/>
- <set field="geoPoints[+2].lat" value="37.4229" type="Float"/>
- <set field="geoPoints[2].lon" value="-122.1369" type="Float"/>
- <set field="geoCenter.lat" value="37.4419" type="Float"/>
- <set field="geoCenter.lon" value="-122.1419" type="Float"/>
+ <set field="geoPoints[+0].lat" value="37.4379" type="Float" locale="en"/>
+ <set field="geoPoints[0].lon" value="-122.1119" type="Float" locale="en"/>
+ <set field="geoPoints[+1].lat" value="37.4819" type="Float" locale="en"/>
+ <set field="geoPoints[1].lon" value="-122.1519" type="Float" locale="en"/>
+ <set field="geoPoints[+2].lat" value="37.4229" type="Float" locale="en"/>
+ <set field="geoPoints[2].lon" value="-122.1369" type="Float" locale="en"/>
+ <set field="geoCenter.lat" value="37.4419" type="Float" locale="en"/>
+ <set field="geoCenter.lon" value="-122.1419" type="Float" locale="en"/>
<set field="geoCenter.zoom" value="11"/>
<set field="geoChart.id" value="chart2"/>
<set field="geoChart.dataSourceId" value="GEOPT_GOOGLE"/>
@@ -353,14 +353,14 @@ under the License.
<section>
<actions>
<set field="tabButtonItem" value="ExampleOsmGeoLocationPointSet1"/>
- <set field="geoPoints[+0].lat" value="37.4419" type="Float"/>
- <set field="geoPoints[0].lon" value="-122.1419" type="Float"/>
- <set field="geoPoints[+1].lat" value="37.4819" type="Float"/>
- <set field="geoPoints[1].lon" value="-122.1519" type="Float"/>
- <set field="geoPoints[+2].lat" value="37.4719" type="Float"/>
- <set field="geoPoints[2].lon" value="-122.1319" type="Float"/>
- <set field="geoCenter.lat" value="37.4419" type="Float"/>
- <set field="geoCenter.lon" value="-122.1419" type="Float"/>
+ <set field="geoPoints[+0].lat" value="37.4419" type="Float" locale="en"/>
+ <set field="geoPoints[0].lon" value="-122.1419" type="Float" locale="en"/>
+ <set field="geoPoints[+1].lat" value="37.4819" type="Float" locale="en"/>
+ <set field="geoPoints[1].lon" value="-122.1519" type="Float" locale="en"/>
+ <set field="geoPoints[+2].lat" value="37.4719" type="Float" locale="en"/>
+ <set field="geoPoints[2].lon" value="-122.1319" type="Float" locale="en"/>
+ <set field="geoCenter.lat" value="37.4419" type="Float" locale="en"/>
+ <set field="geoCenter.lon" value="-122.1419" type="Float" locale="en"/>
<set field="geoCenter.zoom" value="13"/>
</actions>
<widgets>
@@ -372,14 +372,14 @@ under the License.
<section>
<actions>
<set field="tabButtonItem" value="ExampleOsmGeoLocationPointSet2"/>
- <set field="geoPoints[+0].lat" value="37.4459" type="Float"/>
- <set field="geoPoints[0].lon" value="-122.1489" type="Float"/>
- <set field="geoPoints[+1].lat" value="37.4829" type="Float"/>
- <set field="geoPoints[1].lon" value="-122.1599" type="Float"/>
- <set field="geoPoints[+2].lat" value="37.4769" type="Float"/>
- <set field="geoPoints[2].lon" value="-122.1219" type="Float"/>
- <set field="geoCenter.lat" value="37.4419" type="Float"/>
- <set field="geoCenter.lon" value="-122.1419" type="Float"/>
+ <set field="geoPoints[+0].lat" value="37.4459" type="Float" locale="en"/>
+ <set field="geoPoints[0].lon" value="-122.1489" type="Float" locale="en"/>
+ <set field="geoPoints[+1].lat" value="37.4829" type="Float" locale="en"/>
+ <set field="geoPoints[1].lon" value="-122.1599" type="Float" locale="en"/>
+ <set field="geoPoints[+2].lat" value="37.4769" type="Float" locale="en"/>
+ <set field="geoPoints[2].lon" value="-122.1219" type="Float" locale="en"/>
+ <set field="geoCenter.lat" value="37.4419" type="Float" locale="en"/>
+ <set field="geoCenter.lon" value="-122.1419" type="Float" locale="en"/>
<set field="geoCenter.zoom" value="12"/>
</actions>
<widgets>
@@ -391,14 +391,14 @@ under the License.
<section>
<actions>
<set field="tabButtonItem" value="ExampleOsmGeoLocationPointSet3"/>
- <set field="geoPoints[+0].lat" value="37.4379" type="Float"/>
- <set field="geoPoints[0].lon" value="-122.1119" type="Float"/>
- <set field="geoPoints[+1].lat" value="37.4819" type="Float"/>
- <set field="geoPoints[1].lon" value="-122.1519" type="Float"/>
- <set field="geoPoints[+2].lat" value="37.4229" type="Float"/>
- <set field="geoPoints[2].lon" value="-122.1369" type="Float"/>
- <set field="geoCenter.lat" value="37.4419" type="Float"/>
- <set field="geoCenter.lon" value="-122.1419" type="Float"/>
+ <set field="geoPoints[+0].lat" value="37.4379" type="Float" locale="en"/>
+ <set field="geoPoints[0].lon" value="-122.1119" type="Float" locale="en"/>
+ <set field="geoPoints[+1].lat" value="37.4819" type="Float" locale="en"/>
+ <set field="geoPoints[1].lon" value="-122.1519" type="Float" locale="en"/>
+ <set field="geoPoints[+2].lat" value="37.4229" type="Float" locale="en"/>
+ <set field="geoPoints[2].lon" value="-122.1369" type="Float" locale="en"/>
+ <set field="geoCenter.lat" value="37.4419" type="Float" locale="en"/>
+ <set field="geoCenter.lon" value="-122.1419" type="Float" locale="en"/>
<set field="geoCenter.zoom" value="11"/>
</actions>
<widgets>
@@ -427,14 +427,14 @@ under the License.
<widgets>
<section>
<actions>
- <set field="geoPoints[+0].lat" value="37.4459" type="Float"/>
- <set field="geoPoints[0].lon" value="-122.1489" type="Float"/>
- <set field="geoPoints[+1].lat" value="37.4829" type="Float"/>
- <set field="geoPoints[1].lon" value="-122.1599" type="Float"/>
- <set field="geoPoints[+2].lat" value="37.4769" type="Float"/>
- <set field="geoPoints[2].lon" value="-122.1219" type="Float"/>
- <set field="geoCenter.lat" value="37.4419" type="Float"/>
- <set field="geoCenter.lon" value="-122.1419" type="Float"/>
+ <set field="geoPoints[+0].lat" value="37.4459" type="Float" locale="en"/>
+ <set field="geoPoints[0].lon" value="-122.1489" type="Float" locale="en"/>
+ <set field="geoPoints[+1].lat" value="37.4829" type="Float" locale="en"/>
+ <set field="geoPoints[1].lon" value="-122.1599" type="Float" locale="en"/>
+ <set field="geoPoints[+2].lat" value="37.4769" type="Float" locale="en"/>
+ <set field="geoPoints[2].lon" value="-122.1219" type="Float" locale="en"/>
+ <set field="geoCenter.lat" value="37.4419" type="Float" locale="en"/>
+ <set field="geoCenter.lon" value="-122.1419" type="Float" locale="en"/>
<set field="geoCenter.zoom" value="12"/>
<set field="geoChart.id" value="chart1"/>
<set field="geoChart.dataSourceId" value="GEOPT_OSM"/>
@@ -451,14 +451,14 @@ under the License.
<section>
<actions>
<set field="geoPoints" value=""/>
- <set field="geoPoints[+0].lat" value="37.4379" type="Float"/>
- <set field="geoPoints[0].lon" value="-122.1119" type="Float"/>
- <set field="geoPoints[+1].lat" value="37.4819" type="Float"/>
- <set field="geoPoints[1].lon" value="-122.1519" type="Float"/>
- <set field="geoPoints[+2].lat" value="37.4229" type="Float"/>
- <set field="geoPoints[2].lon" value="-122.1369" type="Float"/>
- <set field="geoCenter.lat" value="37.4419" type="Float"/>
- <set field="geoCenter.lon" value="-122.1419" type="Float"/>
+ <set field="geoPoints[+0].lat" value="37.4379" type="Float" locale="en"/>
+ <set field="geoPoints[0].lon" value="-122.1119" type="Float" locale="en"/>
+ <set field="geoPoints[+1].lat" value="37.4819" type="Float" locale="en"/>
+ <set field="geoPoints[1].lon" value="-122.1519" type="Float" locale="en"/>
+ <set field="geoPoints[+2].lat" value="37.4229" type="Float" locale="en"/>
+ <set field="geoPoints[2].lon" value="-122.1369" type="Float" locale="en"/>
+ <set field="geoCenter.lat" value="37.4419" type="Float" locale="en"/>
+ <set field="geoCenter.lon" value="-122.1419" type="Float" locale="en"/>
<set field="geoCenter.zoom" value="11"/>
<set field="geoChart.id" value="chart2"/>
<set field="geoChart.dataSourceId" value="GEOPT_OSM"/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/src/org/ofbiz/content/search/SearchWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/src/org/ofbiz/content/search/SearchWorker.java?rev=1554827&r1=1554826&r2=1554827&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/src/org/ofbiz/content/search/SearchWorker.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/src/org/ofbiz/content/search/SearchWorker.java Thu Jan 2 15:15:32 2014
@@ -42,7 +42,7 @@ public class SearchWorker {
public static final String module = SearchWorker.class.getName();
- public static final Version LUCENE_VERSION = Version.LUCENE_45;
+ public static final Version LUCENE_VERSION = Version.LUCENE_46;
public static void indexContentTree(LocalDispatcher dispatcher, Delegator delegator, String siteId) throws Exception {
GenericValue content = delegator.makeValue("Content", UtilMisc.toMap("contentId", siteId));