[jboss-cvs] JBossAS SVN: r66636 - in trunk: aspects and 26 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 31 18:23:01 EDT 2007
Author: pgier
Date: 2007-10-31 18:23:01 -0400 (Wed, 31 Oct 2007)
New Revision: 66636
Modified:
trunk/aspects/pom.xml
trunk/build/pom.xml
trunk/cluster/
trunk/cluster/pom.xml
trunk/connector/
trunk/console/
trunk/deployment/
trunk/deployment/pom.xml
trunk/hibernate-int/
trunk/iiop/pom.xml
trunk/j2se/
trunk/jbossas/
trunk/jbossas/remoting/pom.xml
trunk/jbossmq/
trunk/jmx-remoting/
trunk/jmx/
trunk/main/
trunk/management/
trunk/mbeans/
trunk/mbeans/pom.xml
trunk/messaging/
trunk/naming/
trunk/pom.xml
trunk/profileservice/
trunk/profileservice/pom.xml
trunk/server/
trunk/server/pom.xml
trunk/system-jmx/
trunk/system-jmx/pom.xml
trunk/system/
trunk/system/pom.xml
trunk/testsuite/
trunk/tomcat/
trunk/tomcat/pom.xml
trunk/varia/
trunk/webservices/
Log:
Updating dependencies, fixing a couple broken parts of the build.
Modified: trunk/aspects/pom.xml
===================================================================
--- trunk/aspects/pom.xml 2007-10-31 22:13:38 UTC (rev 66635)
+++ trunk/aspects/pom.xml 2007-10-31 22:23:01 UTC (rev 66636)
@@ -99,8 +99,16 @@
</dependency>
<dependency>
<groupId>jboss</groupId>
- <artifactId>remoting</artifactId>
+ <artifactId>jboss-remoting</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2007-10-31 22:13:38 UTC (rev 66635)
+++ trunk/build/pom.xml 2007-10-31 22:23:01 UTC (rev 66636)
@@ -10,7 +10,7 @@
<artifactId>jboss-as-parent</artifactId>
<version>5.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>JBoss Application Server (parent)</name>
+ <name>JBoss Application Server Parent</name>
<url>http://www.jboss.com/products/jbossas</url>
<description>JBoss Application Server Parent</description>
@@ -18,7 +18,7 @@
<version.junit>3.8.1</version.junit>
<version.org.jboss.aop>2.0.0-SNAPSHOT</version.org.jboss.aop>
<version.org.jboss.common-core>2.2.1.GA</version.org.jboss.common-core>
- <version.org.jboss.microcontainer>2.0.0-SNAPSHOT</version.org.jboss.microcontainer>
+ <version.org.jboss.microcontainer>2.0.0.Beta5</version.org.jboss.microcontainer>
<version.oswego-concurrent.concurrent>1.3.4-jboss</version.oswego-concurrent.concurrent>
</properties>
@@ -206,6 +206,12 @@
<groupId>jboss</groupId>
<artifactId>jboss-common-logging-log4j</artifactId>
<version>2.0.4.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>jboss</groupId>
@@ -214,6 +220,11 @@
</dependency>
<dependency>
<groupId>jboss</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
<artifactId>jboss-j2ee</artifactId>
<version>4.0.2</version>
</dependency>
@@ -251,7 +262,7 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jbosssx-client</artifactId>
- <version>2.0.1-BETA1</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
@@ -270,18 +281,18 @@
</dependency>
<dependency>
<groupId>jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>2.0.0.CR3</version>
+ <artifactId>pojocache</artifactId>
+ <version>2.0.0.GA</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
- <artifactId>pojocache</artifactId>
- <version>2.0.0.GA</version>
+ <artifactId>jboss-remoting</artifactId>
+ <version>2.2.1.GA</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
- <artifactId>remoting</artifactId>
- <version>2.2.0.SP4</version>
+ <artifactId>web</artifactId>
+ <version>2.1.0.CR4</version>
</dependency>
<dependency>
<groupId>jboss.jbossws</groupId>
@@ -356,8 +367,19 @@
</dependency>
<dependency>
<groupId>org.jboss</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ <version>1.0.0.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-classloading-spi</artifactId>
<version>5.0.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
@@ -366,13 +388,29 @@
</dependency>
<dependency>
<groupId>org.jboss</groupId>
+ <artifactId>jboss-corba-ots-spi</artifactId>
+ <version>5.0.0.Beta3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-ejb3-cache</artifactId>
<version>0.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-test</artifactId>
<version>1.0.4-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
@@ -383,16 +421,34 @@
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
<version>2.0.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
- <version>2.0.0.CR4</version>
+ <version>2.0.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
<version>${version.org.jboss.aop}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.aop</groupId>
@@ -401,6 +457,11 @@
</dependency>
<dependency>
<groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration</artifactId>
+ <version>${version.org.jboss.aop}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-aspects</artifactId>
<version>${version.org.jboss.aop}</version>
</dependency>
Property changes on: trunk/cluster
___________________________________________________________________
Name: svn:ignore
- output
+ output
target
Modified: trunk/cluster/pom.xml
===================================================================
--- trunk/cluster/pom.xml 2007-10-31 22:13:38 UTC (rev 66635)
+++ trunk/cluster/pom.xml 2007-10-31 22:23:01 UTC (rev 66636)
@@ -87,7 +87,7 @@
</dependency>
<dependency>
<groupId>jboss</groupId>
- <artifactId>remoting</artifactId>
+ <artifactId>jboss-remoting</artifactId>
</dependency>
</dependencies>
Property changes on: trunk/connector
___________________________________________________________________
Name: svn:ignore
- output
build.log
+ output
build.log
target
Property changes on: trunk/console
___________________________________________________________________
Name: svn:ignore
- output
+ output
target
Property changes on: trunk/deployment
___________________________________________________________________
Name: svn:ignore
- output
build.log
+ output
build.log
target
Modified: trunk/deployment/pom.xml
===================================================================
--- trunk/deployment/pom.xml 2007-10-31 22:13:38 UTC (rev 66635)
+++ trunk/deployment/pom.xml 2007-10-31 22:23:01 UTC (rev 66636)
@@ -25,71 +25,121 @@
</build>
<dependencies>
<!-- Compile (global dependencies) -->
+ <!--<dependency>
+ <groupId>bcel</groupId>
+ <artifactId>bcel</artifactId>
+ </dependency>-->
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
+ <groupId>javax.security</groupId>
+ <artifactId>jaas</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jad-api</artifactId>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-remoting</artifactId>
</dependency>
<dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jbosssx-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jbossws-jboss50</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-saaj</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jpl-pattern</groupId>
+ <artifactId>jpl-pattern</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jpl-util</groupId>
+ <artifactId>jpl-util</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>remoting</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
+ <artifactId>jboss-metadata</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-transaction-spi</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-impl</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-persistence-api</artifactId>
</dependency>
<dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-j2se</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-naming</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ </dependency>
</dependencies>
</project>
Property changes on: trunk/hibernate-int
___________________________________________________________________
Name: svn:ignore
- output
build.log
+ output
build.log
target
Modified: trunk/iiop/pom.xml
===================================================================
--- trunk/iiop/pom.xml 2007-10-31 22:13:38 UTC (rev 66635)
+++ trunk/iiop/pom.xml 2007-10-31 22:23:01 UTC (rev 66636)
@@ -80,6 +80,10 @@
<artifactId>jboss-common-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-corba-ots-spi</artifactId>
+ </dependency>
+ <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-common-logging-spi</artifactId>
</dependency>
Property changes on: trunk/j2se
___________________________________________________________________
Name: svn:ignore
- output
build.log
+ output
build.log
target
Property changes on: trunk/jbossas
___________________________________________________________________
Name: svn:ignore
- output
thirdparty
+ output
thirdparty
target
Modified: trunk/jbossas/remoting/pom.xml
===================================================================
--- trunk/jbossas/remoting/pom.xml 2007-10-31 22:13:38 UTC (rev 66635)
+++ trunk/jbossas/remoting/pom.xml 2007-10-31 22:23:01 UTC (rev 66636)
@@ -33,7 +33,7 @@
</dependency>
<dependency>
<groupId>jboss</groupId>
- <artifactId>remoting</artifactId>
+ <artifactId>jboss-remoting</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Property changes on: trunk/jbossmq
___________________________________________________________________
Name: svn:ignore
- output
build.log
+ output
build.log
target
Property changes on: trunk/jmx
___________________________________________________________________
Name: svn:ignore
- output
build.log
+ output
build.log
target
Property changes on: trunk/jmx-remoting
___________________________________________________________________
Name: svn:ignore
- output
build.log
+ output
build.log
target
Property changes on: trunk/main
___________________________________________________________________
Name: svn:ignore
- output
+ output
target
Property changes on: trunk/management
___________________________________________________________________
Name: svn:ignore
- output
build.log
+ output
build.log
target
Property changes on: trunk/mbeans
___________________________________________________________________
Name: svn:ignore
- output
build.log
+ output
build.log
target
Modified: trunk/mbeans/pom.xml
===================================================================
--- trunk/mbeans/pom.xml 2007-10-31 22:13:38 UTC (rev 66635)
+++ trunk/mbeans/pom.xml 2007-10-31 22:23:01 UTC (rev 66636)
@@ -33,7 +33,7 @@
<artifactId>dom4j</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
</dependency>
<dependency>
Property changes on: trunk/messaging
___________________________________________________________________
Name: svn:ignore
- output
build.log
+ output
build.log
target
Property changes on: trunk/naming
___________________________________________________________________
Name: svn:ignore
- output
build.log
+ output
build.log
target
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-10-31 22:13:38 UTC (rev 66635)
+++ trunk/pom.xml 2007-10-31 22:23:01 UTC (rev 66636)
@@ -40,7 +40,8 @@
<module>management</module>
<module>ejb3</module>
<module>tomcat</module>
- <module>webservices</module>
+ <!-- Need to fix the webservices build and add this back later -->
+ <!--<module>webservices</module>-->
<module>hibernate-int</module>
<module>console</module>
</modules>
Property changes on: trunk/profileservice
___________________________________________________________________
Name: svn:ignore
- output
+ output
target
Modified: trunk/profileservice/pom.xml
===================================================================
--- trunk/profileservice/pom.xml 2007-10-31 22:13:38 UTC (rev 66635)
+++ trunk/profileservice/pom.xml 2007-10-31 22:23:01 UTC (rev 66636)
@@ -31,7 +31,6 @@
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-managed</artifactId>
- <version>2.0.0-20070627.203733-4</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
@@ -66,7 +65,7 @@
</dependency>
<dependency>
<groupId>jboss</groupId>
- <artifactId>remoting</artifactId>
+ <artifactId>jboss-remoting</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
Property changes on: trunk/server
___________________________________________________________________
Name: svn:ignore
- output
build.log
+ output
build.log
target
Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml 2007-10-31 22:13:38 UTC (rev 66635)
+++ trunk/server/pom.xml 2007-10-31 22:23:01 UTC (rev 66636)
@@ -25,26 +25,46 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<executions>
<execution>
- <id>jjtree</id>
+ <id>jjtree-jbossql</id>
<goals>
<goal>jjtree</goal>
</goals>
+ <phase>generate-sources</phase>
<configuration>
- <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ <sourceDirectory>src/main</sourceDirectory>
<nodePackage>org.jboss.ejb.plugins.cmp.ejbql</nodePackage>
+ <excludes>
+ <exclude>**/EJBQLParser.jjt</exclude>
+ </excludes>
</configuration>
</execution>
<execution>
+ <id>jjtree-ejbql</id>
+ <goals>
+ <goal>jjtree</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <sourceDirectory>src/main</sourceDirectory>
+ <nodePackage>org.jboss.ejb.plugins.cmp.ejbql</nodePackage>
+ <excludes>
+ <exclude>**/JBossQLParser.jjt</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ <execution>
<id>javacc</id>
<goals>
<goal>javacc</goal>
</goals>
+ <phase>generate-sources</phase>
<configuration>
- <sourceDirectory>${project.build.directory}/generated-sources/jjtree</sourceDirectory>
+ <sourceDirectory>${project.build.directory}/generated-sources/jjtree/</sourceDirectory>
<packageName>org.jboss.ejb.plugins.cmp.ejbql</packageName>
+ <staleMillis>0</staleMillis>
</configuration>
</execution>
</executions>
@@ -54,6 +74,10 @@
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-security-spi</artifactId>
</dependency>
@@ -62,6 +86,10 @@
<artifactId>jboss-common-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -139,6 +167,10 @@
<artifactId>concurrent</artifactId>
</dependency>
<dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ </dependency>
+ <dependency>
<groupId>jpl-util</groupId>
<artifactId>jpl-util</artifactId>
</dependency>
Property changes on: trunk/system
___________________________________________________________________
Name: svn:ignore
- output
build.log
+ output
build.log
target
Modified: trunk/system/pom.xml
===================================================================
--- trunk/system/pom.xml 2007-10-31 22:13:38 UTC (rev 66635)
+++ trunk/system/pom.xml 2007-10-31 22:23:01 UTC (rev 66636)
@@ -42,14 +42,6 @@
</dependency>
<dependency>
<groupId>org.jboss</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
- <dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
<artifactId>jbossxb</artifactId>
</dependency>
<dependency>
@@ -85,10 +77,6 @@
<artifactId>jboss-as-main</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-asintegration</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
</dependency>
Property changes on: trunk/system-jmx
___________________________________________________________________
Name: svn:ignore
-
output
+ output
target
Modified: trunk/system-jmx/pom.xml
===================================================================
--- trunk/system-jmx/pom.xml 2007-10-31 22:13:38 UTC (rev 66635)
+++ trunk/system-jmx/pom.xml 2007-10-31 22:23:01 UTC (rev 66636)
@@ -41,7 +41,7 @@
<artifactId>xml-apis</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
</dependency>
<dependency>
Property changes on: trunk/testsuite
___________________________________________________________________
Name: svn:ignore
- .settings
output
build.log
run.tstamp
junit*.properties
+ .settings
output
build.log
run.tstamp
junit*.properties
target
Property changes on: trunk/tomcat
___________________________________________________________________
Name: svn:ignore
- output
build.log
+ output
build.log
target
Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml 2007-10-31 22:13:38 UTC (rev 66635)
+++ trunk/tomcat/pom.xml 2007-10-31 22:23:01 UTC (rev 66636)
@@ -25,147 +25,185 @@
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-security-spi</artifactId>
- </dependency>
- <dependency>
<groupId>apache-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-ejb3</artifactId>
+ <groupId>com.sun</groupId>
+ <artifactId>jsf-impl</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-iiop</artifactId>
+ <groupId>jacorb</groupId>
+ <artifactId>jacorb</artifactId>
</dependency>
<dependency>
+ <groupId>javax.security</groupId>
+ <artifactId>jaas</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </dependency>
+ <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-cache</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-j2ee</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-spi</artifactId>
</dependency>
<dependency>
- <groupId>com.sun</groupId>
- <artifactId>jsf-impl</artifactId>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-security-spi</artifactId>
</dependency>
<dependency>
<groupId>jboss</groupId>
- <artifactId>pojocache</artifactId>
+ <artifactId>jboss-serialization</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
+ <artifactId>jbosssx-client</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
+ <groupId>jboss</groupId>
+ <artifactId>jbossws-jboss50</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system</artifactId>
+ <groupId>jboss</groupId>
+ <artifactId>pojocache</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-iiop</artifactId>
+ <groupId>jboss</groupId>
+ <artifactId>web</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
</dependency>
<dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-security</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
- <artifactId>jboss-transaction-spi</artifactId>
+ <artifactId>jboss-metadata</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jacc-api</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-persistence-api</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossws-spi</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>jboss-jaspi-api</artifactId>
</dependency>
<dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-iiop</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-serialization</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-j2se</artifactId>
</dependency>
<dependency>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-saaj</artifactId>
- <version>1.0.4.GA</version>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-security</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jbossws-jboss50</artifactId>
- <version>2.0.1.GA</version>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
</dependency>
<dependency>
- <groupId>javax.security</groupId>
- <artifactId>jaas</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-jca-api</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jbosssx-client</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-deployers-spi</artifactId>
</dependency>
<dependency>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4</version>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>web</artifactId>
- <version>2.1.0.CR4</version>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>2.0.0.CR4</version>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
</dependency>
+
</dependencies>
</project>
Property changes on: trunk/varia
___________________________________________________________________
Name: svn:ignore
- output
build.log
+ output
build.log
target
Property changes on: trunk/webservices
___________________________________________________________________
Name: svn:ignore
- output
build.log
+ output
build.log
target
More information about the jboss-cvs-commits
mailing list