Author: heiko.braun(a)jboss.com Date: 2008-05-06 07:11:18 -0400 (Tue, 06 May 2008) New Revision: 6899 Modified: container/jboss50/branches/jbossws-jboss500/pom.xml container/jboss50/branches/jbossws-jboss500/src/main/scripts/antrun-install.xml Log: Fix legacy build Modified: container/jboss50/branches/jbossws-jboss500/pom.xml =================================================================== --- container/jboss50/branches/jbossws-jboss500/pom.xml 2008-05-06 09:37:37 UTC (rev 6898) +++ container/jboss50/branches/jbossws-jboss500/pom.xml 2008-05-06 11:11:18 UTC (rev 6899) @@ -1,191 +1,242 @@ <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"> - <modelVersion>4.0.0</modelVersion> - - <name>JBoss Web Services - Container JBoss-5.0.0</name> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> - - <version>3.0.0-SNAPSHOT</version> - - <!-- Parent --> - <parent> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-parent</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> - - <!-- Properties --> - <properties> - <!-- - JBoss component versions taken from - http://snapshots.jboss.org/maven2/org/jboss/jbossas/jboss-as-component-ma... - --> - <jboss.version>5.0.0-SNAPSHOT</jboss.version> - <jboss.ejb3.version>0.1.0-SNAPSHOT</jboss.ejb3.version> - <jboss.deployers.version>2.0.0-SNAPSHOT</jboss.deployers.version> - <jboss.metadata.version>1.0.0.Beta10</jboss.metadata.version> - <jboss.security.version>2.0.2.Beta7</jboss.security.version> - <jboss.jbossxb.version>2.0.0.CR8</jboss.jbossxb.version> - <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version> - <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version> - </properties> - - <!-- DependencyManagement --> - <dependencyManagement> - <dependencies> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>JBoss Web Services - Container JBoss-5.0.0</name> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss500</artifactId> + + <version>3.0.0-SNAPSHOT</version> + + <!-- Parent --> + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-parent</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + + <!-- Properties --> + <properties> + <!-- + JBoss component versions taken from + http://snapshots.jboss.org/maven2/org/jboss/jbossas/jboss-as-component-ma... + --> + + </properties> + + <!-- DependencyManagement --> + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jboss-security-spi-bare</artifactId> + <version></version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-vfs</artifactId> + <version>2.0.0.Beta9</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + <version>2.2.3.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-ejb3</artifactId> + <version>0.1.2.Beta1</version> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-ejb3-ext-API</artifactId> + <version>0.1.2.Beta1</version> + </dependency> + <dependency> + <groupId>org.jboss.aop</groupId> + <artifactId>jboss-aop</artifactId> + <version>2.0.0.CR7</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-common-logging-spi</artifactId> + <version>2.0.2.GA</version> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1-brew</version> + </dependency> + <dependency> + <groupId>jboss.jbossws</groupId> + <artifactId>jboss-jaxrpc</artifactId> + <version>2.0.3.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-j2se</artifactId> + <version>5.0.0.Beta4</version> + </dependency> + <dependency> + <groupId>jboss.jbossws</groupId> + <artifactId>jboss-jaxws</artifactId> + <version>2.0.3.GA</version> + </dependency> + <dependency> + <groupId>jboss.jbossws</groupId> + <artifactId>jboss-saaj</artifactId> + <version>2.0.3.GA</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jbossws-framework</artifactId> + <version>2.0.3.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-deployers-spi</artifactId> + <version>2.0.0.Beta10</version> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-deployers-structure-spi</artifactId> + <version>2.0.0.Beta10</version> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-deployers-client-spi</artifactId> + <version>2.0.0.Beta10</version> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-deployers-core-spi</artifactId> + <version>2.0.0.Beta10</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jbossws-spi</artifactId> + <version>1.0.1.GA</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jbossws-common</artifactId> + <version>1.0.3.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx-client</artifactId> + <version>2.0.2.Beta4</version> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-deployers-vfs-spi</artifactId> + <version>2.0.0.Beta10</version> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-server</artifactId> + <version>5.0.0.Beta4</version> + </dependency> + </dependencies> + </dependencyManagement> + + <!-- Dependencies --> + <dependencies> + + <!-- jbossws dependencies --> <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-common</artifactId> - <version>${jbossws.common.version}</version> + <groupId>jboss</groupId> + <artifactId>jbossws-common</artifactId> </dependency> <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-spi</artifactId> - <version>${jbossws.spi.version}</version> + <groupId>jboss</groupId> + <artifactId>jbossws-spi</artifactId> </dependency> + + <!-- jboss provided dependencies --> <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-server</artifactId> - <version>${jboss.version}</version> - <scope>provided</scope> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-server</artifactId> + <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-structure-spi</artifactId> - <version>${jboss.deployers.version}</version> - <scope>provided</scope> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-deployers-structure-spi</artifactId> + <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.metadata</groupId> - <artifactId>jboss-metadata</artifactId> - <version>${jboss.metadata.version}</version> - <scope>provided</scope> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-ejb3</artifactId> + <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-core</artifactId> - <version>${jboss.ejb3.version}</version> - <scope>provided</scope> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-ejb3-ext-API</artifactId> + <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.security</groupId> - <artifactId>jboss-security-spi</artifactId> - <version>${jboss.security.version}</version> - <scope>provided</scope> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx-client</artifactId> </dependency> + <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - <version>${jboss.jbossxb.version}</version> + <groupId>jboss</groupId> + <artifactId>jbossws-framework</artifactId> </dependency> - </dependencies> - </dependencyManagement> - - <!-- Dependencies --> - <dependencies> - - <!-- FIXME: Remove this dependency --> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - <version>3.0.2-SNAPSHOT</version> - </dependency> - - <!-- jbossws dependencies --> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-common</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-spi</artifactId> - </dependency> - - <!-- jboss provided dependencies --> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-server</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-structure-spi</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.metadata</groupId> - <artifactId>jboss-metadata</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.security</groupId> - <artifactId>jboss-security-spi</artifactId> - <scope>provided</scope> - </dependency> - - <!-- jboss thirdparty dependencies --> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - </dependency> - </dependencies> - - <!-- Plugins --> - <build> - <resources> - <resource> - <targetPath>../etc</targetPath> - <directory>src/main/etc</directory> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/resources/jbossws-jboss50.jar</directory> - </resource> - </resources> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>install</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="artifact.id" value="${project.artifactId}"/> - <property name="version.id" value="${project.version}"/> - <property name="jboss.local.repository" value="${jboss.local.repository}"/> - <ant antfile="src/main/scripts/antrun-install.xml" target="install"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/scripts/assembly-container.xml</descriptor> - <descriptor>src/main/scripts/assembly-resources.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - + + </dependencies> + + <!-- Plugins --> + <build> + <resources> + <resource> + <targetPath>../etc</targetPath> + <directory>src/main/etc</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/resources/jbossws-jboss50.jar</directory> + </resource> + </resources> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>install</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="artifact.id" value="${project.artifactId}"/> + <property name="version.id" value="${project.version}"/> + <property name="jboss.local.repository" value="${jboss.local.repository}"/> + <ant antfile="src/main/scripts/antrun-install.xml" target="install"/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <!--descriptor>src/main/scripts/assembly-container.xml</descriptor--> + <descriptor>src/main/scripts/assembly-resources.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> Modified: container/jboss50/branches/jbossws-jboss500/src/main/scripts/antrun-install.xml =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/scripts/antrun-install.xml 2008-05-06 09:37:37 UTC (rev 6898) +++ container/jboss50/branches/jbossws-jboss500/src/main/scripts/antrun-install.xml 2008-05-06 11:11:18 UTC (rev 6899) @@ -53,7 +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}-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"/>