jlaskowski 2005/02/24 07:07:11
Modified: modules/itests project.xml maven.xml
Log:
fix the issues with the build
Revision Changes Path
1.5 +105 -105 openejb1/modules/itests/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb1/modules/itests/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 5 Jul 2004 21:04:25 -0000 1.4
+++ project.xml 24 Feb 2005 12:07:10 -0000 1.5
@@ -1,105 +1,105 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!-- $Revision$ $Date$ -->
-
-<project>
- <pomVersion>3</pomVersion>
- <extend>${basedir}/../../etc/project.xml</extend>
-
- <!-- ===================== -->
- <!-- Module Identification -->
- <!-- ===================== -->
-
- <name>OpenEJB :: Integration Tests</name>
- <id>openejb-itests</id>
- <shortDescription>Compliance and Integration Tests</shortDescription>
- <description>EJB Compliance and Server Integration Tests</description>
- <url>http://www.openejb.org</url>
- <siteDirectory>/www/openejb.org/core</siteDirectory>
-
<distributionDirectory>/www/openejb.org//builds/core</distributionDirectory>
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
-
- <dependencies>
-
- <!-- Module Dependencies -->
-
- <dependency>
- <groupId>openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
-
- <!-- Thirdparty -->
-
- <dependency>
- <id>junit</id>
- <version>3.8.1</version>
- <properties>
- <runtime>true</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee</artifactId>
- <version>1.4-rc1</version>
- <properties>
- <runtime>true</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <id>idb</id>
- <version>3.26</version>
- <properties>
- <runtime>true</runtime>
- </properties>
- </dependency>
- </dependencies>
-
-
- <!-- =================== -->
- <!-- Build Specification -->
- <!-- =================== -->
-
- <build>
- <resources>
- <resource>
- <directory>${basedir}/src/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/src/etc</directory>
- <includes>
- <include>*.properties</include>
- </includes>
- </resource>
- </resources>
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <excludes>
- <exclude>**/Abstract*.java</exclude>
- </excludes>
- <resources>
- <resource>
- <directory>${basedir}/src/schema</directory>
- <includes>
- <include>*.xsd</include>
- <include>*.dtd</include>
- </includes>
- </resource>
- </resources>
- </unitTest>
- </build>
-</project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!-- $Revision$ $Date$ -->
+
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>${basedir}/../../etc/project.xml</extend>
+
+ <!-- ===================== -->
+ <!-- Module Identification -->
+ <!-- ===================== -->
+
+ <name>OpenEJB :: Integration Tests</name>
+ <id>openejb-itests</id>
+ <shortDescription>Compliance and Integration Tests</shortDescription>
+ <description>EJB Compliance and Server Integration Tests</description>
+ <url>http://www.openejb.org</url>
+ <siteDirectory>/www/openejb.org/core</siteDirectory>
+
<distributionDirectory>/www/openejb.org//builds/core</distributionDirectory>
+
+ <!-- ============ -->
+ <!-- Dependencies -->
+ <!-- ============ -->
+
+ <dependencies>
+
+ <!-- Module Dependencies -->
+
+ <dependency>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+
+ <!-- Thirdparty -->
+
+ <dependency>
+ <id>junit</id>
+ <version>3.8.1</version>
+ <properties>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-j2ee</artifactId>
+ <version>1.4-rc3</version>
+ <properties>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>idb</id>
+ <version>3.26</version>
+ <properties>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+ </dependencies>
+
+
+ <!-- =================== -->
+ <!-- Build Specification -->
+ <!-- =================== -->
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/etc</directory>
+ <includes>
+ <include>*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+ </excludes>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/schema</directory>
+ <includes>
+ <include>*.xsd</include>
+ <include>*.dtd</include>
+ </includes>
+ </resource>
+ </resources>
+ </unitTest>
+ </build>
+</project>
1.2 +2 -3 openejb1/modules/itests/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb1/modules/itests/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 26 Mar 2004 21:43:09 -0000 1.1
+++ maven.xml 24 Feb 2005 12:07:11 -0000 1.2
@@ -5,8 +5,7 @@
<project default="default"
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
- xmlns:maven="jelly:maven"
- xmlns:xdoclet="common:xdoclet">
+ xmlns:maven="jelly:maven">
<preGoal name="xdoc:jelly-transform">
<attainGoal name="html2xdoc"/>
