[weld-commits] Weld SVN: r6457 - core/trunk/jboss-as.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-06-16 14:58:16 -0400 (Wed, 16 Jun 2010)
New Revision: 6457

Modified:
   core/trunk/jboss-as/pom.xml
Log:
fix jboss-as updater since weld-int moved to jboss-as trunk

Modified: core/trunk/jboss-as/pom.xml
===================================================================
--- core/trunk/jboss-as/pom.xml	2010-06-16 18:25:53 UTC (rev 6456)
+++ core/trunk/jboss-as/pom.xml	2010-06-16 18:58:16 UTC (rev 6457)
@@ -34,12 +34,6 @@
 
    <dependencies>
       <dependency>
-         <groupId>org.jboss.weld.integration</groupId>
-         <artifactId>weld-jboss-int-deployer-assembly</artifactId>
-         <version>${weld-deployer.version}</version>
-         <type>zip</type>
-      </dependency>
-      <dependency>
          <groupId>org.jboss.weld</groupId>
          <artifactId>weld-core</artifactId>
          <version>${project.version}</version>
@@ -62,7 +56,7 @@
                      <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
                      <overWriteSnapshots>true</overWriteSnapshots>
                      <stripVersion>true</stripVersion>
-                     <includeArtifactIds>cdi-api,weld-api,weld-core,weld-spi,weld-jboss-int-deployer-assembly</includeArtifactIds>
+                     <includeArtifactIds>cdi-api,weld-api,weld-core,weld-spi</includeArtifactIds>
                   </configuration>
                </execution>
             </executions>
@@ -82,34 +76,37 @@
                         <property file="${basedir}/local.build.properties" />
                         <property file="${basedir}/build.properties" />
                         <property name="jboss.home" value="${env.JBOSS_HOME}" />
-                        <delete
-                           dir="${jboss.home}/server/default/deployers/weld.deployer"
-                           failonerror="false" />
-                        <delete
-                           dir="${jboss.home}/server/default/deployers/webbeans.deployer"
-                           failonerror="false" />
-                        <delete
-                           dir="${jboss.home}/server/all/deployers/weld.deployer"
-                           failonerror="false" />
-                           
-                        <unzip dest="${project.build.directory}"
-                           src="${project.build.directory}/dependency/lib/weld-jboss-int-deployer-assembly.zip" />
+                        <property name="all.deployer.dir" value="${jboss.home}/server/all/deployers/weld.deployer" />
+                        <property name="default.deployer.dir" value="${jboss.home}/server/default/deployers/weld.deployer" />
 
-                        <copy todir="target/weld.deployer/lib-int/"
+                        <copy todir="${all.deployer.dir}/lib-int/"
                            overwrite="true">
                            <fileset dir="target/dependency/lib">
                               <include name="weld-core.jar" />
                            </fileset>
                         </copy>
+                        
+                        <copy todir="${default.deployer.dir}/lib-int/"
+                           overwrite="true">
+                           <fileset dir="target/dependency/lib">
+                              <include name="weld-core.jar" />
+                           </fileset>
+                        </copy>
 
-                        <copy todir="target/weld.deployer/"
+                        <copy todir="${all.deployer.dir}/"
                            overwrite="true">
                            <fileset dir="target/dependency/lib">
                               <include name="weld-spi.jar" />
                            </fileset>
                         </copy>
+                        
+                        <copy todir="${default.deployer.dir}/"
+                           overwrite="true">
+                           <fileset dir="target/dependency/lib">
+                              <include name="weld-spi.jar" />
+                           </fileset>
+                        </copy>
 
-
                         <copy todir="${jboss.home}/client"
                            overwrite="true">
                            <fileset dir="target/dependency/lib">
@@ -117,6 +114,7 @@
                               <include name="cdi-api.jar" />
                            </fileset>
                         </copy>
+                        
                         <copy todir="${jboss.home}/common/lib"
                            overwrite="true">
                            <fileset dir="target/dependency/lib">
@@ -124,20 +122,7 @@
                               <include name="cdi-api.jar" />
                            </fileset>
                         </copy>
-
-                        <copy
-                           todir="${jboss.home}/server/default/deployers/weld.deployer">
-                           <fileset dir="target/weld.deployer">
-                              <include name="**/*" />
-                           </fileset>
-                        </copy>
-                        
-                        <copy
-                           todir="${jboss.home}/server/all/deployers/weld.deployer">
-                           <fileset dir="target/weld.deployer">
-                              <include name="**/*" />
-                           </fileset>
-                        </copy>                        
+                                          
                      </tasks>
                   </configuration>
                </execution>