[jbossws-commits] JBossWS SVN: r6633 - in stack/cxf/branches/tdiesler/trunk: modules/server and 4 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-04-23 09:32:55 -0400 (Wed, 23 Apr 2008) New Revision: 6633 Added: stack/cxf/branches/tdiesler/trunk/modules/server/src/main/scripts/ stack/cxf/branches/tdiesler/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/branches/tdiesler/trunk/src/main/scripts/ stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml Removed: stack/cxf/branches/tdiesler/trunk/ant-import-tests/ stack/cxf/branches/tdiesler/trunk/modules/server/scripts/ stack/cxf/branches/tdiesler/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/branches/tdiesler/trunk/scripts/ stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml Modified: stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml stack/cxf/branches/tdiesler/trunk/pom.xml Log: Move scripts to src/main Modified: stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-23 13:21:26 UTC (rev 6632) +++ stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-23 13:32:55 UTC (rev 6633) @@ -155,7 +155,7 @@ </goals> <configuration> <tasks> - <ant antfile="scripts/antrun-beans-config.xml"/> + <ant antfile="src/main/scripts/antrun-beans-config.xml"/> </tasks> </configuration> </execution> Copied: stack/cxf/branches/tdiesler/trunk/modules/server/src/main/scripts (from rev 6626, stack/cxf/branches/tdiesler/trunk/modules/server/scripts) Deleted: stack/cxf/branches/tdiesler/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/scripts/antrun-beans-config.xml 2008-04-23 08:31:03 UTC (rev 6626) +++ stack/cxf/branches/tdiesler/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-04-23 13:32:55 UTC (rev 6633) @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<project default="main"> - - <property name="project.resources.directory" value="${basedir}/src/main/resources"/> - <property name="project.build.directory" value="${basedir}/target"/> - <property name="project.build.resources.directory" value="${project.build.directory}/resources"/> - - <property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <target name="init"> - </target> - - <!-- Compile resource files --> - <target name="main" depends="init"> - - <!-- concat jbossws-cxf50-beans.xml --> - <echo message="Concat jbossws-cxf50-beans.xml"/> - <concat destfile="${project.build.resources.directory}/jbossws-cxf50-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> - <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; </footer> - </concat> - - <!-- Concat jbossws-cxf42-beans.xml --> - <echo message="Concat jbossws-cxf42-beans.xml"/> - <unzip dest="${project.build.resources.directory}" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> - <concat destfile="${project.build.resources.directory}/jbossws-cxf42-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" - xmlns="urn:jboss:bean-deployer"&gt; </header> - <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/> - <fileset file="${project.build.resources.directory}/jbossws-jboss42-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; </footer> - </concat> - - </target> - -</project> Copied: stack/cxf/branches/tdiesler/trunk/modules/server/src/main/scripts/antrun-beans-config.xml (from rev 6632, stack/cxf/branches/tdiesler/trunk/modules/server/scripts/antrun-beans-config.xml) =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/scripts/antrun-beans-config.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-04-23 13:32:55 UTC (rev 6633) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project default="main"> + + <property name="project.resources.directory" value="${basedir}/src/main/resources"/> + <property name="project.build.directory" value="${basedir}/target"/> + <property name="project.build.resources.directory" value="${project.build.directory}/resources"/> + + <property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/> + + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + + <target name="init"> + </target> + + <!-- Compile resource files --> + <target name="main" depends="init"> + + <!-- concat jbossws-cxf50-beans.xml --> + <echo message="Concat jbossws-cxf50-beans.xml"/> + <concat destfile="${project.build.resources.directory}/jbossws-beans50/META-INF/jboss-beans.xml"> + <header trimleading="yes"> + &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> + <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; </footer> + </concat> + + <!-- Concat jbossws-cxf42-beans.xml --> + <echo message="Concat jbossws-cxf42-beans.xml"/> + <concat destfile="${project.build.resources.directory}/jbossws-beans42/META-INF/jboss-beans.xml"> + <header trimleading="yes"> + &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" + xmlns="urn:jboss:bean-deployer"&gt; </header> + <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/> + <fileset file="${project.build.resources.directory}/jbossws-jboss42-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; </footer> + </concat> + + </target> + +</project> Modified: stack/cxf/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-23 13:21:26 UTC (rev 6632) +++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-23 13:32:55 UTC (rev 6633) @@ -216,7 +216,7 @@ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId> <descriptors> - <descriptor>scripts/assembly-install-jboss422.xml</descriptor> + <descriptor>src/main/scripts/assembly-install-jboss422.xml</descriptor> </descriptors> </configuration> </plugin> Copied: stack/cxf/branches/tdiesler/trunk/src/main/scripts (from rev 6626, stack/cxf/branches/tdiesler/trunk/scripts) Deleted: stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml 2008-04-23 08:31:03 UTC (rev 6626) +++ stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml 2008-04-23 13:32:55 UTC (rev 6633) @@ -1,184 +0,0 @@ -<assembly 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/assembly-1.1.0-SNAPSHOT.xsd"> - - <id>deploy-structure-jboss422</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <dependencySets> - - <!-- bin --> - <dependencySet> - <outputDirectory>bin</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <unpack>true</unpack> - <includes> - <include>*:jbossws-framework:zip:scripts</include> - </includes> - </dependencySet> - - <!-- server/default/lib --> - <!-- - outputFileNameMapping in dependencySet uses pom's artifactid - http://jira.codehaus.org/browse/MASSEMBLY-315 - <dependencySet> - <outputDirectory>server/default/lib</outputDirectory> - <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <unpack>false</unpack> - <includes> - <include>*:jaxws-api:jar</include> - <include>*:jbossws-common:jar</include> - <include>*:jbossws-framework:jar</include> - <include>*:jbossws-spi:jar</include> - <include>*:saaj-api:jar</include> - </includes> - </dependencySet> - --> - </dependencySets> - - <moduleSets> - <!-- client --> - <moduleSet> - <includes> - <include>org.jboss.ws:jbossws-cxf-client</include> - </includes> - <binaries> - <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:jar</include> - <include>*:jaxb-impl:jar</include> - <include>*:jaxb-xjc:jar</include> - <include>*:jaxws-api:jar</include> - <include>*:jbossws-common:jar</include> - <include>*:jbossws-framework:jar</include> - <include>*:jbossws-spi:jar</include> - <include>*:neethi:jar</include> - <include>*:saaj-api:jar</include> - <include>*:saaj-impl:jar</include> - <include>*:spring-beans:jar</include> - <include>*:spring-context:jar</include> - <include>*:spring-core:jar</include> - <include>*:stax-api:jar</include> - <include>*:wsdl4j:jar</include> - <include>*:xml-resolver:jar</include> - <include>*:XmlSchema:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputFileNameMapping>wstx.jar</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:wstx-asl:jar</include> - </includes> - </dependencySet> - </dependencySets> - </binaries> - </moduleSet> - - <!-- server/default/lib --> - <moduleSet> - <includes> - <include>org.jboss.ws:jbossws-cxf-client</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> - <!-- - useProjectArtifact is documented but not in schema - http://jira.codehaus.org/browse/MASSEMBLY-316 - <useProjectArtifact>false</useProjectArtifact> - --> - <includes> - <include>*:jaxws-api:jar</include> - <include>*:jbossws-common:jar</include> - <include>*:jbossws-framework:jar</include> - <include>*:jbossws-spi:jar</include> - <include>*:saaj-api:jar</include> - </includes> - </dependencySet> - </dependencySets> - </binaries> - </moduleSet> - - <!-- server/default/deploy/jbossws.sar --> - <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-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-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> - </moduleSets> - -</assembly> \ No newline at end of file Copied: stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml (from rev 6632, stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml) =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml 2008-04-23 13:32:55 UTC (rev 6633) @@ -0,0 +1,205 @@ +<assembly 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/assembly-1.1.0-SNAPSHOT.xsd"> + + <id>deploy-structure-jboss422</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <dependencySets> + + <!-- bin --> + <dependencySet> + <outputDirectory>bin</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <unpack>true</unpack> + <includes> + <include>*:jbossws-framework:zip:scripts</include> + </includes> + </dependencySet> + + <!-- server/default/lib --> + <!-- + outputFileNameMapping in dependencySet uses pom's artifactid + http://jira.codehaus.org/browse/MASSEMBLY-315 + <dependencySet> + <outputDirectory>server/default/lib</outputDirectory> + <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <unpack>false</unpack> + <includes> + <include>*:jaxws-api:jar</include> + <include>*:jbossws-common:jar</include> + <include>*:jbossws-framework:jar</include> + <include>*:jbossws-spi:jar</include> + <include>*:saaj-api:jar</include> + </includes> + </dependencySet> + --> + </dependencySets> + + <moduleSets> + <!-- client --> + <moduleSet> + <includes> + <include>org.jboss.ws:jbossws-cxf-client</include> + </includes> + <binaries> + <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:jar</include> + <include>*:jaxb-impl:jar</include> + <include>*:jaxb-xjc:jar</include> + <include>*:jaxws-api:jar</include> + <include>*:jbossws-common:jar</include> + <include>*:jbossws-framework:jar</include> + <include>*:jbossws-spi:jar</include> + <include>*:jbossws-jboss42:jar</include> + <include>*:neethi:jar</include> + <include>*:saaj-api:jar</include> + <include>*:saaj-impl:jar</include> + <include>*:spring-beans:jar</include> + <include>*:spring-context:jar</include> + <include>*:spring-core:jar</include> + <include>*:stax-api:jar</include> + <include>*:wsdl4j:jar</include> + <include>*:xml-resolver:jar</include> + <include>*:XmlSchema:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputFileNameMapping>wstx.jar</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:wstx-asl:jar</include> + </includes> + </dependencySet> + </dependencySets> + </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> + <!-- + useProjectArtifact is documented but not in schema + http://jira.codehaus.org/browse/MASSEMBLY-316 + <useProjectArtifact>false</useProjectArtifact> + --> + <includes> + <include>*:jaxws-api:jar</include> + <include>*:jbossws-common:jar</include> + <include>*:jbossws-framework:jar</include> + <include>*:jbossws-spi:jar</include> + <include>*:jbossws-jboss42:jar</include> + <include>*:saaj-api:jar</include> + </includes> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> + + <!-- server/default/deploy/jbossws.sar --> + <moduleSet> + <includes> + <include>org.jboss.ws:jbossws-cxf-server</include> + <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> + <include>*:geronimo-javamail*</include> + <include>*:geronimo-ws-metadata*</include> + <include>*:jaxb-api:jar</include> + <include>*:jaxb-impl:jar</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>*: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-asl:jar</include> + </includes> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> + <!-- server/default/deploy/jbossws.sar/jbossws-context.war --> + <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> + <includeDependencies>false</includeDependencies> + <unpack>true</unpack> + </binaries> + </moduleSet> + </moduleSets> + <fileSets> + <!-- server/default/deploy/jbossws.sar/META-INF --> + <fileSet> + <directory>modules/server/target/resources/jbossws-cxf.sar</directory> + <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory> + <includes> + <include>META-INF/**</include> + </includes> + </fileSet> + <fileSet> + <directory>modules/server/target/resources/jbossws-jboss42.sar</directory> + <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory> + <includes> + <include>META-INF/**</include> + </includes> + </fileSet> + <!-- server/default/deploy/jbossws.sar/jbossws.beans --> + <fileSet> + <directory>modules/server/target/resources/jbossws-beans42</directory> + <outputDirectory>server/default/deploy/jbossws.sar/jbossws.beans</outputDirectory> + <includes> + <include>META-INF/**</include> + </includes> + </fileSet> + </fileSets> + +</assembly> \ No newline at end of file