weaver 2004/05/23 14:26:19
Modified: . maven.xml
portal maven.xml
Log:
see JS2-51 <http://nagoya.apache.org/jira/browse/JS2-51>
Revision Changes Path
1.61 +29 -0 jakarta-jetspeed-2/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/maven.xml,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- maven.xml 23 May 2004 20:52:56 -0000 1.60
+++ maven.xml 23 May 2004 21:26:18 -0000 1.61
@@ -460,4 +460,33 @@
<arg value="${dropstable}" />
</java>
</goal>
+
+ <!-- this will be inherited into all sub-projects to assists in
+ setting jdbc test connecitons-->
+ <preGoal name="test:test">
+ <j:set var="maven.junit.sysproperties" value="${maven.junit.sysproperties}
org.apache.jetspeed.database.url org.apache.jetspeed.database.driver
org.apache.jetspeed.database.user org.apache.jetspeed.database.password p6.home" />
+ <j:set var="org.apache.jetspeed.database.url"
value="${org.apache.jetspeed.test.database.url}"/>
+ <j:set var="org.apache.jetspeed.database.driver"
value="${org.apache.jetspeed.test.database.driver}"/>
+ <j:set var="org.apache.jetspeed.database.user"
value="${org.apache.jetspeed.test.database.user}"/>
+ <j:set var="org.apache.jetspeed.database.password"
value="${org.apache.jetspeed.test.database.password}"/>
+
+ <j:if test="${!pom.id.equals('jetspeed2:jetspeed')}">
+ <copy file="src/test/repository_database.xml" todir="${maven.test.dest}"
overwrite="true" failonerror="false">
+ <filterset begintoken="@" endtoken="@">
+ <filter token="PLATFORM"
value="${org.apache.jetspeed.test.database.ojb.platform}"/>
+ </filterset>
+ </copy>
+ </j:if>
+
+ <j:if test="${pom.id.equals('jetspeed2:jetspeed')}">
+ <copy file="src/java/repository_database.xml" todir="${maven.test.dest}"
overwrite="true" failonerror="false">
+ <filterset begintoken="@" endtoken="@">
+ <filter token="PLATFORM"
value="${org.apache.jetspeed.test.database.ojb.platform}"/>
+ </filterset>
+ </copy>
+ </j:if>
+
+ <path id="jdbc.drivers.path"
path="${org.apache.jetspeed.test.jdbc.drivers.path}"/>
+ <maven:addPath id="maven.dependency.classpath" refid="jdbc.drivers.path"/>
+ </preGoal>
</project>
1.77 +1 -20 jakarta-jetspeed-2/portal/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- maven.xml 23 May 2004 20:52:17 -0000 1.76
+++ maven.xml 23 May 2004 21:26:18 -0000 1.77
@@ -543,26 +543,7 @@
<attainGoal name="ojb.set.production.database.platform"/>
</preGoal>
- <preGoal name="test:test">
- <attainGoal name="dbsetup"/>
- </preGoal>
-
- <preGoal name="test:single">
- <attainGoal name="dbsetup"/>
- </preGoal>
-
- <goal name="dbsetup">
- <attainGoal name="db.test.properties"/>
- <copy file="src/java/repository_database.xml" todir="${maven.test.dest}"
overwrite="true">
- <filterset begintoken="@" endtoken="@">
- <filter token="PLATFORM"
value="${org.apache.jetspeed.test.database.ojb.platform}"/>
- </filterset>
- </copy>
-
- <path id="jdbc.drivers.path"
path="${org.apache.jetspeed.test.jdbc.drivers.path}"/>
- <maven:addPath id="maven.dependency.classpath" refid="jdbc.drivers.path"/>
- </goal>
-
+
<goal name='remove.wars'>
<delete dir="${deploy.war.dir}/${webapp.name}"/>
<delete file="${deploy.war.dir}/${webapp.name}.war"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
