svn commit: r1236044 - in /ofbiz/trunk: build.xml framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java

[hansbak-2]

Author: hansbak
Date: Thu Jan 26 06:01:03 2012
New Revision: 1236044

URL: http://svn.apache.org/viewvc?rev=1236044&view=rev
Log:
add ant target for loading a file using a specific delegator and extend load message

Modified:
    ofbiz/trunk/build.xml
    ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java

Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1236044&r1=1236043&r2=1236044&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Thu Jan 26 06:01:03 2012
@@ -454,7 +454,7 @@ under the License.
         </java>
     </target>
     <target name="run-install-file" depends="build"
-            description="This loads data using the command line argument 'file' to load data from a given file">
+            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}"/>
@@ -464,6 +464,17 @@ under the License.
             <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'">
+        <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=${delegator}"/>
+            <arg value="file=${data-file}"/>
+        </java>
+    </target>
     <!-- =================================
           target: run-install-tenant
          ================================= -->

Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java?rev=1236044&r1=1236043&r2=1236044&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java Thu Jan 26 06:01:03 2012
@@ -472,7 +472,7 @@ public class EntityDataLoadContainer imp
         List<String> infoMessages = FastList.newInstance();
         int totalRowsChanged = 0;
         if (UtilValidate.isNotEmpty(urlList)) {
-            Debug.logImportant("=-=-=-=-=-=-= Doing a data load with the following files:", module);
+            Debug.logImportant("=-=-=-=-=-=-= Doing a data load using delegator '" + delegator.getDelegatorName() + "' with the following files:", module);
             for (URL dataUrl: urlList) {
                 Debug.logImportant(dataUrl.toExternalForm(), module);
             }