svn commit: r1798844 - in /ofbiz/ofbiz-framework/trunk: README.md build.gradle framework/entity/config/entityengine.xml framework/webtools/config/WebtoolsUiLabels.xml

Author: jleroux
Date: Thu Jun 15 15:35:59 2017
New Revision: 1798844

URL: http://svn.apache.org/viewvc?rev=1798844&view=rev
Log:
Implemented: Rename "loadAll" the "loadDefault" Gradle task
(OFBIZ-9411)

As discussed on user ML (https://s.apache.org/xjFj) rename "loadAll"
the "loadDefault" Gradle task.

Modified:
    ofbiz/ofbiz-framework/trunk/README.md
    ofbiz/ofbiz-framework/trunk/build.gradle
    ofbiz/ofbiz-framework/trunk/framework/entity/config/entityengine.xml
    ofbiz/ofbiz-framework/trunk/framework/webtools/config/WebtoolsUiLabels.xml

Modified: ofbiz/ofbiz-framework/trunk/README.md
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/README.md?rev=1798844&r1=1798843&r2=1798844&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/README.md (original)
+++ ofbiz/ofbiz-framework/trunk/README.md Thu Jun 15 15:35:59 2017
@@ -71,10 +71,10 @@ time for this step to complete if you ar
 as it needs to download all dependencies. So please be patient!
 
 MS Windows:
-`gradlew cleanAll loadDefault`
+`gradlew cleanAll loadAll`
 
 Unix-like OS:
-`./gradlew cleanAll loadDefault`
+`./gradlew cleanAll loadAll`
 
 ### Start OFBiz:
 
@@ -160,7 +160,7 @@ Tips:
 
 `gradlew build`
 
-`gradlew cleanAll loadDefault testIntegration`
+`gradlew cleanAll loadAll testIntegration`
 
 #### Example OFBiz server tasks
 
@@ -176,7 +176,7 @@ Tips:
 
 #### Example mixed tasks (standard and OFBiz server)
 
-`gradlew cleanAll loadDefault "ofbiz --start"`
+`gradlew cleanAll loadAll "ofbiz --start"`
 
 * * * * * * * * * * * *
 
@@ -316,7 +316,7 @@ The default data set is defined by datas
 followed by the name of the data set, into the datasource element of the 'entityengine.xml' file.
 
 
-`gradlew loadDefault`
+`gradlew loadAll`
 
 OR
 
@@ -446,7 +446,7 @@ in a list of favorites for frequent reus
 
 #### Run all tests on a clean system
 
-`gradlew cleanAll loadDefault testIntegration`
+`gradlew cleanAll loadAll testIntegration`
 
 #### Clean all generated artifacts
 

Modified: ofbiz/ofbiz-framework/trunk/build.gradle
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/build.gradle?rev=1798844&r1=1798843&r2=1798844&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/build.gradle (original)
+++ ofbiz/ofbiz-framework/trunk/build.gradle Thu Jun 15 15:35:59 2017
@@ -310,14 +310,14 @@ def sysadminGroup = 'System Administrati
 
 // ========== OFBiz Server tasks ==========
 
-task loadDefault(group: ofbizServer) {
+task loadAll(group: ofbizServer) {
     dependsOn 'ofbiz --load-data'
     description 'Load default data; meant for OFBiz development, testing, and demo purposes'
 }
 
 task testIntegration(group: ofbizServer) {
     dependsOn 'ofbiz --test'
-    description 'Run OFBiz integration tests; You must run loadDefault before running this task'
+    description 'Run OFBiz integration tests; You must run loadAll before running this task'
 }
 
 task terminateOfbiz(group: ofbizServer,

Modified: ofbiz/ofbiz-framework/trunk/framework/entity/config/entityengine.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/config/entityengine.xml?rev=1798844&r1=1798843&r2=1798844&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/config/entityengine.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/config/entityengine.xml Thu Jun 15 15:35:59 2017
@@ -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 "gradlew loadDefault" before running "gradlew testIntegration" -->
+    <!-- be sure that your default delegator (or the one you use) uses the same datasource for test. You must run "gradlew loadAll" 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"/>

Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=1798844&r1=1798843&r2=1798844&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/config/WebtoolsUiLabels.xml Thu Jun 15 15:35:59 2017
@@ -3823,17 +3823,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 "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>
+        <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 loadAll" 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 loadAll" 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 loadAll" 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 loadAll" o "java -jar build/libs/ofbiz.jar -l"</value>
+        <value xml:lang="ja">注意: データをロードするインストールスクリプトをまだ実行していない場合、ofbizホームディレクトリで"gradlew loadAll"または"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 loadAll" 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 loadAll" sau "java -jar build/libs/ofbiz.jar -l"</value>
+        <value xml:lang="th">หมายเหตุ: ถ้าคุณไม่ได้ทำการดำเนินงานติดตั้ง data loading script จาก ofbiz home directory ให้ใช้คำสั่ง "gradlew loadAll" หรือ "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 loadAll" hoặc "java -jar build/libs/ofbiz.jar -l"</value>
+        <value xml:lang="zh">注意：如果你还没有运行安装数据载入脚本，那么你可以在OFBiz目录下运行"gradlew loadAll"或"java -jar build/libs/ofbiz.jar -l"</value>
+        <value xml:lang="zh-TW">注意:如果你還沒有執行安裝資料載入腳本,那麼你可以在OFBiz目錄下執行"gradlew loadAll"或"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>