[jboss-cvs] JBossAS SVN: r90446 - in projects/spring-int/trunk/deployers: src/assembly and 1 other directories.

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

Author: marius.bogoevici
Date: 2009-06-18 16:07:15 -0400 (Thu, 18 Jun 2009)
New Revision: 90446

Added:
   projects/spring-int/trunk/deployers/src/main/resources/META-INF/spring-deployers-jboss-beans.xml
Removed:
   projects/spring-int/trunk/deployers/src/main/resources/META-INF/spring-deployers-beans.xml
Modified:
   projects/spring-int/trunk/deployers/pom.xml
   projects/spring-int/trunk/deployers/src/assembly/deployer.xml
Log:
Fixing deployers xml file name and content.

Modified: projects/spring-int/trunk/deployers/pom.xml
===================================================================
--- projects/spring-int/trunk/deployers/pom.xml	2009-06-18 18:44:27 UTC (rev 90445)
+++ projects/spring-int/trunk/deployers/pom.xml	2009-06-18 20:07:15 UTC (rev 90446)
@@ -17,7 +17,7 @@
       <resource>
         <directory>src/main/resources</directory>
         <excludes>
-          <exclude>META-INF/spring-deployers-beans.xml</exclude>
+          <exclude>META-INF/spring-deployers-jboss-beans.xml</exclude>
         </excludes>
       </resource>
     </resources>
@@ -65,6 +65,7 @@
           <artifactId>jboss-vfs</artifactId>
         </exclusion>
       </exclusions>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>apache-xerces</groupId>
@@ -114,10 +115,12 @@
       <groupId>org.jboss.aop</groupId>
       <artifactId>jboss-aop</artifactId>
       <version>${version.jboss.aop}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.javaee</groupId>
       <artifactId>jboss-ejb-api</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>

Modified: projects/spring-int/trunk/deployers/src/assembly/deployer.xml
===================================================================
--- projects/spring-int/trunk/deployers/src/assembly/deployer.xml	2009-06-18 18:44:27 UTC (rev 90445)
+++ projects/spring-int/trunk/deployers/src/assembly/deployer.xml	2009-06-18 20:07:15 UTC (rev 90446)
@@ -7,7 +7,7 @@
       <directory>${basedir}/src/main/resources</directory>
       <outputDirectory></outputDirectory>
       <includes>
-        <include>META-INF/spring-deployers-beans.xml</include>
+        <include>META-INF/spring-deployers-jboss-beans.xml</include>
       </includes>
     </fileSet>
   </fileSets>

Deleted: projects/spring-int/trunk/deployers/src/main/resources/META-INF/spring-deployers-beans.xml
===================================================================
--- projects/spring-int/trunk/deployers/src/main/resources/META-INF/spring-deployers-beans.xml	2009-06-18 18:44:27 UTC (rev 90445)
+++ projects/spring-int/trunk/deployers/src/main/resources/META-INF/spring-deployers-beans.xml	2009-06-18 20:07:15 UTC (rev 90446)
@@ -1,18 +0,0 @@
-<!--
-   Spring deployer beans.
--->
-<deployment>
-  <bean name="SpringParserDeployer" class="org.jboss.spring.deployers.SpringParserDeployer"/>
-  <bean name="ApplicationContextDeployer" class="org.jboss.spring.deployers.ApplicationContextDeployer"/>
-  <!--
-
-        Uncomment this if you want to use only BeanFactory not the full ApplicationContext.
-         And comment the ApplicationContextDeployer, else both will pick-up the SpringMetaData.
-
-  -->
-  <!--
-
-     <bean name="BeanFactoryDeployer" class="org.jboss.spring.deployers.BeanFactoryDeployer"/>
-
-  -->
-</deployment>
\ No newline at end of file

Copied: projects/spring-int/trunk/deployers/src/main/resources/META-INF/spring-deployers-jboss-beans.xml (from rev 90228, projects/spring-int/trunk/deployers/src/main/resources/META-INF/spring-deployers-beans.xml)
===================================================================
--- projects/spring-int/trunk/deployers/src/main/resources/META-INF/spring-deployers-jboss-beans.xml	                        (rev 0)
+++ projects/spring-int/trunk/deployers/src/main/resources/META-INF/spring-deployers-jboss-beans.xml	2009-06-18 20:07:15 UTC (rev 90446)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Spring deployer beans.
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <bean name="SpringParserDeployer" class="org.jboss.spring.deployers.SpringParserDeployer"/>
+
+   <bean name="ApplicationContextDeployer" class="org.jboss.spring.deployers.ApplicationContextDeployer"/>
+
+   <!--
+      Uncomment this if you want to use only BeanFactory not the full ApplicationContext.
+       And comment the ApplicationContextDeployer, else both will pick-up the SpringMetaData. 
+   -->
+   <!--
+   <bean name="BeanFactoryDeployer" class="org.jboss.spring.deployers.BeanFactoryDeployer"/>
+   -->
+
+</deployment>