svn commit: r1756334 - in /ofbiz/trunk/framework: entity/config/entityengine.xml webtools/config/WebtoolsUiLabels.xml

Author: jleroux
Date: Sun Aug 14 21:45:22 2016
New Revision: 1756334

URL: http://svn.apache.org/viewvc?rev=1756334&view=rev
Log:
No functional changes, simply update the documentation with respect to Gradle changes

Modified:
    ofbiz/trunk/framework/entity/config/entityengine.xml
    ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml

Modified: ofbiz/trunk/framework/entity/config/entityengine.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/config/entityengine.xml?rev=1756334&r1=1756333&r2=1756334&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/config/entityengine.xml (original)
+++ ofbiz/trunk/framework/entity/config/entityengine.xml Sun Aug 14 21:45:22 2016
@@ -62,7 +62,7 @@ access. For a detailed description see t
         <group-map group-name="org.apache.ofbiz.tenant" datasource-name="localderbytenant"/>
     </delegator>
 
-    <!-- be sure that your default delegator (or the one you use) uses the same datasource for test. You must run "ant load-demo" before running "ant run-tests" -->
+    <!-- be sure that your default delegator (or the one you use) uses the same datasource for test. You must run "gradlew loadDefault" before running "gradlew testIntegration" -->
     <delegator name="test" entity-model-reader="main" entity-group-reader="main" entity-eca-reader="main">
         <group-map group-name="org.apache.ofbiz" datasource-name="localderby"/>
         <group-map group-name="org.apache.ofbiz.olap" datasource-name="localderbyolap"/>
@@ -123,6 +123,7 @@ access. For a detailed description see t
      * Serializable (NOT Recommended)
      * Not set uses database default
     -->
+    
     <datasource name="localhsql"
             helper-class="org.apache.ofbiz.entity.datasource.GenericHelperDAO"
             field-type-name="hsql"

Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=1756334&r1=1756333&r2=1756334&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Sun Aug 14 21:45:22 2016
@@ -3836,17 +3836,17 @@
         <value xml:lang="zh-TW">沒有出現</value>
     </property>
     <property key="WebtoolsNoteAntRunInstall">
-        <value xml:lang="de">HINWEIS: Sofern Sie das Installationsskript zum Daten lagen noch nicht haben laufen lassen, geben Sie bitte im OFBIZ_HOME Verzeichnis "ant load-demo" oder "java -jar ofbiz.jar load-data" ein.</value>
-        <value xml:lang="en">NOTE: If you have not already run the installation data loading script, from the ofbiz home directory run "ant load-demo" or "java -jar ofbiz.jar load-data"</value>
-        <value xml:lang="fr">NOTE: Si vous n'avez pas déjà exécuté le script de chargement des données d'installation : à partir du répertoire racine d'ofbiz, exécutez "ant load-demo" ou "java -jar ofbiz.jar load-data"</value>
-        <value xml:lang="it">NOTA: Se non hai ancora eseguito lo script di installazione di caricamento dei dati, esegui dalla home directory di ofbiz "ant load-demo" o "java -jar ofbiz.jar load-data"</value>
-        <value xml:lang="ja">注意: データをロードするインストールスクリプトをまだ実行していない場合、ofbizホームディレクトリで"ant load-demo"または"java -jar ofbiz.jar load-data"を実行してください</value>
-        <value xml:lang="pt">NOTA: Se você ainda não executou o script de carregamento e instalação de dados, a partir do diretório home do OFBiz executar "ant load-demo" ou "ofbiz.jar java-jar-install"</value>
-        <value xml:lang="ro">NOTA: Daca inca nu ai executat script_ul de instalare incarcare date, executa de la home directory ofbiz "ant load-demo" sau "java -jar ofbiz.jar load-data"</value>
-        <value xml:lang="th">หมายเหตุ: ถ้าคุณไม่ได้ทำการดำเนินงานติดตั้ง data loading script จาก ofbiz home directory ให้ใช้คำสั่ง "ant load-demo" หรือ "java -jar ofbiz.jar load-data"</value>
-        <value xml:lang="vi">Ghi chú: nếu bạn đã chạy quá trình tải dữ liệu, từ thÆ° mục gốc của Ofbiz bạn hãy chạy "ant load-demo" hoặc "java -jar ofbiz.jar load-data"</value>
-        <value xml:lang="zh">注意：如果你还没有运行安装数据载入脚本，那么你可以在OFBiz目录下运行"ant load-demo"或"java -jar ofbiz.jar load-data"</value>
-        <value xml:lang="zh-TW">注意:如果你還沒有執行安裝資料載入腳本,那麼你可以在OFBiz目錄下執行"ant load-demo"或"java -jar ofbiz.jar load-data"</value>
+        <value xml:lang="de">HINWEIS: Sofern Sie das Installationsskript zum Daten lagen noch nicht haben laufen lassen, geben Sie bitte im OFBIZ_HOME Verzeichnis "gradlew loadDefault" oder "java -jar build/libs/ofbiz.jar -l" ein.</value>
+        <value xml:lang="en">NOTE: If you have not already run the installation data loading script, from the ofbiz home directory run "gradlew loadDefault" or "java -jar build/libs/ofbiz.jar -l"</value>
+        <value xml:lang="fr">NOTE: Si vous n'avez pas déjà exécuté le script de chargement des données d'installation : à partir du répertoire racine d'ofbiz, exécutez "gradlew loadDefault" ou "java -jar build/libs/ofbiz.jar -l"</value>
+        <value xml:lang="it">NOTA: Se non hai ancora eseguito lo script di installazione di caricamento dei dati, esegui dalla home directory di ofbiz "gradlew loadDefault" o "java -jar build/libs/ofbiz.jar -l"</value>
+        <value xml:lang="ja">注意: データをロードするインストールスクリプトをまだ実行していない場合、ofbizホームディレクトリで"gradlew loadDefault"または"java -jar build/libs/ofbiz.jar -l"を実行してください</value>
+        <value xml:lang="pt">NOTA: Se você ainda não executou o script de carregamento e instalação de dados, a partir do diretório home do OFBiz executar "gradlew loadDefault" ou "ofbiz.jar java-jar-install"</value>
+        <value xml:lang="ro">NOTA: Daca inca nu ai executat script_ul de instalare incarcare date, executa de la home directory ofbiz "gradlew loadDefault" sau "java -jar build/libs/ofbiz.jar -l"</value>
+        <value xml:lang="th">หมายเหตุ: ถ้าคุณไม่ได้ทำการดำเนินงานติดตั้ง data loading script จาก ofbiz home directory ให้ใช้คำสั่ง "gradlew loadDefault" หรือ "java -jar build/libs/ofbiz.jar -l"</value>
+        <value xml:lang="vi">Ghi chú: nếu bạn đã chạy quá trình tải dữ liệu, từ thÆ° mục gốc của Ofbiz bạn hãy chạy "gradlew loadDefault" hoặc "java -jar build/libs/ofbiz.jar -l"</value>
+        <value xml:lang="zh">注意：如果你还没有运行安装数据载入脚本，那么你可以在OFBiz目录下运行"gradlew loadDefault"或"java -jar build/libs/ofbiz.jar -l"</value>
+        <value xml:lang="zh-TW">注意:如果你還沒有執行安裝資料載入腳本,那麼你可以在OFBiz目錄下執行"gradlew loadDefault"或"java -jar build/libs/ofbiz.jar -l"</value>
     </property>
     <property key="WebtoolsNoteForeighKeysMayAlsoBeCreated">
         <value xml:lang="de">HINWEIS: Fremdschlüssel können mit der Datenbank-Check/-Update Funktion ebenfalls generiert werden, sofern die check-fks-on-start und andere Optionen auf der Datensource entsprechend gesetzt sind.</value>