Author: pete.muir(a)jboss.org Date: 2009-10-12 20:10:48 -0400 (Mon, 12 Oct 2009) New Revision: 3999 Added: cdi-tck/trunk/dist/porting-package/ cdi-tck/trunk/dist/porting-package/pom.xml cdi-tck/trunk/dist/porting-package/src/ cdi-tck/trunk/dist/porting-package/src/main/ cdi-tck/trunk/dist/porting-package/src/main/assembly/ cdi-tck/trunk/dist/porting-package/src/main/assembly/assembly.xml Modified: cdi-tck/trunk/dist/pom.xml cdi-tck/trunk/dist/src/main/assembly/assembly.xml cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java cdi-tck/trunk/pom.xml Log: CDITCK-5 Modified: cdi-tck/trunk/dist/pom.xml =================================================================== --- cdi-tck/trunk/dist/pom.xml 2009-10-13 00:07:35 UTC (rev 3998) +++ cdi-tck/trunk/dist/pom.xml 2009-10-13 00:10:48 UTC (rev 3999) @@ -5,41 +5,55 @@ <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-parent</artifactId> <version>1.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-dist</artifactId> <packaging>pom</packaging> <version>1.0.0-SNAPSHOT</version> <name>JSR-299 TCK Distribution</name> + + <properties> + <weld.version>1.0.0-SNAPSHOT</weld.version> + </properties> + + <modules> + <module>porting-package</module> + </modules> <dependencies> <dependency> <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-api</artifactId> <version>${project.version}</version> + <optional>true</optional> </dependency> <dependency> <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-api</artifactId> <version>${project.version}</version> <classifier>sources</classifier> + <optional>true</optional> </dependency> <dependency> <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-reference-guide</artifactId> <version>${project.version}</version> <type>war</type> + <optional>true</optional> </dependency> <dependency> <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-impl</artifactId> <version>${project.version}</version> + <optional>true</optional> </dependency> <dependency> <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-impl</artifactId> <version>${project.version}</version> <classifier>sources</classifier> + <optional>true</optional> </dependency> <dependency> <groupId>org.jboss.jsr299.tck</groupId> @@ -47,6 +61,7 @@ <version>${project.version}</version> <classifier>audit-cdi</classifier> <type>xml</type> + <optional>true</optional> </dependency> <dependency> <groupId>org.jboss.jsr299.tck</groupId> @@ -54,6 +69,7 @@ <version>${project.version}</version> <classifier>audit-mb</classifier> <type>xml</type> + <optional>true</optional> </dependency> <dependency> <groupId>org.jboss.jsr299.tck</groupId> @@ -61,6 +77,7 @@ <version>${project.version}</version> <classifier>suite</classifier> <type>xml</type> + <optional>true</optional> </dependency> <dependency> <groupId>org.jboss.jsr299.tck</groupId> @@ -68,6 +85,7 @@ <version>${project.version}</version> <classifier>coverage-cdi</classifier> <type>html</type> + <optional>true</optional> </dependency> <dependency> <groupId>org.jboss.jsr299.tck</groupId> @@ -75,18 +93,19 @@ <version>${project.version}</version> <classifier>coverage-mb</classifier> <type>html</type> + <optional>true</optional> </dependency> + <dependency> + <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>jsr299-tck-dist-porting-package</artifactId> + <version>${project.version}</version> + <type>zip</type> + <optional>true</optional> + <classifier>dist</classifier> + </dependency> </dependencies> <build> - <defaultGoal>deploy</defaultGoal> - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav</artifactId> - <version>1.0-beta-2</version> - </extension> - </extensions> <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> Property changes on: cdi-tck/trunk/dist/porting-package ___________________________________________________________________ Name: svn:ignore + target Added: cdi-tck/trunk/dist/porting-package/pom.xml =================================================================== --- cdi-tck/trunk/dist/porting-package/pom.xml (rev 0) +++ cdi-tck/trunk/dist/porting-package/pom.xml 2009-10-13 00:10:48 UTC (rev 3999) @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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> + <parent> + <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>jsr299-tck-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>jsr299-tck-dist-porting-package</artifactId> + <packaging>pom</packaging> + <version>1.0.0-SNAPSHOT</version> + <name>JSR-299 TCK Distribution - Weld Porting Package</name> + + <properties> + <weld.version>1.0.0-SNAPSHOT</weld.version> + </properties> + + <dependencies> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-jboss-tck-runner</artifactId> + <version>${weld.version}</version> + <optional>true</optional> + <scope>compile</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/assembly.xml</descriptor> + </descriptors> + <finalName>jsr299-tck-porting-package-${project.version}</finalName> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>process-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <stripVersion>true</stripVersion> + <artifactItems> + <artifactItem> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-jboss-tck-runner</artifactId> + <version>${weld.version}</version> + <classifier>dist</classifier> + <type>zip</type> + <overWrite>true</overWrite> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> Added: cdi-tck/trunk/dist/porting-package/src/main/assembly/assembly.xml =================================================================== --- cdi-tck/trunk/dist/porting-package/src/main/assembly/assembly.xml (rev 0) +++ cdi-tck/trunk/dist/porting-package/src/main/assembly/assembly.xml 2009-10-13 00:10:48 UTC (rev 3999) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<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.1.xsd + "> + <id>dist</id> + <baseDirectory>/</baseDirectory> + <formats> + <format>zip</format> + </formats> + + <fileSets> + <fileSet> + <directory>${project.build.directory}/dependency</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + </fileSets> + + <dependencySets> + <dependencySet> + <useTransitiveDependencies>true</useTransitiveDependencies> + <outputDirectory>/porting-package-lib</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + </dependencySet> + </dependencySets> + +</assembly> Modified: cdi-tck/trunk/dist/src/main/assembly/assembly.xml =================================================================== --- cdi-tck/trunk/dist/src/main/assembly/assembly.xml 2009-10-13 00:07:35 UTC (rev 3998) +++ cdi-tck/trunk/dist/src/main/assembly/assembly.xml 2009-10-13 00:10:48 UTC (rev 3999) @@ -2,7 +2,7 @@ <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.xsd + http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.1.xsd "> <id>dist</id> <baseDirectory>jsr299-tck-${project.version}</baseDirectory> @@ -36,6 +36,7 @@ <exclude>org.jboss.jsr299.tck:jsr299-tck-impl</exclude> <exclude>org.jboss.jsr299.tck:jsr299-tck-api</exclude> <exclude>org.jboss.jsr299.tck:jsr299-tck-reference-guide</exclude> + <exclude>org.jboss.jsr299.tck:jsr299-tck-dist-porting-package</exclude> </excludes> <useTransitiveDependencies>true</useTransitiveDependencies> <outputDirectory>lib</outputDirectory> @@ -43,6 +44,15 @@ </dependencySet> <dependencySet> <includes> + <include>org.jboss.jsr299.tck:jsr299-tck-dist-porting-package</include> + </includes> + <useTransitiveDependencies>false</useTransitiveDependencies> + <outputDirectory>/weld</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <unpack>true</unpack> + </dependencySet> + <dependencySet> + <includes> <include>org.jboss.jsr299.tck:jsr299-tck-reference-guide</include> </includes> <unpack>true</unpack> Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java 2009-10-13 00:07:35 UTC (rev 3998) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java 2009-10-13 00:10:48 UTC (rev 3999) @@ -51,7 +51,6 @@ getInstanceByType(CowShed.class).milk(); assert TimestampLogger.getMessage().equals(CowShed.MESSAGE); assert MockLogger.getMessage().equals(TimestampLogger.PREFIX + CowShed.MESSAGE); - assert !TimestampLogger.isInitializeCalled(); assert MockLogger.isInitializeCalled(); } Modified: cdi-tck/trunk/pom.xml =================================================================== --- cdi-tck/trunk/pom.xml 2009-10-13 00:07:35 UTC (rev 3998) +++ cdi-tck/trunk/pom.xml 2009-10-13 00:10:48 UTC (rev 3999) @@ -11,7 +11,7 @@ <parent> <groupId>org.jboss.weld</groupId> <artifactId>weld-parent</artifactId> - <version>1-SNAPSHOT</version> + <version>2-SNAPSHOT</version> </parent> <!-- Metadata -->