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:52:03 UTC
cvs commit: jakarta-jetspeed-2/components/registry project.xml maven.xml
dlestrat 2004/04/28 19:52:03
Modified: components/registry 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.12 +15 -14 jakarta-jetspeed-2/components/registry/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/project.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 19 Apr 2004 17:44:57 -0000 1.11
+++ project.xml 29 Apr 2004 02:52:03 -0000 1.12
@@ -26,13 +26,13 @@
Registry Components
</description>
- <repository>
+ <repository>
<connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-jetspeed-2/components/registry</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/registry/</url>
</repository>
<shortDescription>Registry Components</shortDescription>
- <dependencies>
+ <dependencies>
<dependency>
<id>jetspeed-cm</id>
<groupId>jetspeed2</groupId>
@@ -40,7 +40,7 @@
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
- </dependency>
+ </dependency>
<dependency>
<id>jetspeed-persistence</id>
<groupId>jetspeed2</groupId>
@@ -57,7 +57,7 @@
<properties>
<war.bundle.jar>false</war.bundle.jar>
</properties>
- </dependency>
+ </dependency>
<dependency>
<id>commons-lang</id>
<version>2.0</version>
@@ -93,8 +93,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>
@@ -201,7 +201,7 @@
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
- </dependency>
+ </dependency>
<dependency>
<id>groovy</id>
<version>1.0-beta-4-snapshot</version>
@@ -215,7 +215,7 @@
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
- </dependency>
+ </dependency>
<dependency>
<id>jetspeed-commons</id>
<groupId>jetspeed2</groupId>
@@ -278,8 +278,8 @@
</dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
-
-
+
+
<unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
<unitTest>
<resources>
@@ -287,6 +287,7 @@
<directory>${basedir}/src/test</directory>
<excludes>
<exclude>**/*.java</exclude>
+ <exclude>repository_database.xml</exclude>
</excludes>
</resource>
<resource>
@@ -297,7 +298,7 @@
</resource>
</resources>
</unitTest>
-
+
<resources>
<resource>
<directory>${basedir}/src/java</directory>
@@ -306,6 +307,6 @@
</excludes>
</resource>
</resources>
-
+
</build>
</project>
1.15 +21 -5 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- maven.xml 24 Apr 2004 19:05:54 -0000 1.14
+++ maven.xml 29 Apr 2004 02:52:03 -0000 1.15
@@ -16,6 +16,7 @@
<project default="java:jar"
xmlns:j="jelly:core"
xmlns:define="jelly:define"
+ xmlns:maven="jelly:maven"
xmlns:reactor="reactor">
<!--
@@ -26,7 +27,7 @@
<property name='testcase' value='org.apache.jetspeed.components.portletentity.TestPortletEntityAccessComponent'/>
-->
-<property name='testcase' value='org.apache.jetspeed.components.portletregistry.TestRegistryDirect'/>
+<property name='testcase' value='org.apache.jetspeed.components.portletregistry.TestRegistryFromPortletDescriptor'/>
<goal name="deployJar">
@@ -43,16 +44,31 @@
<!-- <copy file="${basedir}/src/java/repository_registry.xml" tofile="${basedir}/../../portal/src/test/repository_registry.xml"/> -->
</goal>
-
+
<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="build.registry">
+
+ <goal name="build.registry">
<attainGoal name="ojb.registry"/>
<attainGoal name="jar:install"/>
- </goal>
+ </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