You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/11/20 13:18:59 UTC
svn commit: r1640727 - in /ofbiz/trunk: ./ framework/entityext/
framework/service/ framework/webtools/config/
specialpurpose/appserver/templates/glassfish21/
Author: jleroux
Date: Thu Nov 20 12:18:59 2014
New Revision: 1640727
URL: http://svn.apache.org/r1640727
Log:
Fixes and completes r1640588 and more minor things which were left after the change from run-install to load-demo
Modified:
ofbiz/trunk/build.xml
ofbiz/trunk/framework/entityext/ofbiz-component.xml
ofbiz/trunk/framework/service/ofbiz-component.xml
ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
ofbiz/trunk/specialpurpose/appserver/templates/glassfish21/README
ofbiz/trunk/specialpurpose/appserver/templates/glassfish21/run.sh
Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1640727&r1=1640726&r2=1640727&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Thu Nov 20 12:18:59 2014
@@ -643,7 +643,7 @@ under the License.
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
<jvmarg value="${memory.maxpermsize.param}"/>
- <arg value="install"/>
+ <arg value="load-data"/>
</java>
</target>
<target name="load-demo-multitenant" depends="build"
@@ -652,20 +652,20 @@ under the License.
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
<jvmarg value="${memory.maxpermsize.param}"/>
- <arg value="install"/>
+ <arg value="load-data"/>
</java>
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
<jvmarg value="${memory.maxpermsize.param}"/>
- <arg value="install"/>
+ <arg value="load-data"/>
<arg value="delegator=default#DEMO1"/>
</java>
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
<jvmarg value="${memory.maxpermsize.param}"/>
- <arg value="install"/>
+ <arg value="load-data"/>
<arg value="delegator=default#DEMO2"/>
</java>
</target>
@@ -675,7 +675,7 @@ under the License.
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
<jvmarg value="${memory.maxpermsize.param}"/>
- <arg value="install"/>
+ <arg value="load-data"/>
<arg value="readers=seed"/>
</java>
</target>
@@ -685,7 +685,7 @@ under the License.
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
<jvmarg value="${memory.maxpermsize.param}"/>
- <arg value="install"/>
+ <arg value="load-data"/>
<arg value="readers=seed,seed-initial,ext"/>
</java>
</target>
@@ -695,7 +695,7 @@ under the License.
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
<jvmarg value="${memory.maxpermsize.param}"/>
- <arg value="install"/>
+ <arg value="load-data"/>
<arg value="readers=seed,seed-initial,ext,ext-test"/>
</java>
</target>
@@ -705,7 +705,7 @@ under the License.
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
<jvmarg value="${memory.maxpermsize.param}"/>
- <arg value="install"/>
+ <arg value="load-data"/>
<arg value="readers=${data-readers}"/>
</java>
</target>
@@ -716,7 +716,7 @@ under the License.
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
<jvmarg value="${memory.maxpermsize.param}"/>
- <arg value="install"/>
+ <arg value="load-data"/>
<arg value="delegator=${delegator}"/>
<arg value="file=${data-file}"/>
</java>
@@ -732,7 +732,7 @@ under the License.
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
<jvmarg value="${memory.maxpermsize.param}"/>
- <arg value="install"/>
+ <arg value="load-data"/>
<arg value="readers=tenant"/>
</java>
<condition property="hasTenant">
@@ -773,7 +773,7 @@ under the License.
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
<jvmarg value="${memory.maxpermsize.param}"/>
- <arg value="install"/>
+ <arg value="load-data"/>
<arg value="delegator=default#${tenantId}"/>
</java>
</target>
@@ -782,7 +782,7 @@ under the License.
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
<jvmarg value="${memory.maxpermsize.param}"/>
- <arg value="install"/>
+ <arg value="load-data"/>
<arg value="delegator=default#${tenantId}"/>
<arg value="readers=${data-readers}"/>
</java>
@@ -807,7 +807,7 @@ under the License.
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
<jvmarg value="${memory.maxpermsize.param}"/>
- <arg value="install"/>
+ <arg value="load-data"/>
<arg value="delegator=default#${tenantId}"/>
<arg value="component=${component}"/>
</java>
@@ -817,7 +817,7 @@ under the License.
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
<jvmarg value="${memory.maxpermsize.param}"/>
- <arg value="install"/>
+ <arg value="load-data"/>
<arg value="delegator=default#${tenantId}"/>
<arg value="readers=${data-readers}"/>
<arg value="component=${component}"/>
@@ -835,7 +835,7 @@ under the License.
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
<jvmarg value="${memory.maxpermsize.param}"/>
- <arg value="install"/>
+ <arg value="load-data"/>
<arg value="readers=tenant"/>
</java>
<condition property="hasReader">
@@ -856,7 +856,7 @@ under the License.
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
<jvmarg value="${memory.maxpermsize.param}"/>
- <arg value="install"/>
+ <arg value="load-data"/>
<arg value="delegator=${delegator}"/>
</java>
</target>
@@ -865,7 +865,7 @@ under the License.
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
<jvmarg value="${memory.maxpermsize.param}"/>
- <arg value="install"/>
+ <arg value="load-data"/>
<arg value="readers=${data-readers}"/>
<arg value="delegator=${delegator}"/>
</java>
@@ -1044,7 +1044,7 @@ under the License.
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
<jvmarg value="${memory.maxpermsize.param}"/>
- <arg value="install"/>
+ <arg value="load-data"/>
<arg value="readers=${data-readers}"/>
<arg value="delegator=default#${tenantId}"/>
</java>
Modified: ofbiz/trunk/framework/entityext/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/ofbiz-component.xml?rev=1640727&r1=1640726&r2=1640727&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/entityext/ofbiz-component.xml Thu Nov 20 12:18:59 2014
@@ -36,7 +36,7 @@ under the License.
<service-resource type="group" loader="main" location="servicedef/groups.xml"/>
<!-- load the data load container, runs the entity data load stuff -->
- <container name="dataload-container" loaders="install" class="org.ofbiz.entityext.data.EntityDataLoadContainer">
+ <container name="dataload-container" loaders="load-data" class="org.ofbiz.entityext.data.EntityDataLoadContainer">
<property name="delegator-name" value="default"/>
<property name="entity-group-name" value="org.ofbiz"/>
</container>
Modified: ofbiz/trunk/framework/service/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/ofbiz-component.xml?rev=1640727&r1=1640726&r2=1640727&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/service/ofbiz-component.xml Thu Nov 20 12:18:59 2014
@@ -44,7 +44,7 @@ under the License.
<keystore name="rmitrust" type="jks" password="changeit" is-truststore="true"
is-certstore="false" loader="main" location="config/rmitrust.jks"/>
- <container name="service-container" loaders="main,rmi,pos,install,test" class="org.ofbiz.service.ServiceContainer">
+ <container name="service-container" loaders="main,rmi,pos,load-data,test" class="org.ofbiz.service.ServiceContainer">
<property name="dispatcher-factory" value="org.ofbiz.service.GenericDispatcherFactory"/>
</container>
Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=1640727&r1=1640726&r2=1640727&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Thu Nov 20 12:18:59 2014
@@ -3761,17 +3761,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 install" 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 install"</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 install"</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 install"</value>
- <value xml:lang="ja">注æ: ãã¼ã¿ããã¼ãããã¤ã³ã¹ãã¼ã«ã¹ã¯ãªãããã¾ã å®è¡ãã¦ããªãå ´åãofbizãã¼ã ãã£ã¬ã¯ããªã§"ant run-install"ã¾ãã¯"java -jar ofbiz.jar install"ãå®è¡ãã¦ãã ãã</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 "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 install"</value>
- <value xml:lang="th">หมายà¹à¸«à¸à¸¸: à¸à¹à¸²à¸à¸¸à¸à¹à¸¡à¹à¹à¸à¹à¸à¸³à¸à¸²à¸£à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸à¸à¸´à¸à¸à¸±à¹à¸ data loading script à¸à¸²à¸ ofbiz home directory à¹à¸«à¹à¹à¸à¹à¸à¸³à¸ªà¸±à¹à¸ "ant load-demo" หรืภ"java -jar ofbiz.jar install"</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 install"</value>
- <value xml:lang="zh">注æï¼å¦æä½ è¿æ²¡æè¿è¡å®è£
æ°æ®è½½å
¥èæ¬ï¼é£ä¹ä½ å¯ä»¥å¨OFBizç®å½ä¸è¿è¡"ant load-demo"æ"java -jar ofbiz.jar install"</value>
- <value xml:lang="zh_TW">注æ:å¦æä½ éæ²æå·è¡å®è£è³æè¼å
¥è
³æ¬,é£éº¼ä½ å¯ä»¥å¨OFBizç®éä¸å·è¡"ant load-demo"æ"java -jar ofbiz.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>
</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>
Modified: ofbiz/trunk/specialpurpose/appserver/templates/glassfish21/README
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/appserver/templates/glassfish21/README?rev=1640727&r1=1640726&r2=1640727&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/appserver/templates/glassfish21/README (original)
+++ ofbiz/trunk/specialpurpose/appserver/templates/glassfish21/README Thu Nov 20 12:18:59 2014
@@ -67,7 +67,7 @@ if (you are using JavaDB && want seed an
Refer [4]. If you want to use JavaDB with default settings, you can use entityengine.xml_patch
readily available under 'OFBIZ_HOME/setup/glassfish21'.
4. Load seed and demo data (optional, but highly recommended) by using
- './ant run-install' command under OFBIZ_HOME. Refer [5].
+ './ant load-demo' command under OFBIZ_HOME. Refer [5].
5. Copy OFBIZ_HOME/setup/glassfish21/deploy.sh to <work-folder>.
6. Run deploy.sh.
(without quotes) './deploy.sh <glassfish-home> <glassfish-domain-path>'.
Modified: ofbiz/trunk/specialpurpose/appserver/templates/glassfish21/run.sh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/appserver/templates/glassfish21/run.sh?rev=1640727&r1=1640726&r2=1640727&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/appserver/templates/glassfish21/run.sh (original)
+++ ofbiz/trunk/specialpurpose/appserver/templates/glassfish21/run.sh Thu Nov 20 12:18:59 2014
@@ -54,7 +54,7 @@ echo "Started JavaDB server"
# Load the seed and demo data.
cd ${ofbizHome}
- ./ant run-install
+ ./ant load-demo
echo "Loaded seed and demo data"
# Restore entityengine.xml