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 21:07:29 UTC
svn commit: r1557460 - in
/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./ .classpath
LICENSE applications/party/webapp/partymgr/party/editGeoLocation.ftl
framework/common/entitydef/entitymodel.xml
Author: jleroux
Date: Sat Jan 11 20:07:29 2014
New Revision: 1557460
URL: http://svn.apache.org/r1557460
Log:
Merges trunk HEAD
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/party/webapp/partymgr/party/editGeoLocation.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/entitydef/entitymodel.xml
Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1557452-1557459
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=1557460&r1=1557459&r2=1557460&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 20:07:29 2014
@@ -30,7 +30,7 @@
<classpathentry kind="lib" path="framework/base/lib/httpmime-4.2.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/httpunit-1.7.jar"/>
<classpathentry kind="lib" path="framework/base/lib/ical4j-1.0-rc2.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/icu4j-49_1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/icu4j-52_1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/ivy-2.2.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/javolution-5.4.3.jar"/>
<classpathentry kind="lib" path="framework/base/lib/jcip-annotations-1.0.jar"/>
@@ -40,7 +40,7 @@
<classpathentry kind="lib" path="framework/base/lib/juel-2.2.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/junit-dep-4.10.jar"/>
<classpathentry kind="lib" path="framework/base/lib/log4j-1.2.17.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/mail-1.4.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/mail-1.5.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/mx4j-3.0.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/mx4j-remote-3.0.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/nekohtml-1.9.16.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=1557460&r1=1557459&r2=1557460&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 20:07:29 2014
@@ -1207,7 +1207,7 @@ any resulting litigation.
=========================================================================
The following libraries distributed with Apache OFBiz are licensed under the
MIT/X License:
-framework/base/lib/icu4j-49_1.jar
+framework/base/lib/icu4j-52_1.jar
framework/base/lib/jcl-over-slf4j-1.6.4.jar
framework/base/lib/slf4j-api-1.6.4.jar
framework/base/lib/slf4j-log4j12-1.6.4.jar
@@ -1892,7 +1892,7 @@ framework/base/lib/jdbm-1.0-SNAPSHOT.jar
The following library distributed with Apache OFBiz is licensed under the
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL):
framework/base/lib/juel-2.1.1.jar (contains the javax.el package)
-framework/base/lib/mail-1.4.jar
+framework/base/lib/mail-1.5.1.jar
=========================================================================
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 1.
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=1557460&r1=1557459&r2=1557460&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 20:07:29 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="Search"/>
+ <input type="submit" value="${uiLabelMap.CommonSearch}"/>
</form>
<br/><br/>
<form id="updateMapForm" method="post" action="<@o...@ofbizUrl>">
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=1557460&r1=1557459&r2=1557460&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 20:07:29 2014
@@ -282,14 +282,14 @@ under the License.
<field name="dataSourceId" type="id"></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="elevation" type="fixed-point"></field>
+ <field name="elevationUomId" type="id"><description>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"/>
<relation type="one" fk-name="GEOPOINT_DTSRC" rel-entity-name="DataSource">
<key-map field-name="dataSourceId"/>
</relation>
- <relation type="one" fk-name="GPT_TYPE_UOM" title="Elevation" rel-entity-name="Uom">
+ <relation type="one" fk-name="GPT_ELEV_UOM" title="Elevation" rel-entity-name="Uom">
<key-map field-name="elevationUomId" rel-field-name="uomId"/>
</relation>
</entity>