Merge pull request EsupPortail#110 from jameswennmacher/UP-3653

UP-3653 Modified build.xml to use portlet-data-import ability from uMobile's build.xml
vbonamy · Feb 4, 2013 · a6c4893 · a6c4893
2 parents 7a686c1 + c3172b2
commit a6c4893
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/build.xml b/build.xml
@@ -402,6 +402,7 @@
                 </then>
             </if>
         </up-shell-batch>
+        <antcall target="portlet-data-import"/>
     </target>
 
     <target name="dbtest" description="Displays information about the database defined in rdbm.properties">
@@ -495,6 +496,15 @@
         </antcall>
     </target>
 
+	<target name="portlet-data-import" depends="prodPrompt" description="Imports the default portlet-specific data">
+	    <echo>Importing portlet-specific data</echo>
+        <antcall target="mvn">
+            <param name="pomDir" value="${basedir}/uportal-portlets-overlay" />
+            <param name="goal" value="antrun:run" />
+            <param name="portlet-data-import" value="true"/>
+        </antcall>
+	</target>
+
     <target name="data-import" depends="prodPrompt" description="Imports the specified XML file or files">
         <if>
             <not>
@@ -1405,12 +1415,18 @@ IMPORTANT: The '-Dpattern=' property is no longer a regular expression and is a
         </condition>
         <property name="filters.arg" value="-Djasig.ignore" />
 
+        <condition property="portlet-data-import.arg" value="-Dportlet-data-import=${portlet-data-import}">
+            <isset property="portlet-data-import" />
+        </condition>
+        <property name="portlet-data-import.arg" value="-Djasig.ignore" />
+
         <artifact:mvn pom="${pomDir}/pom.xml" failonerror="true" fork="true" mavenHome="${maven.home}" maxmemory="512m">
             <arg value="-s${maven.settings}" />
             <arg value="${test.skip}" />
             <arg value="${offline}" />
             <arg value="${env.arg}" />
             <arg value="${filters.arg}" />
+            <arg value="${portlet-data-import.arg}" />
             <arg value="${goal}" />
             <arg value="${goal1}" />
             <arg value="${goal2}" />