Author: thomas.diesler(a)jboss.com Date: 2008-04-22 11:28:45 -0400 (Tue, 22 Apr 2008) New Revision: 6615 Modified: stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml stack/cxf/branches/tdiesler/trunk/pom.xml stack/cxf/branches/tdiesler/trunk/profiles-example.xml stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml Log: profilesXml http://maven.apache.org/xsd/profiles-1.0.0.xsd Modified: stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-22 14:36:26 UTC (rev 6614) +++ stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-22 15:28:45 UTC (rev 6615) @@ -60,10 +60,10 @@ </patternset> <patternset id="jbossws.server.lib.patternset"> + <include name="**/jaxws-api.jar"/> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> <include name="**/jbossws-spi.jar"/> - <include name="**/jaxws-api.jar"/> <include name="**/saaj-api.jar"/> </patternset> @@ -83,7 +83,6 @@ <include name="**/spring-context.jar"/> <include name="**/spring-core.jar"/> <include name="**/wsdl4j.jar"/> - <include name="**/xbean.jar"/> <include name="**/xml-resolver.jar"/> <include name="**/XmlSchema.jar"/> </patternset> Modified: stack/cxf/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-22 14:36:26 UTC (rev 6614) +++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-22 15:28:45 UTC (rev 6615) @@ -28,6 +28,9 @@ <juddi.service.version>1.2.0.GA</juddi.service.version> <jaxb.api.version>2.1</jaxb.api.version> <jaxb.impl.version>2.1.6</jaxb.impl.version> + <jaxrpc.api.version>1.1</jaxrpc.api.version> + <jaxws.api.version>2.0</jaxws.api.version> + <saaj.api.version>1.3</saaj.api.version> </properties> <!-- Modules --> @@ -143,10 +146,19 @@ <dependency> <groupId>javax.xml</groupId> <artifactId>jaxrpc-api</artifactId> - <version>1.1</version> - <scope>provided</scope> + <version>${jaxrpc.api.version}</version> </dependency> <dependency> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + <version>${saaj.api.version}</version> + </dependency> + <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + <version>${jaxws.api.version}</version> + </dependency> + <dependency> <groupId>stax</groupId> <artifactId>stax-api</artifactId> <version>${cxf.stax.version}</version> @@ -185,25 +197,43 @@ </dependencies> </dependencyManagement> + <!-- Dependencies --> + <dependencies> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + </dependency> + <dependency> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + </dependency> + <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + </dependency> + </dependencies> + <!-- Plugins --> <build> <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> + <finalName>deploy-structure-jboss422</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> <descriptors> <descriptor>scripts/assembly-install-jboss422.xml</descriptor> </descriptors> </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>install</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> </plugin> </plugins> </build> Modified: stack/cxf/branches/tdiesler/trunk/profiles-example.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/profiles-example.xml 2008-04-22 14:36:26 UTC (rev 6614) +++ stack/cxf/branches/tdiesler/trunk/profiles-example.xml 2008-04-22 15:28:45 UTC (rev 6615) @@ -1,5 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<profilesXml xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd"> <!-- This profile can also be defined in ~/.m2/settings.xml --> <profiles> @@ -19,4 +19,4 @@ </profile> </profiles> -</project> \ No newline at end of file +</profilesXml> \ No newline at end of file Modified: stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml 2008-04-22 14:36:26 UTC (rev 6614) +++ stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml 2008-04-22 15:28:45 UTC (rev 6615) @@ -6,14 +6,152 @@ </formats> <includeBaseDirectory>false</includeBaseDirectory> <moduleSets> + <!-- client --> <moduleSet> <includes> <include>org.jboss.ws:jbossws-cxf-client</include> </includes> <binaries> - <outputDirectory>modules/${artifactId}</outputDirectory> + <outputDirectory>client</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <unpack>false</unpack> + <dependencySets> + <dependencySet> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:cxf-*</include> + <include>*:geronimo-javamail*</include> + <include>*:geronimo-ws-metadata*</include> + <include>*:jaxb-api*</include> + <include>*:jaxb-impl*</include> + <include>*:jaxb-xjc*</include> + <include>*:jaxws-api*</include> + <include>*:jbossws-common*</include> + <include>*:jbossws-framework*</include> + <include>*:jbossws-spi*</include> + <include>*:neethi*</include> + <include>*:saaj-api*</include> + <include>*:saaj-impl*</include> + <include>*:spring-beans*</include> + <include>*:spring-context*</include> + <include>*:spring-core*</include> + <include>*:stax-api*</include> + <include>*:wsdl4j*</include> + <include>*:xml-resolver*</include> + <include>*:XmlSchema*</include> + </includes> + </dependencySet> + <dependencySet> + <outputFileNameMapping>wstx.jar</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:wstx*</include> + </includes> + </dependencySet> + </dependencySets> </binaries> </moduleSet> + <!-- server/default/deploy/jbossws.sar --> + <moduleSet> + <includes> + <include>org.jboss.ws:jbossws-cxf-client</include> + </includes> + <binaries> + <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <unpack>false</unpack> + <dependencySets> + <dependencySet> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:cxf-*</include> + </includes> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> + <moduleSet> + <includes> + <include>org.jboss.ws:jbossws-cxf-server</include> + </includes> + <binaries> + <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <unpack>false</unpack> + <dependencySets> + <dependencySet> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:cxf-*</include> + <include>*:geronimo-javamail*</include> + <include>*:geronimo-ws-metadata*</include> + <include>*:jaxrpc-api*</include> + <include>*:jaxws-api*</include> + <include>*:neethi*</include> + <include>*:saaj-api*</include> + <include>*:saaj-impl*</include> + <include>*:spring-beans*</include> + <include>*:spring-context*</include> + <include>*:spring-core*</include> + <include>*:wsdl4j*</include> + <include>*:xml-resolver*</include> + <include>*:XmlSchema*</include> + </includes> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> + <moduleSet> + <includes> + <include>org.jboss.ws:jbossws-cxf-management</include> + </includes> + <binaries> + <outputDirectory>server/default/deploy/jbossws.sar/jbossws-context.war</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <unpack>true</unpack> + </binaries> + </moduleSet> + <!-- server/default/lib --> + <moduleSet> + <includes> + <include>org.jboss.ws:jbossws-cxf-server</include> + </includes> + <binaries> + <outputDirectory>server/default/lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <unpack>false</unpack> + <dependencySets> + <dependencySet> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jaxws-api*</include> + <include>*:jbossws-common*</include> + <include>*:jbossws-framework:jar</include> + <include>*:jbossws-spi*</include> + <include>*:saaj-api*</include> + </includes> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> </moduleSets> + <dependencySets> + <dependencySet> + <outputDirectory>server/default/lib2</outputDirectory> + <outputFileNameMapping>${artifactId}.jar</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <unpack>false</unpack> + <includes> + <include>javax.xml.soap:saaj-api:jar</include> + <include>javax.xml.ws:jaxws-api:jar</include> + <include>org.jboss.ws:jbossws-common:jar</include> + <include>org.jboss.ws:jbossws-framework:jar</include> + <include>org.jboss.ws:jbossws-spi:jar</include> + </includes> + </dependencySet> + </dependencySets> </assembly> \ No newline at end of file