[jboss-cvs] JBossAS SVN: r82877 - in projects/javaee/branches/Branch_5_0: build and 3 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: smcgowan at redhat.com
Date: 2009-01-14 13:22:04 -0500 (Wed, 14 Jan 2009)
New Revision: 82877

Removed:
   projects/javaee/branches/Branch_5_0/jboss-servlet-api/
Modified:
   projects/javaee/branches/Branch_5_0/build/assembly/bin-jdk14.xml
   projects/javaee/branches/Branch_5_0/build/assembly/bin.xml
   projects/javaee/branches/Branch_5_0/build/assembly/sources.xml
   projects/javaee/branches/Branch_5_0/build/pom-jdk14.xml
   projects/javaee/branches/Branch_5_0/build/pom.xml
   projects/javaee/branches/Branch_5_0/jboss-jacc-api/pom.xml
   projects/javaee/branches/Branch_5_0/jboss-transaction-api/pom.xml
   projects/javaee/branches/Branch_5_0/pom.xml
Log:
JBEE-6 - remove servlet apis

Modified: projects/javaee/branches/Branch_5_0/build/assembly/bin-jdk14.xml
===================================================================
--- projects/javaee/branches/Branch_5_0/build/assembly/bin-jdk14.xml	2009-01-14 17:13:36 UTC (rev 82876)
+++ projects/javaee/branches/Branch_5_0/build/assembly/bin-jdk14.xml	2009-01-14 18:22:04 UTC (rev 82877)
@@ -29,10 +29,6 @@
       <outputDirectory>/</outputDirectory>
     </fileSet>
     <fileSet>
-      <directory>jboss-servlet-api/target/classes-jdk14</directory>
-      <outputDirectory>/</outputDirectory>
-    </fileSet>
-    <fileSet>
       <directory>jboss-transaction-api/target/classes-jdk14</directory>
       <outputDirectory>/</outputDirectory>
     </fileSet>

Modified: projects/javaee/branches/Branch_5_0/build/assembly/bin.xml
===================================================================
--- projects/javaee/branches/Branch_5_0/build/assembly/bin.xml	2009-01-14 17:13:36 UTC (rev 82876)
+++ projects/javaee/branches/Branch_5_0/build/assembly/bin.xml	2009-01-14 18:22:04 UTC (rev 82877)
@@ -29,10 +29,6 @@
       <outputDirectory>/</outputDirectory>
     </fileSet>
     <fileSet>
-      <directory>jboss-servlet-api/target/classes</directory>
-      <outputDirectory>/</outputDirectory>
-    </fileSet>
-    <fileSet>
       <directory>jboss-transaction-api/target/classes</directory>
       <outputDirectory>/</outputDirectory>
     </fileSet>

Modified: projects/javaee/branches/Branch_5_0/build/assembly/sources.xml
===================================================================
--- projects/javaee/branches/Branch_5_0/build/assembly/sources.xml	2009-01-14 17:13:36 UTC (rev 82876)
+++ projects/javaee/branches/Branch_5_0/build/assembly/sources.xml	2009-01-14 18:22:04 UTC (rev 82877)
@@ -30,10 +30,6 @@
       <outputDirectory>/</outputDirectory>
     </fileSet>
     <fileSet>
-      <directory>jboss-servlet-api/src/main</directory>
-      <outputDirectory>/</outputDirectory>
-    </fileSet>
-    <fileSet>
       <directory>jboss-transaction-api/src/main</directory>
       <outputDirectory>/</outputDirectory>
     </fileSet>

Modified: projects/javaee/branches/Branch_5_0/build/pom-jdk14.xml
===================================================================
--- projects/javaee/branches/Branch_5_0/build/pom-jdk14.xml	2009-01-14 17:13:36 UTC (rev 82876)
+++ projects/javaee/branches/Branch_5_0/build/pom-jdk14.xml	2009-01-14 18:22:04 UTC (rev 82877)
@@ -205,7 +205,6 @@
     <module>../jboss-jaxr-api</module>
     <module>../jboss-jca-api</module>
     <module>../jboss-jms-api</module>
-    <module>../jboss-servlet-api</module>
     <module>../jboss-transaction-api</module>
     <module>../jboss-jaspi-api</module>
   </modules>-->

Modified: projects/javaee/branches/Branch_5_0/build/pom.xml
===================================================================
--- projects/javaee/branches/Branch_5_0/build/pom.xml	2009-01-14 17:13:36 UTC (rev 82876)
+++ projects/javaee/branches/Branch_5_0/build/pom.xml	2009-01-14 18:22:04 UTC (rev 82877)
@@ -15,8 +15,8 @@
     The JBoss JavaEE API classes
   </description>
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/javaee/trunk</connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/javaee/trunk</developerConnection>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/javaee/branches/Branch_5_0</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/javaee/branches/Branch_5_0</developerConnection>
   </scm>
 
   <properties>
@@ -139,4 +139,4 @@
     </dependencies>
   </dependencyManagement>
 
-</project>
\ No newline at end of file
+</project>

Modified: projects/javaee/branches/Branch_5_0/jboss-jacc-api/pom.xml
===================================================================
--- projects/javaee/branches/Branch_5_0/jboss-jacc-api/pom.xml	2009-01-14 17:13:36 UTC (rev 82876)
+++ projects/javaee/branches/Branch_5_0/jboss-jacc-api/pom.xml	2009-01-14 18:22:04 UTC (rev 82877)
@@ -19,9 +19,9 @@
       <artifactId>jboss-common-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.javaee</groupId>
-      <artifactId>jboss-servlet-api</artifactId>
-      <version>2.5.1-SNAPSHOT</version>
+      <groupId>jboss.web</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.1.1.GA</version>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: projects/javaee/branches/Branch_5_0/jboss-transaction-api/pom.xml
===================================================================
--- projects/javaee/branches/Branch_5_0/jboss-transaction-api/pom.xml	2009-01-14 17:13:36 UTC (rev 82876)
+++ projects/javaee/branches/Branch_5_0/jboss-transaction-api/pom.xml	2009-01-14 18:22:04 UTC (rev 82877)
@@ -13,4 +13,4 @@
   <name>JBoss Transaction 1.0.1 API</name>
   <url>http://www.jboss.org</url>
   <description>The Java Transaction 1.0.1 API classes</description>
-</project>
\ No newline at end of file
+</project>

Modified: projects/javaee/branches/Branch_5_0/pom.xml
===================================================================
--- projects/javaee/branches/Branch_5_0/pom.xml	2009-01-14 17:13:36 UTC (rev 82876)
+++ projects/javaee/branches/Branch_5_0/pom.xml	2009-01-14 18:22:04 UTC (rev 82877)
@@ -28,7 +28,6 @@
     <module>jboss-jaxr-api</module>
     <module>jboss-jca-api</module>
     <module>jboss-jms-api</module>
-    <module>jboss-servlet-api</module>
     <module>jboss-transaction-api</module>
     <module>jboss-jaspi-api</module>
   </modules>