dlestrat 2004/05/23 13:52:17 Modified: portal maven.xml Log: Patch from Ate Douma.
http://issues.apache.org/jira/browse/JS2-49 Revision Changes Path 1.76 +19 -10 jakarta-jetspeed-2/portal/maven.xml Index: maven.xml =================================================================== RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- maven.xml 21 May 2004 18:31:37 -0000 1.75 +++ maven.xml 23 May 2004 20:52:17 -0000 1.76 @@ -181,7 +181,7 @@ <arg value="jetspeed" /> </java> </goal> - + <goal name="pam.securitydeploy"> <java classname="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" fork="yes"> <classpath> @@ -278,7 +278,7 @@ <arg value="webapp" /> </java> </goal> - + <goal name="pam.securityundeploy"> <java classname="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" fork="yes"> <classpath> @@ -500,16 +500,25 @@ <goal name="db.entities"> <j:set var="dbase" value="${org.apache.jetspeed.production.database.default.name}"/> - <j:choose> + <attainGoal name="db.production.properties"/> + <j:choose> <j:when test="${dbase == 'mysql'}" > <j:set var="database.arg.script" value="../src/sql/mysql/populate-entities-for-default-psml.sql" /> </j:when> <j:otherwise> <j:set var="database.arg.script" value="../src/sql/populate-entities-for-default-psml.sql" /> </j:otherwise> - </j:choose> - <attainGoal name="db.production.properties"/> - <attainGoal name="db.execute" /> + </j:choose> + <attainGoal name="db.execute" /> + <j:choose> + <j:when test="${dbase == 'oracle'}" > + <j:set var="database.arg.script" value="../src/sql/oracle/populate-userinfo-for-default-psml.sql" /> + </j:when> + <j:otherwise> + <j:set var="database.arg.script" value="../src/sql/populate-userinfo-for-default-psml.sql" /> + </j:otherwise> + </j:choose> + <attainGoal name="db.execute" /> </goal> <goal name="ojb.set.production.database.platform"> @@ -542,7 +551,7 @@ <attainGoal name="dbsetup"/> </preGoal> - <goal name="dbsetup"> + <goal name="dbsetup"> <attainGoal name="db.test.properties"/> <copy file="src/java/repository_database.xml" todir="${maven.test.dest}" overwrite="true"> <filterset begintoken="@" endtoken="@"> @@ -556,10 +565,10 @@ <goal name='remove.wars'> <delete dir="${deploy.war.dir}/${webapp.name}"/> - <delete file="${deploy.war.dir}/${webapp.name}.war"/> + <delete file="${deploy.war.dir}/${webapp.name}.war"/> <delete dir="${deploy.war.dir}/HW_App"/> <delete dir="${deploy.war.dir}/security"/> - <delete dir="${deploy.war.dir}/struts-demo"/> + <delete dir="${deploy.war.dir}/struts-demo"/> </goal> - + </project> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
