Author: jacopoc
Date: Mon Apr 2 14:53:11 2012
New Revision: 1308370
URL: http://svn.apache.org/viewvc?rev=1308370&view=rev
Log:
OFBIZ-4771
Renamed some ant tasks for consistency, improved descriptions, removed 2
redundant tasks
Summary of changes:
improved descriptions (unified style)
renamed: run --> start
renamed: run-batch --> start-batch
renamed: run-debug --> start-debug
renamed: run-pos --> start-pos
renamed: run-install --> load-demo
renamed: run-install-multitenant --> load-demo-multitenant
renamed: run-install-* targets -> load* (for example: run-install-seed -->
load-seed etc...)
enhanced load-file (was run-install-file) to accept an optional 'delegator'
argument and removed run-install-file-in-delegator and run-tenant-install-file
renamed: run-create-tenant --> create-tenant
renamed: run-single-test --> run-test
renamed: run-single-test-suite --> run-test-suite
the main old tasks (mentioned in documentation etc.) have been kept and now
inform the user of the new syntax
updated README and main screen of Webtools with the new task name
Modified:
ofbiz/trunk/README
ofbiz/trunk/build.xml
ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
Modified: ofbiz/trunk/README
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/README?rev=1308370&r1=1308369&r2=1308370&view=diff
==============================================================================
--- ofbiz/trunk/README (original)
+++ ofbiz/trunk/README Mon Apr 2 14:53:11 2012
@@ -9,11 +9,11 @@ You can load the demo data (strongly adv
command on the command line from the OFBiz home folder (in Unix-like
operating systems type "./ant" rather than "ant"):
-ant run-install
+ant load-demo
Then start OFBiz with the following command:
-ant run
+ant start
(or "java -Xms128M -Xmx512M -XX:MaxPermSize=128m -jar ofbiz.jar")
Modified: ofbiz/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1308370&r1=1308369&r2=1308370&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Mon Apr 2 14:53:11 2012
@@ -144,7 +144,7 @@ under the License.
</target>
<target name="clean-lucene-index"
- description="Removes lucene indexes created in
applications/content/index">
+ description="Remove lucene indexes created in
applications/content/index">
<subant target="clean-lucene-index">
<filelist dir="." files="applications/content/build.xml"/>
</subant>
@@ -380,8 +380,8 @@ under the License.
<!-- Start and Stop OFBiz
-->
<!-- ================================================================== -->
- <target name="run"
- description="This will start OFBiz">
+ <target name="start"
+ description="Start OFBiz">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${pos.memory.max.param}"/>
@@ -390,8 +390,8 @@ under the License.
<sysproperty key="ofbiz.admin.key" value="${ofbiz.admin.key}"/>
</java>
</target>
- <target name="run-batch"
- description="This will start OFBiz as a separate process">
+ <target name="start-batch"
+ description="Start OFBiz as a separate process">
<java jar="ofbiz.jar" fork="true" spawn="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${pos.memory.max.param}"/>
@@ -400,8 +400,8 @@ under the License.
<sysproperty key="ofbiz.admin.key" value="${ofbiz.admin.key}"/>
</java>
</target>
- <target name="run-debug" depends="build"
- description="Starts OFBiz in debugging mode">
+ <target name="start-debug" depends="build"
+ description="Start OFBiz in debugging mode">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -414,8 +414,8 @@ under the License.
<sysproperty key="ofbiz.admin.key" value="${ofbiz.admin.key}"/>
</java>
</target>
- <target name="run-pos"
- description="Start the POS (Point of sale) system">
+ <target name="start-pos"
+ description="Start OFBiz POS (Point of sale)">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -424,7 +424,7 @@ under the License.
</java>
</target>
<target name="stop"
- description="This will stop OFBiz">
+ description="Stop OFBiz">
<java jar="ofbiz.jar" fork="true">
<sysproperty key="ofbiz.admin.port" value="${ofbiz.admin.port}"/>
<sysproperty key="ofbiz.admin.key" value="${ofbiz.admin.key}"/>
@@ -436,8 +436,8 @@ under the License.
<!-- Setup OFBiz Data -->
<!-- ================================================================== -->
- <target name="run-install" depends="build"
- description="This loads all configured data; meant for generic
OFBiz development, testing, demonstration, etc purposes">
+ <target name="load-demo" depends="build"
+ description="Load all data; meant for generic OFBiz development,
testing, demonstration, etc purposes">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -445,8 +445,8 @@ under the License.
<arg value="install"/>
</java>
</target>
- <target name="run-install-multitenant" depends="build"
- description="This loads all data needed for the multi-tenancy
demonstration. Caution: this creates three databases, with each one loaded with
all demo data.">
+ <target name="load-demo-multitenant" depends="build"
+ description="Load all data needed for the multi-tenancy
demonstration. Caution: this creates three databases, with each one loaded with
all demo data.">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -468,8 +468,8 @@ under the License.
<arg value="delegator=default#DEMO2"/>
</java>
</target>
- <target name="run-install-seed" depends="build"
- description="This loads ONLY the seed data (not seed-initial,
demo, ext* or anything else); meant for use after an update of the code to
reload the seed data as it is generally maintained along with the code and
needs to be in sync for operation">
+ <target name="load-seed" depends="build"
+ description="Load ONLY the seed data (not seed-initial, demo, ext*
or anything else); meant for use after an update of the code to reload the seed
data as it is generally maintained along with the code and needs to be in sync
for operation">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -478,8 +478,8 @@ under the License.
<arg value="readers=seed"/>
</java>
</target>
- <target name="run-install-extseed" depends="build"
- description="This loads seed, seed-initial and ext data; meant for
manual/generic testing, development, or going into production with a derived
system based on stock OFBiz where the ext data basically replaces the demo
data">
+ <target name="load-extseed" depends="build"
+ description="Load seed, seed-initial and ext data; meant for
manual/generic testing, development, or going into production with a derived
system based on stock OFBiz where the ext data basically replaces the demo
data">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -488,8 +488,8 @@ under the License.
<arg value="readers=seed,seed-initial,ext"/>
</java>
</target>
- <target name="run-install-exttest" depends="build"
- description="This loads seed, seed-initial, ext and ext-test data;
meant for automated testing with a derived system based on stock OFBiz">
+ <target name="load-exttest" depends="build"
+ description="Load seed, seed-initial, ext and ext-test data; meant
for automated testing with a derived system based on stock OFBiz">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -498,8 +498,8 @@ under the License.
<arg value="readers=seed,seed-initial,ext,ext-test"/>
</java>
</target>
- <target name="run-install-readers" depends="build"
- description='This loads data using the command line argument
data-readers that takes a comma separated list of readers (seed, seed-initial,
demo, ext, ext-test, ext-demo). On Windows XP (at least) you need top wrap the
parameters in double-quotes. For instance: ant run-install-readers
"-Ddata-readers=seed,seed-initial,ext"'>
+ <target name="load-readers" depends="build"
+ description='Load data using the command line argument
data-readers that takes a comma separated list of readers (seed, seed-initial,
demo, ext, ext-test, ext-demo). On Windows XP (at least) you need top wrap the
parameters in double-quotes. For instance: ant load-readers
"-Ddata-readers=seed,seed-initial,ext"'>
<java jar="ofbiz.jar" fork="true" >
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -508,19 +508,9 @@ under the License.
<arg value="readers=${data-readers}"/>
</java>
</target>
- <target name="run-install-file" depends="build"
- description="This loads data using the command line argument
'data-file' to load data from a given file using the default delegator">
- <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="delegator=default"/>
- <arg value="file=${data-file}"/>
- </java>
- </target>
- <target name="run-install-file-in-delegator" depends="build"
- description="This loads data using the command line argument
'data-file' to load data from a given file to the command line argument
'delegator'">
+ <target name="load-file" depends="build"
+ description="Load data using the command line argument 'data-file'
to load data from a given file using the 'default' delegator or a delegator
specified in the command line argument 'delegator'">
+ <property name="delegator" value="default" />
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -531,10 +521,10 @@ under the License.
</java>
</target>
<!-- =================================
- target: run-install-tenant
+ target: load-tenant
================================= -->
- <target name="run-install-tenant"
depends="build,run-install-tenant-all,run-install-tenant-reader,run-install-tenant-component-all,run-install-tenant-component-reader"
- description="This loads data using tenantId, syntax eg: ant
run-install-tenant -DtenantId=DEMO1 (needs multitenant=Y in
general.properties)">
+ <target name="load-tenant"
depends="build,load-tenant-all,load-tenant-reader,load-tenant-component-all,load-tenant-component-reader"
+ description="Load data using tenantId, syntax eg: ant load-tenant
-DtenantId=DEMO1 (needs multitenant=Y in general.properties)">
</target>
<target name="check-tenant-id">
<java jar="ofbiz.jar" fork="true">
@@ -577,7 +567,7 @@ under the License.
</or>
</condition>
</target>
- <target name="run-install-tenant-all" depends="check-tenant-reader"
if="noReader">
+ <target name="load-tenant-all" depends="check-tenant-reader" if="noReader">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -586,7 +576,7 @@ under the License.
<arg value="delegator=default#${tenantId}"/>
</java>
</target>
- <target name="run-install-tenant-reader" depends="check-tenant-reader"
if="hasReader">
+ <target name="load-tenant-reader" depends="check-tenant-reader"
if="hasReader">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -596,8 +586,8 @@ under the License.
<arg value="readers=${data-readers}"/>
</java>
</target>
- <!-- run-install-tenant-component -->
- <target name="run-install-tenant-component" if="hasTenantComponent"
depends="check-tenant-id">
+ <!-- load-tenant-component -->
+ <target name="load-tenant-component" if="hasTenantComponent"
depends="check-tenant-id">
<condition property="hasComponentReader">
<and>
<length string="${data-readers}" trim="true" when="greater"
length="0"/>
@@ -611,7 +601,7 @@ under the License.
</or>
</condition>
</target>
- <target name="run-install-tenant-component-all"
depends="run-install-tenant-component" if="noComponentReader">
+ <target name="load-tenant-component-all" depends="load-tenant-component"
if="noComponentReader">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -621,7 +611,7 @@ under the License.
<arg value="component=${component}"/>
</java>
</target>
- <target name="run-install-tenant-component-reader"
depends="run-install-tenant-component" if="hasComponentReader">
+ <target name="load-tenant-component-reader"
depends="load-tenant-component" if="hasComponentReader">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -633,10 +623,10 @@ under the License.
</java>
</target>
<!-- =================================
- target: run-install-all-tenants
+ target: load-all-tenants
================================= -->
- <target name="run-install-all-tenants"
depends="build,run-install-tenants-all,run-install-tenants-reader"
- description="This loads data all tenants, syntax eg: ant
run-install-all-tenants (needs multitenant=Y in general.properties)">
+ <target name="load-all-tenants"
depends="build,load-tenants-all,load-tenants-reader"
+ description="Load data for all tenants, syntax eg: ant
load-all-tenants (needs multitenant=Y in general.properties)">
</target>
<target name="check-tenants-reader">
<property name="delegator" value="all-tenants"/>
@@ -660,7 +650,7 @@ under the License.
</or>
</condition>
</target>
- <target name="run-install-tenants-all" depends="check-tenants-reader"
if="noReader">
+ <target name="load-tenants-all" depends="check-tenants-reader"
if="noReader">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -669,7 +659,7 @@ under the License.
<arg value="delegator=${delegator}"/>
</java>
</target>
- <target name="run-install-tenants-reader" depends="check-tenants-reader"
if="hasReader">
+ <target name="load-tenants-reader" depends="check-tenants-reader"
if="hasReader">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -680,16 +670,16 @@ under the License.
</java>
</target>
<!-- =================================
- target: run-create-tenant
+ target: create-tenant
================================= -->
- <target name="run-create-tenant"
+ <target name="create-tenant"
depends="create-tenant-on-Derby,create-tenant-on-MySQL,create-tenant-on-Oracle,create-tenant-on-PostgreSQL"
- description="Creates a new tenant in your environment, creates the
delegator, loads initial data with admin-user and password (needs multitenant=Y
in general.properties)">
+ description="Create a new tenant in your environment, create the
delegator, load initial data with admin-user and password (needs multitenant=Y
in general.properties)">
<tstamp/>
</target>
<!-- description="This creates entity Tenant and TenantDataSource in
default, installs data in the delegator and creates the admin-user and password
for the tenant"
- sub-target of run-create-tenant, can't used alone => no description,
to not clutter "ant -p" -->
+ sub-target of create-tenant, can't used alone => no description, to
not clutter "ant -p" -->
<target name="get-tenant-data">
<input addproperty="tenantId" message="Enter Id for the tenant: "/>
<input addproperty="tenantName" message="Enter name for tenant: "/>
@@ -717,7 +707,7 @@ under the License.
<antcall target="tenant-data-entry"/>
</target>
<!-- description="Creates tenant data and instance"
- sub-target of run-create-tenant, can't used alone => no description,
to not clutter "ant -p" -->
+ sub-target of create-tenant, can't used alone => no description, to
not clutter "ant -p" -->
<target name="create-tenant-on-Derby" depends="get-tenant-data"
if="isDerby">
<echo message="Installing on Derby"/>
<copy
file="${basedir}/framework/resources/templates/AdminNewTenantData-Derby.xml"
tofile="runtime/tmp/tmpTenantData.xml">
@@ -726,7 +716,7 @@ under the License.
<filter token="tenantName" value="${tenantName}"/>
</filterset>
</copy>
- <antcall target="run-install-file">
+ <antcall target="load-file">
<param name="data-file" value="runtime/tmp/tmpTenantData.xml"/>
</antcall>
<delete file="runtime/tmp/tmpTenantData.xml"/>
@@ -737,7 +727,7 @@ under the License.
</antcall>
</target>
<!-- description="Creates tenant data and instance. Don't forget db
driver(s) and already created DBs in function of the entityengine.xml
datasource-names"
- sub-target of run-create-tenant, can't used alone => no description,
to not clutter "ant -p" -->
+ sub-target of create-tenant, can't used alone => no description, to
not clutter "ant -p" -->
<target name="create-tenant-on-MySQL" depends="get-tenant-data"
if="isMySQL">
<echo message="Installing on MySQL"/>
<copy
file="${basedir}/framework/resources/templates/AdminNewTenantData-MySQL.xml"
tofile="runtime/tmp/tmpTenantData.xml">
@@ -749,7 +739,7 @@ under the License.
<filter token="db-Password" value="${db-Password}"/>
</filterset>
</copy>
- <antcall target="run-install-file">
+ <antcall target="load-file">
<param name="data-file" value="runtime/tmp/tmpTenantData.xml"/>
</antcall>
<delete file="runtime/tmp/tmpTenantData.xml"/>
@@ -760,7 +750,7 @@ under the License.
</antcall>
</target>
<!-- description="Creates tenant data and instance. Don't forget db
driver(s) and already created DBs in function of the entityengine.xml
datasource-names"
- sub-target of run-create-tenant, can't used alone => no description,
to not clutter "ant -p" -->
+ sub-target of create-tenant, can't used alone => no description, to
not clutter "ant -p" -->
<target name="create-tenant-on-Oracle" depends="get-tenant-data"
if="isOracle">
<echo message="Installing on Oracle"/>
<copy
file="${basedir}/framework/resources/templates/AdminNewTenantData-Oracle.xml"
tofile="runtime/tmp/tmpTenantData.xml">
@@ -772,7 +762,7 @@ under the License.
<filter token="db-Password" value="${db-Password}"/>
</filterset>
</copy>
- <antcall target="run-install-file">
+ <antcall target="load-file">
<param name="data-file" value="runtime/tmp/tmpTenantData.xml"/>
</antcall>
<delete file="runtime/tmp/tmpTenantData.xml"/>
@@ -783,7 +773,7 @@ under the License.
</antcall>
</target>
<!-- description="Creates tenant data and instance. Don't forget db
driver(s) and already created DBs in function of the entityengine.xml
datasource-names"
- sub-target of run-create-tenant, can't used alone => no description,
to not clutter "ant -p" -->
+ sub-target of create-tenant, can't used alone => no description, to
not clutter "ant -p" -->
<target name="create-tenant-on-PostgreSQL" depends="get-tenant-data"
if="isPostgreSQL">
<echo message="Installing on PostgreSQL"/>
<copy
file="${basedir}/framework/resources/templates/AdminNewTenantData-PostgreSQL.xml"
tofile="runtime/tmp/tmpTenantData.xml">
@@ -795,7 +785,7 @@ under the License.
<filter token="db-Password" value="${db-Password}"/>
</filterset>
</copy>
- <antcall target="run-install-file">
+ <antcall target="load-file">
<param name="data-file" value="runtime/tmp/tmpTenantData.xml"/>
</antcall>
<delete file="runtime/tmp/tmpTenantData.xml"/>
@@ -823,7 +813,7 @@ under the License.
</target>
<target name="load-tenant-admin-user-login"
- description="Creates the admin login for the tenant with admin
privileges, and a temporay password equal to 'ofbiz'. Password must be changed
on first login">
+ description="Create the admin login for the tenant with admin
privileges, and a temporay password equal to 'ofbiz'. Password must be changed
on first login">
<echo>------------------------------------</echo>
<echo message="Installing the admin for the tenant"/>
<echo message="Delegator = ${delegatorId}"/>
@@ -836,14 +826,14 @@ under the License.
<filter token="userLoginId" value="${userLoginId}"/>
</filterset>
</copy>
- <antcall target="run-tenant-install-file">
+ <antcall target="load-file">
<param name="data-file" value="runtime/tmp/tmpUserLogin.xml"/>
- <param name="delegatorId" value="${delegatorId}"/>
+ <param name="delegator" value="${delegatorId}"/>
</antcall>
<delete file="runtime/tmp/tmpUserLogin.xml"/>
</target>
<target name="load-tenant-data-readers"
- description="Loads data of given data-readers in the tenant database">
+ description="Load data of given data-readers in the tenant database">
<echo>------------------------------------</echo>
<echo message="Loading selected data-readers in tenant databaset"/>
<echo message="Delegator = default#${tenantId}"/>
@@ -859,19 +849,8 @@ under the License.
<arg value="delegator=default#${tenantId}"/>
</java>
</target>
- <target name="run-tenant-install-file"
- description="Loads the data of the tenant using the command line
argument 'file' to load data from a given file">
- <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="file=${data-file}"/>
- <arg value="delegator=${delegatorId}"/>
- </java>
- </target>
<target name="load-admin-user-login"
- description="Creates a user login with admin privileges and a
temporary password equal to 'ofbiz'; after a succesful login the user will be
prompted for a new password. Example command for the userLogin 'admin': ./ant
load-admin-user-login -DuserLoginId=admin">
+ description="Create a user login with admin privileges and a
temporary password equal to 'ofbiz'; after a successful login the user will be
prompted for a new password. Example command for the userLogin 'admin': ./ant
load-admin-user-login -DuserLoginId=admin">
<fail message="userLoginId parameter is required. To add the parameter
to the command for user admin: -DuserLoginId=admin">
<condition>
<not><isset property="userLoginId"/></not>
@@ -882,19 +861,19 @@ under the License.
<filter token="userLoginId" value="${userLoginId}"/>
</filterset>
</copy>
- <antcall target="run-install-file">
+ <antcall target="load-file">
<param name="data-file" value="runtime/tmp/tmpUserLogin.xml"/>
</antcall>
<delete file="runtime/tmp/tmpUserLogin.xml"/>
</target>
<target name="create-admin-user-login"
- description="Prompts for a user name, then creates a user login
with admin privileges and a temporary password equal to 'ofbiz'. After a
succesful login the user will be prompted for a new password.">
+ description="Prompt for a user name, then create a user login with
admin privileges and a temporary password equal to 'ofbiz'. After a successful
login the user will be prompted for a new password.">
<input addproperty="userLoginId" message="Enter user name (log in with
the temporary password 'ofbiz'):"/>
<antcall target="load-admin-user-login"/>
</target>
<target name="run-tests" depends="build"
- description="Run OFBiz default tests, execute ant run-install before
and see results in runtime/logs/test-results/html/all-tests.html.">
+ description="Run OFBiz default tests; you have to manually execute
'ant load-demo' before and see results in
runtime/logs/test-results/html/all-tests.html.">
<java jar="ofbiz.jar" fork="true" resultproperty="test.result">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -919,7 +898,7 @@ under the License.
</target>
<target name="run-tests-with-cobertura" depends="download-cobertura,
run-tests"
- description="Same as run-tests but downloads cobertura and performs
code coverage. You will need a valid Internet connection to download
cobertura"/>
+ description="Download Cobertura and perform code coverage (same as
run-tests). You will need a valid Internet connection to download cobertura"/>
<target name="_check-separated-tests-already-setup">
<available file="runtime/test-list-build.xml"
property="_separated-tests-already-setup"/>
@@ -935,8 +914,8 @@ under the License.
<env key="LC_ALL" value="C"/>
</java>
</target>
- <target name="run-single-test" depends="build"
- description="Run a single test, syntax eg: ant run-single-test
-Dtest.component=service -Dtest.case=service-soap-tests">
+ <target name="run-test" depends="build"
+ description="Run a single test, syntax eg: ant run-test
-Dtest.component=service -Dtest.case=service-soap-tests">
<java jar="ofbiz.jar" fork="true" resultproperty="test.result">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -959,8 +938,8 @@ under the License.
</condition>
</fail>
</target>
- <target name="run-single-test-suite" depends="build"
- description="Run a single test suite, syntax eg: ant
run-single-test-suite -Dtest.component=mycomponent -Dtest.suiteName=mytests">
+ <target name="run-test-suite" depends="build"
+ description="Run a single test suite, syntax eg: ant
run-test-suite -Dtest.component=mycomponent -Dtest.suiteName=mytests">
<java jar="ofbiz.jar" fork="true" resultproperty="test.result">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -985,7 +964,7 @@ under the License.
</target>
<target name="cobertura-report"
- description="generates a HTML code coverage report with cobertura,
can be found in runtime/logs/cobertura-report">
+ description="Generate a HTML code coverage report with cobertura,
can be found in runtime/logs/cobertura-report">
<delete dir="runtime/logs/cobertura-report"/>
<mkdir dir="runtime/logs/cobertura-report"/>
<taskdef resource="tasks.properties">
@@ -1013,7 +992,7 @@ under the License.
</target>
<target name="cobertura-report-xml"
- description="generates a XML file from the cobertura report, this
will be use by sonar">
+ description="Generate a XML file from the cobertura report, this
will be use by sonar">
<delete dir="runtime/logs/cobertura-report"/>
<mkdir dir="runtime/logs/cobertura-report"/>
<taskdef resource="tasks.properties">
@@ -1077,7 +1056,7 @@ under the License.
<target name="full-sonar">
<antcall target="clean-all"/>
- <antcall target="run-install"/>
+ <antcall target="load-demo"/>
<antcall target="run-tests"/>
<antcall target="cobertura-report-xml"/>
<antcall target="sonar"/>
@@ -1104,7 +1083,7 @@ under the License.
<!-- ================================================================== -->
<target name="create-component"
- description="Creates the layout of an OFBiz component in the
hot-deploy folder.">
+ description="Create the layout of an OFBiz component in the
hot-deploy folder.">
<input addproperty="component-name" message="Component name: (e.g.
mycomponent) [Mandatory]"/>
<input addproperty="component-resource-name" message="Component
resource name: (e.g. MyComponent) [Mandatory]"/>
<input addproperty="webapp-name" message="Webapp name: (e.g.
mycomponent) [Mandatory]"/>
@@ -1230,4 +1209,41 @@ under the License.
Restart OFBiz and then visit the URL:
http://localhost:8080/${webapp-name}
</echo>
</target>
+
+ <!-- ================================================================== -->
+ <!-- Old tasks. -->
+ <!-- ================================================================== -->
+ <target name="run">
+ <echo message="The 'run' command has been renamed 'start'; please use
'ant start' to start OFBiz."/>
+ </target>
+ <target name="run-debug">
+ <echo message="The 'run-debug' command has been renamed 'start-debug';
please use 'ant start-debug' to start OFBiz in debug mode."/>
+ </target>
+ <target name="run-pos">
+ <echo message="The 'run-pos' command has been renamed 'start-pos';
please use 'ant start-pos' to start the OFBiz POS."/>
+ </target>
+ <target name="run-install">
+ <echo message="The 'run-install' command has been renamed 'load-demo';
please use 'ant load-demo' to load seed and demo data."/>
+ </target>
+ <target name="run-install-multitenant">
+ <echo message="The 'run-install-multitenant' command has been renamed
'load-demo-multitenant'; please use 'ant load-demo-multitenant' to load seed
and demo data for multi-tenancy."/>
+ </target>
+ <target name="run-install-seed">
+ <echo message="The 'run-install-seed' command has been renamed
'load-seed'; please use 'ant load-seed' to load seed data."/>
+ </target>
+ <target name="run-install-extseed">
+ <echo message="The 'run-install-extseed' command has been renamed
'load-extseed'; please use 'ant load-extseed' to load seed, seed-initial and
ext data."/>
+ </target>
+ <target name="run-install-exttest">
+ <echo message="The 'run-install-exttest' command has been renamed
'load-exttest'; please use 'ant load-exttest' to load seed, seed-initial, ext
and ext-test data."/>
+ </target>
+ <target name="run-install-readers">
+ <echo message="The 'run-install-readers' command has been renamed
'load-readers'; please use 'ant load-readers' to load data using the command
line argument data-readers."/>
+ </target>
+ <target name="run-install-file">
+ <echo message="The 'run-install-file' command has been renamed
'load-file'; please use 'ant load-file' to load data from a given file."/>
+ </target>
+ <target name="run-install-file-in-delegator">
+ <echo message="The 'run-install-file-in-delegator' command has been
renamed 'load-file'; please use 'ant load-file' to load data from a given
file."/>
+ </target>
</project>
Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=1308370&r1=1308369&r2=1308370&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Mon Apr 2
14:53:11 2012
@@ -2990,15 +2990,15 @@
<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 run-install" 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
run-install" 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 run-install" 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 run-install" o "java -jar ofbiz.jar install"</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 run-install" 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 run-install"
sau "java -jar ofbiz.jar install"</value>
- <value xml:lang="th">หมายà¹à¸«à¸à¸¸:
à¸à¹à¸²à¸à¸¸à¸à¹à¸¡à¹à¹à¸à¹à¸à¸³à¸à¸²à¸£à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸à¸à¸´à¸à¸à¸±à¹à¸
data loading script à¸à¸²à¸ ofbiz home directory
à¹à¸«à¹à¹à¸à¹à¸à¸³à¸ªà¸±à¹à¸ "ant run-install" หรืภ"java -jar
ofbiz.jar install"</value>
- <value
xml:lang="zh">注æï¼å¦æä½ è¿æ²¡æè¿è¡å®è£
æ°æ®è½½å
¥èæ¬ï¼é£ä¹ä½ å¯ä»¥å¨OFBizç®å½ä¸è¿è¡"ant
run-install"æ"java -jar ofbiz.jar install"</value>
- <value
xml:lang="zh_TW">注æï¼å¦æä½ éæ²æéè¡å®è£è³æè¼å
¥è
³æ¬ï¼é£éº¼ä½ å¯ä»¥å¨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 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="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="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>
</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>
