svn commit: r1624970 [1/2] - in /ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./ applications/accounting/webapp/ar/invoice/ applications/content/lib/ applications/order/webapp/ordermgr/entry/catalog/ applications/party/webapp/partymgr/part...

Author: jleroux
Date: Mon Sep 15 08:31:29 2014
New Revision: 1624970

URL: http://svn.apache.org/r1624970
Log:
Keeps in sync with OFBiz trunk HEAD

Added:
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/lib/poi-3.10.1-20140818.jar
      - copied unchanged from r1624951, ofbiz/trunk/applications/content/lib/poi-3.10.1-20140818.jar
Removed:
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/lib/poi-3.9-20121203.jar
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/config/ClasspathLoader.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/ClassLoaderContainer.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/CachedClassLoader.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/META-INF/services/org.ofbiz.base.util.CachedClassLoader$Init
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/util/CachedClassLoaderInit.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/geronimo/lib/geronimo-connector-3.1.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/.gitignore
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ar/invoice/ListInvoices.ftl
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/editShoppingList.ftl
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/findparty.ftl
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/ofbiz-component.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/ComponentContainer.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/NamingServiceContainer.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/ObjectType.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilIO.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/bi/config/BiUiLabels.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/build.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonEntityLabels.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonErrorUiLabels.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonUiLabels.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/fo/pm-iso216.fo.ftl
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/security/config/SecurityEntityLabels.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/config/model/ServiceEngine.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/config/model/ServiceLocation.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/Config.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/Start.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/both.properties
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/install.properties
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/jetty.properties
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/pos.properties
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/rmi.properties
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/setup.properties
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/start.properties
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/test.properties
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/testlist.properties
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/runtime/   (props changed)
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/build.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/src/org/ofbiz/content/test/LuceneTests.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/bizznesstime/includes/footer.ftl
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/bluelight/includes/header.ftl
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/droppingcrumbs/includes/footer.ftl
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/droppingcrumbs/includes/header.ftl
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/includes/footer.ftl
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/includes/appbarClose.ftl
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/includes/footer.ftl

Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Sep 15 08:31:29 2014
@@ -10,3 +10,4 @@ bin
 changelog
 .idea
 dependencyCheck.groovy
+desktop.ini

Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1623292-1624951

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=1624970&r1=1624969&r2=1624970&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 Mon Sep 15 08:31:29 2014
@@ -5,7 +5,7 @@
     <classpathentry kind="lib" path="applications/content/lib/jempbox-1.7.1.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.9-20121203.jar"/>
+    <classpathentry kind="lib" path="applications/content/lib/poi-3.10.1-20140818.jar"/>
     <classpathentry kind="lib" path="applications/content/lib/tika-core-1.0.jar"/>
     <classpathentry kind="lib" path="applications/content/lib/tika-parsers-1.0.jar"/>
     <classpathentry kind="lib" path="applications/product/lib/watermarker-0.0.4.jar"/>
@@ -99,7 +99,6 @@
     <classpathentry kind="lib" path="framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli.jar"/>
     <classpathentry kind="lib" path="framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli-adapters.jar"/>
     <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp2-2.0.1.jar"/>
-    <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-3.1.1.jar"/>
     <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-3.1.1.jar"/>
     <classpathentry kind="lib" path="specialpurpose/jetty/lib/com.sun.el-2.2.0.v201108011116.jar"/>
     <classpathentry kind="lib" path="specialpurpose/jetty/lib/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar"/>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.gitignore
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.gitignore?rev=1624970&r1=1624969&r2=1624970&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.gitignore (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.gitignore Mon Sep 15 08:31:29 2014
@@ -42,3 +42,4 @@ themes/flatgrey/webapp/flatgrey/mainrtl-
 *#
 .*.swp
 .*.swo
+desktop.ini
\ No newline at end of file

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=1624970&r1=1624969&r2=1624970&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 Mon Sep 15 08:31:29 2014
@@ -96,14 +96,13 @@ framework/webapp/lib/ezmorph-0.9.1.jar
 framework/webapp/lib/rome-0.9.jar
 framework/webapp/lib/serializer-2.7.0.jar
 framework/webapp/lib/xalan-2.7.1.jar
-framework/geronimo/lib/geronimo-connector-3.1.1.jar
 framework/geronimo/lib/geronimo-transaction-3.1.1.jar
 framework/testtools/lib/org.springframework.core-3.1.0.M2.jar
 framework/testtools/lib/org.springframework.test-3.1.0.M2.jar
 applications/content/lib/fontbox-1.7.1.jar
 applications/content/lib/jempbox-1.7.1.jar
 applications/content/lib/pdfbox-1.7.1.jar
-applications/content/lib/poi-3.9-20121203.jar
+applications/content/lib/poi-3.10.1-20140818.jar
 applications/content/lib/tika-core-1.0.jar
 applications/content/lib/tika-parsers-1.0.jar
 applications/product/lib/dozer-4.2.1.jar

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ar/invoice/ListInvoices.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ar/invoice/ListInvoices.ftl?rev=1624970&r1=1624969&r2=1624970&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ar/invoice/ListInvoices.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ar/invoice/ListInvoices.ftl Mon Sep 15 08:31:29 2014
@@ -41,9 +41,9 @@ under the License.
         });
 
         if(allChecked) {
-            jQuery('#checkAllInvoices').attr('checked', true);
+            jQuery('#checkAllInvoices').prop('checked', true);
         } else {
-            jQuery('#checkAllInvoices').attr('checked', false);
+            jQuery('#checkAllInvoices').prop('checked', false);
         }
 
         // check if any checkbox is checked
@@ -64,11 +64,11 @@ under the License.
             });
 
             if(jQuery('#serviceName').val() != "") {
-                jQuery('#submitButton').removeAttr('disabled');
+                jQuery('#submitButton').prop('disabled', false);
             }
 
         } else {
-            jQuery('#submitButton').attr('disabled', true);
+            jQuery('#submitButton').prop('disabled', true);
             jQuery('#showInvoiceRunningTotal').html("");
         }
     }
@@ -104,9 +104,9 @@ under the License.
         });
 
         if(anyChecked && (jQuery('#serviceName').val() != "")) {
-            jQuery('#submitButton').removeAttr('disabled');
+            jQuery('#submitButton').prop('disabled', false);
         } else {
-            jQuery('#submitButton').attr('disabled', true);
+            jQuery('#submitButton').prop('disabled', true);
         }
     }
 //]]>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?rev=1624970&r1=1624969&r2=1624970&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl Mon Sep 15 08:31:29 2014
@@ -120,7 +120,7 @@ under the License.
         <@paginationControls/>
     <#else>
         <#include "component://common/webcommon/includes/htmlTemplate.ftl"/>
-        <#assign commonUrl = "category?category_id="+ parameters.category_id! + "&"/>
+        <#assign commonUrl = "category?category_id="+ (parameters.category_id!) + "&"/>
         <#--assign viewIndex = viewIndex - 1/-->
         <#assign viewIndexFirst = 0/>
         <#assign viewIndexPrevious = viewIndex - 1/>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/editShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/editShoppingList.ftl?rev=1624970&r1=1624969&r2=1624970&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/editShoppingList.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/editShoppingList.ftl Mon Sep 15 08:31:29 2014
@@ -178,7 +178,7 @@ under the License.
     <#if shoppingListItemDatas?has_content>
         <#-- Pagination -->
         <#include "component://common/webcommon/includes/htmlTemplate.ftl"/>
-        <#assign commonUrl = "editShoppingList?partyId=" + partyId + "&shoppingListId="+shoppingListId!+"&"/>
+        <#assign commonUrl = "editShoppingList?partyId=" + partyId + "&shoppingListId="+(shoppingListId!)+"&"/>
         <#assign viewIndexFirst = 0/>
         <#assign viewIndexPrevious = viewIndex - 1/>
         <#assign viewIndexNext = viewIndex + 1/>
@@ -261,4 +261,4 @@ under the License.
   </div>
 </div>
 </#if>
-<!-- begin editShoppingList.ftl -->
\ No newline at end of file
+<!-- begin editShoppingList.ftl -->

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/findparty.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/findparty.ftl?rev=1624970&r1=1624969&r2=1624970&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/findparty.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/findparty.ftl Mon Sep 15 08:31:29 2014
@@ -209,7 +209,7 @@ under the License.
   <#if partyList?has_content>
     <#-- Pagination -->
     <#include "component://common/webcommon/includes/htmlTemplate.ftl"/>
-    <#assign commonUrl = "findparty?hideFields=" + hideFields + paramList + "&sortField=" + sortField! + "&"/>
+    <#assign commonUrl = "findparty?hideFields=" + hideFields + paramList + "&sortField=" + (sortField!) + "&"/>
     <#assign viewIndexFirst = 0/>
     <#assign viewIndexPrevious = viewIndex - 1/>
     <#assign viewIndexNext = viewIndex + 1/>

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=1624970&r1=1624969&r2=1624970&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 Mon Sep 15 08:31:29 2014
@@ -212,16 +212,21 @@ under the License.
     <target name="svninfo"
         description="Update the Release-revision info in the footer. Note that you need a valid Internet connection and Subversion connected to the OFBiz repository for that ">
         <echo message="Creating svninfo..."/>
-        <exec executable="svn" dir="." output="runtime/svninfo_tmp.xml">
+        <exec executable="svn" dir="." output="runtime/svninfo_tmp.xml" failonerror="true" resultproperty="hasSvnRepo">
             <arg value="info"/>
             <arg value="--xml"/>
         </exec>
-        <xmlproperty file="runtime/svninfo_tmp.xml"/>
-        <echo message="Rev:${info.entry.commit(revision)}"/>
-        <basename property="releasePath" file="${info.entry.url}"/>
-        <echo message=" - Release-revision : ${releasePath}-r${info.entry.commit(revision)}" file="runtime/svninfo.ftl"/>
-        <delete file="runtime/svninfo_tmp.xml"/>
-        <echo message="Done!"/>
+        <if>
+            <isset property="hasSvnRepo"/>
+            <then>                          
+                <xmlproperty file="runtime/svninfo_tmp.xml"/>
+                <basename property="releasePath" file="${info.entry.url}"/>
+                <echo message="Found Release-revision: ${releasePath}-r${info.entry.commit(revision)}"/>
+                <echo message=" - Release-revision : ${releasePath}-r${info.entry.commit(revision)}" file="runtime/svninfo.ftl"/>
+                <delete file="runtime/svninfo_tmp.xml"/>
+                <echo message="Done!"/>
+            </then>                                  
+        </if>                      
     </target>
 
     <target name="clean-svninfo">
@@ -238,13 +243,18 @@ under the License.
             <arg value="--abbrev-ref"/>
             <arg value="HEAD"/>
         </exec>
-        <exec executable="git" outputproperty="revision">
+        <exec executable="git" outputproperty="revision" failonerror="true" resultproperty="hasGitRepo">
             <arg value="rev-parse"/>
             <arg value="HEAD"/>
         </exec>
-        <echo message="Found Branch-revision: ${branch}-${revision}"/>
-        <echo message=" - Branch-revision: ${branch}-${revision}" file="runtime/gitinfo.ftl"/>
-        <echo message="Done!"/>
+        <if>
+            <isset property="hasGitRepo"/>
+            <then>                          
+                <echo message="Found Branch-revision: ${branch}-${revision}"/>
+                <echo message=" - Branch-revision: ${branch}-${revision}" file="runtime/gitinfo.ftl"/>
+                <echo message="Done!"/>
+            </then>                                  
+        </if>                
     </target>
 
     <target name="clean-gitinfo">
@@ -252,7 +262,22 @@ under the License.
         <echo message=" " file="runtime/gitinfo.ftl"/>
         <echo message="Done!"/>
     </target>
+    
+    <target name="deployed-date-time"
+        description="Set the date and time of last deployment info in the footer.">
+        <tstamp>
+            <format property="dateTime" pattern="yyyy/MM/dd HH:mm:ss"/>
+        </tstamp>
+        <echo message="${dateTime}" file="runtime/deployedThe.ftl"/>
+        <echo message="Done!"/>
+    </target>
 
+    <target name="clean-deployed-date-time">
+        <echo message="Resetting deployed-date-time..."/>
+        <echo message=" " file="runtime/deployedThe.ftl"/>
+        <echo message="Done!"/>
+    </target>    
+    
     <!-- ================================================================== -->
     <!-- Apply patches where needed                                         -->
     <!-- ================================================================== -->

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/ofbiz-component.xml?rev=1624970&r1=1624969&r2=1624970&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/ofbiz-component.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/ofbiz-component.xml Mon Sep 15 08:31:29 2014
@@ -28,9 +28,6 @@ under the License.
 
     <test-suite loader="main" location="testdef/basetests.xml"/>
 
-    <!-- load the cached classloader container (always second) -->
-    <container name="classloader-container" loaders="main,rmi,pos,install,test" class="org.ofbiz.base.container.ClassLoaderContainer"/>
-
     <!-- load the naming (JNDI) server -->
     <container name="naming-container" loaders="rmi" class="org.ofbiz.base.container.NamingServiceContainer">
         <property name="host" value="0.0.0.0"/>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/ComponentContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/ComponentContainer.java?rev=1624970&r1=1624969&r2=1624970&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/ComponentContainer.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/ComponentContainer.java Mon Sep 15 08:31:29 2014
@@ -47,7 +47,7 @@ public class ComponentContainer implemen
     public static final String module = ComponentContainer.class.getName();
 
     //protected static List loadedComponents2 = null;
-    protected Classpath classPath = new Classpath(System.getProperty("java.class.path"));
+    protected Classpath classPath = new Classpath();
     protected Classpath libraryPath = new Classpath(System.getProperty("java.library.path"));
     protected String configFileLocation = null;
     private String name;
@@ -136,7 +136,6 @@ public class ComponentContainer implemen
                 classPath.instrument(instrumenterFile, instrumenterClassName);
             }
 
-            System.setProperty("java.class.path", classPath.toString());
             System.setProperty("java.library.path", libraryPath.toString());
             ClassLoader cl = classPath.getClassLoader();
             Thread.currentThread().setContextClassLoader(cl);
@@ -235,6 +234,7 @@ public class ComponentContainer implemen
         }
 
         Debug.logInfo("Loading component : [" + config.getComponentName() + "]", module);
+        boolean isBaseComponent = "base".equals(config.getComponentName());
         List<ComponentConfig.ClasspathInfo> classpathInfos = config.getClasspathInfos();
         String configRoot = config.getRootLocation();
         configRoot = configRoot.replace('\\', '/');
@@ -263,6 +263,7 @@ public class ComponentContainer implemen
                 if (path.exists()) {
                     if (path.isDirectory()) {
                         if ("dir".equals(cp.type)) {
+                            if (!isBaseComponent)
                             classPath.addComponent(configRoot + location);
                         }
                         // load all .jar, .zip files and native libs in this directory
@@ -270,6 +271,7 @@ public class ComponentContainer implemen
                         for (File file: path.listFiles()) {
                             String fileName = file.getName().toLowerCase();
                             if (fileName.endsWith(".jar") || fileName.endsWith(".zip")) {
+                                if (!isBaseComponent)
                                 classPath.addComponent(file);
                             } else if (fileName.endsWith(nativeLibExt)) {
                                 containsNativeLibs = true;
@@ -280,6 +282,7 @@ public class ComponentContainer implemen
                         }
                     } else {
                         // add a single file
+                        if (!isBaseComponent)
                         classPath.addComponent(configRoot + location);
                     }
                 } else {

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/NamingServiceContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/NamingServiceContainer.java?rev=1624970&r1=1624969&r2=1624970&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/NamingServiceContainer.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/NamingServiceContainer.java Mon Sep 15 08:31:29 2014
@@ -25,6 +25,7 @@ import java.rmi.registry.LocateRegistry;
 import java.rmi.registry.Registry;
 import java.rmi.server.UnicastRemoteObject;
 
+import org.ofbiz.base.start.Start;
 import org.ofbiz.base.util.RMIExtendedSocketFactory;
 
 /**
@@ -57,7 +58,7 @@ public class NamingServiceContainer impl
         ContainerConfig.Container.Property port = cfg.getProperty("port");
         if (port.value != null) {
             try {
-                this.namingPort = Integer.parseInt(port.value) + ClassLoaderContainer.portOffset;
+                this.namingPort = Integer.parseInt(port.value) + Start.getInstance().getConfig().portOffset;
             } catch (Exception e) {
                 throw new ContainerException("Invalid port defined in container [naming-container] configuration or as portOffset; not a valid int");
             }

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/ObjectType.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/ObjectType.java?rev=1624970&r1=1624969&r2=1624970&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/ObjectType.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/ObjectType.java Mon Sep 15 08:31:29 2014
@@ -22,13 +22,12 @@ import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
 
-import javolution.util.FastMap;
-
 import org.ofbiz.base.conversion.ConversionException;
 import org.ofbiz.base.conversion.Converter;
 import org.ofbiz.base.conversion.Converters;
@@ -47,11 +46,48 @@ public class ObjectType {
 
     public static final Object NULL = new NullObject();
 
-    protected static FastMap<String, Class<?>> classCache = FastMap.newInstance();
-
     public static final String LANG_PACKAGE = "java.lang."; // We will test both the raw value and this + raw value
     public static final String SQL_PACKAGE = "java.sql.";   // We will test both the raw value and this + raw value
 
+    private static final Map<String, String> classAlias = new HashMap<String, String>();
+    private static final Map<String, Class> primitives = new HashMap<String, Class>();
+
+    static {
+        classAlias.put("Object", "java.lang.Object");
+        classAlias.put("String", "java.lang.String");
+        classAlias.put("Boolean", "java.lang.Boolean");
+        classAlias.put("BigDecimal", "java.math.BigDecimal");
+        classAlias.put("Double", "java.lang.Double");
+        classAlias.put("Float", "java.lang.Float");
+        classAlias.put("Long", "java.lang.Long");
+        classAlias.put("Integer", "java.lang.Integer");
+        classAlias.put("Short", "java.lang.Short");
+        classAlias.put("Byte", "java.lang.Byte");
+        classAlias.put("Character", "java.lang.Character");
+        classAlias.put("Timestamp", "java.sql.Timestamp");
+        classAlias.put("Time", "java.sql.Time");
+        classAlias.put("Date", "java.sql.Date");
+        classAlias.put("Locale", "java.util.Locale");
+        classAlias.put("Collection", "java.util.Collection");
+        classAlias.put("List", "java.util.List");
+        classAlias.put("Set", "java.util.Set");
+        classAlias.put("Map", "java.util.Map");
+        classAlias.put("HashMap", "java.util.HashMap");
+        classAlias.put("TimeZone", "java.util.TimeZone");
+        classAlias.put("TimeDuration", "org.ofbiz.base.util.TimeDuration");
+        classAlias.put("GenericValue", "org.ofbiz.entity.GenericValue");
+        classAlias.put("GenericPK", "org.ofbiz.entity.GenericPK");
+        classAlias.put("GenericEntity", "org.ofbiz.entity.GenericEntity");
+        primitives.put("boolean", Boolean.TYPE);
+        primitives.put("short", Short.TYPE);
+        primitives.put("int", Integer.TYPE);
+        primitives.put("long", Long.TYPE);
+        primitives.put("float", Float.TYPE);
+        primitives.put("double", Double.TYPE);
+        primitives.put("byte", Byte.TYPE);
+        primitives.put("char", Character.TYPE);
+    }
+
     /**
      * Loads a class with the current thread's context classloader.
      * @param className The name of the class to load
@@ -59,25 +95,23 @@ public class ObjectType {
      * @throws ClassNotFoundException
      */
     public static Class<?> loadClass(String className) throws ClassNotFoundException {
-        int genericsStart = className.indexOf("<");
-        if (genericsStart != -1) className = className.substring(0, genericsStart);
-
-        // small block to speed things up by putting using preloaded classes for common objects, this turns out to help quite a bit...
-        Class<?> theClass = CachedClassLoader.globalClassNameClassMap.get(className);
-
-        if (theClass != null) return theClass;
-
         return loadClass(className, null);
     }
 
     /**
-     * Loads a class with the current thread's context classloader.
+     * Loads a class with the specified classloader.
      * @param className The name of the class to load
      * @param loader The ClassLoader to use
      * @return The requested class
      * @throws ClassNotFoundException
      */
     public static Class<?> loadClass(String className, ClassLoader loader) throws ClassNotFoundException {
+        Class<?> theClass = null;
+        // if it is a primitive type, return the object from the "primitives" map
+        if (primitives.containsKey(className)) {
+            return primitives.get(className);
+        }
+
         int genericsStart = className.indexOf("<");
         if (genericsStart != -1) className = className.substring(0, genericsStart);
 
@@ -98,26 +132,14 @@ public class ObjectType {
             }
         }
 
-        // small block to speed things up by putting using preloaded classes for common objects, this turns out to help quite a bit...
-        Class<?> theClass = CachedClassLoader.globalClassNameClassMap.get(className);
-
-        if (theClass != null) return theClass;
+        // if className is an alias (e.g. "String") then replace it with the proper class name (e.g. "java.lang.String")
+        if (classAlias.containsKey(className)) {
+            className = classAlias.get(className);
+        }
 
         if (loader == null) loader = Thread.currentThread().getContextClassLoader();
 
-        try {
-            theClass = Class.forName(className, true, loader);
-        } catch (Exception e) {
-            theClass = classCache.get(className);
-            if (theClass == null) {
-                theClass = Class.forName(className);
-                if (theClass != null) {
-                    if (classCache.putIfAbsent(className, theClass) == null) {
-                        if (Debug.verboseOn()) Debug.logVerbose("Loaded Class: " + theClass.getName(), module);
-                    }
-                }
-            }
-        }
+        theClass = Class.forName(className, true, loader);
 
         return theClass;
     }

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilIO.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilIO.java?rev=1624970&r1=1624969&r2=1624970&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilIO.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilIO.java Mon Sep 15 08:31:29 2014
@@ -43,7 +43,6 @@ import java.nio.charset.Charset;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
-import org.ofbiz.base.container.ClassLoaderContainer;
 import org.ofbiz.base.conversion.Converter;
 import org.ofbiz.base.conversion.Converters;
 import org.ofbiz.base.json.JSON;
@@ -378,7 +377,7 @@ public final class UtilIO {
             for (i = offset; i < length && buffer[i] != ':'; i++);
             if (i > offset && i < length) {
                 String className = new String(buffer, offset, i);
-                Class<?> type = Class.forName(className, true, ClassLoaderContainer.getClassLoader());
+                Class<?> type = Class.forName(className);
                 if (buffer[length - 1] == '\n') {
                     length--;
                 }

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java?rev=1624970&r1=1624969&r2=1624970&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java Mon Sep 15 08:31:29 2014
@@ -194,6 +194,58 @@ public class ObjectTypeTests extends Gen
         assertSame(label + ":to-java.lang.Object", toConvert, simpleTypeConvert(toConvert, "java.lang.Object", null, null, null, true));
     }
 
+    public void testLoadClassWithNonExistentClass() {
+        Exception exception = null;
+        try {
+            ObjectType.loadClass("foobarbaz");
+        } catch (Exception e) {
+            exception = e;
+        }
+        assertTrue("Exception thrown by loadClass(\"foobarbaz\") is not ClassNotFoundException", exception instanceof ClassNotFoundException);
+    }
+
+    public void testLoadClassWithPrimitives() {
+        try {
+            Class<?> theClass;
+            theClass = ObjectType.loadClass("boolean");
+            assertEquals("Wrong class returned by loadClass(\"boolean\")", (Boolean.TYPE).getName(), theClass.getName());
+            theClass = ObjectType.loadClass("short");
+            assertEquals("Wrong class returned by loadClass(\"short\")", (Short.TYPE).getName(), theClass.getName());
+            theClass = ObjectType.loadClass("int");
+            assertEquals("Wrong class returned by loadClass(\"int\")", (Integer.TYPE).getName(), theClass.getName());
+            theClass = ObjectType.loadClass("long");
+            assertEquals("Wrong class returned by loadClass(\"long\")", (Long.TYPE).getName(), theClass.getName());
+            theClass = ObjectType.loadClass("float");
+            assertEquals("Wrong class returned by loadClass(\"float\")", (Float.TYPE).getName(), theClass.getName());
+            theClass = ObjectType.loadClass("double");
+            assertEquals("Wrong class returned by loadClass(\"double\")", (Double.TYPE).getName(), theClass.getName());
+            theClass = ObjectType.loadClass("byte");
+            assertEquals("Wrong class returned by loadClass(\"byte\")", (Byte.TYPE).getName(), theClass.getName());
+            theClass = ObjectType.loadClass("char");
+            assertEquals("Wrong class returned by loadClass(\"char\")", (Character.TYPE).getName(), theClass.getName());
+        } catch (Exception e) {
+            fail("Exception thrown by loadClass: " + e.getMessage());
+        }
+    }
+
+    public void testLoadClassWithAlias() {
+        try {
+            Class<?> theClass;
+            // first try with a class full name
+            theClass = ObjectType.loadClass("java.lang.String");
+            assertEquals("Wrong class returned by loadClass(\"java.lang.String\")", "java.lang.String", theClass.getName());
+            // now try with some aliases
+            theClass = ObjectType.loadClass("String");
+            assertEquals("Wrong class returned by loadClass(\"String\")", "java.lang.String", theClass.getName());
+            theClass = ObjectType.loadClass("Object");
+            assertEquals("Wrong class returned by loadClass(\"Object\")", "java.lang.Object", theClass.getName());
+            theClass = ObjectType.loadClass("Date");
+            assertEquals("Wrong class returned by loadClass(\"Date\")", "java.sql.Date", theClass.getName());
+        } catch (Exception e) {
+            fail("Exception thrown by loadClass: " + e.getMessage());
+        }
+    }
+
     public void testClassNotFound() {
         GeneralException caught = null;
         try {

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/bi/config/BiUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/bi/config/BiUiLabels.xml?rev=1624970&r1=1624969&r2=1624970&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/bi/config/BiUiLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/bi/config/BiUiLabels.xml Mon Sep 15 08:31:29 2014
@@ -122,7 +122,7 @@
         <value xml:lang="it">I dati per dimensioni e fatti sono gestiti e mantenuti aggiornati usando servizi standard di OFBiz</value>
         <value xml:lang="ja">ディメンジョンとファクトのデータを最新に保つために、標準OFBizサービス</value>
         <value xml:lang="th">ข้อมูลสำหรับขอบเขตและข้อเท็จจริงคือการดูแลและรักษาวันที่ใช้บริการ OFBiz</value>
-        <value xml:lang="zh">数据纬度和事实的维护和更新由标准的OFBiz服务</value>
+        <value xml:lang="zh">数据维度和事实的维护和更新由标准的OFBiz服务负责</value>
         <value xml:lang="zh_TW">資料維度和事實的維護和更新由標準的OFBiz服務負責</value>
     </property>
     <property key="BusinessIntelligenceNote12">
@@ -167,7 +167,7 @@
         <value xml:lang="it">Le seguenti dimensioni (e servizi dei dati) sono definiti: CurrencyDimension, DateDimension, ProductDimension;</value>
         <value xml:lang="ja">次のディメンジョン (およびデータサービス) が定義されています: 通貨ディメンジョン、日付ディメンジョン、製品ディメンジョン、</value>
         <value xml:lang="th">การวัดขนาดตามที่กำหนด (และข้อมูลการบริการ) ระบุ : CurrencyDimension, DateDimension, ProductDimension;</value>
-        <value xml:lang="zh">已经定义了下列纬度（以及数据服务）：货币纬度、日期纬度、产品纬度；</value>
+        <value xml:lang="zh">已经定义了下列维度（以及数据服务）：货币维度、日期维度、产品维度；</value>
         <value xml:lang="zh_TW">已經定義了下列維度（以及資料服務）：貨幣維度、日期維度、產品維度；</value>
     </property>
     <property key="BusinessIntelligenceNote17">
@@ -176,7 +176,7 @@
         <value xml:lang="it">verranno usati per completare questi e disegnare gli altri (il numero totale di dimensioni saranno probabilmente circa 20).</value>
         <value xml:lang="ja">私たちはそれを完了させ、別のものを設計する必要があります (ディメンジョンの合計は約20になります)。</value>
         <value xml:lang="th">เรากำลังทำสิ่งเหล่านั้นสำเร็จแล้วและวางแผนสิ่งต่อไป (จำนวนทั้งหมดประมาณ 20)</value>
-        <value xml:lang="zh">我们将完成它们，并设计其它的（全部纬度数量大约将在20个左右）。</value>
+        <value xml:lang="zh">我们将完成它们，并设计其它的（全部维度数量大约将在20个左右）。</value>
         <value xml:lang="zh_TW">我們將完成它們，並設計其它的（全部維度數量大约將在20個左右）。</value>
     </property>
     <property key="BusinessIntelligenceNote18">
@@ -347,7 +347,7 @@
         <value xml:lang="it">dimensioni, fatti e star schemas (view-entities).</value>
         <value xml:lang="ja">ディメンジョン、ファクト、そしてスタースキーマ (ビュー) です。</value>
         <value xml:lang="th">ขอบเขต,ข้อเท็จจริงและแผนผัง (เป็นการแสดงสิ่งที่มีอยู่)</value>
-        <value xml:lang="zh">纬度、事实和星型模型(浏览实体)。</value>
+        <value xml:lang="zh">维度、事实和星型模型(浏览实体)。</value>
         <value xml:lang="zh_TW">維度、事實和星型模型(檢視個體)。</value>
     </property>
     <property key="BusinessIntelligenceNote6">
@@ -356,7 +356,7 @@
         <value xml:lang="it">Le dimensioni, fatti e star schemas sono definiti in accordo alle migliori pratiche per i datawarehouses</value>
         <value xml:lang="ja">ディメンジョン、ファクト、そしてスタースキーマはデータウェアハウスのベストプラックティス、</value>
         <value xml:lang="th">ขอบเขต,ข้อเท็จจริงและแผนผังตามที่ระบุเป็นวิธีปฏิบัติที่ดีที่สุดสำหรับข้อมูลคลังสินค้า</value>
-        <value xml:lang="zh">纬度、事实和星型模型定义参考了数据仓库最佳实践</value>
+        <value xml:lang="zh">维度、事实和星型模型定义参考了数据仓库最佳实践</value>
         <value xml:lang="zh_TW">維度、事實和星型模型定義参考了資料倉儲最佳實務</value>
     </property>
     <property key="BusinessIntelligenceNote7">

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/build.xml?rev=1624970&r1=1624969&r2=1624970&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/build.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/build.xml Mon Sep 15 08:31:29 2014
@@ -35,6 +35,7 @@ under the License.
         <fileset dir="../base/lib/commons" includes="*.jar"/>
         <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
         <fileset dir="../base/build/lib" includes="*.jar"/>
+        <fileset dir="../start/build/lib" includes="*.jar"/>
         <fileset dir="../entity/lib" includes="*.jar"/>
         <fileset dir="../entity/build/lib" includes="*.jar"/>
     </path>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=1624970&r1=1624969&r2=1624970&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Mon Sep 15 08:31:29 2014
@@ -71,12 +71,12 @@ import org.apache.tomcat.util.scan.Stand
 
 import org.ofbiz.base.component.ComponentConfig;
 import org.ofbiz.base.concurrent.ExecutionPool;
-import org.ofbiz.base.container.ClassLoaderContainer;
 import org.ofbiz.base.container.Container;
 import org.ofbiz.base.container.ContainerConfig;
 import org.ofbiz.base.container.ContainerConfig.Container.Property;
 import org.ofbiz.base.container.ContainerException;
 import org.ofbiz.base.location.FlexibleLocation;
+import org.ofbiz.base.start.Start;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.SSLUtil;
 import org.ofbiz.base.util.UtilValidate;
@@ -477,7 +477,7 @@ public class CatalinaContainer implement
         // need some standard properties
         String protocol = ContainerConfig.getPropertyValue(connectorProp, "protocol", "HTTP/1.1");
         String address = ContainerConfig.getPropertyValue(connectorProp, "address", "0.0.0.0");
-        int port = ContainerConfig.getPropertyValue(connectorProp, "port", 0) + ClassLoaderContainer.portOffset;
+        int port = ContainerConfig.getPropertyValue(connectorProp, "port", 0) + Start.getInstance().getConfig().portOffset;
 
         boolean secure = ContainerConfig.getPropertyValue(connectorProp, "secure", false);
         if (protocol.toLowerCase().startsWith("ajp")) {
@@ -678,7 +678,7 @@ public class CatalinaContainer implement
 
         context.setJ2EEApplication(J2EE_APP);
         context.setJ2EEServer(J2EE_SERVER);
-        context.setLoader(new WebappLoader(ClassLoaderContainer.getClassLoader()));
+        context.setLoader(new WebappLoader(Thread.currentThread().getContextClassLoader()));
 
         context.setCookies(appInfo.isSessionCookieAccepted());
         context.addParameter("cookies", appInfo.isSessionCookieAccepted() ? "true" : "false");

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonEntityLabels.xml?rev=1624970&r1=1624969&r2=1624970&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonEntityLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonEntityLabels.xml Mon Sep 15 08:31:29 2014
@@ -929,7 +929,7 @@
         <value xml:lang="ru">Собственность</value>
         <value xml:lang="th">บ้านและที่ดิน</value>
         <value xml:lang="vi">IND_REAL_ESTATE</value>
-        <value xml:lang="zh">房子产</value>
+        <value xml:lang="zh">房地产</value>
         <value xml:lang="zh_TW">房地產</value>
     </property>
     <property key="Enumeration.description.IND_RETAIL">
@@ -2533,7 +2533,7 @@
         <value xml:lang="ru">Подтверждение возврата</value>
         <value xml:lang="th">คืนค่าการยอมรับ</value>
         <value xml:lang="vi">Đồng ý hoàn trả</value>
-        <value xml:lang="zh">己接受的退货</value>
+        <value xml:lang="zh">已接受的退货</value>
         <value xml:lang="zh_TW">已接受的退貨</value>
     </property>
     <property key="Enumeration.description.PRDS_RTN_CANCEL">
@@ -2791,7 +2791,7 @@
         <value xml:lang="ru">Автоматически для каждого заказа на продажу</value>
         <value xml:lang="th">อัตโนมัติสำหรับทุก ๆ รายการขาย</value>
         <value xml:lang="vi">Tá»± động cho tất cả hóa đơn bán hàng</value>
-        <value xml:lang="zh">对每个销售定单自动</value>
+        <value xml:lang="zh">对每个销售订单自动</value>
         <value xml:lang="zh_TW">對每個銷售訂單自動</value>
     </property>
     <property key="Enumeration.description.PRODRQM_DS">
@@ -3982,7 +3982,7 @@
         <value xml:lang="ru">Каналы продаж</value>
         <value xml:lang="th">ช่องทางรายการขาย</value>
         <value xml:lang="vi">Thứ tá»± theo Kênh bán hàng</value>
-        <value xml:lang="zh">定单销售渠道</value>
+        <value xml:lang="zh">订单销售渠道</value>
         <value xml:lang="zh_TW">訂單銷售通路</value>
     </property>
     <property key="EnumerationType.description.ORDER_SEQMD">
@@ -8667,7 +8667,7 @@
         <value xml:lang="ru">Ожидание принятия</value>
         <value xml:lang="th">ในระหว่างการตอบรับ</value>
         <value xml:lang="vi">Đang nghiệm thu</value>
-        <value xml:lang="zh">待定的接受</value>
+        <value xml:lang="zh">等待接受中</value>
         <value xml:lang="zh_TW">等待接受中</value>
     </property>
     <property key="StatusItem.description.CLPT_REJECTED">
@@ -9876,7 +9876,7 @@
         <value xml:lang="ru">Заказана</value>
         <value xml:lang="th">มีตามสั่ง แต่ยังไม่ส่งมา</value>
         <value xml:lang="vi">Đang đặt hàng</value>
-        <value xml:lang="zh">按定单</value>
+        <value xml:lang="zh">按订单</value>
         <value xml:lang="zh_TW">按訂單</value>
     </property>
     <property key="StatusItem.description.INV_PROMISED">
@@ -11527,7 +11527,7 @@
         <value xml:lang="ru">Заказано</value>
         <value xml:lang="th">คูลำดับ</value>
         <value xml:lang="vi">Đã đặt hàng</value>
-        <value xml:lang="zh">已下定单</value>
+        <value xml:lang="zh">已下订单</value>
         <value xml:lang="zh_TW">已下訂單</value>
     </property>
     <property key="StatusItem.description.QUO_REJECTED">
@@ -11588,7 +11588,7 @@
         <value xml:lang="ru">Заказано</value>
         <value xml:lang="th">คู่ลำดับ</value>
         <value xml:lang="vi">Đã đặt hàng</value>
-        <value xml:lang="zh">已下定单</value>
+        <value xml:lang="zh">已下订单</value>
         <value xml:lang="zh_TW">已下訂單</value>
     </property>
     <property key="StatusItem.description.REQ_PROPOSED">
@@ -12827,7 +12827,7 @@
         <value xml:lang="ru">Позиция заказа</value>
         <value xml:lang="th">รายการสั่งซื้อ</value>
         <value xml:lang="vi">Hạng mục đơn hàng</value>
-        <value xml:lang="zh">定单明细</value>
+        <value xml:lang="zh">订单明细</value>
         <value xml:lang="zh_TW">訂單明細</value>
     </property>
     <property key="StatusType.description.ORDER_RETURN_STTS">
@@ -12843,7 +12843,7 @@
         <value xml:lang="ru">Статус заказа возврата</value>
         <value xml:lang="th">คืนค่าสถานะรายการสั่งซื้อ</value>
         <value xml:lang="vi">Trạng thái đơn hàng trả về</value>
-        <value xml:lang="zh">定单退货状态</value>
+        <value xml:lang="zh">订单退货状态</value>
         <value xml:lang="zh_TW">訂單退貨狀態</value>
     </property>
     <property key="StatusType.description.ORDER_STATUS">
@@ -12860,7 +12860,7 @@
         <value xml:lang="ru">Заказ</value>
         <value xml:lang="th">รายการสั่งซื้อ</value>
         <value xml:lang="vi">Đặt hàng</value>
-        <value xml:lang="zh">定单</value>
+        <value xml:lang="zh">订单</value>
         <value xml:lang="zh_TW">訂單</value>
     </property>
     <property key="StatusType.description.PAYMENT_PREF_STATUS">
@@ -14660,7 +14660,7 @@
         <value xml:lang="ru">Запрос ТМЦ отменен</value>
         <value xml:lang="th">ยกเลิกคำร้องสินค้าคงเหลือ</value>
         <value xml:lang="vi">Đã hủy bỏ</value>
-        <value xml:lang="zh">存货强求已取消</value>
+        <value xml:lang="zh">存货请求已取消</value>
         <value xml:lang="zh_TW">存貨請求已取消</value>
     </property>
     <property key="StatusValidChange.transitionName.IXF_REQUESTED.IXF_COMPLETE">
@@ -14675,7 +14675,7 @@
         <value xml:lang="ru">Запрос ТМЦ завершен</value>
         <value xml:lang="th">คำร้องสินค้าคงเหลือเสร็จสมบูรณ์</value>
         <value xml:lang="vi">Hoàn thành</value>
-        <value xml:lang="zh">存货强求已完成</value>
+        <value xml:lang="zh">存货请求已完成</value>
         <value xml:lang="zh_TW">存貨請求已完成</value>
     </property>
     <property key="StatusValidChange.transitionName.IXF_REQUESTED.IXF_EN_ROUTE">

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonErrorUiLabels.xml?rev=1624970&r1=1624969&r2=1624970&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonErrorUiLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonErrorUiLabels.xml Mon Sep 15 08:31:29 2014
@@ -146,7 +146,7 @@
         <value xml:lang="pt_BR">Elemento raiz não foi definido</value>
         <value xml:lang="ru">Корневой элемент не имеет значения</value>
         <value xml:lang="vi">Gốc tài liệu chÆ°a được thiết lập</value>
-        <value xml:lang="zh">已经设置了根元素</value>
+        <value xml:lang="zh">未设置根元素</value>
         <value xml:lang="zh_TW">未設定根元素</value>
     </property>
     <property key="ImageTransform.unknown_buffered_image_type">

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonUiLabels.xml?rev=1624970&r1=1624969&r2=1624970&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonUiLabels.xml Mon Sep 15 08:31:29 2014
@@ -478,7 +478,7 @@
         <value xml:lang="ru">Строка адреса</value>
         <value xml:lang="th">ที่อยู่</value>
         <value xml:lang="vi">Dòng địa chỉ</value>
-        <value xml:lang="zh">地址线</value>
+        <value xml:lang="zh">地址行</value>
         <value xml:lang="zh-CN">地址栏</value>
         <value xml:lang="zh_TW">地址行</value>
     </property>
@@ -625,7 +625,7 @@
         <value xml:lang="ru">Вся неделя</value>
         <value xml:lang="th">สัปดาห์ทั้งหมด</value>
         <value xml:lang="vi">Toàn bộ tuần</value>
-        <value xml:lang="zh">全部周</value>
+        <value xml:lang="zh">整个星期</value>
         <value xml:lang="zh-CN">所有星期</value>
         <value xml:lang="zh_TW">整個星期</value>
     </property>
@@ -1813,7 +1813,7 @@
         <value xml:lang="ru">Свернуть</value>
         <value xml:lang="th">ล้มเหลว</value>
         <value xml:lang="vi">Mở rộng</value>
-        <value xml:lang="zh">合拢</value>
+        <value xml:lang="zh">收起</value>
         <value xml:lang="zh_TW">收合</value>
     </property>
     <property key="CommonCollapseAll">
@@ -1830,7 +1830,7 @@
         <value xml:lang="ru">Свернуть все</value>
         <value xml:lang="th">ล้มเหลว</value>
         <value xml:lang="vi">Mở rộng toàn bộ</value>
-        <value xml:lang="zh">全部合拢</value>
+        <value xml:lang="zh">全部收起</value>
         <value xml:lang="zh_TW">全部收合</value>
     </property>
     <property key="CommonComingSoon">
@@ -1979,7 +1979,7 @@
         <value xml:lang="ru">Подтвердить</value>
         <value xml:lang="th">ยืนยัน</value>
         <value xml:lang="vi">Bạn có xác nhận phần lá»±a chọn thêm không?</value>
-        <value xml:lang="zh">确认</value>
+        <value xml:lang="zh">确定要增加吗？</value>
         <value xml:lang="zh_TW">確定要增加嗎？</value>
     </property>
     <property key="CommonConfirmDelete">
@@ -2399,7 +2399,7 @@
         <value xml:lang="ru">Кредит</value>
         <value xml:lang="th">เครดิต</value>
         <value xml:lang="vi">Tín dụng</value>
-        <value xml:lang="zh">信用</value>
+        <value xml:lang="zh">贷方</value>
         <value xml:lang="zh-CN">贷方</value>
         <value xml:lang="zh_TW">貸方</value>
     </property>
@@ -2766,25 +2766,9 @@
         <value xml:lang="zh">删除该小窗口</value>
         <value xml:lang="zh_TW">删除此Portlet</value>
     </property>
-    <property key="CommonDepth">
-        <value xml:lang="ar">عمق</value>
-        <value xml:lang="cs">Hloubka</value>
-        <value xml:lang="de">Tiefe</value>
-        <value xml:lang="en">Depth</value>
-        <value xml:lang="es">Profundidad</value>
-        <value xml:lang="fr">Profondeur</value>
-        <value xml:lang="hi-IN">गहराई</value>
-        <value xml:lang="it">Profondità</value>
-        <value xml:lang="ja">深度</value>
-        <value xml:lang="nl">Diepte</value>
-        <value xml:lang="pt">Profundidade</value>
-        <value xml:lang="ro">Adancime</value>
-        <value xml:lang="ru">Глубина</value>
-        <value xml:lang="th">ความลึก</value>
-        <value xml:lang="vi">Độ dày</value>
-        <value xml:lang="zh">深度</value>
-        <value xml:lang="zh-CN">深度</value>
-        <value xml:lang="zh_TW">深度</value>
+    <property key="CommonDeployedThe">
+        <value xml:lang="en">Deployed the</value>
+        <value xml:lang="fr">Déployé le</value>
     </property>
     <property key="CommonDescription">
         <value xml:lang="ar">وصف</value>
@@ -3421,7 +3405,7 @@
         <value xml:lang="ru">Подчиненные</value>
         <value xml:lang="th">เด็ก</value>
         <value xml:lang="vi">Thành phần con</value>
-        <value xml:lang="zh">下级固定资产</value>
+        <value xml:lang="zh">子</value>
         <value xml:lang="zh_TW">子</value>
     </property>
     <property key="CommonEntityTestFailure">
@@ -5616,7 +5600,7 @@
         <value xml:lang="ru">Последний</value>
         <value xml:lang="th">สุดท้าย</value>
         <value xml:lang="vi">Mới nhất</value>
-        <value xml:lang="zh">最近的</value>
+        <value xml:lang="zh">最后</value>
         <value xml:lang="zh_TW">最後</value>
     </property>
     <property key="CommonLastSytemNotes">
@@ -8424,7 +8408,7 @@
     </property>
     <property key="CommonPoweredBy">
         <value xml:lang="en">Powered by</value>
-        <value xml:lang="fr">Fonctionne grâce à </value>
+        <value xml:lang="fr">Motorisé par</value>
         <value xml:lang="hi-IN">द्वारा संचालित</value>
         <value xml:lang="it">Realizzato con</value>
         <value xml:lang="ru">Сделанно</value>
@@ -9093,7 +9077,7 @@
         <value xml:lang="ru">Зарегистрированный пользователь</value>
         <value xml:lang="th">ลงทะเบียนผู้ใช้</value>
         <value xml:lang="vi">Người dùng đã đăng ký</value>
-        <value xml:lang="zh">已登记用户</value>
+        <value xml:lang="zh">已注册用户</value>
         <value xml:lang="zh-CN">注册用户</value>
         <value xml:lang="zh_TW">使用者已註冊</value>
     </property>
@@ -9561,7 +9545,7 @@
         <value xml:lang="ru">Сбережения</value>
         <value xml:lang="th">กำลังบันทึก</value>
         <value xml:lang="vi">LÆ°u trữ</value>
-        <value xml:lang="zh">节省</value>
+        <value xml:lang="zh">储蓄</value>
         <value xml:lang="zh-CN">储蓄</value>
         <value xml:lang="zh_TW">儲蓄</value>
     </property>
@@ -9656,7 +9640,7 @@
         <value xml:lang="ru">Во-вторых</value>
         <value xml:lang="th">ในลำดับที่สอง</value>
         <value xml:lang="vi">Cấp hai</value>
-        <value xml:lang="zh">每秒</value>
+        <value xml:lang="zh">秒</value>
         <value xml:lang="zh_TW">秒</value>
     </property>
     <property key="CommonSecondaryApps">
@@ -10786,7 +10770,7 @@
         <value xml:lang="ru">Постоые</value>
         <value xml:lang="th">แสดงปกติ</value>
         <value xml:lang="vi">Hiển thị đơn giản</value>
-        <value xml:lang="zh">简单值</value>
+        <value xml:lang="zh">简单视图</value>
         <value xml:lang="zh-CN">关所有表</value>
         <value xml:lang="zh_TW">簡單檢視</value>
     </property>
@@ -10807,7 +10791,7 @@
         <value xml:lang="ru">Большие</value>
         <value xml:lang="th">แสดงขนาดใหญ่</value>
         <value xml:lang="vi">Xem cỡ lớn</value>
-        <value xml:lang="zh">大数值</value>
+        <value xml:lang="zh">大视图</value>
         <value xml:lang="zh-CN">开所有表</value>
         <value xml:lang="zh_TW">大型檢視</value>
     </property>
@@ -11660,7 +11644,7 @@
         <value xml:lang="ru">UOM ID</value>
         <value xml:lang="th">รหัสหน่วยวัด</value>
         <value xml:lang="vi">Đơn vị tính</value>
-        <value xml:lang="zh">货币单位标识</value>
+        <value xml:lang="zh">度量单位标识</value>
         <value xml:lang="zh-CN">单位标识</value>
         <value xml:lang="zh_TW">計量單位代號</value>
     </property>
@@ -11916,7 +11900,7 @@
         <value xml:lang="ru">Действительно с даты</value>
         <value xml:lang="th">มีผลจากวันที่</value>
         <value xml:lang="vi">Hiệu lá»±c Từ ngày</value>
-        <value xml:lang="zh">验证开始日期</value>
+        <value xml:lang="zh">有效的开始日期</value>
         <value xml:lang="zh-CN">有效的起始日期</value>
         <value xml:lang="zh_TW">有效開始日</value>
     </property>
@@ -11937,7 +11921,7 @@
         <value xml:lang="ru">Действительно по дату</value>
         <value xml:lang="th">มีผลถึงวันที่</value>
         <value xml:lang="vi">Hiệu lá»±c Đến ngày</value>
-        <value xml:lang="zh">验证截止日期</value>
+        <value xml:lang="zh">有效的截止日期</value>
         <value xml:lang="zh-CN">有效的终止日期</value>
         <value xml:lang="zh_TW">有效截止日</value>
     </property>
@@ -12049,7 +12033,7 @@
         <value xml:lang="pt-BR">O acesso a esta visualização foi bloqueada.</value>
         <value xml:lang="ru">Доступ к этому виду - запрещен</value>
         <value xml:lang="vi">Quyền truy cập tới giao diện này hiện đã bị khoá</value>
-        <value xml:lang="zh">已经禁止访问这个浏览了。</value>
+        <value xml:lang="zh">已经禁止访问这个界面了。</value>
         <value xml:lang="zh_TW">已經禁止訪問這個瀏覽了。</value>
     </property>
     <property key="CommonViewCalendar">
@@ -12211,7 +12195,7 @@
         <value xml:lang="ja">プレビューするには画像を、テーマを選択するにはリンクを、選択を有効にするには完了をクリックしてください。</value>
         <value xml:lang="ru">Нажмите на картинку для предварительного просмотра, на ссылке выбранной темы, и затем сделайте потверждение вашего выбора</value>
         <value xml:lang="vi">Bạn có thể xem trước Giao diện bằng cách bấm vào hình, sau đó vào liên kết chọn giao diện, và bấm vào nút 'Hoàn tất' để thá»±c hiện thiết lập Giao diện</value>
-        <value xml:lang="zh">点击图片来预览，点击连接来选择风格，然后点击“完成”来让你的选择生效</value>
+        <value xml:lang="zh">点击图片来预览，点击链接来选择风格，然后点击“完成”来让你的选择生效</value>
         <value xml:lang="zh_TW">點擊圖片來預覽，點擊連結來選擇風格，然後點擊“完成”來讓您的選擇生效</value>
     </property>
     <property key="CommonVisualThemes">
@@ -12827,7 +12811,7 @@
         <value xml:lang="ja">在庫管理、拠点、位置、発送、受領、物理在庫</value>
         <value xml:lang="ru">Управление инвентарем, объект, местность, отправление, получение, переучет</value>
         <value xml:lang="vi">Quản lý Kho bãi, Chi nhánh / CÆ¡ sở, Địa điểm, Vận chuyển, Nhận hàng và Kho vật lý</value>
-        <value xml:lang="zh">库存管理，包括场、地点、送货、收货、物理库存</value>
+        <value xml:lang="zh">库存管理，包括场所、地点、送货、收货、实物库存</value>
         <value xml:lang="zh_TW">庫存管理，包括場所、地點、送貨、收貨、實體庫存</value>
     </property>
     <property key="Financials">
@@ -13156,7 +13140,7 @@
         <value xml:lang="pt-BR">Contagem de recorrências atual</value>
         <value xml:lang="ru">Текущий счетчик возврата</value>
         <value xml:lang="vi">Số lần lặp lại</value>
-        <value xml:lang="zh">当前并发计数</value>
+        <value xml:lang="zh">当前重复次数计数</value>
         <value xml:lang="zh_TW">當前重現次數</value>
     </property>
     <property key="FormFieldTitle_currentStatusId">
@@ -13461,7 +13445,7 @@
         <value xml:lang="pt-BR">Contagem de Recorrências Máxima</value>
         <value xml:lang="ru">Максимальный возврат счетчика</value>
         <value xml:lang="vi">Số lần lặp tối đa</value>
-        <value xml:lang="zh">最大并发数量</value>
+        <value xml:lang="zh">最大重复次数</value>
         <value xml:lang="zh_TW">最大重現次數</value>
     </property>
     <property key="FormFieldTitle_modifiedByUserLoginId">
@@ -13832,7 +13816,7 @@
         <value xml:lang="ru">Валюта</value>
         <value xml:lang="th">หน่วยวัด</value>
         <value xml:lang="vi">Đơn vị tính</value>
-        <value xml:lang="zh">币值</value>
+        <value xml:lang="zh">单位</value>
         <value xml:lang="zh_TW">度量單位</value>
     </property>
     <property key="FormFieldTitle_updateButton">
@@ -14091,7 +14075,7 @@
         <value xml:lang="th">หน้าหมวดหมู่สินค้า</value>
         <value xml:lang="vi">Trang Phân loại Quản lý</value>
         <value xml:lang="zh">分类页面</value>
-        <value xml:lang="zh">分類頁面</value>
+        <value xml:lang="zh_TW">分類頁面</value>
     </property>
     <property key="PageTitleCheckoutOptions">
         <value xml:lang="cs">Možnosti objednání</value>
@@ -14242,7 +14226,7 @@
         <value xml:lang="ru">Поиск Гео</value>
         <value xml:lang="th">ค้นหาข้อมูลโครงสร้าง</value>
         <value xml:lang="vi">Tìm kiếm Địa lý</value>
-        <value xml:lang="zh">查詢地理</value>
+        <value xml:lang="zh">查询地理位置</value>
         <value xml:lang="zh_TW">查詢地理位置</value>
     </property>
     <property key="PageTitleMain">

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/fo/pm-iso216.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/fo/pm-iso216.fo.ftl?rev=1624970&r1=1624969&r2=1624970&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/fo/pm-iso216.fo.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/fo/pm-iso216.fo.ftl Mon Sep 15 08:31:29 2014
@@ -26,7 +26,7 @@ under the License.
     </fo:simple-page-master>
 
     <fo:simple-page-master master-name="iso216-landscape"
-        page-width="210mm" page-height="297mm"
+        page-width="297mm" page-height="210mm"
         margin-top="15mm" margin-bottom="15mm"
         margin-left="20mm" margin-right="20mm">
       <fo:region-body margin-top="25mm" margin-bottom="12mm"/>