[jboss-cvs] JBossAS SVN: r81981 - in trunk: cluster and 14 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Dec 2 15:28:32 EST 2008
Author: pgier
Date: 2008-12-02 15:28:32 -0500 (Tue, 02 Dec 2008)
New Revision: 81981
Modified:
trunk/aspects/build-test.xml
trunk/aspects/build-test50.xml
trunk/cluster/pom.xml
trunk/component-matrix/pom.xml
trunk/console/build.xml
trunk/console/pom.xml
trunk/ejb3/build-test.xml
trunk/ejb3/build.xml
trunk/embedded/build.xml
trunk/hibernate-int/build.xml
trunk/main/pom.xml
trunk/server/build.xml
trunk/spring-int/build.xml
trunk/testsuite/build.xml
trunk/thirdparty/pom.xml
trunk/tomcat/build-test.xml
trunk/tomcat/build.xml
trunk/tools/etc/buildmagic/libraries.ent
trunk/varia/build-test.xml
trunk/varia/build.xml
trunk/varia/pom.xml
trunk/webservices/build.xml
Log:
[JBAS-6055] Exclude duplicate servlet-api and jsp-api jars.
Modified: trunk/aspects/build-test.xml
===================================================================
--- trunk/aspects/build-test.xml 2008-12-02 20:06:35 UTC (rev 81980)
+++ trunk/aspects/build-test.xml 2008-12-02 20:28:32 UTC (rev 81981)
@@ -76,7 +76,7 @@
<!-- The combined library classpath -->
<path id="library.classpath">
<path refid="sun.jaf.classpath"/>
- <path refid="sun.servlet.classpath"/>
+ <path refid="jboss.web.classpath"/>
<path refid="javassist.classpath"/>
<path refid="qdox.classpath"/>
<path refid="hibernate3.classpath"/>
Modified: trunk/aspects/build-test50.xml
===================================================================
--- trunk/aspects/build-test50.xml 2008-12-02 20:06:35 UTC (rev 81980)
+++ trunk/aspects/build-test50.xml 2008-12-02 20:28:32 UTC (rev 81981)
@@ -83,7 +83,7 @@
<path refid="jboss.jbosssx.classpath"/>
<path refid="jboss.integration.classpath"/>
<path refid="sun.jaf.classpath"/>
- <path refid="sun.servlet.classpath"/>
+ <path refid="jboss.web.classpath"/>
<path refid="javassist.classpath"/>
<path refid="jboss.serialization.classpath"/>
<path refid="qdox.classpath"/>
Modified: trunk/cluster/pom.xml
===================================================================
--- trunk/cluster/pom.xml 2008-12-02 20:06:35 UTC (rev 81980)
+++ trunk/cluster/pom.xml 2008-12-02 20:28:32 UTC (rev 81981)
@@ -45,7 +45,7 @@
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<includes>
<include>org/jboss/ha/framework/server/DistributedReplicantManagerImpl.class</include>
- <include>org/jboss/ha/framework/server/DistributedStateImpl.class</include>
+ <!--<include>org/jboss/ha/framework/server/DistributedStateImpl.class</include>-->
<include>org/jboss/ha/jndi/HAJNDI.class</include>
<include>org/jboss/ha/framework/server/HARMIServerImpl.class</include>
</includes>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2008-12-02 20:06:35 UTC (rev 81980)
+++ trunk/component-matrix/pom.xml 2008-12-02 20:28:32 UTC (rev 81981)
@@ -118,6 +118,8 @@
<exclude>apache-logging:commons-logging</exclude>
<exclude>sun-jaf:activation</exclude>
<exclude>sun-javamail:mail</exclude>
+ <exclude>javax.servlet.jsp:jsp-api</exclude>
+ <exclude>javax.servlet:servlet-api</exclude>
</excludes>
</bannedDependencies>
</rules>
@@ -161,6 +163,10 @@
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -402,6 +408,12 @@
<groupId>httpunit</groupId>
<artifactId>httpunit</artifactId>
<version>1.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -477,18 +489,6 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- </dependency>
-
- <dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
<version>1.1</version>
@@ -692,6 +692,10 @@
<groupId>jboss</groupId>
<artifactId>jboss-common</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -705,6 +709,10 @@
<groupId>jboss</groupId>
<artifactId>jboss-common</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
Modified: trunk/console/build.xml
===================================================================
--- trunk/console/build.xml 2008-12-02 20:06:35 UTC (rev 81980)
+++ trunk/console/build.xml 2008-12-02 20:28:32 UTC (rev 81981)
@@ -79,7 +79,7 @@
<path refid="dom4j.dom4j.classpath"/>
<path refid="beanshell.beanshell.classpath"/>
<path refid="jboss.microcontainer.classpath"/>
- <path refid="sun.servlet.classpath"/>
+ <path refid="jboss.web.classpath"/>
<path refid="jfreechart.jfreechart.classpath"/>
<path refid="trove.classpath"/>
</path>
Modified: trunk/console/pom.xml
===================================================================
--- trunk/console/pom.xml 2008-12-02 20:06:35 UTC (rev 81980)
+++ trunk/console/pom.xml 2008-12-02 20:28:32 UTC (rev 81981)
@@ -41,11 +41,11 @@
<artifactId>jboss-as-management</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>jboss.web</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
+ <groupId>jboss.web</groupId>
<artifactId>jsp-api</artifactId>
</dependency>
<dependency>
Modified: trunk/ejb3/build-test.xml
===================================================================
--- trunk/ejb3/build-test.xml 2008-12-02 20:06:35 UTC (rev 81980)
+++ trunk/ejb3/build-test.xml 2008-12-02 20:28:32 UTC (rev 81981)
@@ -131,7 +131,7 @@
<!-- The combined library classpath -->
<path id="library.classpath">
<path refid="sun.jaf.classpath"/>
- <path refid="sun.servlet.classpath"/>
+ <path refid="jboss.web.classpath"/>
<path refid="javassist.classpath"/>
<path refid="qdox.classpath"/>
<path refid="hibernate3.classpath"/>
@@ -274,7 +274,7 @@
<path refid="apache.log4j.classpath"/>
<path refid="apache.logging.classpath"/>
<path refid="jboss.test.classpath"/>
- <path refid="sun.servlet.classpath"/>
+ <path refid="jboss.web.classpath"/>
<pathelement path="${jboss.dist}/client/jboss-ejb3-client.jar"/>
<pathelement path="${jboss.dist}/lib/jboss-vfs.jar"/>
<path refid="jboss.microcontainer.classpath"/>
Modified: trunk/ejb3/build.xml
===================================================================
--- trunk/ejb3/build.xml 2008-12-02 20:06:35 UTC (rev 81980)
+++ trunk/ejb3/build.xml 2008-12-02 20:28:32 UTC (rev 81981)
@@ -80,7 +80,7 @@
<path id="library.classpath">
<path refid="sun.jaf.classpath"/>
<path refid="sun.jaxb.classpath"/>
- <path refid="sun.servlet.classpath"/>
+ <path refid="jboss.web.classpath"/>
<path refid="javassist.classpath"/>
<path refid="qdox.classpath"/>
<path refid="jgroups.jgroups.classpath"/>
Modified: trunk/embedded/build.xml
===================================================================
--- trunk/embedded/build.xml 2008-12-02 20:06:35 UTC (rev 81980)
+++ trunk/embedded/build.xml 2008-12-02 20:28:32 UTC (rev 81981)
@@ -74,7 +74,7 @@
<!-- The combined library classpath -->
<path id="library.classpath">
<path refid="sun.jaf.classpath"/>
- <path refid="sun.servlet.classpath"/>
+ <path refid="jboss.web.classpath"/>
<path refid="javassist.classpath"/>
<path refid="qdox.classpath"/>
<path refid="jgroups.jgroups.classpath"/>
Modified: trunk/hibernate-int/build.xml
===================================================================
--- trunk/hibernate-int/build.xml 2008-12-02 20:06:35 UTC (rev 81980)
+++ trunk/hibernate-int/build.xml 2008-12-02 20:28:32 UTC (rev 81981)
@@ -72,7 +72,7 @@
<path id="library.classpath">
<path refid="apache.commons.classpath"/>
<path refid="dom4j.dom4j.classpath"/>
- <path refid="sun.servlet.classpath"/>
+ <path refid="jboss.web.classpath"/>
<path refid="hibernate3.classpath"/>
<path refid="odmg.classpath"/>
<path refid="cglib.classpath"/>
Modified: trunk/main/pom.xml
===================================================================
--- trunk/main/pom.xml 2008-12-02 20:06:35 UTC (rev 81980)
+++ trunk/main/pom.xml 2008-12-02 20:28:32 UTC (rev 81981)
@@ -36,7 +36,9 @@
</goals>
<phase>package</phase>
<configuration>
- <descriptor>src/assembly/run.xml</descriptor>
+ <descriptors>
+ <descriptor>src/assembly/run.xml</descriptor>
+ </descriptors>
<archive>
<manifestEntries>
<Main-Class>org.jboss.Main</Main-Class>
Modified: trunk/server/build.xml
===================================================================
--- trunk/server/build.xml 2008-12-02 20:06:35 UTC (rev 81980)
+++ trunk/server/build.xml 2008-12-02 20:28:32 UTC (rev 81981)
@@ -97,7 +97,7 @@
<path refid="jboss.serialization.classpath"/>
<path refid="oswego.concurrent.classpath"/>
<path refid="sun.jaxb.classpath"/>
- <path refid="sun.servlet.classpath"/>
+ <path refid="jboss.web.classpath"/>
</path>
<!-- ======= -->
Modified: trunk/spring-int/build.xml
===================================================================
--- trunk/spring-int/build.xml 2008-12-02 20:06:35 UTC (rev 81980)
+++ trunk/spring-int/build.xml 2008-12-02 20:28:32 UTC (rev 81981)
@@ -353,7 +353,7 @@
<pathelement path="${spring.lib}/spring-webmvc.jar"/>
<pathelement path="${spring.lib}/spring-web.jar"/>
<!--<pathelement path="${spring.lib}/spring-context.jar"/>-->
- <path refid="sun.servlet.classpath"/>
+ <path refid="jboss.web.classpath"/>
</path>
<target name="example-clean" depends="init">
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2008-12-02 20:06:35 UTC (rev 81980)
+++ trunk/testsuite/build.xml 2008-12-02 20:28:32 UTC (rev 81981)
@@ -140,7 +140,7 @@
<path refid="sun.javamail.classpath"/>
<path refid="sun.jaxb.classpath"/>
<path refid="sun.jsf.classpath"/>
- <path refid="sun.servlet.classpath"/>
+ <path refid="jboss.web.classpath"/>
<path refid="trove.classpath"/>
<path refid="wutka.dtdparser.classpath"/>
<path refid="woodstox.woodstox.classpath"/>
Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml 2008-12-02 20:06:35 UTC (rev 81980)
+++ trunk/thirdparty/pom.xml 2008-12-02 20:28:32 UTC (rev 81981)
@@ -278,20 +278,6 @@
</mapping>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <mapping>
- <componentId>sun-servlet</componentId>
- </mapping>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <mapping>
- <componentId>sun-servlet</componentId>
- </mapping>
- </dependency>
- <dependency>
<groupId>jboss.messaging</groupId>
<artifactId>jboss-messaging-client</artifactId>
<exportArtifact>false</exportArtifact>
@@ -1843,14 +1829,6 @@
<artifactId>streambuffer</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jboss-xacml</artifactId>
</dependency>
Modified: trunk/tomcat/build-test.xml
===================================================================
--- trunk/tomcat/build-test.xml 2008-12-02 20:06:35 UTC (rev 81980)
+++ trunk/tomcat/build-test.xml 2008-12-02 20:28:32 UTC (rev 81981)
@@ -117,7 +117,7 @@
<!-- The combined library classpath -->
<path id="library.classpath">
<path refid="sun.jaf.classpath"/>
- <path refid="sun.servlet.classpath"/>
+ <path refid="jboss.web.classpath"/>
<path refid="javassist.classpath"/>
<path refid="qdox.classpath"/>
<path refid="hibernate3.classpath"/>
@@ -234,7 +234,7 @@
<path refid="apache.log4j.classpath"/>
<path refid="apache.logging.classpath"/>
<path refid="jboss.test.classpath"/>
- <path refid="sun.servlet.classpath"/>
+ <path refid="jboss.web.classpath"/>
<pathelement path="${jboss.dist}/client/jbossall-client.jar"/>
</path>
Modified: trunk/tomcat/build.xml
===================================================================
--- trunk/tomcat/build.xml 2008-12-02 20:06:35 UTC (rev 81980)
+++ trunk/tomcat/build.xml 2008-12-02 20:28:32 UTC (rev 81981)
@@ -49,7 +49,7 @@
&libraries;
<!-- The combined library classpath -->
<path id="library.classpath">
- <path refid="sun.servlet.classpath"/>
+ <path refid="jboss.web.classpath"/>
<path refid="sun.jaxb.classpath"/>
<path refid="sun.jsf.classpath"/>
<path refid="apache.commons.classpath"/>
Modified: trunk/tools/etc/buildmagic/libraries.ent
===================================================================
--- trunk/tools/etc/buildmagic/libraries.ent 2008-12-02 20:06:35 UTC (rev 81980)
+++ trunk/tools/etc/buildmagic/libraries.ent 2008-12-02 20:28:32 UTC (rev 81981)
@@ -451,14 +451,6 @@
<pathelement path="${sun.jmx.lib}/jmxtools.jar"/>
</path>
- <!-- Sun Java Servlet Technology -->
- <property name="sun.servlet.root" value="${project.thirdparty}/sun-servlet"/>
- <property name="sun.servlet.lib" value="${sun.servlet.root}/lib"/>
- <path id="sun.servlet.classpath">
- <pathelement path="${sun.servlet.lib}/servlet-api.jar"/>
- <pathelement path="${sun.servlet.lib}/jsp-api.jar"/>
- </path>
-
<!-- Sun Open Source XACML Implementation -->
<property name="sun.xacml.root" value="${project.thirdparty}/sun-xacml"/>
<property name="sun.xacml.lib" value="${sun.xacml.root}/lib"/>
@@ -519,7 +511,7 @@
<pathelement path="${xdoclet.xdoclet.lib}/xdoclet-web-module-${xdoclet.version}.jar"/>
<pathelement path="${xdoclet.xdoclet.lib}/xdoclet-xdoclet-module-${xdoclet.version}.jar"/>
<path refid="apache.commons.classpath"/>
- <path refid="sun.servlet.classpath"/>
+ <path refid="jboss.web.classpath"/>
</path>
<path id="xdoclet.task.classpath">
<path refid="xdoclet.xdoclet.classpath"/>
Modified: trunk/varia/build-test.xml
===================================================================
--- trunk/varia/build-test.xml 2008-12-02 20:06:35 UTC (rev 81980)
+++ trunk/varia/build-test.xml 2008-12-02 20:28:32 UTC (rev 81981)
@@ -69,7 +69,7 @@
<path refid="sun.jaf.classpath"/>
<path refid="sun.javamail.classpath"/>
<path refid="sun.jaxb.classpath"/>
- <path refid="sun.servlet.classpath"/>
+ <path refid="jboss.web.classpath"/>
<path refid="apache.bsf.classpath"/>
<path refid="apache.commons.classpath"/>
<path refid="apache.log4j.classpath"/>
Modified: trunk/varia/build.xml
===================================================================
--- trunk/varia/build.xml 2008-12-02 20:06:35 UTC (rev 81980)
+++ trunk/varia/build.xml 2008-12-02 20:28:32 UTC (rev 81981)
@@ -78,7 +78,7 @@
<path refid="sun.jaf.classpath"/>
<path refid="sun.javamail.classpath"/>
<path refid="sun.jaxb.classpath"/>
- <path refid="sun.servlet.classpath"/>
+ <path refid="jboss.web.classpath"/>
<path refid="apache.bsf.classpath"/>
<path refid="apache.commons.classpath"/>
<path refid="apache.log4j.classpath"/>
Modified: trunk/varia/pom.xml
===================================================================
--- trunk/varia/pom.xml 2008-12-02 20:06:35 UTC (rev 81980)
+++ trunk/varia/pom.xml 2008-12-02 20:28:32 UTC (rev 81981)
@@ -194,7 +194,7 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>jboss.web</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
Modified: trunk/webservices/build.xml
===================================================================
--- trunk/webservices/build.xml 2008-12-02 20:06:35 UTC (rev 81980)
+++ trunk/webservices/build.xml 2008-12-02 20:28:32 UTC (rev 81981)
@@ -84,7 +84,7 @@
<path refid="jboss.jboss.deployers.classpath"/>
<path refid="jboss.microcontainer.classpath"/>
<path refid="sun.jaxb.classpath"/>
- <path refid="sun.servlet.classpath"/>
+ <path refid="jboss.web.classpath"/>
</path>
&modules;
More information about the jboss-cvs-commits
mailing list