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 dl...@apache.org on 2004/04/29 04:49:59 UTC
cvs commit: jakarta-jetspeed-2/components/prefs project.xml maven.xml
dlestrat 2004/04/28 19:49:59
Modified: components/prefs project.xml maven.xml
Log:
Applying patch from Ate Douma regarding JS2-18: Cannot run J2 using
Oracle due to problems with OBJ, Torque and dependencies on HSQLDB.
Revision Changes Path
1.6 +13 -12 jakarta-jetspeed-2/components/prefs/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/prefs/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 29 Mar 2004 04:54:39 -0000 1.5
+++ project.xml 29 Apr 2004 02:49:59 -0000 1.6
@@ -26,12 +26,12 @@
</description>
<shortDescription>Preferences SPI Components</shortDescription>
- <repository>
+ <repository>
<connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-jetspeed-2/components/perfs</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/perfs/</url>
</repository>
- <dependencies>
+ <dependencies>
<dependency>
<id>jetspeed-cm</id>
<groupId>jetspeed2</groupId>
@@ -39,7 +39,7 @@
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
- </dependency>
+ </dependency>
<dependency>
<id>jetspeed-persistence</id>
<groupId>jetspeed2</groupId>
@@ -56,7 +56,7 @@
<properties>
<war.bundle.jar>false</war.bundle.jar>
</properties>
- </dependency>
+ </dependency>
<dependency>
<id>commons-lang</id>
<version>2.0</version>
@@ -92,8 +92,8 @@
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
- </dependency>
-
+ </dependency>
+
<dependency>
<id>commons-configuration</id>
<version>1.0-dev</version>
@@ -144,8 +144,8 @@
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<id>jdbc-se</id>
<jar>jdbc-se2.0.jar</jar>
<properties>
@@ -202,7 +202,7 @@
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
- </dependency>
+ </dependency>
<dependency>
<id>groovy</id>
<version>1.0-beta-4-snapshot</version>
@@ -216,7 +216,7 @@
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
- </dependency>
+ </dependency>
<dependency>
<id>jta</id>
<jar>jta1.0.1.jar</jar>
@@ -245,6 +245,7 @@
<directory>${basedir}/src/test</directory>
<excludes>
<exclude>**/*.java</exclude>
+ <exclude>repository_database.xml</exclude>
</excludes>
</resource>
<resource>
@@ -255,7 +256,7 @@
</resource>
</resources>
</unitTest>
-
+
<resources>
<resource>
<directory>${basedir}/src/java</directory>
@@ -264,6 +265,6 @@
</excludes>
</resource>
</resources>
-
+
</build>
</project>
1.7 +21 -5 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- maven.xml 18 Mar 2004 14:38:33 -0000 1.6
+++ maven.xml 29 Apr 2004 02:49:59 -0000 1.7
@@ -14,19 +14,20 @@
limitations under the License.
-->
<project default="java:jar"
- xmlns:j="jelly:core"
+ xmlns:j="jelly:core"
xmlns:define="jelly:define"
+ xmlns:maven="jelly:maven"
xmlns:reactor="reactor">
<!-- Target of maven test:single test -->
- <property name='testcase' value='org.apache.jetspeed.prefs.TestPropertyManager'/>
-
+ <property name='testcase' value='org.apache.jetspeed.prefs.TestPropertyManager'/>
+
<goal name="deployJar">
<attainGoal name="jar:install"/>
<copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
</goal>
-
+
<!-- ================================================================ -->
<!-- Merge OJB desriptor with Jetspeed main OJB descriptor -->
<!-- ================================================================ -->
@@ -40,10 +41,25 @@
<copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
</goal>
-
+
<goal name="build.prefs">
<attainGoal name="ojb.registry"/>
<attainGoal name="jar:install"/>
</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