[jboss-cvs] jboss-seam/build ...
Peter Muir
peter at bleepbleep.org.uk
Thu Aug 16 06:53:39 EDT 2007
User: pmuir
Date: 07/08/16 06:53:39
Modified: build ioc.pom.xml debug.pom.xml remoting.pom.xml
gen.pom.xml mail.pom.xml pdf.pom.xml core.pom.xml
Added: build build.xml
Log:
More work on dependency mangement and better coverage target
Revision Changes Path
1.2 +63 -4 jboss-seam/build/ioc.pom.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ioc.pom.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/ioc.pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ioc.pom.xml 11 Jul 2007 18:33:54 -0000 1.1
+++ ioc.pom.xml 16 Aug 2007 10:53:39 -0000 1.2
@@ -3,10 +3,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ioc</artifactId>
<parent>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<version>2.0.0.BETA</version>
</parent>
@@ -16,10 +16,21 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
+ <exclusions>
+ <!-- Prevent the insanity which is commons-logging pom introducing dependencies on weird stuff -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-core</artifactId>
</dependency>
@@ -32,6 +43,7 @@
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
+ <optional>true</optional>
<scope>provided</scope>
</dependency>
@@ -50,7 +62,6 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-system</artifactId>
- <version>4.2.0.GA</version>
<scope>provided</scope>
</dependency>
@@ -58,6 +69,20 @@
<groupId>jboss</groupId>
<artifactId>jboss-kernel</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -69,7 +94,41 @@
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
+ <optional>true</optional>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <optional>true</optional>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jbossxb</artifactId>
</dependency>
</dependencies>
1.2 +15 -2 jboss-seam/build/debug.pom.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: debug.pom.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/debug.pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- debug.pom.xml 11 Jul 2007 18:33:54 -0000 1.1
+++ debug.pom.xml 16 Aug 2007 10:53:39 -0000 1.2
@@ -6,7 +6,7 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-debug</artifactId>
<parent>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<version>2.0.0.BETA</version>
</parent>
@@ -14,13 +14,14 @@
<dependencies>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-core</artifactId>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -28,6 +29,18 @@
<artifactId>jsf-facelets</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
1.3 +45 -5 jboss-seam/build/remoting.pom.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: remoting.pom.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/remoting.pom.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- remoting.pom.xml 11 Jul 2007 18:33:54 -0000 1.2
+++ remoting.pom.xml 16 Aug 2007 10:53:39 -0000 1.3
@@ -6,7 +6,7 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-remoting</artifactId>
<parent>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<version>2.0.0.BETA</version>
</parent>
@@ -14,26 +14,66 @@
<dependencies>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-core</artifactId>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
- </dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms-api</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
+ </dependencies>
</project>
\ No newline at end of file
1.2 +2 -2 jboss-seam/build/gen.pom.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: gen.pom.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/gen.pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gen.pom.xml 11 Jul 2007 18:33:54 -0000 1.1
+++ gen.pom.xml 16 Aug 2007 10:53:39 -0000 1.2
@@ -6,7 +6,7 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-gen</artifactId>
<parent>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<version>2.0.0.BETA</version>
</parent>
@@ -14,7 +14,7 @@
<dependencies>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-core</artifactId>
</dependency>
1.2 +19 -5 jboss-seam/build/mail.pom.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: mail.pom.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/mail.pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- mail.pom.xml 11 Jul 2007 18:33:54 -0000 1.1
+++ mail.pom.xml 16 Aug 2007 10:53:39 -0000 1.2
@@ -3,10 +3,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-mail</artifactId>
<parent>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<version>2.0.0.BETA</version>
</parent>
@@ -14,18 +14,25 @@
<dependencies>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-core</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ui</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-pdf</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
@@ -36,6 +43,7 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -44,6 +52,12 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
</project>
\ No newline at end of file
1.4 +42 -11 jboss-seam/build/pdf.pom.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: pdf.pom.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/pdf.pom.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- pdf.pom.xml 11 Jul 2007 18:33:54 -0000 1.3
+++ pdf.pom.xml 16 Aug 2007 10:53:39 -0000 1.4
@@ -3,10 +3,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-pdf</artifactId>
<parent>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<version>2.0.0.BETA</version>
</parent>
@@ -16,21 +16,40 @@
<dependency>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-core</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ui</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -41,9 +60,21 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
</dependency>
- </dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
</project>
\ No newline at end of file
1.5 +205 -36 jboss-seam/build/core.pom.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: core.pom.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/core.pom.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- core.pom.xml 14 Jul 2007 22:53:24 -0000 1.4
+++ core.pom.xml 16 Aug 2007 10:53:39 -0000 1.5
@@ -3,37 +3,62 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-core</artifactId>
<parent>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<version>2.0.0.BETA</version>
</parent>
+ <!--
+ * Dependencies marked provided are provided by the latest JBoss AS Seam is targeted at (default/lib or default/deploy)
+ * Dependencies marked optional are provide optional features of Seam, not necessarily included in JBoss AS
+ -->
+
<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
+ <scope>provided</scope>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
+ <scope>provided</scope>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <optional>true</optional>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -45,6 +70,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
@@ -52,29 +78,40 @@
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
+ <scope>provided</scope>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.ejb</groupId>
<artifactId>ejb-api</artifactId>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
@@ -82,29 +119,67 @@
<groupId>com.octo.captcha</groupId>
<artifactId>jcaptcha-all</artifactId>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.xml.soap</groupId>
<artifactId>saaj-api</artifactId>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.jms</groupId>
<artifactId>jms-api</artifactId>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
@@ -112,6 +187,45 @@
<groupId>groovy</groupId>
<artifactId>groovy-all</artifactId>
<optional>true</optional>
+ <exclusions>
+ <!-- groovy-all imports a lot of stuff, would be better to just use specific bits -->
+ <exclusion>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>mockobjects</groupId>
+ <artifactId>mockobjects-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -123,12 +237,13 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <optional>true</optional>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
@@ -139,19 +254,19 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-cache-jdk50</artifactId>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.buni</groupId>
+ <groupId>org.buni.meldware</groupId>
<artifactId>meldware-mailjmx</artifactId>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.buni</groupId>
+ <groupId>org.buni.meldware</groupId>
<artifactId>meldware-mailapi</artifactId>
<optional>true</optional>
</dependency>
@@ -160,12 +275,44 @@
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-compiler</artifactId>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Surefire can't cope with such a new version of testng, so we have to specify it
@@ -173,12 +320,18 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.6-jboss-seam-2.0.0.BETA</version>
+ <version>5.6</version>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jbpm</groupId>
<artifactId>jbpm-jpdl</artifactId>
<optional>true</optional>
</dependency>
@@ -190,14 +343,13 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-el</artifactId>
- <optional>true</optional>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-embedded</artifactId>
+ <groupId>org.jboss.embedded</groupId>
+ <artifactId>jboss-embedded-api</artifactId>
<optional>true</optional>
</dependency>
@@ -207,6 +359,23 @@
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
</project>
\ No newline at end of file
1.9 +65 -97 jboss-seam/build/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: build.xml
diff -N build.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ build.xml 16 Aug 2007 10:53:39 -0000 1.9
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<project name="Seam2 Build Utilities" basedir="." default="help" xmlns:artifact="urn:maven-artifact-ant">
+ <path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks.jar" />
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
+
+ <artifact:remoteRepository id="local.repository" url="file://${basedir}/repository" />
+
+ <target name="deployLocal" description="Deploy a pom and jar to local (development) repository">
+ <echo message="Deploying ${pom.groupId}.${pom.artifactId} to local repository" />
+ <artifact:deploy file="${jar}">
+ <pom file="@{pom}" />
+ <remoteRepository refid="local.repository" />
+ </artifact:deploy>
+ </target>
+
+ <target name="deployLocalPomOnly" description="Deploy a pom to the (development) repository">
+ <echo message="Deploying ${pom.groupId}.${pom.artifactId} to local repository (pom only)" />
+ <artifact:deploy>
+ <pom file="@{pom}" />
+ <remoteRepository refid="local.repository" />
+ </artifact:deploy>
+ </target>
+
+ <target name="deployLocalJarOnly" description="Deploy a jar (generating the pom) to local (development) repository">
+ <echo message="Deploying ${pom.groupId}.${pom.artifactId} to local repository (generating pom)" />
+ <artifact:deploy file="${pom}">
+ <remoteRepository refid="local.repository" />
+ </artifact:deploy>
+ </target>
+
+ <target name="deployProfiles" description="Deploy all profiles to the local (development) repository">
+ <deployProfile pom="profiles/seam-ajax4jsf.pom.xml" />
+ <deployProfile pom="profiles/seam-drools.pom.xml" />
+ <deployProfile pom="profiles/seam-facelets.pom.xml" />
+ <deployProfile pom="profiles/seam-gwt.pom.xml" />
+ <deployProfile pom="profiles/seam-hibernate-search.pom.xml" />
+ <deployProfile pom="profiles/seam-jboss-cache.pom.xml" />
+ <deployProfile pom="profiles/seam-jbpm-jpdl.pom.xml" />
+ <deployProfile pom="profiles/seam-jbpm-jpdl-tomcat.pom.xml" />
+ <deployProfile pom="profiles/seam-jcaptcha.pom.xml" />
+ <deployProfile pom="profiles/seam-quartz.pom.xml" />
+ <deployProfile pom="profiles/seam-richfaces.pom.xml" />
+ <deployProfile pom="profiles/seam-spring.pom.xml" />
+ <deployProfile pom="profiles/seam-urlrewrite.pom.xml" />
+ </target>
+
+ <target name="help">
+ <echo>Examples:</echo>
+ <echo>---------</echo>
+ <echo />
+ <echo>Deploy both a pom and the associated jar: </echo>
+ <echo> ant deployLocal -Dpom=jboss-el.pom.xml -Djar=jboss-el.jar</echo>
+ <echo />
+ <echo>Deploy a pom only (useful if packaging is set to pom):</echo>
+ <echo> ant deployLocalPomOnly -Dpom=jboss-el.pom.xml</echo>
+ <echo />
+ <echo>Deploy a jar and generate a basic pom:</echo>
+ <echo> ant deployLocal -Dpom=jboss-el.pom.xml -Djar=jboss-el.jar</echo>
+ <echo />
+ <echo>Deploy all profiles to local repository:</echo>
+ <echo> ant deployProfiles</echo>
+ </target>
+
+ <macrodef name="deployProfile">
+ <attribute name="pom"/>
+ <sequential>
+ <artifact:deploy>
+ <pom file="@{pom}"/>
+ <remoteRepository refid="local.repository" />
+ </artifact:deploy>
+ </sequential>
+ </macrodef>
+</project>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list