You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2003/06/17 19:10:26 UTC
cvs commit: avalon-logkit maven.xml project.xml
bloritsch 2003/06/17 10:10:26
Modified: . maven.xml project.xml
Log:
make this cleaner and work
Revision Changes Path
1.2 +39 -12 avalon-logkit/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-logkit/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 17 Jun 2003 16:23:07 -0000 1.1
+++ maven.xml 17 Jun 2003 17:10:26 -0000 1.2
@@ -12,22 +12,49 @@
<!-- friendly error in case file is not available -->
<ant:available file="${avalon.buildsystem}/maven-common.xml"
property="buildsystem.available"/>
- <j:set var="avalon.buildsystem.available" value="${buildsystem.available}"/>
- <j:if test="${empty(avalon.buildsystem.available)}">
- <ant:fail>
- ===================================================================
- BUILD SYSTEM FAILURE!
- ===================================================================
-
- a required file, ${avalon.buildsystem}/maven-common.xml, cannot be
- found. Try setting the avalon.buildsystem property in
- project.properties to the correct location.
- </ant:fail>
- </j:if>
+ <ant:available classname="javax.mail.Message" property="javamail.present"/>
+ <ant:available classname="javax.jms.Message" property="jms.present"/>
+ <ant:fail unless="buildsystem.available">
+ ===================================================================
+ BUILD SYSTEM FAILURE!
+ ===================================================================
+
+ a required file, ${avalon.buildsystem}/maven-common.xml, cannot be
+ found. Try setting the avalon.buildsystem property in
+ project.properties to the correct location.
+ </ant:fail>
+ <ant:fail unless="javamail.present">
+ Avalon LogKit must have JavaMail in your repository. You must
+ download it manually from the URL provided here:
+
+ http://java.sun.com/products/javamail/index.html
+
+ Place the jar in your repository in the subdirectory:
+
+ javamail/jars
+ </ant:fail>
+ <ant:fail unless="jms.present">
+ Avalon LogKit must have JavaMail in your repository. You must
+ download it manually from the URL provided here:
+
+ http://java.sun.com/products/jms/docs.html
+
+ Place the jar in your repository in the subdirectory:
+
+ jms/jars
+ </ant:fail>
</goal>
<!-- include the avalon-wide custom goal decorators from maven-common.xml -->
<j:import file="${avalon.buildsystem}/maven-common.xml" inherit="true"/>
+
+ <preGoal name="java:compile">
+ <ant:property name="java.src.dir" location="${maven.build.dir}/src"/>
+ <ant:copy todir="${java.src.dir}">
+ <ant:fileset dir="${basedir}/src/java"/>
+ <ant:fileset dir="${basedir}/src/compat"/>
+ </ant:copy>
+ </preGoal>
<postGoal name="avalon:deploy-upload">
<!-- upload big jar -->
1.2 +25 -14 avalon-logkit/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-logkit/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 17 Jun 2003 16:23:07 -0000 1.1
+++ project.xml 17 Jun 2003 17:10:26 -0000 1.2
@@ -14,19 +14,30 @@
</description>
<dependencies>
- <dependency>
- <id>avalon-framework</id>
- <version>4.1.4</version>
- <groupId>framework</groupId>
- </dependency>
- <dependency>
- <id>log4j</id>
- <version>1.2.8</version>
- </dependency>
- <dependency>
- <id>commons-logging</id>
- <version>1.0.2</version>
- </dependency>
+ <dependency>
+ <id>avalon-framework</id>
+ <version>4.1.4</version>
+ <groupId>framework</groupId>
+ </dependency>
+ <dependency>
+ <id>log4j</id>
+ <version>1.2.8</version>
+ </dependency>
+ <dependency>
+ <id>commons-logging</id>
+ <version>1.0.2</version>
+ </dependency>
+ <dependency>
+ <id>servletapi</id>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <id>javamail</id>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <id>jms</id>
+ <version>1.1</version>
+ </dependency>
</dependencies>
-
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org