svn commit: r1626688 [26/46] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1626688 [26/46] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
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=1626688&r1=1626687&r2=1626688&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 22 08:09:27 2014 @@ -212,21 +212,19 @@ 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" failonerror="true" resultproperty="hasSvnRepo"> + <exec executable="svn" dir="." output="runtime/svninfo_tmp.xml"> <arg value="info"/> <arg value="--xml"/> </exec> - <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> + <xmlproperty file="runtime/svninfo_tmp.xml"/> + <echo message="Rev:${info.entry.commit(revision)}"/> + <basename property="releasePath" file="${info.entry.url}"/> + <tstamp> + <format property="dateTime" pattern="yyyy-MM-dd HH:mm:ss"/> + </tstamp> + <echo message=" - Release-revision : ${releasePath}-r${info.entry.commit(revision)}, ${uiLabelMap.CommonBuiltOn} ${dateTime}" file="runtime/svninfo.ftl"/> + <delete file="runtime/svninfo_tmp.xml"/> + <echo message="Done!"/> </target> <target name="clean-svninfo"> @@ -243,18 +241,16 @@ under the License. <arg value="--abbrev-ref"/> <arg value="HEAD"/> </exec> - <exec executable="git" outputproperty="revision" failonerror="true" resultproperty="hasGitRepo"> + <exec executable="git" outputproperty="revision"> <arg value="rev-parse"/> <arg value="HEAD"/> </exec> - <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> + <tstamp> + <format property="dateTime" pattern="yyyy-MM-dd HH:mm:ss"/> + </tstamp> + <echo message="Found Branch-revision: ${branch}-${revision}"/> + <echo message=" - Branch-revision: ${branch}-${revision}, ${uiLabelMap.CommonBuiltOn} ${dateTime}" file="runtime/gitinfo.ftl"/> + <echo message="Done!"/> </target> <target name="clean-gitinfo"> @@ -262,46 +258,34 @@ 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 --> <!-- ================================================================== --> + + <target name="build-dev" - description="Patch and build all sources in a dev environment. This includes patching OFBiz using patches in runtime/patches. On Windows you need to have patch.exe in the path and patch files must all be in dos format (CR+LF)"> - <!-- patch task can't handle a fileset => create a global patch --> - <concat destfile="${basedir}/runtime/patches/dev.patch" encoding="UTF-8" outputencoding="UTF-8"> - <fileset dir="${basedir}/runtime/patches" casesensitive="no"> - <exclude name="dev.patch"/> <!-- exclude the patch itself in case it's still there --> - <include name="*.patch"/> - </fileset> - </concat> - <if> - <resourceexists> - <file file="${basedir}/runtime/patches/dev.patch"/> - </resourceexists> - <then> - <patch strip="0" patchfile="${basedir}/runtime/patches/dev.patch" dir="${basedir}"/> - <delete> - <fileset dir="${basedir}/runtime/patches" includes="dev.patch"/> - </delete> - </then> - </if> + description="Patch sources in a dev environment if patch files are present in runtime/patches."> + <!-- patch task can't handle a fileset => create a global patch --> + <concat destfile="${basedir}/runtime/patches/dev.patch" encoding="UTF-8" outputencoding="UTF-8"> + <fileset dir="${basedir}/runtime/patches" casesensitive="no"> + <exclude name="dev.patch"/> <!-- exclude the patch itself in case it's still there --> + <include name="*.patch"/> + </fileset> + </concat> + <if> + <available file="${basedir}/runtime/patches/dev.patch"/> + <then> + <exec executable="svn" dir="${basedir}"> + <arg value="patch"/> + <arg value="${basedir}/runtime/patches/dev.patch"/> + </exec> + <delete> + <fileset dir="${basedir}/runtime/patches" includes="dev.patch"/> + </delete> + </then> + </if> </target> <target name="build-test" @@ -343,6 +327,7 @@ under the License. <target name="build" depends="ofbiz-init"> <echo message="[build] ========== Start Building (Compile) =========="/> + <antcall target="build-dev"/> <antcall target="build-framework"/> <antcall target="build-applications"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/config/DateTimeLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/config/DateTimeLabels.xml?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/config/DateTimeLabels.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/config/DateTimeLabels.xml Mon Sep 22 08:09:27 2014 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +--> +<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <property key="hour.plural"> <value xml:lang="de">Stunden</value> <value xml:lang="en">hours</value> @@ -133,7 +134,7 @@ <value xml:lang="ru">недели</value> <value xml:lang="th">สัà¸à¸à¸²à¸«à¹</value> <value xml:lang="zh">å¨</value> - <value xml:lang="zh_TW">å¨</value> + <value xml:lang="zh_TW">é±</value> </property> <property key="week.singular"> <value xml:lang="de">Woche</value> @@ -146,6 +147,6 @@ <value xml:lang="ru">неделÑ</value> <value xml:lang="th">สัà¸à¸à¸²à¸«à¹</value> <value xml:lang="zh">å¨</value> - <value xml:lang="zh_TW">å¨</value> + <value xml:lang="zh_TW">é±</value> </property> </resource> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/config/log4j2.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/config/log4j2.xml?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/config/log4j2.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/config/log4j2.xml Mon Sep 22 08:09:27 2014 @@ -32,10 +32,10 @@ <logger name="org.apache" level="warn" additivity="false"> <appender-ref ref="external"/> </logger> - <logger name="org.apache.tomcat" level="info" additivity="true"> + <logger name="org.apache.tomcat" level="info" additivity="false"> <appender-ref ref="external"/> </logger> - <logger name="org.apache.catalina" level="info" additivity="true"> + <logger name="org.apache.catalina" level="info" additivity="false"> <appender-ref ref="external"/> </logger> <logger name="freemarker" level="warn" additivity="false"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/FileUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/FileUtil.java?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/FileUtil.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/FileUtil.java Mon Sep 22 08:09:27 2014 @@ -38,9 +38,8 @@ import java.util.Set; import javolution.util.FastList; import javolution.util.FastSet; -import org.ofbiz.base.location.ComponentLocationResolver; - import org.apache.commons.io.FileUtils; +import org.ofbiz.base.location.ComponentLocationResolver; /** * File Utilities @@ -294,6 +293,7 @@ public class FileUtil { } } + @Override public boolean accept(File dir, String name) { File file = new File(dir, name); if (file.getName().startsWith(".")) { @@ -395,4 +395,20 @@ public class FileUtil { return false; } } + + /** + * + * + * Check if the specified <code>fileName</code> exists and is a file (not a directory) + * If the specified file doesn't exist or is a directory <code>FALSE</code> returns. + * + * @param fileName A full path to a file in which the String will be searched. + * @return <code>TRUE</code> if the <code>fileName</code> exists and is a file (not a directory) + * <code>FALSE</code> otherwise. + */ + public static boolean isFile(String fileName) { + File f = new File(fileName); + return f.isFile(); + } + } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilValidate.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilValidate.java?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilValidate.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilValidate.java Mon Sep 22 08:09:27 2014 @@ -1241,16 +1241,16 @@ public class UtilValidate { if (!isCreditCard(cc)) return "Unknown"; - if (isMasterCard(cc)) return "MasterCard"; - if (isVisa(cc)) return "Visa"; - if (isAmericanExpress(cc)) return "AmericanExpress"; - if (isDinersClub(cc)) return "DinersClub"; - if (isDiscover(cc)) return "Discover"; - if (isEnRoute(cc)) return "EnRoute"; - if (isJCB(cc)) return "JCB"; - if (isSolo(cc)) return "Solo"; - if (isswitch (cc)) return "Switch"; - if (isVisaElectron(cc)) return "VisaElectron"; + if (isMasterCard(cc)) return "CCT_MASTERCARD"; + if (isVisa(cc)) return "CCT_VISA"; + if (isAmericanExpress(cc)) return "CCT_AMERICANEXPRESS"; + if (isDinersClub(cc)) return "CCT_DINERSCLUB"; + if (isDiscover(cc)) return "CCT_DISCOVER"; + if (isEnRoute(cc)) return "CCT_ENROUTE"; + if (isJCB(cc)) return "CCT_JCB"; + if (isSolo(cc)) return "CCT_SOLO"; + if (isswitch (cc)) return "CCT_SWITCH"; + if (isVisaElectron(cc)) return "CCT_VISAELECTRON"; return "Unknown"; } @@ -1264,17 +1264,17 @@ public class UtilValidate { if (isEmpty(cardNumberPassed)) return defaultEmptyOK; String cardNumber = stripCharsInBag(cardNumberPassed, creditCardDelimiters); - if ((cardType.equalsIgnoreCase("VISA")) && (isVisa(cardNumber))) return true; - if ((cardType.equalsIgnoreCase("MASTERCARD")) && (isMasterCard(cardNumber))) return true; - if (((cardType.equalsIgnoreCase("AMERICANEXPRESS")) || (cardType.equalsIgnoreCase("AMEX"))) && (isAmericanExpress(cardNumber))) return true; - if ((cardType.equalsIgnoreCase("DISCOVER")) && (isDiscover(cardNumber))) return true; - if ((cardType.equalsIgnoreCase("JCB")) && (isJCB(cardNumber))) return true; - if (((cardType.equalsIgnoreCase("DINERSCLUB")) || (cardType.equalsIgnoreCase("DINERS"))) && (isDinersClub(cardNumber))) return true; - if ((cardType.equalsIgnoreCase("CARTEBLANCHE")) && (isCarteBlanche(cardNumber))) return true; - if ((cardType.equalsIgnoreCase("ENROUTE")) && (isEnRoute(cardNumber))) return true; - if ((cardType.equalsIgnoreCase("SOLO")) && (isSolo(cardNumber))) return true; - if ((cardType.equalsIgnoreCase("SWITCH")) && (isswitch (cardNumber))) return true; - if ((cardType.equalsIgnoreCase("VISAELECTRON")) && (isVisaElectron(cardNumber))) return true; + if (("CCT_VISA".equalsIgnoreCase(cardType)) && (isVisa(cardNumber))) return true; + if (("CCT_MASTERCARD".equalsIgnoreCase(cardType)) && (isMasterCard(cardNumber))) return true; + if ((("CCT_AMERICANEXPRESS".equalsIgnoreCase(cardType)) || ("CCT_AMEX".equalsIgnoreCase(cardType))) && (isAmericanExpress(cardNumber))) return true; + if (("CCT_DISCOVER".equalsIgnoreCase(cardType)) && (isDiscover(cardNumber))) return true; + if (("CCT_JCB".equalsIgnoreCase(cardType)) && (isJCB(cardNumber))) return true; + if ((("CCT_DINERSCLUB".equalsIgnoreCase(cardType)) || ("CCT_DINERS".equalsIgnoreCase(cardType))) && (isDinersClub(cardNumber))) return true; + if (("CCT_CARTEBLANCHE".equalsIgnoreCase(cardType)) && (isCarteBlanche(cardNumber))) return true; + if (("CCT_ENROUTE".equalsIgnoreCase(cardType)) && (isEnRoute(cardNumber))) return true; + if (("CCT_SOLO".equalsIgnoreCase(cardType)) && (isSolo(cardNumber))) return true; + if (("CCT_SWITCH".equalsIgnoreCase(cardType)) && (isswitch (cardNumber))) return true; + if (("CCT_VISAELECTRON".equalsIgnoreCase(cardType)) && (isVisaElectron(cardNumber))) return true; return false; } 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=1626688&r1=1626687&r2=1626688&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 22 08:09:27 2014 @@ -35,7 +35,7 @@ <value xml:lang="ja">OFBiz: ãã¸ãã¹ã¤ã³ããªã¸ã§ã³ã¹</value> <value xml:lang="th">OFBiz:à¸à¸²à¸£à¹à¸£à¸µà¸¢à¸à¸£à¸¹à¹à¸à¸²à¸à¸à¸¸à¸£à¸à¸´à¸</value> <value xml:lang="zh">OFBizï¼åä¸æºè½</value> - <value xml:lang="zh_TW">OFBizï¼åæ¥æºæ §</value> + <value xml:lang="zh_TW">OFBiz:åæ¥æºæ §</value> </property> <property key="BusinessIntelligenceCompanySubtitle"> <value xml:lang="ar">جزء ٠٠عائÙØ© Ø£ÙÙبÙز ÙÙتطبÙÙات اÙØرة ÙÙتسÙÙر</value> @@ -105,7 +105,7 @@ <value xml:lang="it">La chiave naturale: ${naturalKeyFields} è vuota nel valore: ${dimensionValue}</value> <value xml:lang="ja">èªç¶ãã¼: ${naturalKeyFields} ãå¤: ${dimensionValue} ã§ç©ºã§ã</value> <value xml:lang="zh">å¼ï¼${dimensionValue} ä¸çèªç¶é®ï¼${naturalKeyFields} æ¯ç©ºç</value> - <value xml:lang="zh_TW">å¼ï¼${dimensionValue} ä¸çèªç¶éµï¼${naturalKeyFields} æ¯ç©ºç</value> + <value xml:lang="zh_TW">å¼:${dimensionValue} ä¸çèªç¶éµ:${naturalKeyFields} æ¯ç©ºç</value> </property> <property key="BusinessIntelligenceNote10"> <value xml:lang="en">The best practices for datawarehouses are mainly taken from the great book "The Data Warehouse Toolkit - Second Edition" by Ralph Kimball.</value> @@ -114,7 +114,7 @@ <value xml:lang="ja">ãã¼ã¿ã¦ã§ã¢ãã¦ã¹ã®ãã¹ããã©ãã¯ãã£ã¹ã¯å大ãªæ¸ç± "The Data Warehouse Toolkit - Second Edition" by Ralph Kimball ã®ä¸ã§è©³ããè¿°ã¹ããã¦ãã¾ãã</value> <value xml:lang="th">วิà¸à¸µà¸à¸à¸´à¸à¸±à¸à¸´à¸à¸µà¹à¸à¸µà¸à¸µà¹à¸ªà¸¸à¸à¸ªà¸³à¸«à¸£à¸±à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¸ªà¹à¸§à¸à¹à¸«à¸à¹à¸¡à¸²à¸à¸²à¸à¸«à¸à¸±à¸à¸ªà¸·à¸à¸à¸µ ๠à¸à¸·à¹à¸ "The Data Warehouse Toolkit - Second Edition" à¹à¸à¸¢ Ralph Kimball</value> <value xml:lang="zh">æ°æ®ä»åºçæä½³å®è·µæ¥èªRalph Kimballæ°åçä¼å¤§ç书ãæ°æ®ä»åºå·¥å ·ç®±ï¼ç»´åº¦å»ºæ¨¡çå®å ¨æåï¼ç¬¬äºçï¼ãã</value> - <value xml:lang="zh_TW">è³æåå²çæ佳實åä¾èªRalph Kimballæ°å¯«çå大çæ¸ãè³æåå²å·¥å ·ç®±ï¼ç¶åº¦å»ºæ¨¡çå®å ¨æåï¼ç¬¬äºçï¼ãã</value> + <value xml:lang="zh_TW">è³æåå²çæä½³æ £ä¾ä¾èªRalph Kimballæ°å¯«çå大çæ¸ãè³æåå²å·¥å ·ç®±:ç¶åº¦å»ºæ¨¡çå®å ¨æå(第äºç)ã.</value> </property> <property key="BusinessIntelligenceNote11"> <value xml:lang="en">The data for dimensions and facts are maintained and kept up to date using standard OFBiz services</value> @@ -132,7 +132,7 @@ <value xml:lang="ja">(大é¨åã¯ããè¨èªã§è¨è¿°ããã¦ãã¦ãã«ã¹ã¿ãã¤ãºã容æ) ããã³ ECAã«ã¼ã« (容æã«ã«ã¹ã¿ãã¤ãºå¯è½) ã使ããã¦ãã¾ãã</value> <value xml:lang="th">(สิà¹à¸à¸à¸µà¹à¹à¸à¸µà¸¢à¸à¸à¸±à¹à¸à¸¡à¸«à¸à¹à¸ minilang à¸à¸¶à¸ facilitate customizations) à¹à¸¥à¸°à¹à¸à¹à¸²à¹à¸à¸à¸à¸µà¹à¸ªà¸à¸²à¸à¸° (à¸à¸¢à¹à¸²à¸à¸ªà¸°à¸à¸§à¸)</value> <value xml:lang="zh">(å®ä»¬ä¸çç»å¤§å¤æ°ä½¿ç¨minilangæ¥å®ç°å®å¶)以åecaè§å(容æå®å¶)å®ç°ã</value> - <value xml:lang="zh_TW">(å®ä»¬ä¸ç絶大å¤æ¸ä½¿ç¨minilangä¾å¯¦ä½å®¢è£½å)以åECAè¦å(容æ客製å)ã</value> + <value xml:lang="zh_TW">(å®åä¸ç絶大å¤æ¸ä½¿ç¨minilangä¾å¯¦ä½å®¢è£½å)以åECAè¦å(容æ客製å).</value> </property> <property key="BusinessIntelligenceNote13"> <value xml:lang="en">The main low level services to post data to the datawarehouse,</value> @@ -141,7 +141,7 @@ <value xml:lang="ja">主ã«ä¸ä½(å)ã®ãµã¼ãã¹ã§ãã¼ã¿ã¦ã§ã¢ãã¦ã¹ã«ãã¼ã¿ãéä¿¡ããã¾ãã</value> <value xml:lang="th">หลัà¸à¸à¸²à¸£à¸à¸£à¸´à¸à¸²à¸£à¸£à¸°à¸à¸±à¸à¸¥à¹à¸²à¸à¹à¸à¸à¸²à¸£à¸à¸±à¸à¸à¸¶à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸¥à¸à¹à¸à¸à¸¥à¸±à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸ªà¸´à¸à¸à¹à¸²</value> <value xml:lang="zh">主è¦çåºå±æå¡å®ç°ææ°æ®æ交å°æ°æ®ä»åºï¼</value> - <value xml:lang="zh_TW">主è¦çåºå±¤æå實ç¾æè³ææ交å°è³æåå²ï¼</value> + <value xml:lang="zh_TW">主è¦çåºå±¤æå實ç¾æè³ææ交å°è³æåå²,</value> </property> <property key="BusinessIntelligenceNote14"> <value xml:lang="en">to map the operational keys with the datawarehouse ones, and to manage</value> @@ -150,7 +150,7 @@ <value xml:lang="ja">æä½ãã¼ã¨ãã¼ã¿ã¦ã§ã¢ãã¦ã¹ãããããã</value> <value xml:lang="th">à¹à¸à¸à¸à¸µà¹à¸ªà¸³à¸à¸±à¸à¸à¸µà¹à¸ªà¸²à¸¡à¸²à¸£à¸à¹à¸à¹à¸à¸²à¸à¹à¸à¹à¸à¹à¸§à¸¢à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¹à¸¥à¸°à¸à¸²à¸£à¸à¸±à¸à¸à¸²à¸£</value> <value xml:lang="zh">ææä½é®ä¸æ°æ®ä»åºç建ç«æ å°ï¼å¹¶ç®¡ç</value> - <value xml:lang="zh_TW">ææä½ééµåè³æåå²çé¨ä»½å»ºç«æ å°ï¼ä¸¦ç®¡ç</value> + <value xml:lang="zh_TW">ææä½ééµåè³æåå²çé¨ä»½å»ºç«æ å°,並管ç</value> </property> <property key="BusinessIntelligenceNote15"> <value xml:lang="en">history of data changes are already implemented; they will be improved as the datawarehouse will grow (e.g. performance enhancements).</value> @@ -159,7 +159,7 @@ <value xml:lang="ja">å±¥æ´ãã¼ã¿ã®å¤æ´ã®ç®¡çãè¡ããã¨ããã§ã«å®è£ ããã¦ãã¾ã: ãã¼ã¿ã¦ã§ã¢ãã¦ã¹ã®æé·ã«åããã¦ããããè¦ç´ããã¾ã (ãã¨ãã°ããã©ã¼ãã³ã¹ã®æ¹å)</value> <value xml:lang="th">à¸à¸§à¸²à¸¡à¹à¸à¹à¸à¸¡à¸²à¸à¸à¸à¸à¹à¸à¸¡à¸¹à¸¥à¹à¸à¹à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸à¹à¸£à¸µà¸¢à¸à¸£à¹à¸à¸¢à¹à¸¥à¹à¸§; à¹à¸à¹à¸¡à¸µà¸à¸²à¸£à¸à¸£à¸±à¸à¸à¸£à¸¸à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¹à¸«à¹à¸à¸µà¸à¸¶à¹à¸ (à¸à¸±à¸§à¸à¸¢à¹à¸²à¸à¹à¸à¹à¸ à¸à¸²à¸£à¸à¸³à¹à¸«à¹à¸à¸µà¸à¸¶à¹à¸)</value> <value xml:lang="zh">å·²ç»å®ç°æ°æ®çåå²è®°å½ï¼å®ä»¬ä¼éæ°æ®ä»åºçå¢é¿èæ¹è¿ï¼å¦æ§è½æåï¼ã</value> - <value xml:lang="zh_TW">å·²ç¶å¯¦ä½è³æçæ·å²è¨éï¼å®åæéè³æåå²çå¢é·èæ¹é²ï¼å¦æ§è½æåï¼ã</value> + <value xml:lang="zh_TW">å·²ç¶å¯¦ä½è³æçæ·å²è¨é;å®åæé¨è³æåå²çå¢é·èæ¹é²(å¦æ§è½æå).</value> </property> <property key="BusinessIntelligenceNote16"> <value xml:lang="en">The following dimensions (and data services) are defined: CurrencyDimension, DateDimension, ProductDimension;</value> @@ -168,7 +168,7 @@ <value xml:lang="ja">次ã®ãã£ã¡ã³ã¸ã§ã³ (ããã³ãã¼ã¿ãµã¼ãã¹) ãå®ç¾©ããã¦ãã¾ã: é貨ãã£ã¡ã³ã¸ã§ã³ãæ¥ä»ãã£ã¡ã³ã¸ã§ã³ã製åãã£ã¡ã³ã¸ã§ã³ã</value> <value xml:lang="th">à¸à¸²à¸£à¸§à¸±à¸à¸à¸à¸²à¸à¸à¸²à¸¡à¸à¸µà¹à¸à¸³à¸«à¸à¸ (à¹à¸¥à¸°à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¸à¸£à¸´à¸à¸²à¸£) ระà¸à¸¸ : CurrencyDimension, DateDimension, ProductDimension;</value> <value xml:lang="zh">å·²ç»å®ä¹äºä¸å维度ï¼ä»¥åæ°æ®æå¡ï¼ï¼è´§å¸ç»´åº¦ãæ¥æ维度ã产å维度ï¼</value> - <value xml:lang="zh_TW">å·²ç¶å®ç¾©äºä¸åç¶åº¦ï¼ä»¥åè³ææåï¼ï¼è²¨å¹£ç¶åº¦ãæ¥æç¶åº¦ãç¢åç¶åº¦ï¼</value> + <value xml:lang="zh_TW">å·²ç¶å®ç¾©äºä¸åç¶åº¦(以åè³ææå):貨幣ç¶åº¦ãæ¥æç¶åº¦ãç¢åç¶åº¦;</value> </property> <property key="BusinessIntelligenceNote17"> <value xml:lang="en">we will have to complete them and design the other ones (the total number of dimension will be probably around 20).</value> @@ -177,7 +177,7 @@ <value xml:lang="ja">ç§ãã¡ã¯ãããå®äºãããå¥ã®ãã®ãè¨è¨ããå¿ è¦ãããã¾ã (ãã£ã¡ã³ã¸ã§ã³ã®åè¨ã¯ç´20ã«ãªãã¾ã)ã</value> <value xml:lang="th">à¹à¸£à¸²à¸à¸³à¸¥à¸±à¸à¸à¸³à¸ªà¸´à¹à¸à¹à¸«à¸¥à¹à¸²à¸à¸±à¹à¸à¸ªà¸³à¹à¸£à¹à¸à¹à¸¥à¹à¸§à¹à¸¥à¸°à¸§à¸²à¸à¹à¸à¸à¸ªà¸´à¹à¸à¸à¹à¸à¹à¸ (à¸à¸³à¸à¸§à¸à¸à¸±à¹à¸à¸«à¸¡à¸à¸à¸£à¸°à¸¡à¸²à¸ 20)</value> <value xml:lang="zh">æ们å°å®æå®ä»¬ï¼å¹¶è®¾è®¡å ¶å®çï¼å ¨é¨ç»´åº¦æ°é大约å°å¨20个左å³ï¼ã</value> - <value xml:lang="zh_TW">æåå°å®æå®åï¼ä¸¦è¨è¨å ¶å®çï¼å ¨é¨ç¶åº¦æ¸é大约å°å¨20åå·¦å³ï¼ã</value> + <value xml:lang="zh_TW">æåå°å®æå®å,並è¨è¨å ¶å®ç(å ¨é¨ç¶åº¦æ¸é大ç´å°å¨20åå·¦å³).</value> </property> <property key="BusinessIntelligenceNote18"> <value xml:lang="en">Just one fact and one star schema are defined: SalesInvoiceItemFact and SalesInvoiceItemStarSchema.</value> @@ -186,7 +186,7 @@ <value xml:lang="ja">ãã¡ã¯ãã1ã¤ã¨ã¹ã¿ã¼ã¹ãã¼ãã1ã¤å®ç¾©ããã¦ãã¾ã: 販売è«æ±æ¸æç´°ãã¡ã¯ã ãã㳠販売è«æ±æ¸æç´°ã¹ã¿ã¼ã¹ãã¼ãã</value> <value xml:lang="th">à¸à¸°à¸à¹à¸à¸à¸£à¸°à¸à¸¸ 1 à¸à¹à¸à¹à¸à¹à¸à¸à¸£à¸´à¸à¹à¸¥à¸° 1 à¹à¸à¸£à¸à¸à¸²à¸£: SalesInvoiceItemFact and SalesInvoiceItemStarSchema</value> <value xml:lang="zh">åªå®ä¹äºä¸ä¸ªäºå®åä¸ä¸ªæå模åï¼SalesInvoiceItemFactåSalesInvoiceItemStarSchemaã</value> - <value xml:lang="zh_TW">åªå®ç¾©äºä¸åäºå¯¦åä¸åæå模åï¼SalesInvoiceItemFactåSalesInvoiceItemStarSchemaã</value> + <value xml:lang="zh_TW">åªå®ç¾©äºä¸åäºå¯¦åä¸åæå模å:SalesInvoiceItemFactåSalesInvoiceItemStarSchema.</value> </property> <property key="BusinessIntelligenceNote19"> <value xml:lang="en">You can quickly initialize the datawarehouse by clicking on the link below:</value> @@ -195,7 +195,7 @@ <value xml:lang="ja">次ã®ãªã³ã¯ãã¯ãªãã¯ããã¨ããã¼ã¿ã¦ã§ã¢ãã¦ã¹ãç°¡åã«åæåãããã¨ãã§ãã¾ã:</value> <value xml:lang="th">à¸à¸¸à¸à¸ªà¸²à¸¡à¸²à¸£à¸à¹à¸£à¸´à¹à¸¡à¸à¹à¸à¹à¸à¹à¸²à¸ªà¸¹à¹à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¹à¸à¹à¸à¸¢à¹à¸²à¸à¸£à¸§à¸à¹à¸£à¹à¸§à¹à¸à¸¢à¸à¸²à¸£à¸à¸¥à¸´à¸à¸à¸à¸¥à¸´à¸à¸à¹à¸à¹à¸²à¸à¸¥à¹à¸²à¸à¸à¸µà¹</value> <value xml:lang="zh">ä½ è½éè¿ç¹å»ä¸é¢çé¾æ¥æ¥å¿«éåå§åæ°æ®ä»åºï¼</value> - <value xml:lang="zh_TW">ä½ è½ééé»é¸ä¸é¢çé£çµä¾å¿«éåå§åè³æåå²ï¼</value> + <value xml:lang="zh_TW">ä½ è½ééé»é¸ä¸é¢çé£çµä¾å¿«éåå§åè³æåå²:</value> </property> <property key="BusinessIntelligenceNote1"> <value xml:lang="en">This is a proof of concept for an OFBiz integrated framework for business intelligence analysis.</value> @@ -204,7 +204,7 @@ <value xml:lang="ja">OFBizçµ±åãã¬ã¼ã ã¯ã¼ã¯ã«ããããã¸ãã¹ã¤ã³ããªã¸ã§ã³ã¹åæã®ã³ã³ã»ããã</value> <value xml:lang="th">à¸à¸²à¸£à¸à¸à¸ªà¸à¸à¸à¸§à¸²à¸¡à¹à¸à¹à¸²à¹à¸à¸ªà¸³à¸«à¸£à¸±à¸ OFBiz framework à¹à¸à¸·à¹à¸à¸à¸²à¸£à¸§à¸´à¹à¸à¸£à¸²à¸°à¸«à¹à¸£à¸°à¸à¸à¸à¸²à¸£à¹à¸£à¸µà¸¢à¸à¸£à¸¹à¹à¸à¸²à¸à¸à¸¸à¸£à¸à¸´à¸</value> <value xml:lang="zh">è¿æ¯ä¸ä¸ªéªè¯OFBizéææ¡æ¶è½å¤ç¨äºåä¸æºè½çå®ç°ã</value> - <value xml:lang="zh_TW">éæ¯ä¸åé©èOFBizæ´åææ¡æ¶è½å¤ç¨æ¼åæ¥æºæ §ç實ä½ã</value> + <value xml:lang="zh_TW">éæ¯ä¸åé©èOFBizæ´è¤åæ¡æ¶è½å¤ ç¨æ¼åæ¥æºæ §ç實ä½.</value> </property> <property key="BusinessIntelligenceNote20"> <value xml:lang="en">The CurrencyDimension, DateDimension, ProductDimension and the SalesInvoiceItemFact entities will be automatically populated.</value> @@ -213,7 +213,7 @@ <value xml:lang="ja">é貨ãã£ã¡ã³ã¸ã§ã³ãæ¥ä»ãã£ã¡ã³ã¸ã§ã³ã製åãã£ã¡ã³ã¸ã§ã³ãããã³è²©å£²è«æ±æ¸æç´°ãã¡ã¯ãã®ã¨ã³ãã£ãã£ã¯èªåçã«çæããã¾ãã</value> <value xml:lang="th">CurrencyDimension, DateDimension, ProductDimension à¹à¸¥à¸° SalesInvoiceItemFact à¸à¸°à¸à¸à¸à¸¢à¸¹à¹à¹à¸à¸¢à¸à¸±à¸à¹à¸à¸¡à¸±à¸à¸´</value> <value xml:lang="zh">ä¼èªå¨æCurrencyDimensionãDateDimensionãProductDimension以åSalesInvoiceItemFactå®ä½å¡«å ¥ã</value> - <value xml:lang="zh_TW">æèªåæCurrencyDimensionãDateDimensionãProductDimension以åSalesInvoiceItemFactåé«è¼¸å ¥ã</value> + <value xml:lang="zh_TW">æèªåæCurrencyDimensionãDateDimensionãProductDimension以åSalesInvoiceItemFactè³æ實é«å¢å è³æ.</value> </property> <property key="BusinessIntelligenceNote21"> <value xml:lang="en">Then you can run the analysis using the report builder menu.</value> @@ -222,7 +222,7 @@ <value xml:lang="ja">ããã¦ã¬ãã¼ããã«ãã¡ãã¥ã¼ããåæãå®è¡ãããã¨ãã§ãã¾ãã</value> <value xml:lang="th">หลัà¸à¸à¸²à¸à¸à¸µà¹à¸à¸¸à¸à¸à¸³à¸à¸²à¸£à¸§à¸´à¹à¸à¸£à¸²à¸°à¸«à¹à¹à¸¥à¹à¸§à¸ªà¸²à¸¡à¸²à¸£à¸à¹à¸à¹à¹à¸¡à¸à¸¹à¸à¸²à¸£à¸ªà¸£à¹à¸²à¸à¸£à¸²à¸¢à¸à¸²à¸à¹à¸à¹</value> <value xml:lang="zh">ç¶åä½ è½ä½¿ç¨æ¥åçæç¨åºèåè¿è¡åæã</value> - <value xml:lang="zh_TW">ç¶å¾ä½ è½ä½¿ç¨å ±è¡¨ç¢çç¨å¼é¸å®å·è¡åæã</value> + <value xml:lang="zh_TW">ç¶å¾ä½ è½ä½¿ç¨å ±è¡¨ç¢çç¨å¼é¸å®å·è¡åæ.</value> </property> <property key="BusinessIntelligenceNote22"> <value xml:lang="en">The report builder is a very simple tool that allows you to run</value> @@ -231,7 +231,7 @@ <value xml:lang="ja">ã¬ãã¼ããã«ãã¯ãåæãå®è¡ããããã®ãé常ã«ã·ã³ãã«ãªãã¼ã«ã§ãã</value> <value xml:lang="th">à¸à¸²à¸£à¸ªà¸£à¹à¸²à¸à¸£à¸²à¸¢à¸à¸²à¸à¹à¸à¹à¸à¹à¸à¸£à¸·à¹à¸à¸à¸¡à¸·à¸à¸à¹à¸²à¸¢ ๠à¸à¸µà¹à¹à¸«à¹à¸à¸¸à¸à¹à¸à¹à¸à¸²à¸à¹à¸à¹</value> <value xml:lang="zh">æ¥åçæç¨åºæ¯ä¸ä¸ªå¾ç®åçå·¥å ·ï¼å è®¸ä½ è¿è¡</value> - <value xml:lang="zh_TW">å ±è¡¨ç¢çç¨å¼æ¯ä¸ä¸ªå¾ç°¡å®çå·¥å ·ï¼å è®¸ä½ å·è¡</value> + <value xml:lang="zh_TW">å ±è¡¨ç¢çç¨å¼æ¯ä¸åå¾ç°¡å®çå·¥å ·,å è¨±ä½ å·è¡</value> </property> <property key="BusinessIntelligenceNote23"> <value xml:lang="en">the analysis on all the star schemas defined in the system.</value> @@ -240,7 +240,7 @@ <value xml:lang="ja">ãã¹ã¦ã®ã¹ã¿ã¼ã¹ãã¼ãä¸ã§ã®åæãã·ã¹ãã ã§å®ç¾©ããã¦ãã¾ãã</value> <value xml:lang="th">à¸à¸²à¸£à¸§à¸´à¹à¸à¸£à¸²à¸°à¸«à¹à¸à¸à¹à¸à¸à¸à¸±à¸à¸à¸±à¹à¸à¸«à¸¡à¸à¸à¸µà¹à¸£à¸°à¸à¸¸à¹à¸à¸£à¸°à¸à¸</value> <value xml:lang="zh">ç³»ç»ä¸å®ä¹çæææå模åçåæã</value> - <value xml:lang="zh_TW">ç³»ç»ä¸å®ä¹çæææå模åçåæã</value> + <value xml:lang="zh_TW">系統ä¸å®ç¾©çæææå模åçåæ.</value> </property> <property key="BusinessIntelligenceNote24"> <value xml:lang="en">However, right now there is just one star schema defined:</value> @@ -249,7 +249,7 @@ <value xml:lang="ja">ããããä»ç¾å¨1ã¤ã®ã¹ã¿ã¼ã¹ãã¼ãã ããå®ç¾©ããã¦ãã¾ã:</value> <value xml:lang="th">à¸à¸¢à¹à¸²à¸à¹à¸£à¸à¹à¸à¸²à¸¡, à¸à¸à¸°à¸à¸µà¹à¸¡à¸µà¹à¸à¸à¸à¸±à¸à¸à¸µà¹à¸à¸³à¸«à¸à¸:</value> <value xml:lang="zh">ç¶èï¼ç®ååªå®ä¹äºä¸ä¸ªæå模åï¼</value> - <value xml:lang="zh_TW">ç¶èï¼ç®ååªå®ç¾©äºä¸åæå模åï¼</value> + <value xml:lang="zh_TW">ç¶è,ç®ååªå®ç¾©äºä¸åæå模å:</value> </property> <property key="BusinessIntelligenceNote25"> <value xml:lang="en">SalesInvoiceItemStarSchema that is a simple "profit and loss" (P&L) analysis.</value> @@ -258,7 +258,7 @@ <value xml:lang="ja">販売è«æ±æç´°ã¹ã¿ã¼ã¹ãã¼ã ã¯åç´ãª "æç" (P&L) åæã§ãã</value> <value xml:lang="th">SalesInvoiceItemStarSchema à¹à¸à¹à¸à¸à¸²à¸£à¸§à¸´à¹à¸à¸£à¸²à¸°à¸«à¹à¸à¸±à¹à¸à¸à¸·à¹à¸à¸à¸²à¸à¸à¸à¸ "à¸à¸³à¹à¸£à¹à¸¥à¸°à¸à¸²à¸à¸à¸¸à¸" (P&L) </value> <value xml:lang="zh">éå®å票æç»æå模å(SalesInvoiceItemStarSchema)æ¯ä¸ä¸ªç®åççäºåæã</value> - <value xml:lang="zh_TW">é·å®ç¼ç¥¨æç»æå模å(SalesInvoiceItemStarSchema)æ¯ä¸åç®å®ççè§åæã</value> + <value xml:lang="zh_TW">é·å®ç¼ç¥¨ç´°é æå模å(SalesInvoiceItemStarSchema)æ¯ä¸åç°¡å®ççè§åæ.</value> </property> <property key="BusinessIntelligenceNote26"> <value xml:lang="en">Just select using the checkboxes the fields (columns) you want to see in the report</value> @@ -267,7 +267,7 @@ <value xml:lang="ja">ãã§ãã¯ããã¯ã¹ã®é ç®ãé¸æããã ãã§ã¬ãã¼ããåç §ãããã¨ãã§ãã¾ãã</value> <value xml:lang="th">à¸à¸°à¸à¹à¸à¸à¹à¸¥à¸·à¸à¸à¹à¸à¹à¹à¸à¹à¸à¸à¹à¸à¸ (à¸à¸à¸¥à¸±à¸¡à¸ à¹) à¸à¸²à¸¡à¸à¸µà¹à¸à¸¸à¸à¸à¹à¸à¸à¸à¸²à¸£à¹à¸«à¹à¸¡à¸µà¹à¸à¸£à¸²à¸¢à¸à¸²à¸</value> <value xml:lang="zh">使ç¨éæ©æ¡éæ©ä½ æ³å¨æ¥åä¸çå°çé£äºæ°æ®é¡¹(å)ï¼</value> - <value xml:lang="zh_TW">使ç¨é¸ææ¡é¸æä½ æ³å¨å ±è¡¨ä¸çå°çé£äºæ¬ä½ï¼</value> + <value xml:lang="zh_TW">使ç¨é¸ææ¡é¸æä½ æ³å¨å ±è¡¨ä¸çå°çé£äºæ¬ä½,</value> </property> <property key="BusinessIntelligenceNote27"> <value xml:lang="en">and a simple report will be shown: according to the columns selected the data will be aggregated (drill up/down);</value> @@ -276,7 +276,7 @@ <value xml:lang="ja">ããã¦ãé¸æããé ç®ã®ãã¼ã¿ã«å¾ã£ã¦ç°¡åãªã¬ãã¼ããéè¨ãã表示ããã¾ã (ããªã«ã¢ãã/ãã¦ã³)</value> <value xml:lang="th">à¹à¸¥à¸°à¸à¸·à¹à¸à¸à¸²à¸à¸à¸à¸à¸£à¸²à¸¢à¸à¸²à¸à¸à¸°à¸à¹à¸à¸à¹à¸ªà¸à¸: à¸à¸²à¸¡à¸à¸à¸¥à¸±à¸¡à¸ à¹à¸à¸µà¹à¹à¸¥à¸·à¸à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸°à¸à¹à¸à¸à¸£à¸§à¸¡à¸à¸±à¸ (drill up/down);</value> <value xml:lang="zh">ç¶åä¼æ¾ç¤ºä¸ä¸ªç®åçæ¥åï¼æç §éæ©çåï¼æ°æ®ä¼è¢«èå(æ±æ»åæ/ç»ååæ)ï¼</value> - <value xml:lang="zh_TW">ç¶å¾æ顯示ä¸åç°¡å®çå ±è¡¨ï¼æç §é¸æçæ¬ä½ï¼è³ææ被èå(å¯ç¸½åæ/ç´°ååæ)ï¼</value> + <value xml:lang="zh_TW">ç¶å¾æ顯示ä¸åç°¡å®çå ±è¡¨:æç §é¸æçæ¬ä½,è³ææ被èå(å¯ç¸½åæ/ç´°ååæ);</value> </property> <property key="BusinessIntelligenceNote28"> <value xml:lang="en">all the descriptions you see in the report screens are pulled from the entity definitions.</value> @@ -285,7 +285,7 @@ <value xml:lang="ja">ã¬ãã¼ãç»é¢ã®ãã¹ã¦ã®å®ç¾©ãã¨ã³ãã£ãã£ã®å®ç¾©ããæ½åºããã¾ãã</value> <value xml:lang="th">รายละà¹à¸à¸µà¸¢à¸à¸à¸±à¹à¸à¸«à¸¡à¸à¸à¸µà¹à¸à¸¸à¸à¹à¸«à¹à¸à¹à¸à¸«à¸à¹à¸²à¸£à¸²à¸¢à¸à¸²à¸à¸à¸¶à¸à¸¡à¸²à¸à¸²à¸à¸ªà¸´à¹à¸à¸à¸µà¹à¸à¸³à¸«à¸</value> <value xml:lang="zh">ä½ å¨æ¥åå±å¹ä¸çå°çå ¨é¨æè¿°é½æ¯ä»å®ä½å®ä¹ä¸æ½ååºæ¥çã</value> - <value xml:lang="zh_TW">ä½ å¨å ±è¡¨ç«é¢ä¸çå°çå ¨é¨æè¿°é½æ¯å¾åé«å®ç¾©ä¸æ½ååºä¾çã</value> + <value xml:lang="zh_TW">ä½ å¨å ±è¡¨ç«é¢ä¸çå°çå ¨é¨æè¿°é½æ¯å¾è³æ實é«å®ç¾©ä¸æ½ååºä¾ç.</value> </property> <property key="BusinessIntelligenceNote29"> <value xml:lang="en">The initialization is needed only once, because the product data and sales invoice data</value> @@ -294,7 +294,7 @@ <value xml:lang="ja">製åãã¼ã¿ããã³è²©å£²è«æ±ãã¼ã¿ã®ããã«ãåæåã¯1åã ãå¿ è¦ã§ãã</value> <value xml:lang="th">à¸à¸²à¸£à¹à¸£à¸´à¹à¸¡à¸à¹à¸à¹à¸à¹à¸à¸à¸§à¸²à¸¡à¸à¹à¸à¸à¸à¸²à¸£à¸à¸¢à¹à¸²à¸à¹à¸£à¸à¹à¸à¸£à¸²à¸°à¹à¸à¹à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸ªà¸´à¸à¸à¹à¸²à¹à¸¥à¸°à¸à¹à¸à¸¡à¸¹à¸¥à¹à¸à¹à¸à¹à¸à¸à¸²à¸£à¸à¸²à¸¢</value> <value xml:lang="zh">åå§ååªéè¦åä¸æ¬¡ï¼å 为产åæ°æ®åéå®å票æ°æ®</value> - <value xml:lang="zh_TW">åå§ååªéè¦åä¸æ¬¡ï¼å çºç¢åè³æåé·å®ç¼ç¥¨è³æ</value> + <value xml:lang="zh_TW">åå§ååªéè¦åä¸æ¬¡,å çºç¢åè³æåé·å®ç¼ç¥¨è³æ</value> </property> <property key="BusinessIntelligenceNote2"> <value xml:lang="en">The idea is to define a set entities for business intelligence analysis in a separate (olap) database,</value> @@ -303,7 +303,7 @@ <value xml:lang="ja">ãã¸ãã¹ã¤ã³ããªã¸ã§ã³ã¹åæã®ããã«å¥ã®(OLAP)ãã¼ã¿ãã¼ã¹ã«ã¨ã³ãã£ãã£ä¸å¼ãå®ç¾©ããã¨ããèãã¯ã</value> <value xml:lang="th">à¹à¸à¸à¸à¸²à¸£à¹à¸à¸à¸²à¸£à¸à¸±à¹à¸à¸à¹à¸²à¸ªà¸´à¹à¸à¸à¸µà¹à¸¡à¸µà¸à¸¢à¸¹à¹à¹à¸à¸·à¹à¸à¸§à¸´à¹à¸à¸£à¸²à¸°à¸«à¹à¸à¸²à¸£à¹à¸£à¸µà¸¢à¸à¸£à¸¹à¹à¸à¸²à¸à¸à¸¸à¸£à¸à¸´à¸à¹à¸à¸à¸²à¸£à¹à¸¢à¸ (olap) à¸à¸²à¸à¸à¹à¸à¸¡à¸¹à¸¥</value> <value xml:lang="zh">æè·¯æ¯å¨ä¸ä¸ªç¬ç«ç(OLAP)æ°æ®åºä¸ä¸ºåä¸æºè½åæå®ä¹ä¸ç»å®ä½ï¼</value> - <value xml:lang="zh_TW">é»åæ¯å¨ä¸ååé¢ç(OLAP)è³æ庫çºåæ¥æºæ §åæå®ç¾©ä¸ç»åé«ï¼</value> + <value xml:lang="zh_TW">é»åæ¯å¨ä¸ååé¢ç(OLAP)è³æ庫çºåæ¥æºæ §åæå®ç¾©ä¸çµè³æ實é«,</value> </property> <property key="BusinessIntelligenceNote30"> <value xml:lang="en">are kept updated by ecas: if you create/update a product or create a new invoice,</value> @@ -312,7 +312,7 @@ <value xml:lang="ja">製åã®ä½æ/æ´æ°ã¾ãã¯æ°è¦è«æ±ã®ä½ææã®ECASæ´æ°ã§ä¿ããã¾ãã</value> <value xml:lang="th">à¹à¸à¹à¸à¸à¸²à¸£à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸à¹à¸à¸¢à¸à¸²à¸£à¹à¸à¸à¸à¸µà¹: à¸à¹à¸²à¸à¸¸à¸à¸ªà¸£à¹à¸²à¸/à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸à¸ªà¸´à¸à¸à¹à¸²à¸«à¸£à¸·à¸à¸ªà¸£à¹à¸²à¸à¹à¸à¸ªà¹à¸à¸à¸à¸à¹à¸«à¸¡à¹</value> <value xml:lang="zh">æ¯ç±ECASæ¥ä¿æåæ´æ°çï¼å¦æä½ å建/æ´æ°ä¸ä¸ªäº§åææ°å»ºä¸ä¸ªå票ï¼</value> - <value xml:lang="zh_TW">æ¯ç±ECASä¾ä¿æåæ´æ°çï¼å¦æä½ æ°å»º/æ´æ°ä¸åç¢åææ°å»ºä¸åç¼ç¥¨ï¼</value> + <value xml:lang="zh_TW">æ¯ç±ECASä¾ä¿æåæ´æ°ç:å¦æä½ æ°å»º/æ´æ°ä¸åç¢åææ°å»ºä¸åç¼ç¥¨,</value> </property> <property key="BusinessIntelligenceNote31"> <value xml:lang="en">the new information will be immediately included in the datawarehouse analysis.</value> @@ -321,7 +321,7 @@ <value xml:lang="ja">æ°ããæ å ±ã¯ãã¼ã¿ã¦ã§ã¢ãã¦ã¹åæã®ä¸ã«ç´æ¥åãè¾¼ã¾ãã¾ãã</value> <value xml:lang="th">à¸à¹à¸à¸¡à¸¹à¸¥à¹à¸«à¸¡à¹à¸à¸°à¸à¹à¸à¸à¸£à¸§à¸¡à¸à¸±à¸à¸à¸µà¹à¸à¸à¸²à¸£à¸§à¸´à¹à¸à¸£à¸²à¸°à¸«à¹à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²</value> <value xml:lang="zh">æ°ä¿¡æ¯ä¼ç«å³å å«å¨æ°æ®ä»åºçåæä¸ã</value> - <value xml:lang="zh_TW">æ°è¨æ¯æç«å³å å«å¨è³æåå²çåæä¸ã</value> + <value xml:lang="zh_TW">æ°è¨æ¯æç«å³å å«å¨è³æåå²çåæä¸.</value> </property> <property key="BusinessIntelligenceNote3"> <value xml:lang="en">accessible, in the same way as the main one (OLTP), via the delegator.</value> @@ -330,7 +330,7 @@ <value xml:lang="ja">ç解ããããã主æµ(OLAP)ã¨åãæ¹æ³ã§ãããªã²ã¼ã¿ã«ãã£ã¦å®ç¾ãã¾ãã</value> <value xml:lang="th">สามารà¸à¹à¸à¹à¸²à¸à¸¶à¸à¹à¸à¹à¹à¸à¸à¸²à¸à¹à¸à¸µà¸¢à¸§à¸à¸±à¸à¸à¸±à¸à¸à¸²à¸à¹à¸£à¸ (OLTP)</value> <value xml:lang="zh">å¯è®¿é®ï¼ä¸ä¸»è¦çæ°æ®åºåæï¼éè¿delegatorå®ç°ã</value> - <value xml:lang="zh_TW">å¯ååçï¼å主è¦ç(OLTP)è³æ庫ç¸åçµæ§ï¼éédelegatorã</value> + <value xml:lang="zh_TW">å¯ååç,å主è¦ç(OLTP)è³æ庫ç¸åçµæ§,éédelegator.</value> </property> <property key="BusinessIntelligenceNote4"> <value xml:lang="en">The new olap database, will contain all the entities necessary to datawarehouse analysis:</value> @@ -339,7 +339,7 @@ <value xml:lang="ja">æ°ããOLAPãã¼ã¿ãã¼ã¹ã¯ãã¼ã¿ã¦ã§ã¢ãã¦ã¹åæã«å¿ è¦ãªã¨ã³ãã£ãã£ãå ¨ã¦å«ãã§ãã¾ãã</value> <value xml:lang="th">à¸à¸²à¸à¸à¹à¸à¸¡à¸¹à¸¥ olap à¹à¸«à¸¡à¹à¸à¸°à¸à¸£à¸°à¸à¸à¸à¸à¹à¸§à¸¢à¸ªà¸´à¹à¸à¸à¸µà¹à¸¡à¸µà¸à¸¢à¸¹à¹à¸à¸¶à¹à¸à¸à¸³à¹à¸à¹à¸à¹à¸à¸à¸²à¸£à¸§à¸´à¹à¸à¸£à¸²à¸°à¸«à¹à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²:</value> <value xml:lang="zh">æ°çOLAPæ°æ®åºï¼å°å å«å ¨é¨æ°æ®ä»åºåææéçå®ä½ï¼</value> - <value xml:lang="zh_TW">æ°çOLAPè³æ庫ï¼å°å å«å ¨é¨è³æåå²åææéçåé«ï¼</value> + <value xml:lang="zh_TW">æ°çOLAPè³æ庫,å°å å«å ¨é¨è³æåå²åææéçè³æ實é«:</value> </property> <property key="BusinessIntelligenceNote5"> <value xml:lang="en">dimensions, facts and star schemas (that are view-entities).</value> @@ -348,7 +348,7 @@ <value xml:lang="ja">ãã£ã¡ã³ã¸ã§ã³ããã¡ã¯ããããã¦ã¹ã¿ã¼ã¹ãã¼ã (ãã¥ã¼) ã§ãã</value> <value xml:lang="th">à¸à¸à¸à¹à¸à¸,à¸à¹à¸à¹à¸à¹à¸à¸à¸£à¸´à¸à¹à¸¥à¸°à¹à¸à¸à¸à¸±à¸ (à¹à¸à¹à¸à¸à¸²à¸£à¹à¸ªà¸à¸à¸ªà¸´à¹à¸à¸à¸µà¹à¸¡à¸µà¸à¸¢à¸¹à¹)</value> <value xml:lang="zh">维度ãäºå®åæå模å(æµè§å®ä½)ã</value> - <value xml:lang="zh_TW">ç¶åº¦ãäºå¯¦åæå模å(檢è¦åé«)ã</value> + <value xml:lang="zh_TW">ç¶åº¦ãäºå¯¦åæå模å(檢è¦è³æ實é«).</value> </property> <property key="BusinessIntelligenceNote6"> <value xml:lang="en">The dimensions, facts and star schemas are defined according to best practices for datawarehouses</value> @@ -357,7 +357,7 @@ <value xml:lang="ja">ãã£ã¡ã³ã¸ã§ã³ããã¡ã¯ããããã¦ã¹ã¿ã¼ã¹ãã¼ãã¯ãã¼ã¿ã¦ã§ã¢ãã¦ã¹ã®ãã¹ããã©ãã¯ãã£ã¹ã</value> <value xml:lang="th">à¸à¸à¸à¹à¸à¸,à¸à¹à¸à¹à¸à¹à¸à¸à¸£à¸´à¸à¹à¸¥à¸°à¹à¸à¸à¸à¸±à¸à¸à¸²à¸¡à¸à¸µà¹à¸£à¸°à¸à¸¸à¹à¸à¹à¸à¸§à¸´à¸à¸µà¸à¸à¸´à¸à¸±à¸à¸´à¸à¸µà¹à¸à¸µà¸à¸µà¹à¸ªà¸¸à¸à¸ªà¸³à¸«à¸£à¸±à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²</value> <value xml:lang="zh">维度ãäºå®åæå模åå®ä¹åèäºæ°æ®ä»åºæä½³å®è·µ</value> - <value xml:lang="zh_TW">ç¶åº¦ãäºå¯¦åæå模åå®ç¾©åèäºè³æåå²æ佳實å</value> + <value xml:lang="zh_TW">ç¶åº¦ãäºå¯¦åæå模åå®ç¾©åèäºè³æåå²æä½³æ £ä¾</value> </property> <property key="BusinessIntelligenceNote7"> <value xml:lang="en">and best practices for OFBiz: they are defined as standard entities using the xml entity defs;</value> @@ -366,7 +366,7 @@ <value xml:lang="ja">ããã³OFBizã®ãã¹ããã©ãã¯ãã£ã¹ã«å¾ã£ã¦å®ç¾©ããã¦ãã¾ã: ãããã¯xmlã¨ã³ãã£ãã£å®ç¾©ã使ç¨ãã¦æ¨æºã¨ã³ãã£ãã£ã¨ãã¦å®ç¾©ããã¦ãã¾ãã</value> <value xml:lang="th">à¹à¸¥à¸°à¸§à¸´à¸à¸µà¸à¸à¸´à¸à¸±à¸à¸´à¸à¸µà¹à¸à¸µà¸à¸µà¹à¸ªà¸¸à¸à¸ªà¸³à¸«à¸£à¸±à¸ OFBiz à¸à¸·à¸: à¸à¹à¸à¸à¸à¸³à¸«à¸à¸à¸¡à¸²à¸à¸£à¸à¸²à¸à¸ªà¸´à¹à¸à¸à¸µà¹à¸¡à¸µà¸à¸¢à¸¹à¹à¹à¸«à¹à¹à¸«à¸¡à¸·à¸à¸à¸à¸±à¸à¸à¸µà¹à¹à¸à¹à¹à¸ xml </value> <value xml:lang="zh">以åOFBizæä½³å®è·µï¼æå®ä»¬ç¨XMLå®ä½å®ä¹å®ä¹ä¸ºæ åå®ä½ï¼</value> - <value xml:lang="zh_TW">以åOFBizæ佳實ä½ï¼æå®ä»¬ç¨XMLåé«å®ç¾©å®ç¾©ä¸ºæ¨æºåé«ï¼</value> + <value xml:lang="zh_TW">以åOFBizæä½³æ £ä¾:æå®åç¨XMLè³æ實é«å®ç¾©å®ç¾©çºæ¨æºè³æ實é«;</value> </property> <property key="BusinessIntelligenceNote8"> <value xml:lang="en">clear and consistent naming conventions are used and they are documented</value> @@ -375,7 +375,7 @@ <value xml:lang="ja">æçã§ä¸è²«ããå½åè¦åã使ç¨ãããã¾ãããããææ¸åããããã</value> <value xml:lang="th">ยà¸à¹à¸¥à¸´à¸à¹à¸¥à¸°à¹à¸à¹à¸à¸·à¹à¸à¸à¹à¸à¸à¸à¸¥à¸à¸à¸µà¹à¸ªà¸à¸à¸à¸¥à¹à¸à¸à¸à¸±à¸à¹à¸¥à¸°à¹à¸à¹à¸à¹à¸à¸à¸²à¸¡à¹à¸à¸à¸ªà¸²à¸£</value> <value xml:lang="zh">使ç¨ç®æä¸è´çå½åè§èï¼</value> - <value xml:lang="zh_TW">使ç¨ç®æä¸è´çå½åè¦ç¯ï¼</value> + <value xml:lang="zh_TW">使ç¨ç°¡æä¸è´çå½åè¦ç¯,</value> </property> <property key="BusinessIntelligenceNote9"> <value xml:lang="en">by meta data descriptions (in the entity def).</value> @@ -384,7 +384,7 @@ <value xml:lang="ja">ã¡ã¿ãã¼ã¿å®ç¾©ã使ç¨ããã¾ã (ã¨ã³ãã£ãã£å®ç¾©ã®ä¸ã§)ã</value> <value xml:lang="th">à¹à¸à¸¢à¸£à¸²à¸¢à¸¥à¸°à¹à¸à¸µà¸¢à¸à¸à¸µà¹à¸¡à¸²à¸à¸à¸à¸à¹à¸à¸¡à¸¹à¸¥(à¸à¸¢à¸¹à¹à¹à¸à¸à¸µà¹à¸à¸³à¸«à¸à¸)</value> <value xml:lang="zh">(å¨å®ä½å®ä¹ä¸)éè¿å æ°æ®æè¿°è¿è¡ææ¡£åã</value> - <value xml:lang="zh_TW">(å¨åé«å®ç¾©ä¸)éé Meta data æè¿°é²è¡æ件åã</value> + <value xml:lang="zh_TW">(å¨è³æ實é«å®ç¾©ä¸)éé Meta data æè¿°é²è¡æªå.</value> </property> <property key="BusinessIntelligenceQuickInitDataWarehouse"> <value xml:lang="en">Quick Init DataWarehouse</value> @@ -411,7 +411,7 @@ <value xml:lang="ja">ã¬ãã¼ããä½æ</value> <value xml:lang="th">à¹à¸ªà¸à¸à¸£à¸²à¸¢à¸à¸²à¸</value> <value xml:lang="zh">修饰æ¥å</value> - <value xml:lang="zh_TW">修飾æ¥å</value> + <value xml:lang="zh_TW">ä¿®é£¾å ±å</value> </property> <property key="BusinessIntelligenceReportBuilder"> <value xml:lang="en">Report Builder</value> @@ -420,7 +420,7 @@ <value xml:lang="ja">ã¬ãã¼ããã«ã</value> <value xml:lang="th">สรà¹à¸²à¸à¸£à¸²à¸¢à¸à¸²à¸</value> <value xml:lang="zh">æ¥åçæç¨åº</value> - <value xml:lang="zh_TW">å ±åç¢çç¨åº</value> + <value xml:lang="zh_TW">å ±åç¢çç¨å¼</value> </property> <property key="BusinessIntelligenceReportBuilderRenderStarSchemaReport"> <value xml:lang="en">Render Star Schema Report</value> @@ -463,6 +463,6 @@ <value xml:lang="it">Il metodo di aggiornamento: ${updateMode} non è ancora supportato.</value> <value xml:lang="ja">æ´æ°ã¢ã¼ã: ${updateMode} ã¯ã¾ã ãµãã¼ãããã¦ãã¾ããã</value> <value xml:lang="zh">è¿ä¸æ¯ææ´æ°ç¶æï¼${updateMode}ã</value> - <value xml:lang="zh_TW">éä¸æ¯æ´æ´æ°çæ ï¼${updateMode}ã</value> + <value xml:lang="zh_TW">éä¸æ¯æ´æ´æ°çæ :${updateMode}.</value> </property> </resource> 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=1626688&r1=1626687&r2=1626688&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 Mon Sep 22 08:09:27 2014 @@ -27,14 +27,14 @@ under the License. <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> <container name="catalina-container" loaders="main" class="org.ofbiz.catalina.container.CatalinaContainer"> - <!-- static configuration for tomcat --> + <!-- configuration for the Tomcat server --> <property name="use-naming" value="false"/> <property name="debug" value="0"/> <property name="catalina-runtime-home" value="runtime/catalina"/> <property name="apps-context-reloadable" value="false"/> <property name="apps-cross-context" value="false"/> <property name="apps-distributable" value="false"/><!-- you must also set all the webapps you want distributable, by adding <distributable/> in their web.xml file --> - <!-- one or more tomcat engines (servers); map to this + host --> + <!-- configuration of the Tomcat service that hosts OFBiz applications: the service has one engine and one or more connectors --> <property name="default-server" value="engine"> <property name="default-host" value="0.0.0.0"/> <property name="jvm-route" value="jvm1"/> @@ -66,119 +66,87 @@ under the License. <!-- <property name="ssl-accelerator-port" value="8443"/> --> <property name="enable-cross-subdomain-sessions" value="false"/> </property> - <!-- all connectors support type, host, port, enable-lookups --> <property name="ajp-connector" value="connector"> - <!-- see http://jakarta.apache.org/tomcat/tomcat-5.5-doc/config/ajp.html for reference --> - <property name="allowTrace" value="false"/> - <property name="emptySessionPath" value="false"/> - <property name="enableLookups" value="true"/> - <property name="maxPostSize" value="2097152"/> + <!-- see http://tomcat.apache.org/tomcat-7.0-doc/config/ajp.html for reference --> + <property name="port" value="8009"/> <property name="protocol" value="AJP/1.3"/> - <property name="proxyName" value=""/> - <property name="proxyPort" value=""/> - <property name="redirectPort" value=""/> <property name="scheme" value="http"/> <property name="secure" value="false"/> <property name="URIEncoding" value="UTF-8"/> - <property name="useBodyEncodingForURI" value="false"/> <property name="xpoweredBy" value="true"/> + <property name="enableLookups" value="true"/> <!-- set to false to improve performance (false is the default value in Tomcat) --> <!-- AJP/13 connector attributes --> - <property name="address" value="0.0.0.0"/> - <property name="backlog" value="10"/> - <property name="maxSpareThreads" value="50"/> + <!-- commented out because the values match the Tomcat defaults: + <property name="tomcatAuthentication" value="true"/> + <property name="allowTrace" value="false"/> + <property name="maxPostSize" value="2097152"/> + <property name="noCompressionUserAgents" value=""/> + <property name="connectionLinger" value="-1"/> + <property name="connectionTimeout" value="60000"/> + <property name="maxHttpHeaderSize" value="8192"/> + <property name="maxKeepAliveRequests" value="100"/> <property name="maxThreads" value="200"/> - <property name="minSpareThreads" value="4"/> - <property name="port" value="8009"/> + <property name="minSpareThreads" value="10"/> + <property name="acceptCount" value="100"/> + <property name="restrictedUserAgents" value=""/> + <property name="socketBuffer" value="9000"/> <property name="tcpNoDelay" value="true"/> - <property name="soTimeout" value="60000"/> - <property name="tomcatAuthentication" value="true"/> + <property name="threadPriority" value="5"/> + --> </property> <property name="http-connector" value="connector"> - <!-- see http://jakarta.apache.org/tomcat/tomcat-5.5-doc/config/http.html for reference --> - <property name="allowTrace" value="false"/> - <property name="emptySessionPath" value="false"/> - <property name="enableLookups" value="true"/> - <property name="maxPostSize" value="2097152"/> + <!-- see http://tomcat.apache.org/tomcat-7.0-doc/config/http.html for reference --> + <property name="port" value="8080"/> <property name="protocol" value="HTTP/1.1"/> - <property name="proxyName" value=""/> - <property name="proxyPort" value=""/> - <property name="redirectPort" value=""/> <property name="scheme" value="http"/> <property name="secure" value="false"/> <property name="URIEncoding" value="UTF-8"/> - <property name="useBodyEncodingForURI" value="false"/> <property name="xpoweredBy" value="true"/> - <!-- HTTP connector attributes --> - <property name="acceptCount" value="10"/> - <property name="address" value="0.0.0.0"/> - <property name="bufferSize" value="2048"/> + <property name="enableLookups" value="true"/> <!-- set to false to improve performance (false is the default value in Tomcat) --> <property name="compression" value="on"/> <property name="compressableMimeType" value="text/html,text/xml,text/plain,text/javascript,text/css"/> + <!-- commented out because the values match the Tomcat defaults: + <property name="allowTrace" value="false"/> + <property name="maxPostSize" value="2097152"/> <property name="noCompressionUserAgents" value=""/> <property name="connectionLinger" value="-1"/> <property name="connectionTimeout" value="60000"/> - <property name="disableUploadTimeout" value="false"/> <property name="maxHttpHeaderSize" value="8192"/> <property name="maxKeepAliveRequests" value="100"/> - <property name="maxSpareThreads" value="50"/> - <property name="maxThreads" value="100"/> - <property name="minSpareThreads" value="4"/> - <property name="port" value="8080"/> + <property name="maxThreads" value="200"/> + <property name="minSpareThreads" value="10"/> + <property name="acceptCount" value="100"/> <property name="restrictedUserAgents" value=""/> - <property name="server" value=""/> <property name="socketBuffer" value="9000"/> - <property name="strategy" value="lf"/> <property name="tcpNoDelay" value="true"/> - <property name="threadPriority" value="java.lang.Thread#NORM_PRIORITY"/> + <property name="threadPriority" value="5"/> + --> </property> <property name="https-connector" value="connector"> - <!-- see http://jakarta.apache.org/tomcat/tomcat-5.5-doc/config/http.html for reference --> - <property name="allowTrace" value="false"/> - <property name="emptySessionPath" value="false"/> - <property name="enableLookups" value="true"/> - <property name="maxPostSize" value="2097152"/> + <!-- see http://tomcat.apache.org/tomcat-7.0-doc/config/http.html for reference --> + <property name="port" value="8443"/> <property name="protocol" value="HTTP/1.1"/> - <property name="proxyName" value=""/> - <property name="proxyPort" value=""/> - <property name="redirectPort" value=""/> <property name="scheme" value="https"/> <property name="secure" value="true"/> + <property name="SSLEnabled" value="true"/> <property name="URIEncoding" value="UTF-8"/> - <property name="useBodyEncodingForURI" value="false"/> <property name="xpoweredBy" value="true"/> - <!-- HTTP connector attributes --> - <property name="acceptCount" value="10"/> - <property name="address" value="0.0.0.0"/> - <property name="bufferSize" value="2048"/> + <property name="enableLookups" value="true"/> <!-- set to false to improve performance (false is the default value in Tomcat) --> <property name="compression" value="on"/> <property name="compressableMimeType" value="text/html,text/xml,text/plain,text/javascript,text/css"/> - <property name="noCompressionUserAgents" value=""/> - <property name="connectionLinger" value="-1"/> - <property name="connectionTimeout" value="60000"/> - <property name="disableUploadTimeout" value="false"/> - <property name="maxHttpHeaderSize" value="8192"/> - <property name="maxKeepAliveRequests" value="100"/> - <property name="maxSpareThreads" value="50"/> - <property name="maxThreads" value="100"/> - <property name="minSpareThreads" value="4"/> - <property name="port" value="8443"/> - <property name="restrictedUserAgents" value=""/> - <property name="server" value=""/> - <property name="socketBuffer" value="9000"/> - <property name="strategy" value="lf"/> - <property name="tcpNoDelay" value="true"/> - <property name="threadPriority" value="java.lang.Thread#NORM_PRIORITY"/> <!-- SSL connector attributes --> - <property name="sSLImplementation" value="org.ofbiz.catalina.container.SSLImpl"/> + <property name="sslImplementationName" value="org.ofbiz.catalina.container.SSLImpl"/> <property name="algorithm" value="SunX509"/> <!-- the clientAuth to "want" in order to receive certs from the client; note that this isn't set this way by default because with certain browsers (like Safari) it breaks access via HTTPS, so until that problem is fixed - the default will be false --> + the default will be false <property name="clientAuth" value="false"/> + --> <property name="keystoreFile" value="framework/base/config/ofbizssl.jks"/> - <property name="keystorePass" value="changeit"/> <property name="keystoreType" value="JKS"/> + <property name="keyAlias" value="ofbiz"/> + <property name="keyPass" value="changeit"/> <property name="sslProtocol" value="TLS"/> <property name="ciphers" value=""/> </property> @@ -202,133 +170,40 @@ under the License. <property name="access-log-prefix" value="access_log."/> <property name="access-log-dir" value="runtime/logs"/> <property name="enable-request-dump" value="false"/> - <!-- uncomment for cluster support - <property name="default-server-cluster" value="cluster"> - <property name="rep-valve-filter"> - <property-value>.*\.gif;.*\.js;.*\.jpg;.*\.htm;.*\.html;.*\.txt;.*\.png;.*\.css;.*\.ico;.*\.htc;</property-value> - </property> - <property name="manager-class" value="org.apache.catalina.cluster.session.DeltaManager"/> - <property name="debug" value="5"/> - <property name="replication-mode" value="org.apache.catalina.tribes.transport.bio.PooledMultiSender"/> - <property name="tcp-listen-host" value="auto"/> - <property name="tcp-listen-port" value="4001"/> - <property name="tcp-sector-timeout" value="100"/> - <property name="tcp-thread-count" value="6"/> - <property name="mcast-bind-addr" value="192.168.2.1"/> - <property name="mcast-addr" value="224.0.0.1"/> - <property name="mcast-port" value="45564"/> - <property name="mcast-freq" value="500"/> - <property name="mcast-drop-time" value="3000"/> - </property> - --> - <!-- <property name="ssl-accelerator-port" value="8443"/> --> </property> - <!-- all connectors support type, host, port, enable-lookups --> <property name="ajp-connector" value="connector"> - <!-- see http://jakarta.apache.org/tomcat/tomcat-5.5-doc/config/ajp.html for reference --> - <property name="allowTrace" value="false"/> - <property name="emptySessionPath" value="false"/> - <property name="enableLookups" value="true"/> - <property name="maxPostSize" value="2097152"/> + <property name="port" value="8010"/> <property name="protocol" value="AJP/1.3"/> - <property name="proxyName" value=""/> - <property name="proxyPort" value=""/> - <property name="redirectPort" value=""/> <property name="scheme" value="http"/> <property name="secure" value="false"/> <property name="URIEncoding" value="UTF-8"/> - <property name="useBodyEncodingForURI" value="false"/> <property name="xpoweredBy" value="true"/> - <!-- AJP/13 connector attributes --> - <property name="address" value="0.0.0.0"/> - <property name="backlog" value="10"/> - <property name="maxSpareThreads" value="50"/> - <property name="maxThreads" value="200"/> - <property name="minSpareThreads" value="4"/> - <property name="port" value="8010"/> - <property name="tcpNoDelay" value="true"/> - <property name="soTimeout" value="60000"/> - <property name="tomcatAuthentication" value="true"/> + <property name="enableLookups" value="true"/> </property> <property name="http-connector" value="connector"> - <!-- see http://jakarta.apache.org/tomcat/tomcat-5.5-doc/config/http.html for reference --> - <property name="allowTrace" value="false"/> - <property name="emptySessionPath" value="false"/> - <property name="enableLookups" value="true"/> - <property name="maxPostSize" value="2097152"/> + <property name="port" value="8080"/> <property name="protocol" value="HTTP/1.1"/> - <property name="proxyName" value=""/> - <property name="proxyPort" value=""/> - <property name="redirectPort" value=""/> <property name="scheme" value="http"/> <property name="secure" value="false"/> <property name="URIEncoding" value="UTF-8"/> - <property name="useBodyEncodingForURI" value="false"/> <property name="xpoweredBy" value="true"/> - <!-- HTTP connector attributes --> - <property name="acceptCount" value="10"/> - <property name="address" value="0.0.0.0"/> - <property name="bufferSize" value="2048"/> - <property name="compressableMimeType" value="text/html,text/xml,text/plain"/> + <property name="enableLookups" value="true"/> <property name="compression" value="on"/> - <property name="connectionLinger" value="-1"/> - <property name="connectionTimeout" value="60000"/> - <property name="disableUploadTimeout" value="false"/> - <property name="maxHttpHeaderSize" value="8192"/> - <property name="maxKeepAliveRequests" value="100"/> - <property name="maxSpareThreads" value="50"/> - <property name="maxThreads" value="100"/> - <property name="minSpareThreads" value="4"/> - <property name="noCompressionUserAgents" value=""/> - <property name="port" value="8080"/> - <property name="restrictedUserAgents" value=""/> - <property name="server" value=""/> - <property name="socketBuffer" value="9000"/> - <property name="strategy" value="lf"/> - <property name="tcpNoDelay" value="true"/> - <property name="threadPriority" value="java.lang.Thread#NORM_PRIORITY"/> + <property name="compressableMimeType" value="text/html,text/xml,text/plain,text/javascript,text/css"/> </property> <property name="https-connector" value="connector"> - <!-- see http://jakarta.apache.org/tomcat/tomcat-5.5-doc/config/http.html for reference --> - <property name="allowTrace" value="false"/> - <property name="emptySessionPath" value="false"/> - <property name="enableLookups" value="true"/> - <property name="maxPostSize" value="2097152"/> + <property name="port" value="8443"/> <property name="protocol" value="HTTP/1.1"/> - <property name="proxyName" value=""/> - <property name="proxyPort" value=""/> - <property name="redirectPort" value=""/> <property name="scheme" value="https"/> <property name="secure" value="true"/> + <property name="SSLEnabled" value="true"/> <property name="URIEncoding" value="UTF-8"/> - <property name="useBodyEncodingForURI" value="false"/> <property name="xpoweredBy" value="true"/> - <!-- HTTP connector attributes --> - <property name="acceptCount" value="10"/> - <property name="address" value="0.0.0.0"/> - <property name="bufferSize" value="2048"/> - <property name="compressableMimeType" value="text/html,text/xml,text/plain"/> + <property name="enableLookups" value="true"/> <property name="compression" value="on"/> - <property name="connectionLinger" value="-1"/> - <property name="connectionTimeout" value="60000"/> - <property name="disableUploadTimeout" value="false"/> - <property name="maxHttpHeaderSize" value="8192"/> - <property name="maxKeepAliveRequests" value="100"/> - <property name="maxSpareThreads" value="50"/> - <property name="maxThreads" value="100"/> - <property name="minSpareThreads" value="4"/> - <property name="noCompressionUserAgents" value=""/> - <property name="port" value="8443"/> - <property name="restrictedUserAgents" value=""/> - <property name="server" value=""/> - <property name="socketBuffer" value="9000"/> - <property name="strategy" value="lf"/> - <property name="tcpNoDelay" value="true"/> - <property name="threadPriority" value="java.lang.Thread#NORM_PRIORITY"/> - <!-- SSL connector attributes --> - <property name="sSLImplementation" value="org.ofbiz.catalina.container.SSLImpl"/> + <property name="compressableMimeType" value="text/html,text/xml,text/plain,text/javascript,text/css"/> + <property name="sslImplementationName" value="org.ofbiz.catalina.container.SSLImpl"/> <property name="algorithm" value="SunX509"/> - <property name="clientAuth" value="want"/> <property name="keystoreFile" value="framework/base/config/ofbizssl.jks"/> <property name="keystorePass" value="changeit"/> <property name="keystoreType" value="JKS"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |