jlaskowski 2005/02/24 07:07:09
Modified: modules/core project.xml maven.xml
Log:
fix the issues with the build
Revision Changes Path
1.9 +152 -152 openejb1/modules/core/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb1/modules/core/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 26 Aug 2004 07:20:26 -0000 1.8
+++ project.xml 24 Feb 2005 12:07:08 -0000 1.9
@@ -1,152 +1,152 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!-- $Revision$ $Date$ -->
-
-<project>
- <pomVersion>3</pomVersion>
- <extend>${basedir}/../../etc/project.xml</extend>
-
- <!-- ===================== -->
- <!-- Module Identification -->
- <!-- ===================== -->
-
- <name>OpenEJB :: Core</name>
- <id>openejb-core</id>
- <shortDescription>OpenEJB Core J2EE Container</shortDescription>
- <description>OpenEJB Core EJB Container</description>
- <url>http://www.openejb.org</url>
- <siteDirectory>/www/openejb.org/core</siteDirectory>
-
<distributionDirectory>/www/openejb.org//builds/core</distributionDirectory>
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
-
- <dependencies>
-
- <!-- Module Dependencies -->
-
-
- <!-- Thirdparty -->
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee</artifactId>
- <version>1.4-rc1</version>
- <properties>
- <runtime>true</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <id>log4j</id>
- <version>1.2.8</version>
- <url>http://jakarta.apache.org/log4j</url>
- <properties>
- <runtime>true</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.6.0</version>
- <url>http://xml.apache.org</url>
- <properties>
- <runtime>true</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <id>xml-apis</id>
- <version>1.0.b2</version>
- <properties>
- <runtime>true</runtime>
- </properties>
- </dependency>
-
-
- <dependency>
- <id>castor</id>
- <version>0.9.5.3</version>
- <url>http://www.castor.org</url>
- <properties>
- <runtime>true</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <id>oro</id>
- <version>2.0.8</version>
- <properties>
- <runtime>true</runtime>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
- <url>http://jakarta.apache.org/commons/logging/</url>
- <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/schema</directory>
- <targetPath>openejb/dtds</targetPath>
- <includes>
- <include>*.xsd</include>
- <include>*.dtd</include>
- </includes>
- </resource>
- <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 :: Core</name>
+ <id>openejb-core</id>
+ <shortDescription>OpenEJB Core J2EE Container</shortDescription>
+ <description>OpenEJB Core EJB Container</description>
+ <url>http://www.openejb.org</url>
+ <siteDirectory>/www/openejb.org/core</siteDirectory>
+
<distributionDirectory>/www/openejb.org//builds/core</distributionDirectory>
+
+ <!-- ============ -->
+ <!-- Dependencies -->
+ <!-- ============ -->
+
+ <dependencies>
+
+ <!-- Module Dependencies -->
+
+
+ <!-- Thirdparty -->
+
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-j2ee</artifactId>
+ <version>1.4-rc3</version>
+ <properties>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>log4j</id>
+ <version>1.2.8</version>
+ <url>http://jakarta.apache.org/log4j</url>
+ <properties>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.0</version>
+ <url>http://xml.apache.org</url>
+ <properties>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>xml-apis</id>
+ <version>1.0.b2</version>
+ <properties>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
+
+ <dependency>
+ <id>castor</id>
+ <version>0.9.5.3</version>
+ <url>http://www.castor.org</url>
+ <properties>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>oro</id>
+ <version>2.0.8</version>
+ <properties>
+ <runtime>true</runtime>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.3</version>
+ <url>http://jakarta.apache.org/commons/logging/</url>
+ <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/schema</directory>
+ <targetPath>openejb/dtds</targetPath>
+ <includes>
+ <include>*.xsd</include>
+ <include>*.dtd</include>
+ </includes>
+ </resource>
+ <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.9 +50 -51 openejb1/modules/core/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb1/modules/core/maven.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- maven.xml 25 Aug 2004 22:57:56 -0000 1.8
+++ maven.xml 24 Feb 2005 12:07:09 -0000 1.9
@@ -1,51 +1,50 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!-- $Revision$ $Date$ -->
-
-<project default="default"
- xmlns:j="jelly:core"
- xmlns:ant="jelly:ant"
- xmlns:maven="jelly:maven"
- xmlns:xdoclet="common:xdoclet">
-
- <preGoal name="xdoc:jelly-transform">
- <attainGoal name="html2xdoc"/>
- </preGoal>
-
- <preGoal name="jar:jar">
- <ant:tstamp />
- <replace file="${maven.build.dest}/openejb-version.properties"
- token="@VERSION-REPLACED-BY-MAVEN@"
- value="${pom.currentVersion}"/>
- <replace file="${maven.build.dest}/openejb-version.properties"
- token="@DATE-REPLACED-BY-MAVEN@"
- value="${DSTAMP}"/>
- <replace file="${maven.build.dest}/openejb-version.properties"
- token="@TIME-REPLACED-BY-MAVEN@"
- value="${TSTAMP}"/>
- </preGoal>
-
- <postGoal name="jar:jar">
- <ant:jar
destfile="${basedir}/target/openejb-loader-${pom.currentVersion}.jar">
- <fileset dir="${basedir}/target/classes" >
- <include name="org/openejb/util/ClasspathUtils*" />
- <include name="org/openejb/util/FileUtils.class" />
- <include
name="org/openejb/client/LocalInitialContextFactory.class" />
- <include name="org/openejb/loader/**" />
- <include name="org/openejb/OpenEJBException.class" />
- </fileset>
- </ant:jar>
-
- <copy file="${basedir}/../webadmin/src/webapp/WEB-INF/web.xml"
todir="${basedir}/target"/>
- <replace file="${basedir}/target/web.xml" token="@OPENEJB_HOME@"
- value="${basedir}/../../target/openejb-${pom.currentVersion}"/>
-
- <war
destfile="${basedir}/target/openejb-loader-${pom.currentVersion}.war"
webxml="${basedir}/target/web.xml">
- <lib dir="${basedir}/target/">
- <include name="openejb-loader-${pom.currentVersion}.jar"/>
- </lib>
- </war>
-
- <delete file="${basedir}/target/web.xml"/>
- </postGoal>
-</project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!-- $Revision$ $Date$ -->
+
+<project default="default"
+ xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
+ xmlns:maven="jelly:maven">
+
+ <preGoal name="xdoc:jelly-transform">
+ <attainGoal name="html2xdoc"/>
+ </preGoal>
+
+ <preGoal name="jar:jar">
+ <ant:tstamp />
+ <replace file="${maven.build.dest}/openejb-version.properties"
+ token="@VERSION-REPLACED-BY-MAVEN@"
+ value="${pom.currentVersion}"/>
+ <replace file="${maven.build.dest}/openejb-version.properties"
+ token="@DATE-REPLACED-BY-MAVEN@"
+ value="${DSTAMP}"/>
+ <replace file="${maven.build.dest}/openejb-version.properties"
+ token="@TIME-REPLACED-BY-MAVEN@"
+ value="${TSTAMP}"/>
+ </preGoal>
+
+ <postGoal name="jar:jar">
+ <ant:jar
destfile="${basedir}/target/openejb-loader-${pom.currentVersion}.jar">
+ <fileset dir="${basedir}/target/classes" >
+ <include name="org/openejb/util/ClasspathUtils*" />
+ <include name="org/openejb/util/FileUtils.class" />
+ <include
name="org/openejb/client/LocalInitialContextFactory.class" />
+ <include name="org/openejb/loader/**" />
+ <include name="org/openejb/OpenEJBException.class" />
+ </fileset>
+ </ant:jar>
+
+ <copy file="${basedir}/../webadmin/src/webapp/WEB-INF/web.xml"
todir="${basedir}/target"/>
+ <replace file="${basedir}/target/web.xml" token="@OPENEJB_HOME@"
+ value="${basedir}/../../target/openejb-${pom.currentVersion}"/>
+
+ <war
destfile="${basedir}/target/openejb-loader-${pom.currentVersion}.war"
webxml="${basedir}/target/web.xml">
+ <lib dir="${basedir}/target/">
+ <include name="openejb-loader-${pom.currentVersion}.jar"/>
+ </lib>
+ </war>
+
+ <delete file="${basedir}/target/web.xml"/>
+ </postGoal>
+</project>
