Author: alessio.soldano(a)jboss.com Date: 2011-01-26 09:20:28 -0500 (Wed, 26 Jan 2011) New Revision: 13608 Added: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml Modified: stack/cxf/trunk/modules/resources/pom.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml Log: Adding deployment aspect conf file for AS 7 Modified: stack/cxf/trunk/modules/resources/pom.xml =================================================================== --- stack/cxf/trunk/modules/resources/pom.xml 2011-01-26 13:39:01 UTC (rev 13607) +++ stack/cxf/trunk/modules/resources/pom.xml 2011-01-26 14:20:28 UTC (rev 13608) @@ -20,7 +20,7 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> - <phase>package</phase> + <phase>prepare-package</phase> <goals> <goal>run</goal> </goals> @@ -34,7 +34,30 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>all</id> + <goals><goal>jar</goal></goals> + <phase>package</phase> + <configuration> + <excludes> + <exclude>**/jbossws-jboss700/**</exclude> + </excludes> + </configuration> + </execution> + <execution> + <id>jboss700</id> + <goals><goal>jar</goal></goals> + <phase>package</phase> + <configuration> + <classifier>jboss700</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss700/jbossws.beans</classesDirectory> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> - </project> Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2011-01-26 13:39:01 UTC (rev 13607) +++ stack/cxf/trunk/modules/server/pom.xml 2011-01-26 14:20:28 UTC (rev 13608) @@ -273,7 +273,7 @@ <executions> <execution> <id>copy-dependencies</id> - <phase>package</phase> + <phase>prepare-package</phase> <goals> <goal>unpack</goal> </goals> @@ -301,7 +301,7 @@ <executions> <execution> <id>copy-dependencies</id> - <phase>package</phase> + <phase>prepare-package</phase> <goals> <goal>unpack</goal> </goals> @@ -328,7 +328,7 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> - <phase>package</phase> + <phase>prepare-package</phase> <goals> <goal>run</goal> </goals> Added: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml 2011-01-26 14:20:28 UTC (rev 13608) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2011, Red Hat, Inc., and individual contributors + ~ as indicated by the @author tags. See the copyright.txt file in the + ~ distribution for a full listing of individual contributors. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<deploymentAspects xmlns="urn:jboss:ws:deployment:aspects:1.0"> + <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect" priority="4"/> + <deploymentAspect class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect" priority="5"> + <property name="contextProperties" class="java.util.HashMap"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry> + <key>stack.transport.class.provider</key> + <value>org.jboss.wsf.stack.cxf.deployment.CXFServletClassProvider</value> + </entry> + </map> + </property> + </deploymentAspect> + <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.DescriptorDeploymentAspect" priority="13"> + <property name="invokerEJB3" class="java.lang.String">org.jboss.wsf.stack.cxf.InvokerEJB3</property> + <property name="invokerJSE" class="java.lang.String">org.jboss.wsf.stack.cxf.InvokerJSE</property> + </deploymentAspect> + <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.BusDeploymentAspect" priority="15"/> +</deploymentAspects> \ No newline at end of file Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2011-01-26 13:39:01 UTC (rev 13607) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2011-01-26 14:20:28 UTC (rev 13608) @@ -36,6 +36,11 @@ tofile="${dest.dir}/jbossws-jaxrpc-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" /> + <copy + file="${src.dir}/jbossws-cxf-config-as7.xml" + tofile="${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/deployment-aspects.xml" + /> + </target> </project>