[jbossws-commits] JBossWS SVN: r6685 - in container/jboss50/branches/jbossws-jboss501: src/main/etc and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-04-25 06:58:15 -0400 (Fri, 25 Apr 2008) New Revision: 6685 Added: container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-container.xml Modified: container/jboss50/branches/jbossws-jboss501/.classpath container/jboss50/branches/jbossws-jboss501/pom.xml container/jboss50/branches/jbossws-jboss501/src/main/etc/component-info.xml container/jboss50/branches/jbossws-jboss501/src/main/scripts/antrun-install.xml container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-resources.xml Log: Add container.jar Modified: container/jboss50/branches/jbossws-jboss501/.classpath =================================================================== --- container/jboss50/branches/jbossws-jboss501/.classpath 2008-04-25 10:38:00 UTC (rev 6684) +++ container/jboss50/branches/jbossws-jboss501/.classpath 2008-04-25 10:58:15 UTC (rev 6685) @@ -1,15 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="lib" path="output/lib/jbossws-jboss50-container.jar"/> - <classpathentry kind="lib" path="output/lib/jbossws-jboss50.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-jaxrpc.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-jaxws.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-saaj.jar"/> - <classpathentry kind="lib" path="thirdparty/jbossws-common.jar"/> - <classpathentry kind="lib" path="thirdparty/jbossws-framework.jar"/> - <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar"/> - <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="output" path="target/eclipse-classes"/> Modified: container/jboss50/branches/jbossws-jboss501/pom.xml =================================================================== --- container/jboss50/branches/jbossws-jboss501/pom.xml 2008-04-25 10:38:00 UTC (rev 6684) +++ container/jboss50/branches/jbossws-jboss501/pom.xml 2008-04-25 10:58:15 UTC (rev 6685) @@ -101,9 +101,6 @@ <directory>src/main/etc</directory> <filtering>true</filtering> </resource> - <resource> - <directory>src/main/resources/jbossws-jboss50.jar</directory> - </resource> </resources> <plugins> <plugin> @@ -135,6 +132,7 @@ </goals> <configuration> <descriptors> + <descriptor>src/main/scripts/assembly-container.xml</descriptor> <descriptor>src/main/scripts/assembly-resources.xml</descriptor> </descriptors> </configuration> Modified: container/jboss50/branches/jbossws-jboss501/src/main/etc/component-info.xml =================================================================== --- container/jboss50/branches/jbossws-jboss501/src/main/etc/component-info.xml 2008-04-25 10:38:00 UTC (rev 6684) +++ container/jboss50/branches/jbossws-jboss501/src/main/etc/component-info.xml 2008-04-25 10:58:15 UTC (rev 6685) @@ -1,26 +1,24 @@ -<project name="jboss/jbossws-jboss50"> +<project name="jboss/jbossws-jboss501"> - <component id="jboss/jbossws-jboss50" + <component id="jboss/jbossws-jboss501" description="JBossWS container integration layer" - version=&quot;@repository.id(a)&quot; + version="${version}" licenseType="lgpl"> - <artifact id="jbossws-jboss50.jar"/> - <artifact id="jbossws-jboss50-deployer.zip"/> - <artifact id="jbossws-jboss50-src.zip"/> + <artifact id="jbossws-jboss501.jar"/> + <artifact id="jbossws-jboss501-container.jar"/> + <artifact id="jbossws-jboss501-resources.zip"/> + <artifact id="jbossws-jboss501-src.jar"/> <import componentref="jboss/jbossws-common"> - <compatible version="@jbossws-common@"/> + <compatible version="${jbossws.common.version}"/> </import> - <import componentref="jboss/jbossws-framework"> - <compatible version="@jbossws-framework@"/> - </import> <import componentref="jboss/jbossws-spi"> - <compatible version="@jbossws-spi@"/> + <compatible version="${jbossws.spi.version}"/> </import> <export> - <include input="jbossws-jboss50.jar"/> + <include input="jbossws-jboss501.jar"/> </export> </component> Modified: container/jboss50/branches/jbossws-jboss501/src/main/scripts/antrun-install.xml =================================================================== --- container/jboss50/branches/jbossws-jboss501/src/main/scripts/antrun-install.xml 2008-04-25 10:38:00 UTC (rev 6684) +++ container/jboss50/branches/jbossws-jboss501/src/main/scripts/antrun-install.xml 2008-04-25 10:58:15 UTC (rev 6685) @@ -53,6 +53,7 @@ <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss/${artifact.id}/${repository.id}"/> <mkdir dir="${jboss.repository.dir}/lib"/> <copy file="${project.target.dir}/${artifact.id}-${version.id}.jar" tofile="${jboss.repository.dir}/lib/${artifact.id}.jar" overwrite="true"/> + <copy file="${project.target.dir}/${artifact.id}-${version.id}-container.jar" tofile="${jboss.repository.dir}/lib/${artifact.id}-container.jar" overwrite="true"/> <copy file="${project.target.dir}/${artifact.id}-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/${artifact.id}-src.jar" overwrite="true"/> <copy file="${project.target.dir}/${artifact.id}-${version.id}-resources.zip" tofile="${jboss.repository.dir}/lib/${artifact.id}-resources.zip" overwrite="true"/> <copy file="${project.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/component-info.xml" overwrite="true"/> Added: container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-container.xml =================================================================== --- container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-container.xml (rev 0) +++ container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-container.xml 2008-04-25 10:58:15 UTC (rev 6685) @@ -0,0 +1,14 @@ +<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>container</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>src/main/resources/jbossws-jboss50-container.jar</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-container.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-resources.xml =================================================================== --- container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-resources.xml 2008-04-25 10:38:00 UTC (rev 6684) +++ container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-resources.xml 2008-04-25 10:58:15 UTC (rev 6685) @@ -9,6 +9,10 @@ <fileSet> <directory>src/main/resources</directory> <outputDirectory>/</outputDirectory> + <includes> + <include>jbossws-jboss50.deployer/**</include> + <include>jbossws-jboss50.jar/**</include> + </includes> </fileSet> </fileSets> </assembly> \ No newline at end of file