You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by we...@apache.org on 2004/05/23 23:23:40 UTC
cvs commit: jakarta-jetspeed-2/components/persistence maven.xml
weaver 2004/05/23 14:23:39
Modified: components/registry project.properties maven.xml
components/rdbms maven.xml
components/security maven.xml
components/prefs maven.xml
components/persistence maven.xml
Log:
see JS2-51 <http://nagoya.apache.org/jira/browse/JS2-51>
Revision Changes Path
1.7 +2 -7 jakarta-jetspeed-2/components/registry/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/project.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.properties 29 Apr 2004 02:52:10 -0000 1.6
+++ project.properties 23 May 2004 21:23:39 -0000 1.7
@@ -42,13 +42,8 @@
# Include private method and field in Javadoc.
maven.multiproject.type=jar
-# Sets up the system properties for the test JDBC datasource
-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
-
+# These defaults can be overriden by putting a build.properties into
+# your USER_HOME directory that contains the override values.
org.apache.jetspeed.test.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
org.apache.jetspeed.test.database.driver = org.hsqldb.jdbcDriver
org.apache.jetspeed.test.database.user = sa
1.18 +0 -15 jakarta-jetspeed-2/components/registry/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/maven.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- maven.xml 20 May 2004 23:24:20 -0000 1.17
+++ maven.xml 23 May 2004 21:23:39 -0000 1.18
@@ -37,19 +37,4 @@
</goal>
- <preGoal name="test:test">
- <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}"/>
- <copy file="src/test/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"/>
- </preGoal>
-
</project>
1.5 +0 -16 jakarta-jetspeed-2/components/rdbms/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/rdbms/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 8 May 2004 17:40:22 -0000 1.4
+++ maven.xml 23 May 2004 21:23:39 -0000 1.5
@@ -30,21 +30,5 @@
<copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
</goal>
- <preGoal name="test:test">
- <attainGoal name='dbsetup'/>
- </preGoal>
- <preGoal name="test:single">
- <attainGoal name='dbsetup'/>
- </preGoal>
-
- <goal name="dbsetup">
- <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}"/>
-
- <path id="jdbc.drivers.path" path="${org.apache.jetspeed.test.jdbc.drivers.path}"/>
- <maven:addPath id="maven.dependency.classpath" refid="jdbc.drivers.path"/>
- </goal>
</project>
1.8 +1 -25 jakarta-jetspeed-2/components/security/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/security/maven.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- maven.xml 21 May 2004 22:15:15 -0000 1.7
+++ maven.xml 23 May 2004 21:23:39 -0000 1.8
@@ -22,35 +22,11 @@
<!-- Target of maven test:single test -->
<property name='testcase' value='org.apache.jetspeed.security.TestLoginModule'/>
- <preGoal name="test:test">
- <attainGoal name="dbsetup"/>
- </preGoal>
- <preGoal name="test:single">
- <attainGoal name="dbsetup"/>
- </preGoal>
-
- <!-- ================================================================ -->
- <!-- Merge OJB desriptor with Jetspeed main OJB descriptor -->
- <!-- ================================================================ -->
-
+
<goal name="deployJar">
<attainGoal name="jar:install"/>
<copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
</goal>
- <goal name="dbsetup">
- <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}"/>
- <copy file="src/test/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>
</project>
1.11 +1 -27 jakarta-jetspeed-2/components/prefs/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/prefs/maven.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- maven.xml 21 May 2004 22:14:15 -0000 1.10
+++ maven.xml 23 May 2004 21:23:39 -0000 1.11
@@ -22,35 +22,9 @@
<!-- Target of maven test:single test -->
<property name='testcase' value='org.apache.jetspeed.prefs.TestPreferences'/>
- <preGoal name="test:test">
- <attainGoal name="dbsetup"/>
- </preGoal>
- <preGoal name="test:single">
- <attainGoal name="dbsetup"/>
- </preGoal>
-
- <!-- ================================================================ -->
- <!-- Merge OJB desriptor with Jetspeed main OJB descriptor -->
- <!-- ================================================================ -->
-
<goal name="deployJar">
<attainGoal name="jar:install"/>
<copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
- </goal>
-
- <goal name="dbsetup">
- <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}"/>
- <copy file="src/test/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>
</project>
1.5 +0 -17 jakarta-jetspeed-2/components/persistence/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/persistence/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 29 Apr 2004 02:12:49 -0000 1.4
+++ maven.xml 23 May 2004 21:23:39 -0000 1.5
@@ -22,26 +22,9 @@
<!-- Target of maven test:single test -->
<property name='testcase' value='org.apache.jetspeed.components.TestComponentManager'/>
-
<goal name="deployJar">
<attainGoal name="jar:install"/>
-
<copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
</goal>
-
- <preGoal name="test:test">
- <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}"/>
- <copy file="src/test/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"/>
- </preGoal>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org