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/11 20:55:43 UTC
svn commit: r1557452 - in
/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./
applications/marketing/config/
applications/order/webapp/ordermgr/WEB-INF/actions/entry/
applications/party/data/ applications/party/script/org/ofbiz/party/party/
a...
Author: jleroux
Date: Sat Jan 11 19:55:42 2014
New Revision: 1557452
URL: http://svn.apache.org/r1557452
Log:
Merges trunk HEAD
Added:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/icu4j-52_1.jar
- copied unchanged from r1557451, ofbiz/trunk/framework/base/lib/icu4j-52_1.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/mail-1.5.1.jar
- copied unchanged from r1557451, ofbiz/trunk/framework/base/lib/mail-1.5.1.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/xpp3-1.1.4c.jar
- copied unchanged from r1557451, ofbiz/trunk/framework/base/lib/xpp3-1.1.4c.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/xstream-1.4.6.jar
- copied unchanged from r1557451, ofbiz/trunk/framework/base/lib/xstream-1.4.6.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/test/UtilXmlTests.java
- copied unchanged from r1557451, ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/UtilXmlTests.java
Removed:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/icu4j-49_1.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/mail-1.4.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/xpp3_min-1.1.4c.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/xstream-1.3.1.jar
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed)
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/config/MarketingUiLabels.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/data/PartyGeoPointData.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/WEB-INF/actions/party/GetGeoLocation.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/editGeoLocation.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/entitydef/entitymodel.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilXml.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/testdef/basetests.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/ofbiz-component.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/entitydef/entitymodel.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/script/org/ofbiz/common/CommonServices.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/geolocation.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/miscAjaxFunctions.js
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/dtd/simple-methods-v2.xsd
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-form.xsd
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-screen.xsd
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlMenuMacroLibrary.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ivy.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/ExampleScreens.xml
Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1554827-1557451
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath Sat Jan 11 19:55:42 2014
@@ -57,8 +57,8 @@
<classpathentry kind="lib" path="framework/base/lib/xmlrpc-client-3.1.2.jar"/>
<classpathentry kind="lib" path="framework/base/lib/xmlrpc-common-3.1.2.jar"/>
<classpathentry kind="lib" path="framework/base/lib/xmlrpc-server-3.1.2.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/xstream-1.3.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/xpp3_min-1.1.4c.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/xstream-1.4.6.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/xpp3-1.1.4c.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-beanutils-core-1.8.3.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-cli-1.2.jar"/>
<classpathentry kind="lib" path="framework/base/lib/commons/commons-codec-1.6.jar"/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE Sat Jan 11 19:55:42 2014
@@ -446,8 +446,8 @@ framework/base/lib/httpunit-1.7.jar
framework/base/lib/ical4j-1.0-rc2.jar
lib/build/javacc/javacc.jar (5.0)
framework/base/lib/javolution-5.4.3.jar
-framework/base/lib/xpp3_min-1.1.4c.jar
-framework/base/lib/xstream-1.3.1.jar
+framework/base/lib/xpp3-1.1.4c.jar
+framework/base/lib/xstream-1.4.6.jar
framework/base/lib/owasp-esapi-full-java-1.4.jar
framework/base/lib/scripting/antlr-2.7.6.jar
framework/base/lib/scripting/asm-3.2.jar
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/config/MarketingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/config/MarketingUiLabels.xml?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/config/MarketingUiLabels.xml Sat Jan 11 19:55:42 2014
@@ -1465,7 +1465,7 @@
<value xml:lang="zh_TW">å¦æçºç©ºï¼ä¸éå®å</value>
</property>
<property key="MarketingTrackingCodeOrder">
- <value xml:lang="en">Tracking Code Aufträge</value>
+ <value xml:lang="de">Tracking Code Aufträge</value>
<value xml:lang="en">Tracking Code Orders</value>
<value xml:lang="es">Ãrdenes de seguimiento</value>
<value xml:lang="fr">Codes de suivi des commandes</value>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy Sat Jan 11 19:55:42 2014
@@ -57,9 +57,11 @@ partyId = null;
partyId = parameters.partyId;
if (partyId) {
party = delegator.findOne("Person", [partyId : partyId], false);
- contactMech = EntityUtil.getFirst(ContactHelper.getContactMech(party, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false));
- if (contactMech) {
- ShoppingCart shoppingCart = ShoppingCartEvents.getCartObject(request);
- shoppingCart.setAllShippingContactMechId(contactMech.contactMechId);
+ if (party) {
+ contactMech = EntityUtil.getFirst(ContactHelper.getContactMech(party, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false));
+ if (contactMech) {
+ ShoppingCart shoppingCart = ShoppingCartEvents.getCartObject(request);
+ shoppingCart.setAllShippingContactMechId(contactMech.contactMechId);
+ }
}
}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/data/PartyGeoPointData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/data/PartyGeoPointData.xml?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/data/PartyGeoPointData.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/data/PartyGeoPointData.xml Sat Jan 11 19:55:42 2014
@@ -20,12 +20,13 @@ under the License.
<entity-engine-xml>
<!-- GeoPoint for DemoCustomer and other demonstrations (in Orem, Utah, USA) -->
+ <!-- For demonstration purpose, it's also used with other entities: fixed asset, facility location, postal address and other parties (notably company) -->
<GeoPoint
geoPointId="9000"
dataSourceId="GEOPT_GOOGLE"
latitude="40.297264"
longitude="-111.696625"
- elevation="4756"
+ elevation="4770"
elevationUomId="LEN_ft"
information="A testing GeoPoint for contactMechId=9015 (DemoCustomer)"
/>
@@ -35,17 +36,17 @@ under the License.
dataSourceId="GEOPT_GOOGLE"
latitude="52.350"
longitude="4.917"
- elevation="-4"
+ elevation="10"
elevationUomId="LEN_m"
information="A testing GeoPoint for contactMechId=EUROCUSTOMER (EuroCustomer)"
/>
- <!-- GeoPoint for FrenchCustomer (at Chemin de la Mouline, Poussan, France) -->
+ <!-- GeoPoint for FrenchCustomer (at 400E Chemin de la Mouline, Poussan, France) -->
<GeoPoint
geoPointId="9002"
dataSourceId="GEOPT_GOOGLE"
- latitude="43.491661995004264"
- longitude="3.6840248107910156"
- elevation="40"
+ latitude="43.492"
+ longitude="3.684"
+ elevation="30"
elevationUomId="LEN_m"
information="A testing GeoPoint for contactMechId=FRENCHCUSTOMER (FrenchCustomer)"
/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml Sat Jan 11 19:55:42 2014
@@ -128,8 +128,8 @@ under the License.
<simple-method method-name="editGeoLocation" short-description="Edit GeoLocation">
<if-empty field="parameters.geoPointId">
<set field="createGeoPointMap.dataSourceId" value="GEOPT_GOOGLE"/>
- <set field="createGeoPointMap.latitude" from-field="parameters.lat" type="Double" locale="en"/>
- <set field="createGeoPointMap.longitude" from-field="parameters.lng" type="Double" locale="en"/>
+ <set field="createGeoPointMap.latitude" from-field="parameters.lat"/>
+ <set field="createGeoPointMap.longitude" from-field="parameters.lng"/>
<call-service service-name="createGeoPoint" in-map-name="createGeoPointMap">
<result-to-field result-name="geoPointId" field="geoPointId"/>
</call-service>
@@ -143,8 +143,8 @@ under the License.
<else>
<set field="updateGeoPointMap.geoPointId" from-field="parameters.geoPointId"/>
<set field="updateGeoPointMap.dataSourceId" value="GEOPT_GOOGLE"/>
- <set field="updateGeoPointMap.latitude" from-field="parameters.lat" type="Double" locale="en"/>
- <set field="updateGeoPointMap.longitude" from-field="parameters.lng" type="Double" locale="en"/>
+ <set field="updateGeoPointMap.latitude" from-field="parameters.lat"/>
+ <set field="updateGeoPointMap.longitude" from-field="parameters.lng"/>
<call-service service-name="updateGeoPoint" in-map-name="updateGeoPointMap"/>
</else>
</if-empty>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/WEB-INF/actions/party/GetGeoLocation.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/WEB-INF/actions/party/GetGeoLocation.groovy?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/WEB-INF/actions/party/GetGeoLocation.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/WEB-INF/actions/party/GetGeoLocation.groovy Sat Jan 11 19:55:42 2014
@@ -23,18 +23,14 @@ import org.ofbiz.base.util.*;
import org.ofbiz.base.util.string.*;
import org.ofbiz.party.contact.ContactHelper;
import org.ofbiz.common.geo.*;
-import java.text.NumberFormat;
if (partyId) {
context.partyId = partyId;
latestGeoPoint = GeoWorker.findLatestGeoPoint(delegator, "PartyAndGeoPoint", "partyId", partyId, null, null);
if (latestGeoPoint) {
context.geoPointId = latestGeoPoint.geoPointId;
- NumberFormat nf = NumberFormat.getInstance(Locale.ENGLISH);
- nf.setMinimumFractionDigits(5);
- nf.setMaximumFractionDigits(10);
- context.latitude = nf.format(latestGeoPoint.latitude);
- context.longitude = nf.format(latestGeoPoint.longitude);
+ context.latitude = latestGeoPoint.latitude;
+ context.longitude = latestGeoPoint.longitude;
} else {
context.latitude = 0;
context.longitude = 0;
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/editGeoLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/editGeoLocation.ftl?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/editGeoLocation.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/editGeoLocation.ftl Sat Jan 11 19:55:42 2014
@@ -121,7 +121,7 @@ under the License.
<div align="center" id="map" style="border:1px solid #979797; background-color:#e5e3df; width:500px; height:450px; margin:2em auto;"><br/></div>
<form action="#" onsubmit="showAddress(this.address.value); return false">
<input type="text" size="50" name="address"/>
- <input type="submit" value="${uiLabelMap.CommonSearch}"/>
+ <input type="submit" value="Search"/>
</form>
<br/><br/>
<form id="updateMapForm" method="post" action="<@o...@ofbizUrl>">
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/entitydef/entitymodel.xml?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/entitydef/entitymodel.xml Sat Jan 11 19:55:42 2014
@@ -1232,6 +1232,7 @@ under the License.
<field name="sectionId" type="id"></field>
<field name="levelId" type="id"></field>
<field name="positionId" type="id"></field>
+ <field name="geoPointId" type="id"></field>
<prim-key field="facilityId"/>
<prim-key field="locationSeqId"/>
<relation type="one" fk-name="FACILITY_LOC_FAC" rel-entity-name="Facility">
@@ -1240,6 +1241,9 @@ under the License.
<relation type="one" fk-name="FACILITY_LOC_TENM" title="Type" rel-entity-name="Enumeration">
<key-map field-name="locationTypeEnumId" rel-field-name="enumId"/>
</relation>
+ <relation type="one" fk-name="FACILITY_LOC_GEOPT" rel-entity-name="GeoPoint">
+ <key-map field-name="geoPointId"/>
+ </relation>
</entity>
<entity entity-name="FacilityLocationGeoPoint" package-name="org.ofbiz.product.facility" title="Facility Location Geo Location with history">
<field name="facilityId" type="id-ne"></field>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml Sat Jan 11 19:55:42 2014
@@ -60,14 +60,6 @@ under the License.
<copy file="runtime/data/derby.properties" todir="runtime/data/derby"/>
</target>
- <target name="ivy-init">
- <taskdef resource="org/apache/ivy/ant/antlib.xml"
- uri="antlib:org.apache.ivy.ant">
- <classpath>
- <pathelement location="framework/base/lib/ivy-2.2.0.jar" />
- </classpath>
- </taskdef>
- </target>
<target name="sonar-init">
<taskdef uri="antlib:org.sonar.ant:sonar" resource="org/sonar/ant/antlib.xml">
<classpath>
@@ -88,6 +80,7 @@ under the License.
<target name="clean-all"
description="Clean all DB, Catalina and caches data, logs, and runtime subdirectories and all specific files like .rej, .orig">
+ <antcall target="clean-ivy"/>
<antcall target="clean-data"/>
<antcall target="clean-logs"/>
<antcall target="clean-output"/>
@@ -96,19 +89,20 @@ under the License.
<antcall target="clean-cache"/>
<antcall target="clean-tempfiles"/>
<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"/ -->
+ <antcall target="clean-downloads"/>
<antcall target="clean"/>
</target>
<target name="clean-downloads"
description="Clean all downloaded files">
- <delete>
+ <delete verbose="true" deleteonexit="true">
<fileset dir="framework/base/lib" includes="cobertura-*.jar"/>
<fileset dir="framework/base/lib" includes="sonar-*.jar"/>
+ <fileset dir="framework/base/lib" includes="activemq-*.jar"/>
<fileset dir="framework/entity/lib/jdbc" includes="postgresql-*.jar"/>
+ <fileset dir="framework/entity/lib/jdbc" includes="mysql-*.jar"/>
</delete>
+ <antcall target="clean-ivy"/>
</target>
<target name="clean-data"
description="Clean all DB data (Derby) under runtime/data">
@@ -176,6 +170,7 @@ under the License.
</target>
<target name="clean">
+ <ivy:cleancache/>
<hotdeployant target="clean"/>
<antcall target="clean-specialpurpose"/>
<antcall target="clean-applications"/>
@@ -1148,20 +1143,27 @@ under the License.
<!-- ================================================================== -->
<!-- Ivy targets, more info at http://ant.apache.org/ivy/ -->
<!-- ================================================================== -->
+ <target name="clean-ivy" description="Clean Ivy local cache">
+ <ivy:cleancache/>
+ </target>
+
+ <target name="download-activemq" description="Download activemq for DCC (Distributed Cache Clearing)">
+ <ivy:retrieve pattern="framework/base/lib/[artifact]-[revision].[ext]" conf="activemq"/>
+ </target>
- <target name="download-cobertura" depends="ivy-init">
+ <target name="download-cobertura" description="Download cobertura related files">
<ivy:retrieve pattern="framework/base/lib/[artifact]-[revision].[ext]" conf="cobertura"/>
</target>
- <target name="download-PG-JDBC" depends="ivy-init" description="Download postgres jdbc driver">
+ <target name="download-PG-JDBC" description="Download postgres jdbc driver">
<ivy:retrieve pattern="framework/entity/lib/jdbc/[artifact]-[revision].[ext]" conf="postgres"/>
</target>
- <target name="download-sonar-ant-task" depends="ivy-init">
+ <target name="download-sonar-ant-task" description="Download sonar related files">
<ivy:retrieve pattern="framework/base/lib/[artifact]-[revision].[ext]" conf="sonar-ant-task"/>
</target>
- <target name="download-mySQL-JDBC" depends="ivy-init" description="Download mySQL jdbc driver">
+ <target name="download-mySQL-JDBC" description="Download mySQL jdbc driver">
<ivy:retrieve pattern="framework/entity/lib/jdbc/[artifact]-[revision].[ext]" conf="mysql"/>
</target>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilXml.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilXml.java?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilXml.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilXml.java Sat Jan 11 19:55:42 2014
@@ -73,6 +73,11 @@ import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.DefaultHandler;
import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.Converter;
+import com.thoughtworks.xstream.converters.MarshallingContext;
+import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
/**
* Utilities methods to simplify dealing with JAXP & DOM XML parsing
@@ -81,7 +86,13 @@ import com.thoughtworks.xstream.XStream;
public class UtilXml {
public static final String module = UtilXml.class.getName();
- protected static final XStream xstream = new XStream();
+ private static final XStream xstream = createXStream();
+
+ private static XStream createXStream() {
+ XStream xstream = new XStream();
+ xstream.registerConverter(new UnsupportedClassConverter());
+ return xstream;
+ }
// ----- DOM Level 3 Load and Save Methods -- //
@@ -1116,4 +1127,26 @@ public class UtilXml {
}
}
}
+
+ private static class UnsupportedClassConverter implements Converter {
+
+ @Override
+ public boolean canConvert(@SuppressWarnings("rawtypes") Class arg0) {
+ if (java.lang.ProcessBuilder.class.equals(arg0)) {
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public void marshal(Object arg0, HierarchicalStreamWriter arg1, MarshallingContext arg2) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public Object unmarshal(HierarchicalStreamReader arg0, UnmarshallingContext arg1) {
+ throw new UnsupportedOperationException();
+ }
+ }
+
}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/testdef/basetests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/testdef/basetests.xml?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/testdef/basetests.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/testdef/basetests.xml Sat Jan 11 19:55:42 2014
@@ -37,5 +37,6 @@
<!--junit-test-suite class-name="org.ofbiz.base.util.test.UtilIOTests"/-->
<junit-test-suite class-name="org.ofbiz.base.test.BaseUnitTests"/>
<junit-test-suite class-name="org.ofbiz.base.util.test.UtilPropertiesTests"/>
+ <junit-test-suite class-name="org.ofbiz.base.util.test.UtilXmlTests"/>
</test-group>
</test-suite>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/ofbiz-component.xml?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/ofbiz-component.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/ofbiz-component.xml Sat Jan 11 19:55:42 2014
@@ -120,7 +120,7 @@ under the License.
<property name="connectionLinger" value="-1"/>
<property name="connectionTimeout" value="60000"/>
<property name="disableUploadTimeout" value="false"/>
- <property name="maxHttpHeaderSize" value="4096"/>
+ <property name="maxHttpHeaderSize" value="8192"/>
<property name="maxKeepAliveRequests" value="100"/>
<property name="maxSpareThreads" value="50"/>
<property name="maxThreads" value="100"/>
@@ -158,7 +158,7 @@ under the License.
<property name="connectionLinger" value="-1"/>
<property name="connectionTimeout" value="60000"/>
<property name="disableUploadTimeout" value="false"/>
- <property name="maxHttpHeaderSize" value="4096"/>
+ <property name="maxHttpHeaderSize" value="8192"/>
<property name="maxKeepAliveRequests" value="100"/>
<property name="maxSpareThreads" value="50"/>
<property name="maxThreads" value="100"/>
@@ -277,7 +277,7 @@ under the License.
<property name="connectionLinger" value="-1"/>
<property name="connectionTimeout" value="60000"/>
<property name="disableUploadTimeout" value="false"/>
- <property name="maxHttpHeaderSize" value="4096"/>
+ <property name="maxHttpHeaderSize" value="8192"/>
<property name="maxKeepAliveRequests" value="100"/>
<property name="maxSpareThreads" value="50"/>
<property name="maxThreads" value="100"/>
@@ -315,7 +315,7 @@ under the License.
<property name="connectionLinger" value="-1"/>
<property name="connectionTimeout" value="60000"/>
<property name="disableUploadTimeout" value="false"/>
- <property name="maxHttpHeaderSize" value="4096"/>
+ <property name="maxHttpHeaderSize" value="8192"/>
<property name="maxKeepAliveRequests" value="100"/>
<property name="maxSpareThreads" value="50"/>
<property name="maxThreads" value="100"/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/entitydef/entitymodel.xml?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/entitydef/entitymodel.xml Sat Jan 11 19:55:42 2014
@@ -280,9 +280,9 @@ under the License.
title="Geographic Location">
<field name="geoPointId" type="id-ne"></field>
<field name="dataSourceId" type="id"></field>
- <field name="latitude" type="floating-point" not-null="true"></field>
- <field name="longitude" type="floating-point" not-null="true"></field>
- <field name="elevation" type="floating-point"></field>
+ <field name="latitude" type="short-varchar" not-null="true"></field>
+ <field name="longitude" type="short-varchar" not-null="true"></field>
+ <field name="elevation" type="short-varchar"></field>
<field name="elevationUomId" type="id"><description>We need an UOM for elevation (feet, meters, etc.)</description></field>
<field name="information" type="comment"><description>To enter any related information</description></field>
<prim-key field="geoPointId"/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/script/org/ofbiz/common/CommonServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/script/org/ofbiz/common/CommonServices.xml?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/script/org/ofbiz/common/CommonServices.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/script/org/ofbiz/common/CommonServices.xml Sat Jan 11 19:55:42 2014
@@ -247,7 +247,7 @@ under the License.
</simple-method>
<simple-method method-name="getCountryList" short-description="Returns a list of country" login-required="false">
- <call-class-method method-name="getCountryList" class-name="org.ofbiz.common.CommonWorkers" ret-field="geoList">
+ <call-class-method method-name="get CountryList" class-name="org.ofbiz.common.CommonWorkers" ret-field="geoList">
<field field="delegator" type="org.ofbiz.entity.Delegator"/>
</call-class-method>
<iterate list="geoList" entry="countryGeo">
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/geolocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/geolocation.ftl?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/geolocation.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/geolocation.ftl Sat Jan 11 19:55:42 2014
@@ -58,13 +58,13 @@ under the License.
var map = new google.maps.Map(document.getElementById("${id}"),
<#if geoChart.points?has_content>
- { center: new google.maps.LatLng(${center.lat?c}, ${center.lon?c}),
+ { center: new google.maps.LatLng(${center.lat}, ${center.lon}),
zoom: ${zoom},
mapTypeId: google.maps.MapTypeId.ROADMAP
});
<#list geoChart.points as point>
var marker_${point_index} = new google.maps.Marker({
- position: new google.maps.LatLng(${point.lat?c}, ${point.lon?c}),
+ position: new google.maps.LatLng(${point.lat}, ${point.lon}),
map: map
});
<#if point.link?has_content>
@@ -78,7 +78,7 @@ under the License.
</#list>
var latlngs = [
<#list geoChart.points as point>
- new google.maps.LatLng(${point.lat?c}, ${point.lon?c})<#if point_has_next>,</#if>
+ new google.maps.LatLng(${point.lat}, ${point.lon})<#if point_has_next>,</#if>
</#list>
];
showAllMarkers(map, latlngs);
@@ -117,7 +117,7 @@ under the License.
map = new OpenLayers.Map("${id}");
map.addLayer(new OpenLayers.Layer.OSM());
var zoom = ${zoom};
- var center= new OpenLayers.LonLat(${center.lon?c},${center.lat?c})
+ var center= new OpenLayers.LonLat(${center.lon},${center.lat})
.transform(new OpenLayers.Projection("EPSG:4326"), // transform from WGS 1984
map.getProjectionObject() // to Spherical Mercator Projection
);
@@ -125,7 +125,7 @@ under the License.
map.addLayer(markers);
<#if geoChart.points?has_content>
<#list geoChart.points as point>
- markers.addMarker(new OpenLayers.Marker(new OpenLayers.LonLat(${point.lon?c} ,${point.lat?c}).transform(
+ markers.addMarker(new OpenLayers.Marker(new OpenLayers.LonLat(${point.lon} ,${point.lat}).transform(
new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject())));
</#list>
</#if>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/miscAjaxFunctions.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/miscAjaxFunctions.js?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/miscAjaxFunctions.js (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/miscAjaxFunctions.js Sat Jan 11 19:55:42 2014
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-// *** getDependentDropdownValues allows to dynamically populate a dependent drop-down on change on its parent drop-down, doesn't require any fixed naming convention
+
+function getDependentDropdownValues(request, paramKey, paramField, targetField, responseName, keyName, descName, selected, callback, allowEmpty, hide, hideTitle, inputField){
+// To dynamically populate a dependent drop-down on change on its parent drop-down, doesn't require any fixed naming convention
// request = request calling the service which retrieve the info from the DB, ex: getAssociatedStateList
// paramKey = parameter value used in the called service
// paramField = parent drop-down field Id (mainId)
@@ -30,10 +32,9 @@
// hide = optional boolean argument, if true the dependent drop-down field (targetField) will be hidden when no options are available else only disabled. False by default.
// hideTitle = optional boolean argument (hide must be set to true), if true the title of the dependent drop-down field (targetField) will be hidden when no options are available else only disabled. False by default.
// inputField = optional name of an input field
-// this is to handle a specific case where an input field is needed instead of a drop-down when no values are returned by the request
-// this will be maybe extended later to use an auto-completed drop-down or a lookup, instead of straight drop-down currently, when there are too much values to populate
-// this is e.g. currently used in the Product Price Rules screen
-function getDependentDropdownValues(request, paramKey, paramField, targetField, responseName, keyName, descName, selected, callback, allowEmpty, hide, hideTitle, inputField){
+// this is to handle a specific case where an input field is needed instead of a drop-down when no values are returned by the request
+// this will be maybe extended later to use an auto-completed drop-down or a lookup, instead of straight drop-down currently, when there are too much values to populate
+// this is e.g. currently used in the Product Price Rules screen
target = '#' + targetField;
input = '#' + inputField;
targetTitle = target + '_title'
@@ -188,4 +189,4 @@ function initTimeZone() {
timezoneJS.timezone.zoneFileBasePath = '/images/date/timezones/min';
timezoneJS.timezone.loadingSchemes.PRELOAD_ALL;
timezoneJS.timezone.init();
-}
\ No newline at end of file
+}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/dtd/simple-methods-v2.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/dtd/simple-methods-v2.xsd?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/dtd/simple-methods-v2.xsd (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/dtd/simple-methods-v2.xsd Sat Jan 11 19:55:42 2014
@@ -1218,16 +1218,6 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="locale">
- <xs:annotation>
- <xs:documentation>
- A locale value (eg: en). The locale allows to pass values whose types are locale dependent (like Float, etc.).
- Defaults to the environment locale. Works only if a type which makes sense is also passed.
-
- Optional. Attribute types: constant, ${expression}.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
<xs:attribute name="set-if-null" type="booleanConst">
<xs:annotation>
<xs:documentation>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java Sat Jan 11 19:55:42 2014
@@ -183,10 +183,6 @@ public final class MethodContext {
return this.locale;
}
- public void setLocale(Locale locale) {
- this.locale = locale;
- }
-
public int getMethodType() {
return this.methodType;
}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java Sat Jan 11 19:55:42 2014
@@ -20,7 +20,6 @@ package org.ofbiz.minilang.method.envops
import java.util.HashMap;
import java.util.LinkedList;
-import java.util.Locale;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.ObjectType;
@@ -77,7 +76,6 @@ public final class SetOperation extends
private final FlexibleStringExpander defaultFse;
private final FlexibleStringExpander formatFse;
- private final FlexibleStringExpander localeFse;
private final FlexibleMapAccessor<Object> fieldFma;
private final FlexibleMapAccessor<Object> fromFma;
private final Scriptlet scriptlet;
@@ -92,7 +90,7 @@ public final class SetOperation extends
if (MiniLangValidate.validationOn()) {
MiniLangValidate.deprecatedAttribute(simpleMethod, element, "from-field", "replace with \"from\"");
MiniLangValidate.deprecatedAttribute(simpleMethod, element, "default-value", "replace with \"default\"");
- MiniLangValidate.attributeNames(simpleMethod, element, "field", "from-field", "from", "value", "default-value", "default", "format", "type", "set-if-null", "set-if-empty", "locale");
+ MiniLangValidate.attributeNames(simpleMethod, element, "field", "from-field", "from", "value", "default-value", "default", "format", "type", "set-if-null", "set-if-empty");
MiniLangValidate.requiredAttributes(simpleMethod, element, "field");
MiniLangValidate.requireAnyAttribute(simpleMethod, element, "from-field", "from", "value");
MiniLangValidate.constantPlusExpressionAttributes(simpleMethod, element, "value");
@@ -116,7 +114,6 @@ public final class SetOperation extends
this.valueFse = FlexibleStringExpander.getInstance(element.getAttribute("value"));
this.defaultFse = FlexibleStringExpander.getInstance(element.getAttribute("default"));
this.formatFse = FlexibleStringExpander.getInstance(element.getAttribute("format"));
- this.localeFse = FlexibleStringExpander.getInstance(element.getAttribute("locale"));
this.type = element.getAttribute("type");
Class<?> targetClass = null;
if (!this.type.isEmpty() && !"NewList".equals(this.type) && !"NewMap".equals(this.type)) {
@@ -144,15 +141,7 @@ public final class SetOperation extends
Debug.logWarning(exc, "Error evaluating scriptlet [" + this.scriptlet + "]: " + exc, module);
}
} else if (!this.fromFma.isEmpty()) {
- Locale localeTemp = null; // FIXME this is a temporary hack waiting for a better geolocation data model, related with OFBIZ-5453
- if (!this.localeFse.isEmpty() && this.type.length() > 0) {
- localeTemp = methodContext.getLocale();
- methodContext.setLocale(new Locale(this.localeFse.expandString(methodContext.getEnvMap())));
- newValue = this.fromFma.get(methodContext.getEnvMap());
- methodContext.setLocale(localeTemp);
- } else {
- newValue = this.fromFma.get(methodContext.getEnvMap());
- }
+ newValue = this.fromFma.get(methodContext.getEnvMap());
if (Debug.verboseOn())
Debug.logVerbose("In screen getting value for field from [" + this.fromFma.toString() + "]: " + newValue, module);
} else if (!this.valueFse.isEmpty()) {
@@ -187,12 +176,7 @@ public final class SetOperation extends
if (targetClass == null) {
targetClass = MiniLangUtil.getObjectClassForConversion(newValue);
}
- if (!this.localeFse.isEmpty() && this.type.length() > 0) {// FIXME this is a temporary hack waiting for a better geolocation data model, related with OFBIZ-5453
- Locale localeTemp = new Locale(this.localeFse.expandString(methodContext.getEnvMap()));
- newValue = MiniLangUtil.convertType(newValue, targetClass, localeTemp, methodContext.getTimeZone(), format);
- } else {
- newValue = MiniLangUtil.convertType(newValue, targetClass, methodContext.getLocale(), methodContext.getTimeZone(), format);
- }
+ newValue = MiniLangUtil.convertType(newValue, targetClass, methodContext.getLocale(), methodContext.getTimeZone(), format);
} catch (Exception e) {
String errMsg = "Could not convert field value for the field: [" + this.fieldFma.toString() + "] to the [" + this.type + "] type for the value [" + newValue + "]: " + e.getMessage();
Debug.logWarning(e, errMsg, module);
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-form.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-form.xsd?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-form.xsd (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-form.xsd Sat Jan 11 19:55:42 2014
@@ -1908,16 +1908,6 @@ under the License.
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute type="xs:string" name="locale">
- <xs:annotation>
- <xs:documentation>
- A locale value (eg: en). The locale allows to pass values with types which are locale dependent (like Float, etc.).
- Defaults to the environment locale. Works only if a type which makes sense is also passed.
-
- Optional. Attribute types: constant, ${expression}.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:complexType>
</xs:element>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-screen.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-screen.xsd?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-screen.xsd (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-screen.xsd Sat Jan 11 19:55:42 2014
@@ -346,16 +346,6 @@ under the License.
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute type="xs:string" name="locale">
- <xs:annotation>
- <xs:documentation>
- A locale value (eg: en). The locale allows to pass values with types which are locale dependent (like Float, etc.).
- Defaults to the environment locale. Works only if a type which makes sense is also passed.
-
- Optional. Attribute types: constant, ${expression}.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:complexType>
</xs:element>
<xs:element name="property-map" substitutionGroup="AllActions">
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java Sat Jan 11 19:55:42 2014
@@ -33,6 +33,7 @@ import javax.servlet.http.HttpSession;
import javolution.util.FastList;
import javolution.util.FastMap;
+import org.w3c.dom.Element;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
import org.ofbiz.base.util.ObjectType;
@@ -58,7 +59,6 @@ import org.ofbiz.minilang.method.MethodC
import org.ofbiz.service.DispatchContext;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.ModelService;
-import org.w3c.dom.Element;
@SuppressWarnings("serial")
public abstract class ModelWidgetAction implements Serializable {
@@ -121,7 +121,6 @@ public abstract class ModelWidgetAction
protected FlexibleStringExpander valueExdr;
protected FlexibleStringExpander defaultExdr;
protected FlexibleStringExpander globalExdr;
- protected FlexibleStringExpander localeExdr;
protected String type;
protected String toScope;
protected String fromScope;
@@ -133,7 +132,6 @@ public abstract class ModelWidgetAction
this.valueExdr = FlexibleStringExpander.getInstance(setElement.getAttribute("value"));
this.defaultExdr = FlexibleStringExpander.getInstance(setElement.getAttribute("default-value"));
this.globalExdr = FlexibleStringExpander.getInstance(setElement.getAttribute("global"));
- this.localeExdr = FlexibleStringExpander.getInstance(setElement.getAttribute("locale"));
this.type = setElement.getAttribute("type");
this.toScope = setElement.getAttribute("to-scope");
this.fromScope = setElement.getAttribute("from-scope");
@@ -186,11 +184,7 @@ public abstract class ModelWidgetAction
newValue = FastList.newInstance();
} else {
try {
- Locale locale = (Locale) context.get("locale");
- if (!this.localeExdr.isEmpty()) {
- locale = new Locale(this.globalExdr.expandString(context));
- }
- newValue = ObjectType.simpleTypeConvert(newValue, this.type, null, (TimeZone) context.get("timeZone"), locale, true);
+ newValue = ObjectType.simpleTypeConvert(newValue, this.type, null, (TimeZone) context.get("timeZone"), (Locale) context.get("locale"), true);
} catch (GeneralException e) {
String errMsg = "Could not convert field value for the field: [" + this.field.getOriginalName() + "] to the [" + this.type + "] type for the value [" + newValue + "]: " + e.toString();
Debug.logError(e, errMsg, module);
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java Sat Jan 11 19:55:42 2014
@@ -116,7 +116,6 @@ public abstract class ModelFormAction {
protected FlexibleStringExpander valueExdr;
protected FlexibleStringExpander defaultExdr;
protected FlexibleStringExpander globalExdr;
- protected FlexibleStringExpander localeExdr;
protected String type;
public SetField(ModelForm modelForm, Element setElement) {
@@ -126,7 +125,6 @@ public abstract class ModelFormAction {
this.valueExdr = FlexibleStringExpander.getInstance(setElement.getAttribute("value"));
this.defaultExdr = FlexibleStringExpander.getInstance(setElement.getAttribute("default-value"));
this.globalExdr = FlexibleStringExpander.getInstance(setElement.getAttribute("global"));
- this.localeExdr = FlexibleStringExpander.getInstance(setElement.getAttribute("locale"));
this.type = setElement.getAttribute("type");
if (!this.fromField.isEmpty() && !this.valueExdr.isEmpty()) {
throw new IllegalArgumentException("Cannot specify a from-field [" + setElement.getAttribute("from-field") + "] and a value [" + setElement.getAttribute("value") + "] on the set action in a screen widget");
@@ -159,11 +157,7 @@ public abstract class ModelFormAction {
newValue = FastList.newInstance();
} else {
try {
- Locale locale = (Locale) context.get("locale");
- if (!this.localeExdr.isEmpty()) {
- locale = new Locale(this.globalExdr.expandString(context));
- }
- newValue = ObjectType.simpleTypeConvert(newValue, this.type, null, (TimeZone) context.get("timeZone"), locale, true);
+ newValue = ObjectType.simpleTypeConvert(newValue, this.type, null, (TimeZone) context.get("timeZone"), (Locale) context.get("locale"), true);
} catch (GeneralException e) {
String errMsg = "Could not convert field value for the field: [" + this.field.getOriginalName() + "] to the [" + this.type + "] type for the value [" + newValue + "]: " + e.toString();
Debug.logError(e, errMsg, module);
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlMenuMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlMenuMacroLibrary.ftl?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlMenuMacroLibrary.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlMenuMacroLibrary.ftl Sat Jan 11 19:55:42 2014
@@ -54,7 +54,7 @@ under the License.
</#list>
</form><#rt/>
</#if>
-<#if linkType?has_content>
+<#if linkUrl?has_content>
<a<#if id?has_content> id="${id}"</#if><#if style?has_content> class="${style}"</#if><#if name?has_content> name="${name}"</#if><#if targetWindow?has_content> target="${targetWindow}"</#if> href="<#if "hidden-form"==linkType>javascript:document.${uniqueItemName}.submit()<#else>${linkUrl}</#if>"><#rt/>
</#if>
<#if imgStr?has_content>${imgStr}</#if><#if text?has_content>${text}</#if><#rt/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ivy.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ivy.xml?rev=1557452&r1=1557451&r2=1557452&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ivy.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ivy.xml Sat Jan 11 19:55:42 2014
@@ -25,6 +25,7 @@
<description homepage="http://ofbiz.apache.org/"/>
</info>
<configurations>
+ <conf name="activemq" description="downloads the ActiveMQ jars"/>
<conf name="cobertura" description="downloads cobertura 1.9.4.1 (GPL2.0) http://cobertura.sourceforge.net/"/>
<conf name="mysql" description="downloads the mysql JDBC driver"/>
<conf name="postgres" description="downloads the postgres JDBC driver"/>
@@ -32,6 +33,7 @@
http://docs.codehaus.org/display/SONAR/Analyzing+with+SonarQube+Ant+Task"/>
</configurations>
<dependencies>
+ <dependency org="org.apache.activemq" name="activemq-all" rev="5.4.2" conf="activemq->default"/>
<dependency org="net.sourceforge.cobertura" name="cobertura" rev="1.9.4.1" conf="cobertura->default"/>
<dependency org="mysql" name="mysql-connector-java" rev="5.1.6" conf="mysql->default"/>
<dependency org="postgresql" name="postgresql" rev="9.0-801.jdbc4" conf="postgres->default"/>
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=1557452&r1=1557451&r2=1557452&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 Sat Jan 11 19:55:42 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" 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="geoPoints[+0].lat" value="37.4419"/>
+ <set field="geoPoints[0].lon" value="-122.1419"/>
+ <set field="geoPoints[+1].lat" value="37.4819"/>
+ <set field="geoPoints[1].lon" value="-122.1519"/>
+ <set field="geoPoints[+2].lat" value="37.4719"/>
+ <set field="geoPoints[2].lon" value="-122.1319"/>
+ <set field="geoCenter.lat" value="37.4419"/>
+ <set field="geoCenter.lon" value="-122.1419"/>
<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" 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="geoPoints[+0].lat" value="37.4459"/>
+ <set field="geoPoints[0].lon" value="-122.1489"/>
+ <set field="geoPoints[+1].lat" value="37.4829"/>
+ <set field="geoPoints[1].lon" value="-122.1599"/>
+ <set field="geoPoints[+2].lat" value="37.4769"/>
+ <set field="geoPoints[2].lon" value="-122.1219"/>
+ <set field="geoCenter.lat" value="37.4419"/>
+ <set field="geoCenter.lon" value="-122.1419"/>
<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" 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="geoPoints[+0].lat" value="37.4379"/>
+ <set field="geoPoints[0].lon" value="-122.1119"/>
+ <set field="geoPoints[+1].lat" value="37.4819"/>
+ <set field="geoPoints[1].lon" value="-122.1519"/>
+ <set field="geoPoints[+2].lat" value="37.4229"/>
+ <set field="geoPoints[2].lon" value="-122.1369"/>
+ <set field="geoCenter.lat" value="37.4419"/>
+ <set field="geoCenter.lon" value="-122.1419"/>
<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" 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="geoPoints[+0].lat" value="37.4459"/>
+ <set field="geoPoints[0].lon" value="-122.1489"/>
+ <set field="geoPoints[+1].lat" value="37.4829"/>
+ <set field="geoPoints[1].lon" value="-122.1599"/>
+ <set field="geoPoints[+2].lat" value="37.4769"/>
+ <set field="geoPoints[2].lon" value="-122.1219"/>
+ <set field="geoCenter.lat" value="37.4419"/>
+ <set field="geoCenter.lon" value="-122.1419"/>
<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" 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="geoPoints[+0].lat" value="37.4379"/>
+ <set field="geoPoints[0].lon" value="-122.1119"/>
+ <set field="geoPoints[+1].lat" value="37.4819"/>
+ <set field="geoPoints[1].lon" value="-122.1519"/>
+ <set field="geoPoints[+2].lat" value="37.4229"/>
+ <set field="geoPoints[2].lon" value="-122.1369"/>
+ <set field="geoCenter.lat" value="37.4419"/>
+ <set field="geoCenter.lon" value="-122.1419"/>
<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" 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="geoPoints[+0].lat" value="37.4419"/>
+ <set field="geoPoints[0].lon" value="-122.1419"/>
+ <set field="geoPoints[+1].lat" value="37.4819"/>
+ <set field="geoPoints[1].lon" value="-122.1519"/>
+ <set field="geoPoints[+2].lat" value="37.4719"/>
+ <set field="geoPoints[2].lon" value="-122.1319"/>
+ <set field="geoCenter.lat" value="37.4419"/>
+ <set field="geoCenter.lon" value="-122.1419"/>
<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" 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="geoPoints[+0].lat" value="37.4459"/>
+ <set field="geoPoints[0].lon" value="-122.1489"/>
+ <set field="geoPoints[+1].lat" value="37.4829"/>
+ <set field="geoPoints[1].lon" value="-122.1599"/>
+ <set field="geoPoints[+2].lat" value="37.4769"/>
+ <set field="geoPoints[2].lon" value="-122.1219"/>
+ <set field="geoCenter.lat" value="37.4419"/>
+ <set field="geoCenter.lon" value="-122.1419"/>
<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" 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="geoPoints[+0].lat" value="37.4379"/>
+ <set field="geoPoints[0].lon" value="-122.1119"/>
+ <set field="geoPoints[+1].lat" value="37.4819"/>
+ <set field="geoPoints[1].lon" value="-122.1519"/>
+ <set field="geoPoints[+2].lat" value="37.4229"/>
+ <set field="geoPoints[2].lon" value="-122.1369"/>
+ <set field="geoCenter.lat" value="37.4419"/>
+ <set field="geoCenter.lon" value="-122.1419"/>
<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" 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="geoPoints[+0].lat" value="37.4459"/>
+ <set field="geoPoints[0].lon" value="-122.1489"/>
+ <set field="geoPoints[+1].lat" value="37.4829"/>
+ <set field="geoPoints[1].lon" value="-122.1599"/>
+ <set field="geoPoints[+2].lat" value="37.4769"/>
+ <set field="geoPoints[2].lon" value="-122.1219"/>
+ <set field="geoCenter.lat" value="37.4419"/>
+ <set field="geoCenter.lon" value="-122.1419"/>
<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" 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="geoPoints[+0].lat" value="37.4379"/>
+ <set field="geoPoints[0].lon" value="-122.1119"/>
+ <set field="geoPoints[+1].lat" value="37.4819"/>
+ <set field="geoPoints[1].lon" value="-122.1519"/>
+ <set field="geoPoints[+2].lat" value="37.4229"/>
+ <set field="geoPoints[2].lon" value="-122.1369"/>
+ <set field="geoCenter.lat" value="37.4419"/>
+ <set field="geoCenter.lon" value="-122.1419"/>
<set field="geoCenter.zoom" value="11"/>
<set field="geoChart.id" value="chart2"/>
<set field="geoChart.dataSourceId" value="GEOPT_OSM"/>