Author: rogerk Date: 2010-03-15 15:13:11 -0400 (Mon, 15 Mar 2010) New Revision: 6051 Added: core/branches/1.0.1-SP1/ core/branches/1.0.1-SP1/bom/pom.xml core/branches/1.0.1-SP1/impl/pom.xml core/branches/1.0.1-SP1/impl/src/main/java/org/jboss/weld/util/Proxies.java core/branches/1.0.1-SP1/inject-tck-runner/pom.xml core/branches/1.0.1-SP1/jboss-tck-runner/pom.xml core/branches/1.0.1-SP1/osgi-bundle/pom.xml core/branches/1.0.1-SP1/parent/pom.xml core/branches/1.0.1-SP1/pom.xml core/branches/1.0.1-SP1/porting-package/pom.xml core/branches/1.0.1-SP1/tests/pom.xml Removed: core/branches/1.0.1-SP1/bom/pom.xml core/branches/1.0.1-SP1/impl/pom.xml core/branches/1.0.1-SP1/impl/src/main/java/org/jboss/weld/util/Proxies.java core/branches/1.0.1-SP1/inject-tck-runner/pom.xml core/branches/1.0.1-SP1/jboss-tck-runner/pom.xml core/branches/1.0.1-SP1/osgi-bundle/pom.xml core/branches/1.0.1-SP1/parent/pom.xml core/branches/1.0.1-SP1/pom.xml core/branches/1.0.1-SP1/porting-package/pom.xml core/branches/1.0.1-SP1/tests/pom.xml Log: [maven-release-plugin] copy for branch 1.0.1-SP1 Copied: core/branches/1.0.1-SP1 (from rev 5959, core/tags/1.0.1-Final) Deleted: core/branches/1.0.1-SP1/bom/pom.xml =================================================================== --- core/tags/1.0.1-Final/bom/pom.xml 2010-02-24 03:53:20 UTC (rev 5959) +++ core/branches/1.0.1-SP1/bom/pom.xml 2010-03-15 19:13:11 UTC (rev 6051) @@ -1,145 +0,0 @@ -<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> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-bom</artifactId> - <packaging>pom</packaging> - <version>1.0.1-Final</version> - - <parent> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-parent</artifactId> - <version>9</version> - </parent> - - <name>Weld Core BOM</name> - - <!-- Minimal project metadata, for more see parent/pom.xml --> - <description>Weld Core "bill of materials" which can be imported by any project using the Weld implementation of CDI. It provides dependency management for the implementation.</description> - - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <distribution>repo</distribution> - <url>http://www.apache.org/licenses/LICENSE-2.0.html</url> - </license> - </licenses> - <url>http://www.seamframework.org/Weld</url> - - <developers> - <developer> - <name>Weld committers</name> - </developer> - </developers> - - <properties> - <weld.api.version>1.0-SP1</weld.api.version> - <!-- Override the API and compile with more recent EL API --> - <google.collections.version>1.0</google.collections.version> - <javassist.version>3.11.0.GA</javassist.version> - <cdi.tck.version>1.0.1-Final</cdi.tck.version> - <atinject.tck.version>1.0.0-PFD-3</atinject.tck.version> - <jboss.interceptor.version>1.0.0-CR11</jboss.interceptor.version> - <slf4j.version>1.5.10</slf4j.version> - <cal10n.version>0.7.2</cal10n.version> - </properties> - - <dependencyManagement> - <dependencies> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-api-bom</artifactId> - <version>${weld.api.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>${javassist.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-porting-package</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-test</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.jsr299.tck</groupId> - <artifactId>jsr299-tck-api</artifactId> - <version>${cdi.tck.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.jsr299.tck</groupId> - <artifactId>jsr299-tck-impl</artifactId> - <version>${cdi.tck.version}</version> - </dependency> - - <dependency> - <groupId>org.atinject</groupId> - <artifactId>inject-tck</artifactId> - <version>${atinject.tck.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.interceptor</groupId> - <artifactId>jboss-interceptor</artifactId> - <version>${jboss.interceptor.version}</version> - </dependency> - - <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - <version>${google.collections.version}</version> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-ext</artifactId> - <version>${slf4j.version}</version> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>${slf4j.version}</version> - </dependency> - - <dependency> - <groupId>ch.qos</groupId> - <artifactId>cal10n-api</artifactId> - <version>${cal10n.version}</version> - </dependency> - - </dependencies> - </dependencyManagement> - - <!-- SCM and distribution management --> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1... - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags... - <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/bom<... - </scm> - -</project> Copied: core/branches/1.0.1-SP1/bom/pom.xml (from rev 6050, core/tags/1.0.1-Final/bom/pom.xml) =================================================================== --- core/branches/1.0.1-SP1/bom/pom.xml (rev 0) +++ core/branches/1.0.1-SP1/bom/pom.xml 2010-03-15 19:13:11 UTC (rev 6051) @@ -0,0 +1,145 @@ +<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> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-bom</artifactId> + <packaging>pom</packaging> + <version>1.0.1-SP1</version> + + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-parent</artifactId> + <version>9</version> + </parent> + + <name>Weld Core BOM</name> + + <!-- Minimal project metadata, for more see parent/pom.xml --> + <description>Weld Core "bill of materials" which can be imported by any project using the Weld implementation of CDI. It provides dependency management for the implementation.</description> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <distribution>repo</distribution> + <url>http://www.apache.org/licenses/LICENSE-2.0.html</url> + </license> + </licenses> + <url>http://www.seamframework.org/Weld</url> + + <developers> + <developer> + <name>Weld committers</name> + </developer> + </developers> + + <properties> + <weld.api.version>1.0-SP1</weld.api.version> + <!-- Override the API and compile with more recent EL API --> + <google.collections.version>1.0</google.collections.version> + <javassist.version>3.11.0.GA</javassist.version> + <cdi.tck.version>1.0.1-Final</cdi.tck.version> + <atinject.tck.version>1.0.0-PFD-3</atinject.tck.version> + <jboss.interceptor.version>1.0.0-CR11</jboss.interceptor.version> + <slf4j.version>1.5.10</slf4j.version> + <cal10n.version>0.7.2</cal10n.version> + </properties> + + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api-bom</artifactId> + <version>${weld.api.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>${javassist.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-porting-package</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-test</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>jsr299-tck-api</artifactId> + <version>${cdi.tck.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>jsr299-tck-impl</artifactId> + <version>${cdi.tck.version}</version> + </dependency> + + <dependency> + <groupId>org.atinject</groupId> + <artifactId>inject-tck</artifactId> + <version>${atinject.tck.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor</artifactId> + <version>${jboss.interceptor.version}</version> + </dependency> + + <dependency> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + <version>${google.collections.version}</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-ext</artifactId> + <version>${slf4j.version}</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>${slf4j.version}</version> + </dependency> + + <dependency> + <groupId>ch.qos</groupId> + <artifactId>cal10n-api</artifactId> + <version>${cal10n.version}</version> + </dependency> + + </dependencies> + </dependencyManagement> + + <!-- SCM and distribution management --> + <scm> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP... + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/bran... + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/bom</url> + </scm> + +</project> Deleted: core/branches/1.0.1-SP1/impl/pom.xml =================================================================== --- core/tags/1.0.1-Final/impl/pom.xml 2010-02-24 03:53:20 UTC (rev 5959) +++ core/branches/1.0.1-SP1/impl/pom.xml 2010-03-15 19:13:11 UTC (rev 6051) @@ -1,186 +0,0 @@ -<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"> - <parent> - <artifactId>weld-core-parent</artifactId> - <groupId>org.jboss.weld</groupId> - <version>1.0.1-Final</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - <name>Weld Core Implementation</name> - <description>Weld's implementation of CDI</description> - - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <distribution>repo</distribution> - <url>http://www.apache.org/licenses/LICENSE-2.0.html</url> - </license> - </licenses> - <url>http://www.seamframework.org/Weld</url> - - - <dependencies> - - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-spi</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - </dependency> - - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> - - <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - </dependency> - - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>org.jboss.interceptor</groupId> - <artifactId>jboss-interceptor-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.interceptor</groupId> - <artifactId>jboss-interceptor</artifactId> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-ext</artifactId> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>ch.qos.cal10n.plugins</groupId> - <artifactId>maven-cal10n-plugin</artifactId> - <executions> - <execution> - <id>verify-messages</id> - <phase>verify</phase> - <goals> - <goal>verify</goal> - </goals> - <configuration> - <enumTypes> - <!-- list every enum type you would like to see checked --> - <enumType>org.jboss.weld.logging.messages.BeanManagerMessage</enumType> - <enumType>org.jboss.weld.logging.messages.BeanMessage</enumType> - <enumType>org.jboss.weld.logging.messages.BootstrapMessage</enumType> - <enumType>org.jboss.weld.logging.messages.ContextMessage</enumType> - <enumType>org.jboss.weld.logging.messages.ConversationMessage</enumType> - <enumType>org.jboss.weld.logging.messages.ElMessage</enumType> - <enumType>org.jboss.weld.logging.messages.EventMessage</enumType> - <enumType>org.jboss.weld.logging.messages.JsfMessage</enumType> - <enumType>org.jboss.weld.logging.messages.MetadataMessage</enumType> - <enumType>org.jboss.weld.logging.messages.ReflectionMessage</enumType> - <enumType>org.jboss.weld.logging.messages.ResolutionMessage</enumType> - <enumType>org.jboss.weld.logging.messages.ServletMessage</enumType> - <enumType>org.jboss.weld.logging.messages.UtilMessage</enumType> - <enumType>org.jboss.weld.logging.messages.ValidatorMessage</enumType> - <enumType>org.jboss.weld.logging.messages.VersionMessage</enumType> - <enumType>org.jboss.weld.logging.messages.XmlMessage</enumType> - </enumTypes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>javax.xml.ws</id> - <activation> - <jdk>1.5</jdk> - </activation> - <dependencies> - <dependency> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - </dependency> - </dependencies> - </profile> - </profiles> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1... - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags... - <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/impl<... - </scm> - -</project> Copied: core/branches/1.0.1-SP1/impl/pom.xml (from rev 6050, core/tags/1.0.1-Final/impl/pom.xml) =================================================================== --- core/branches/1.0.1-SP1/impl/pom.xml (rev 0) +++ core/branches/1.0.1-SP1/impl/pom.xml 2010-03-15 19:13:11 UTC (rev 6051) @@ -0,0 +1,186 @@ +<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"> + <parent> + <artifactId>weld-core-parent</artifactId> + <groupId>org.jboss.weld</groupId> + <version>1.0.1-SP1</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + <name>Weld Core Implementation</name> + <description>Weld's implementation of CDI</description> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <distribution>repo</distribution> + <url>http://www.apache.org/licenses/LICENSE-2.0.html</url> + </license> + </licenses> + <url>http://www.seamframework.org/Weld</url> + + + <dependencies> + + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-spi</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + + <dependency> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor</artifactId> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-ext</artifactId> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>ch.qos.cal10n.plugins</groupId> + <artifactId>maven-cal10n-plugin</artifactId> + <executions> + <execution> + <id>verify-messages</id> + <phase>verify</phase> + <goals> + <goal>verify</goal> + </goals> + <configuration> + <enumTypes> + <!-- list every enum type you would like to see checked --> + <enumType>org.jboss.weld.logging.messages.BeanManagerMessage</enumType> + <enumType>org.jboss.weld.logging.messages.BeanMessage</enumType> + <enumType>org.jboss.weld.logging.messages.BootstrapMessage</enumType> + <enumType>org.jboss.weld.logging.messages.ContextMessage</enumType> + <enumType>org.jboss.weld.logging.messages.ConversationMessage</enumType> + <enumType>org.jboss.weld.logging.messages.ElMessage</enumType> + <enumType>org.jboss.weld.logging.messages.EventMessage</enumType> + <enumType>org.jboss.weld.logging.messages.JsfMessage</enumType> + <enumType>org.jboss.weld.logging.messages.MetadataMessage</enumType> + <enumType>org.jboss.weld.logging.messages.ReflectionMessage</enumType> + <enumType>org.jboss.weld.logging.messages.ResolutionMessage</enumType> + <enumType>org.jboss.weld.logging.messages.ServletMessage</enumType> + <enumType>org.jboss.weld.logging.messages.UtilMessage</enumType> + <enumType>org.jboss.weld.logging.messages.ValidatorMessage</enumType> + <enumType>org.jboss.weld.logging.messages.VersionMessage</enumType> + <enumType>org.jboss.weld.logging.messages.XmlMessage</enumType> + </enumTypes> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>javax.xml.ws</id> + <activation> + <jdk>1.5</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + </dependency> + </dependencies> + </profile> + </profiles> + + <scm> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP... + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/bran... + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/impl</url> + </scm> + +</project> Deleted: core/branches/1.0.1-SP1/impl/src/main/java/org/jboss/weld/util/Proxies.java =================================================================== --- core/tags/1.0.1-Final/impl/src/main/java/org/jboss/weld/util/Proxies.java 2010-02-24 03:53:20 UTC (rev 5959) +++ core/branches/1.0.1-SP1/impl/src/main/java/org/jboss/weld/util/Proxies.java 2010-03-15 19:13:11 UTC (rev 6051) @@ -1,308 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.weld.util; - -import static org.jboss.weld.logging.messages.UtilMessage.CANNOT_PROXY_NON_CLASS_TYPE; -import static org.jboss.weld.logging.messages.UtilMessage.INSTANCE_NOT_A_PROXY; -import static org.jboss.weld.util.reflection.Reflections.EMPTY_CLASSES; - -import java.lang.reflect.Constructor; -import java.lang.reflect.Modifier; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.Set; - -import javassist.util.proxy.MethodHandler; -import javassist.util.proxy.ProxyFactory; -import javassist.util.proxy.ProxyObject; - -import org.jboss.weld.exceptions.ForbiddenArgumentException; -import org.jboss.weld.util.reflection.Reflections; -import org.jboss.weld.util.reflection.SecureReflections; - -/** - * Utilties for working with Javassist proxies - * - * @author Nicklas Karlsson - * @author Pete Muir - * - */ -public class Proxies -{ - - public static class TypeInfo - { - - private final Set<Class<?>> interfaces; - private final Set<Class<?>> classes; - - private TypeInfo() - { - super(); - this.interfaces = new LinkedHashSet<Class<?>>(); - this.classes = new LinkedHashSet<Class<?>>(); - } - - public Class<?> getSuperClass() - { - if (classes.isEmpty()) - { - return null; - } - Iterator<Class<?>> it = classes.iterator(); - Class<?> superclass = it.next(); - while (it.hasNext()) - { - Class<?> clazz = it.next(); - if (superclass.isAssignableFrom(clazz)) - { - superclass = clazz; - } - } - return superclass; - } - - private Class<?>[] getInterfaces() - { - return interfaces.toArray(EMPTY_CLASSES); - } - - public ProxyFactory createProxyFactory() - { - ProxyFactory proxyFactory = new ProxyFactory(); - Class<?> superClass = getSuperClass(); - if(superClass != null && superClass != Object.class) - { - proxyFactory.setSuperclass(superClass); - } - proxyFactory.setInterfaces(getInterfaces()); - return proxyFactory; - } - - public TypeInfo add(Type type) - { - if (type instanceof Class<?>) - { - Class<?> clazz = (Class<?>) type; - if (clazz.isInterface()) - { - interfaces.add(clazz); - } - else - { - classes.add(clazz); - } - } - else if (type instanceof ParameterizedType) - { - add(((ParameterizedType)type).getRawType()); - } - else - { - throw new ForbiddenArgumentException(CANNOT_PROXY_NON_CLASS_TYPE, type); - } - return this; - } - - public static TypeInfo of(Set<? extends Type> types) - { - TypeInfo typeInfo = create(); - for (Type type : types) - { - typeInfo.add(type); - } - return typeInfo; - } - - public static TypeInfo create() - { - return new TypeInfo(); - } - - } - - private static final String DEFAULT_INTERCEPTOR = "default_interceptor"; - - /** - * Create a proxy with a handler, registering the proxy for cleanup - * - * @param <T> - * @param methodHandler - * @param typeInfo - * @return - * @throws IllegalAccessException - * @throws InstantiationException - */ - public static <T> T createProxy(MethodHandler methodHandler, TypeInfo typeInfo) throws IllegalAccessException, InstantiationException - { - return SecureReflections.newInstance(Proxies.<T>createProxyClass(methodHandler, typeInfo)); - } - - /** - * Create a proxy class - * - * You will need to manually register the proxy instances for cleanup - * - * @param <T> - * @param typeInfo - * @return - */ - public static <T> Class<T> createProxyClass(TypeInfo typeInfo) - { - return createProxyClass(null, typeInfo); - } - - /** - * Create a proxy class - * - * You will need to manually register the proxy instances for cleanup - * - * @param <T> - * @param methodHandler - * @param typeInfo - * @return - */ - public static <T> Class<T> createProxyClass(MethodHandler methodHandler, TypeInfo typeInfo) - { - ProxyFactory proxyFactory = typeInfo.createProxyFactory(); - attachMethodHandler(proxyFactory, methodHandler); - - @SuppressWarnings("unchecked") - Class<T> clazz = proxyFactory.createClass(); - return clazz; - } - - /** - * Indicates if a class is proxyable - * - * @param type The class to test - * @return True if proxyable, false otherwise - */ - public static boolean isTypeProxyable(Type type) - { - if (type instanceof Class<?>) - { - return isClassProxyable((Class<?>) type); - } - else if (type instanceof ParameterizedType) - { - Type rawType = ((ParameterizedType) type).getRawType(); - if (rawType instanceof Class<?>) - { - return isClassProxyable((Class<?>) rawType); - } - } - return false; - } - - - /** - * Indicates if a set of types are all proxyable - * - * @param types The types to test - * @return True if proxyable, false otherwise - */ - public static boolean isTypesProxyable(Iterable<? extends Type> types) - { - for (Type apiType : types) - { - if (Object.class.equals(apiType)) - { - continue; - } - if (!isTypeProxyable(apiType)) - { - return false; - } - } - return true; - } - - private static boolean isClassProxyable(Class<?> clazz) - { - if (clazz.isInterface()) - { - return true; - } - else - { - Constructor<?> constructor = null; - try - { - constructor = SecureReflections.getDeclaredConstructor(clazz); - } - catch (NoSuchMethodException e) - { - return false; - } - if (constructor == null) - { - return false; - } - else if (Modifier.isPrivate(constructor.getModifiers())) - { - return false; - } - else if (Reflections.isTypeOrAnyMethodFinal(clazz)) - { - return false; - } - else if (clazz.isPrimitive()) - { - return false; - } - else if (Reflections.isArrayType(clazz)) - { - return false; - } - else - { - return true; - } - } - } - - public static ProxyFactory attachMethodHandler(ProxyFactory proxyFactory, MethodHandler methodHandler) - { - if (methodHandler != null) - { - proxyFactory.setHandler(new CleanableMethodHandler(methodHandler)); - } - return proxyFactory; - } - - public static <T> T attachMethodHandler(T instance, MethodHandler methodHandler) - { - if (instance instanceof ProxyObject) - { - if (methodHandler != null) - { - ((ProxyObject) instance).setHandler(new CleanableMethodHandler(methodHandler)); - } - return instance; - } - else - { - throw new ForbiddenArgumentException(INSTANCE_NOT_A_PROXY, instance); - } - - } - - -} Copied: core/branches/1.0.1-SP1/impl/src/main/java/org/jboss/weld/util/Proxies.java (from rev 6020, core/tags/1.0.1-Final/impl/src/main/java/org/jboss/weld/util/Proxies.java) =================================================================== --- core/branches/1.0.1-SP1/impl/src/main/java/org/jboss/weld/util/Proxies.java (rev 0) +++ core/branches/1.0.1-SP1/impl/src/main/java/org/jboss/weld/util/Proxies.java 2010-03-15 19:13:11 UTC (rev 6051) @@ -0,0 +1,308 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.weld.util; + +import static org.jboss.weld.logging.messages.UtilMessage.CANNOT_PROXY_NON_CLASS_TYPE; +import static org.jboss.weld.logging.messages.UtilMessage.INSTANCE_NOT_A_PROXY; +import static org.jboss.weld.util.reflection.Reflections.EMPTY_CLASSES; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Modifier; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.Set; + +import javassist.util.proxy.MethodHandler; +import javassist.util.proxy.ProxyFactory; +import javassist.util.proxy.ProxyObject; + +import org.jboss.weld.exceptions.ForbiddenArgumentException; +import org.jboss.weld.util.reflection.Reflections; +import org.jboss.weld.util.reflection.SecureReflections; + +/** + * Utilties for working with Javassist proxies + * + * @author Nicklas Karlsson + * @author Pete Muir + * + */ +public class Proxies +{ + + public static class TypeInfo + { + + private final Set<Class<?>> interfaces; + private final Set<Class<?>> classes; + + private TypeInfo() + { + super(); + this.interfaces = new LinkedHashSet<Class<?>>(); + this.classes = new LinkedHashSet<Class<?>>(); + } + + public Class<?> getSuperClass() + { + if (classes.isEmpty()) + { + return null; + } + Iterator<Class<?>> it = classes.iterator(); + Class<?> superclass = it.next(); + while (it.hasNext()) + { + Class<?> clazz = it.next(); + if (superclass.isAssignableFrom(clazz)) + { + superclass = clazz; + } + } + return superclass; + } + + private Class<?>[] getInterfaces() + { + return interfaces.toArray(EMPTY_CLASSES); + } + + public ProxyFactory createProxyFactory() + { + ProxyFactory proxyFactory = new ProxyFactory(); + Class<?> superClass = getSuperClass(); + if(superClass != null && superClass != Object.class) + { + proxyFactory.setSuperclass(superClass); + } + proxyFactory.setInterfaces(getInterfaces()); + return proxyFactory; + } + + public TypeInfo add(Type type) + { + if (type instanceof Class<?>) + { + Class<?> clazz = (Class<?>) type; + if (clazz.isInterface()) + { + interfaces.add(clazz); + } + else + { + classes.add(clazz); + } + } + else if (type instanceof ParameterizedType) + { + add(((ParameterizedType)type).getRawType()); + } + else + { + throw new ForbiddenArgumentException(CANNOT_PROXY_NON_CLASS_TYPE, type); + } + return this; + } + + public static TypeInfo of(Set<? extends Type> types) + { + TypeInfo typeInfo = create(); + for (Type type : types) + { + typeInfo.add(type); + } + return typeInfo; + } + + public static TypeInfo create() + { + return new TypeInfo(); + } + + } + + private static final String DEFAULT_INTERCEPTOR = "default_interceptor"; + + /** + * Create a proxy with a handler, registering the proxy for cleanup + * + * @param <T> + * @param methodHandler + * @param typeInfo + * @return + * @throws IllegalAccessException + * @throws InstantiationException + */ + public static <T> T createProxy(MethodHandler methodHandler, TypeInfo typeInfo) throws IllegalAccessException, InstantiationException + { + return SecureReflections.newInstance(Proxies.<T>createProxyClass(methodHandler, typeInfo)); + } + + /** + * Create a proxy class + * + * You will need to manually register the proxy instances for cleanup + * + * @param <T> + * @param typeInfo + * @return + */ + public static <T> Class<T> createProxyClass(TypeInfo typeInfo) + { + return createProxyClass(null, typeInfo); + } + + /** + * Create a proxy class + * + * You will need to manually register the proxy instances for cleanup + * + * @param <T> + * @param methodHandler + * @param typeInfo + * @return + */ + public static <T> Class<T> createProxyClass(MethodHandler methodHandler, TypeInfo typeInfo) + { + ProxyFactory proxyFactory = typeInfo.createProxyFactory(); + attachMethodHandler(proxyFactory, methodHandler); + + @SuppressWarnings("unchecked") + Class<T> clazz = proxyFactory.createClass(); + return clazz; + } + + /** + * Indicates if a class is proxyable + * + * @param type The class to test + * @return True if proxyable, false otherwise + */ + public static boolean isTypeProxyable(Type type) + { + if (type instanceof Class<?>) + { + return isClassProxyable((Class<?>) type); + } + else if (type instanceof ParameterizedType) + { + Type rawType = ((ParameterizedType) type).getRawType(); + if (rawType instanceof Class<?>) + { + return isClassProxyable((Class<?>) rawType); + } + } + return false; + } + + + /** + * Indicates if a set of types are all proxyable + * + * @param types The types to test + * @return True if proxyable, false otherwise + */ + public static boolean isTypesProxyable(Iterable<? extends Type> types) + { + for (Type apiType : types) + { + if (Object.class.equals(apiType)) + { + continue; + } + if (!isTypeProxyable(apiType)) + { + return false; + } + } + return true; + } + + private static boolean isClassProxyable(Class<?> clazz) + { + if (clazz.isInterface()) + { + return true; + } + else + { + Constructor<?> constructor = null; + try + { + constructor = SecureReflections.getDeclaredConstructor(clazz); + } + catch (NoSuchMethodException e) + { + return false; + } + if (constructor == null) + { + return false; + } + else if (Modifier.isPrivate(constructor.getModifiers())) + { + return false; + } + else if (Reflections.isTypeOrAnyMethodFinal(clazz)) + { + return false; + } + else if (clazz.isPrimitive()) + { + return false; + } + else if (Reflections.isArrayType(clazz)) + { + return false; + } + else + { + return true; + } + } + } + + public static ProxyFactory attachMethodHandler(ProxyFactory proxyFactory, MethodHandler methodHandler) + { + if (methodHandler != null) + { + proxyFactory.setHandler(new CleanableMethodHandler(methodHandler)); + } + return proxyFactory; + } + + public static <T> T attachMethodHandler(T instance, MethodHandler methodHandler) + { + if (instance instanceof ProxyObject) + { + if (methodHandler != null) + { + ((ProxyObject) instance).setHandler(new CleanableMethodHandler(methodHandler)); + } + return instance; + } + else + { + throw new ForbiddenArgumentException(INSTANCE_NOT_A_PROXY, instance); + } + + } + + +} Deleted: core/branches/1.0.1-SP1/inject-tck-runner/pom.xml =================================================================== --- core/tags/1.0.1-Final/inject-tck-runner/pom.xml 2010-02-24 03:53:20 UTC (rev 5959) +++ core/branches/1.0.1-SP1/inject-tck-runner/pom.xml 2010-03-15 19:13:11 UTC (rev 6051) @@ -1,95 +0,0 @@ -<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"> - <parent> - <artifactId>weld-core-parent</artifactId> - <groupId>org.jboss.weld</groupId> - <version>1.0.1-Final</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-inject-tck-runner</artifactId> - <name>AtInject TCK runner for Weld</name> - <description>Aggregates dependencies and run's the AtInject TCK for Weld</description> - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <distribution>repo</distribution> - <url>http://www.apache.org/licenses/LICENSE-2.0.html</url> - </license> - </licenses> - <url>http://www.seamframework.org/Weld</url> - - <dependencies> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-test</artifactId> - <exclusions> - <exclusion> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.atinject</groupId> - <artifactId>inject-tck</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <includes> - <include>**/AtInjectTCK.java</include> - </includes> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1... - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags... - <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/inject-... - </scm> - -</project> Copied: core/branches/1.0.1-SP1/inject-tck-runner/pom.xml (from rev 6050, core/tags/1.0.1-Final/inject-tck-runner/pom.xml) =================================================================== --- core/branches/1.0.1-SP1/inject-tck-runner/pom.xml (rev 0) +++ core/branches/1.0.1-SP1/inject-tck-runner/pom.xml 2010-03-15 19:13:11 UTC (rev 6051) @@ -0,0 +1,95 @@ +<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"> + <parent> + <artifactId>weld-core-parent</artifactId> + <groupId>org.jboss.weld</groupId> + <version>1.0.1-SP1</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-inject-tck-runner</artifactId> + <name>AtInject TCK runner for Weld</name> + <description>Aggregates dependencies and run's the AtInject TCK for Weld</description> + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <distribution>repo</distribution> + <url>http://www.apache.org/licenses/LICENSE-2.0.html</url> + </license> + </licenses> + <url>http://www.seamframework.org/Weld</url> + + <dependencies> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-test</artifactId> + <exclusions> + <exclusion> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.atinject</groupId> + <artifactId>inject-tck</artifactId> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <includes> + <include>**/AtInjectTCK.java</include> + </includes> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <scm> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP... + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/bran... + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/inject-tck-ru... + </scm> + +</project> Deleted: core/branches/1.0.1-SP1/jboss-tck-runner/pom.xml =================================================================== --- core/tags/1.0.1-Final/jboss-tck-runner/pom.xml 2010-02-24 03:53:20 UTC (rev 5959) +++ core/branches/1.0.1-SP1/jboss-tck-runner/pom.xml 2010-03-15 19:13:11 UTC (rev 6051) @@ -1,322 +0,0 @@ -<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"> - <parent> - <artifactId>weld-core-parent</artifactId> - <groupId>org.jboss.weld</groupId> - <version>1.0.1-Final</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-jboss-tck-runner</artifactId> - <name>CDI TCK runner for Weld</name> - <description>Aggregates dependencies and runs the CDI TCK (both standalone and on JBoss AS)</description> - - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <distribution>repo</distribution> - <url>http://www.apache.org/licenses/LICENSE-2.0.html</url> - </license> - </licenses> - <url>http://www.seamframework.org/Weld</url> - - - <dependencies> - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-porting-package</artifactId> - </dependency> - - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-jboss-as-60</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.jboss.slf4j</groupId> - <artifactId>slf4j-jboss-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>process-resources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <stripVersion>true</stripVersion> - <artifactItems> - <artifactItem> - <groupId>org.jboss.jsr299.tck</groupId> - <artifactId>jsr299-tck-impl</artifactId> - <type>xml</type> - <classifier>suite</classifier> - <overWrite>true</overWrite> - </artifactItem> - <artifactItem> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-porting-package</artifactId> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-test</artifactId> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.glassfish.web</groupId> - <artifactId>el-impl</artifactId> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <suiteXmlFiles> - <suiteXmlFile>src/test/resources/tck-tests.xml</suiteXmlFile> - </suiteXmlFiles> - <argLine>-Xmx256m</argLine> - <forkMode>once</forkMode> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <executions> - <execution> - <id>generate-test-report</id> - <phase>test</phase> - <goals> - <goal>report-only</goal> - </goals> - </execution> - </executions> - <configuration> - <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory> - <outputName>test-report</outputName> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/main/assembly/assembly.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>run</id> - <activation> - <property> - <name>!osgi.bundles.defaultStartLevel</name> - </property> - </activation> - <dependencies> - - <dependency> - <groupId>org.jboss.jsr299.tck</groupId> - <artifactId>jsr299-tck-impl</artifactId> - </dependency> - - </dependencies> - </profile> - <profile> - <id>incontainer-debug</id> - <activation> - <property> - <name>incontainer-debug</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <suiteXmlFiles> - <suiteXmlFile>src/test/resources/tck-tests.xml</suiteXmlFile> - </suiteXmlFiles> - <systemProperties> - <property> - <name>org.jboss.testharness.standalone</name> - <value>false</value> - </property> - <property> - <name>org.jboss.testharness.container.extraConfigurationDir</name> - <value>../jboss-as</value> - </property> - <property> - <name>org.jboss.testharness.container.forceRestart</name> - <value>false</value> - </property> - <property> - <name>org.jboss.testharness.libraryDirectory</name> - <value>target/dependency/lib</value> - </property> - <property> - <name>org.jboss.testharness.runIntegrationTests</name> - <value>true</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>incontainer</id> - <activation> - <property> - <name>incontainer</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <suiteXmlFiles> - <suiteXmlFile>src/test/resources/tck-tests.xml</suiteXmlFile> - </suiteXmlFiles> - <systemProperties> - <property> - <name>java.io.tmpdir</name> - <value>${project.build.outputDirectory}</value> - </property> - <property> - <name>org.jboss.testharness.standalone</name> - <value>false</value> - </property> - <property> - <name>org.jboss.testharness.container.extraConfigurationDir</name> - <value>../jboss-as</value> - </property> - <property> - <name>org.jboss.testharness.container.forceRestart</name> - <value>true</value> - </property> - <property> - <name>org.jboss.testharness.runIntegrationTests</name> - <value>true</value> - </property> - <property> - <name>org.jboss.testharness.libraryDirectory</name> - <value>target/dependency/lib</value> - </property> - <property> - <name>org.jboss.testharness.outputDirectory</name> - <value>target</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>write-artifacts-to-disk</id> - <activation> - <property> - <name>dumpArtifacts</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-jsr-299-artifacts</id> - <phase>generate-test-sources</phase> - <goals> - <goal>java</goal> - </goals> - </execution> - </executions> - <configuration> - <mainClass>org.jboss.testharness.api.TCK</mainClass> - <systemProperties> - <systemProperty> - <key>dumpArtifacts</key> - <value>true</value> - </systemProperty> - <systemProperty> - <key>org.jboss.testharness.outputDirectory</key> - <value>target/jsr299-artifacts</value> - </systemProperty> - <systemProperty> - <key>org.jboss.testharness.libraryDirectory</key> - <value>target/dependency/lib</value> - </systemProperty> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1... - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags... - <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/jboss-t... - </scm> - -</project> Copied: core/branches/1.0.1-SP1/jboss-tck-runner/pom.xml (from rev 6050, core/tags/1.0.1-Final/jboss-tck-runner/pom.xml) =================================================================== --- core/branches/1.0.1-SP1/jboss-tck-runner/pom.xml (rev 0) +++ core/branches/1.0.1-SP1/jboss-tck-runner/pom.xml 2010-03-15 19:13:11 UTC (rev 6051) @@ -0,0 +1,322 @@ +<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"> + <parent> + <artifactId>weld-core-parent</artifactId> + <groupId>org.jboss.weld</groupId> + <version>1.0.1-SP1</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-jboss-tck-runner</artifactId> + <name>CDI TCK runner for Weld</name> + <description>Aggregates dependencies and runs the CDI TCK (both standalone and on JBoss AS)</description> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <distribution>repo</distribution> + <url>http://www.apache.org/licenses/LICENSE-2.0.html</url> + </license> + </licenses> + <url>http://www.seamframework.org/Weld</url> + + + <dependencies> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-porting-package</artifactId> + </dependency> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-jboss-as-60</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.jboss.slf4j</groupId> + <artifactId>slf4j-jboss-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>process-resources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <stripVersion>true</stripVersion> + <artifactItems> + <artifactItem> + <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>jsr299-tck-impl</artifactId> + <type>xml</type> + <classifier>suite</classifier> + <overWrite>true</overWrite> + </artifactItem> + <artifactItem> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-porting-package</artifactId> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-test</artifactId> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>src/test/resources/tck-tests.xml</suiteXmlFile> + </suiteXmlFiles> + <argLine>-Xmx256m</argLine> + <forkMode>once</forkMode> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <executions> + <execution> + <id>generate-test-report</id> + <phase>test</phase> + <goals> + <goal>report-only</goal> + </goals> + </execution> + </executions> + <configuration> + <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory> + <outputName>test-report</outputName> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/assembly.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>run</id> + <activation> + <property> + <name>!osgi.bundles.defaultStartLevel</name> + </property> + </activation> + <dependencies> + + <dependency> + <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>jsr299-tck-impl</artifactId> + </dependency> + + </dependencies> + </profile> + <profile> + <id>incontainer-debug</id> + <activation> + <property> + <name>incontainer-debug</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>src/test/resources/tck-tests.xml</suiteXmlFile> + </suiteXmlFiles> + <systemProperties> + <property> + <name>org.jboss.testharness.standalone</name> + <value>false</value> + </property> + <property> + <name>org.jboss.testharness.container.extraConfigurationDir</name> + <value>../jboss-as</value> + </property> + <property> + <name>org.jboss.testharness.container.forceRestart</name> + <value>false</value> + </property> + <property> + <name>org.jboss.testharness.libraryDirectory</name> + <value>target/dependency/lib</value> + </property> + <property> + <name>org.jboss.testharness.runIntegrationTests</name> + <value>true</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>incontainer</id> + <activation> + <property> + <name>incontainer</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>src/test/resources/tck-tests.xml</suiteXmlFile> + </suiteXmlFiles> + <systemProperties> + <property> + <name>java.io.tmpdir</name> + <value>${project.build.outputDirectory}</value> + </property> + <property> + <name>org.jboss.testharness.standalone</name> + <value>false</value> + </property> + <property> + <name>org.jboss.testharness.container.extraConfigurationDir</name> + <value>../jboss-as</value> + </property> + <property> + <name>org.jboss.testharness.container.forceRestart</name> + <value>true</value> + </property> + <property> + <name>org.jboss.testharness.runIntegrationTests</name> + <value>true</value> + </property> + <property> + <name>org.jboss.testharness.libraryDirectory</name> + <value>target/dependency/lib</value> + </property> + <property> + <name>org.jboss.testharness.outputDirectory</name> + <value>target</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>write-artifacts-to-disk</id> + <activation> + <property> + <name>dumpArtifacts</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jsr-299-artifacts</id> + <phase>generate-test-sources</phase> + <goals> + <goal>java</goal> + </goals> + </execution> + </executions> + <configuration> + <mainClass>org.jboss.testharness.api.TCK</mainClass> + <systemProperties> + <systemProperty> + <key>dumpArtifacts</key> + <value>true</value> + </systemProperty> + <systemProperty> + <key>org.jboss.testharness.outputDirectory</key> + <value>target/jsr299-artifacts</value> + </systemProperty> + <systemProperty> + <key>org.jboss.testharness.libraryDirectory</key> + <value>target/dependency/lib</value> + </systemProperty> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + + <scm> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP... + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/bran... + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/jboss-tck-run... + </scm> + +</project> Deleted: core/branches/1.0.1-SP1/osgi-bundle/pom.xml =================================================================== --- core/tags/1.0.1-Final/osgi-bundle/pom.xml 2010-02-24 03:53:20 UTC (rev 5959) +++ core/branches/1.0.1-SP1/osgi-bundle/pom.xml 2010-03-15 19:13:11 UTC (rev 6051) @@ -1,202 +0,0 @@ - - <!-- - /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * - Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. * - * Use is subject to license terms. * * Licensed under the Apache - License, Version 2.0 (the "License"); * you may not use this file - except in compliance with the License. * You may obtain a copy of - the License at * http://www.apache.org/licenses/LICENSE-2.0 * - Unless required by applicable law or agreed to in writing, - software * distributed under the License is distributed on an "AS - IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - express or implied. * See the License for the specific language - governing permissions and * limitations under the License. */ - --> -<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"> - <parent> - <artifactId>weld-core-parent</artifactId> - <groupId>org.jboss.weld</groupId> - <version>1.0.1-Final</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.jboss.weld</groupId> - <artifactId>weld-osgi-bundle</artifactId> - <name>Weld OSGi Bundle</name> - <description>Weld runtime packaged as an OSGi bundle</description> - - <developers> - <developer> - <id>ss141213</id> - <name>Sanjeeb Sahoo</name> - <url>http://weblogs.dev.java.net/ss141213</url> - <organization>Sun Microsystems, Inc.</organization> - <roles> - <role>developer</role> - </roles> - </developer> - <developer> - <name>Roger Kitain</name> - <id>rogerk</id> - <organization>Sun Microsystems, Inc.</organization> - </developer> - </developers> - - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <distribution>repo</distribution> - <url>http://www.apache.org/licenses/LICENSE-2.0.html</url> - </license> - </licenses> - <url>http://www.seamframework.org/Weld</url> - - - <properties> - <osgi.version>1.0</osgi.version> - </properties> - <build> - <plugins> - - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <_include>-osgi.bundle</_include> - - <Embed-Dependency>*; scope=compile; inline=true, slf4j-jdk14; inline=true</Embed-Dependency> - - <_exportcontents> - javax.inject; - javax.decorator; - javax.enterprise.*; - version=${osgi.version}, - org.jboss.weld.context; - org.jboss.weld.ejb; - org.jboss.weld.bean; - org.jboss.weld.bean.proxy; - org.jboss.weld.*.api.*; - org.jboss.weld.*.spi.*; - org.jboss.weld.conversation; - org.jboss.weld; - org.jboss.weld.bootstrap; - org.jboss.weld.introspector; - org.jboss.weld.manager; - org.jboss.weld.servlet; - org.jboss.interceptor.*; - version=${osgi.version}, - org.jboss.weld.el; - version=${osgi.version}, - org.jboss.weld.jsf; - version=${osgi.version}, - javassist.util.proxy;version=${javassist.version} - </_exportcontents> - - <!-- A note about how slf4j is handled: - We optionally import slf4j APIs (i.e. packages that are part of slf4j-api.jar). - We also bundle them privately along with the jdk14-logging binding. - This allows us to function even when there is no separate slf4j bundle. - When there is a separate slf4j bundle, because of our optional Import-Package header, - we will get wired to that bundle. Please also note that we don't import impl package, - as it is sufficient to import just the api. In some other environment, user can - deploy slf4j-api bundle and their desired binding bundle. The binding bundle is - a fragement which attaches itself to the api bundle. We will get wired to the - api bundle and everything will work. - We also bundle all the slf4j extension and cal10n stuff to avoid having dependency - on foreign bundles. - --> - <Import-Package> - org.slf4j; org.slf4j.spi; org.slf4j.helpers; version=${slf4j.version}; resolution:=optional, - ch.qos.cal10n; version=${cal10n.version}; resolution:=optional, - javax.interceptor.*, *; - resolution:=optional - </Import-Package> - - <Private-Package> - !javax.interceptor.*, org.slf4j.*; -split-package:=merge-first, ch.qos.cal10n.* - </Private-Package> - - </instructions> - - <!-- - Maven uses the output directory (target/classes) - rather than the final bundle, when compiling against - projects in the same reactor (ie. the same build). - Since this jar comprises of classes that come from - some other jar and other modules may depend on this - artifact, we need to unpack. - --> - <unpackBundle>true</unpackBundle> - </configuration> - <executions> - <execution> - <id>osgi-bundle</id> - <goals> - <goal>bundle</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-spi</artifactId> - </dependency> - - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> - - <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - </dependency> - - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.interceptor</groupId> - <artifactId>jboss-interceptor</artifactId> - </dependency> - - <!-- We bundle jdk binding inside this OSGi bundle --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - <scope>provided</scope> - </dependency> - - </dependencies> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1... - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags... - <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/osgi-bu... - </scm> - -</project> Copied: core/branches/1.0.1-SP1/osgi-bundle/pom.xml (from rev 6050, core/tags/1.0.1-Final/osgi-bundle/pom.xml) =================================================================== --- core/branches/1.0.1-SP1/osgi-bundle/pom.xml (rev 0) +++ core/branches/1.0.1-SP1/osgi-bundle/pom.xml 2010-03-15 19:13:11 UTC (rev 6051) @@ -0,0 +1,202 @@ + + <!-- + /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * + Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. * + * Use is subject to license terms. * * Licensed under the Apache + License, Version 2.0 (the "License"); * you may not use this file + except in compliance with the License. * You may obtain a copy of + the License at * http://www.apache.org/licenses/LICENSE-2.0 * + Unless required by applicable law or agreed to in writing, + software * distributed under the License is distributed on an "AS + IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + express or implied. * See the License for the specific language + governing permissions and * limitations under the License. */ + --> +<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"> + <parent> + <artifactId>weld-core-parent</artifactId> + <groupId>org.jboss.weld</groupId> + <version>1.0.1-SP1</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.jboss.weld</groupId> + <artifactId>weld-osgi-bundle</artifactId> + <name>Weld OSGi Bundle</name> + <description>Weld runtime packaged as an OSGi bundle</description> + + <developers> + <developer> + <id>ss141213</id> + <name>Sanjeeb Sahoo</name> + <url>http://weblogs.dev.java.net/ss141213</url> + <organization>Sun Microsystems, Inc.</organization> + <roles> + <role>developer</role> + </roles> + </developer> + <developer> + <name>Roger Kitain</name> + <id>rogerk</id> + <organization>Sun Microsystems, Inc.</organization> + </developer> + </developers> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <distribution>repo</distribution> + <url>http://www.apache.org/licenses/LICENSE-2.0.html</url> + </license> + </licenses> + <url>http://www.seamframework.org/Weld</url> + + + <properties> + <osgi.version>1.0</osgi.version> + </properties> + <build> + <plugins> + + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <_include>-osgi.bundle</_include> + + <Embed-Dependency>*; scope=compile; inline=true, slf4j-jdk14; inline=true</Embed-Dependency> + + <_exportcontents> + javax.inject; + javax.decorator; + javax.enterprise.*; + version=${osgi.version}, + org.jboss.weld.context; + org.jboss.weld.ejb; + org.jboss.weld.bean; + org.jboss.weld.bean.proxy; + org.jboss.weld.*.api.*; + org.jboss.weld.*.spi.*; + org.jboss.weld.conversation; + org.jboss.weld; + org.jboss.weld.bootstrap; + org.jboss.weld.introspector; + org.jboss.weld.manager; + org.jboss.weld.servlet; + org.jboss.interceptor.*; + version=${osgi.version}, + org.jboss.weld.el; + version=${osgi.version}, + org.jboss.weld.jsf; + version=${osgi.version}, + javassist.util.proxy;version=${javassist.version} + </_exportcontents> + + <!-- A note about how slf4j is handled: + We optionally import slf4j APIs (i.e. packages that are part of slf4j-api.jar). + We also bundle them privately along with the jdk14-logging binding. + This allows us to function even when there is no separate slf4j bundle. + When there is a separate slf4j bundle, because of our optional Import-Package header, + we will get wired to that bundle. Please also note that we don't import impl package, + as it is sufficient to import just the api. In some other environment, user can + deploy slf4j-api bundle and their desired binding bundle. The binding bundle is + a fragement which attaches itself to the api bundle. We will get wired to the + api bundle and everything will work. + We also bundle all the slf4j extension and cal10n stuff to avoid having dependency + on foreign bundles. + --> + <Import-Package> + org.slf4j; org.slf4j.spi; org.slf4j.helpers; version=${slf4j.version}; resolution:=optional, + ch.qos.cal10n; version=${cal10n.version}; resolution:=optional, + javax.interceptor.*, *; + resolution:=optional + </Import-Package> + + <Private-Package> + !javax.interceptor.*, org.slf4j.*; -split-package:=merge-first, ch.qos.cal10n.* + </Private-Package> + + </instructions> + + <!-- + Maven uses the output directory (target/classes) + rather than the final bundle, when compiling against + projects in the same reactor (ie. the same build). + Since this jar comprises of classes that come from + some other jar and other modules may depend on this + artifact, we need to unpack. + --> + <unpackBundle>true</unpackBundle> + </configuration> + <executions> + <execution> + <id>osgi-bundle</id> + <goals> + <goal>bundle</goal> + </goals> + <phase>package</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-spi</artifactId> + </dependency> + + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + + <dependency> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + </dependency> + + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor</artifactId> + </dependency> + + <!-- We bundle jdk binding inside this OSGi bundle --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <scope>provided</scope> + </dependency> + + </dependencies> + + <scm> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP... + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/bran... + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/osgi-bundle&l... + </scm> + +</project> Deleted: core/branches/1.0.1-SP1/parent/pom.xml =================================================================== --- core/tags/1.0.1-Final/parent/pom.xml 2010-02-24 03:53:20 UTC (rev 5959) +++ core/branches/1.0.1-SP1/parent/pom.xml 2010-03-15 19:13:11 UTC (rev 6051) @@ -1,180 +0,0 @@ -<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> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-parent</artifactId> - <packaging>pom</packaging> - - <parent> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-bom</artifactId> - <version>1.0.1-Final</version> - <relativePath>../bom</relativePath> - </parent> - - <name>Weld Core Parent</name> - - <!-- Full metadata --> - - <url>http://www.seamframework.org/Weld</url> - - <description> - Parent for Weld, the reference implementation of JSR 299: Contexts and Dependency Injection for Java EE - </description> - - <ciManagement> - <system>Hudson</system> - <url>http://hudson.jboss.org</url> - </ciManagement> - - <issueManagement> - <system>JIRA</system> - <url>http://jira.jboss.org/browse/WELD</url> - </issueManagement> - - <organization> - <name>Seam Framework</name> - <url>http://seamframework.org</url> - </organization> - - <inceptionYear>2008</inceptionYear> - - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0</url> - </license> - </licenses> - - <developers> - <developer> - <name>Pete Muir</name> - <roles> - <role>Project Lead</role> - </roles> - <email&gt;pete.muir(a)jboss.org&lt;/email&gt; - <organization>JBoss, a division of Red Hat</organization> - <url>http://in.relation.to/Bloggers/Pete</url> - </developer> - - <developer> - <name>Shane Bryzak</name> - <organization>JBoss, a division of Red Hat</organization> - </developer> - - <developer> - <name>David Allen</name> - </developer> - - <developer> - <name>Nicklas Karlsson</name> - </developer> - </developers> - - - <properties> - <glassfish.el.version>2.1.2-b04</glassfish.el.version> - <log4j.version>1.2.14</log4j.version> - <!-- Testing deps --> - <testng.version>5.10</testng.version> - <jboss.test.harness.version>1.1.0-CR5</jboss.test.harness.version> - <apache.httpclient.version>3.1</apache.httpclient.version> - <junit.version>4.7</junit.version> - <htmlunit.version>2.4</htmlunit.version> - </properties> - - - <!-- Specify Weld non-runtime dependencies (e.g. testing) --> - - <dependencyManagement> - <dependencies> - - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>${testng.version}</version> - <classifier>jdk15</classifier> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness</artifactId> - <version>${jboss.test.harness.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-jboss-as-50</artifactId> - <version>${jboss.test.harness.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-jboss-as-60</artifactId> - <version>${jboss.test.harness.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-jboss-embedded</artifactId> - <version>${jboss.test.harness.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-tomcat</artifactId> - <version>${jboss.test.harness.version}</version> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>${apache.httpclient.version}</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - </dependency> - - <dependency> - <groupId>net.sourceforge.htmlunit</groupId> - <artifactId>htmlunit</artifactId> - <version>${htmlunit.version}</version> - </dependency> - - <dependency> - <groupId>org.glassfish.web</groupId> - <artifactId>el-impl</artifactId> - <version>${glassfish.el.version}</version> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>${slf4j.version}</version> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - <version>${slf4j.version}</version> - </dependency> - - </dependencies> - </dependencyManagement> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1... - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags... - <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/parent&... - </scm> - -</project> - Copied: core/branches/1.0.1-SP1/parent/pom.xml (from rev 6050, core/tags/1.0.1-Final/parent/pom.xml) =================================================================== --- core/branches/1.0.1-SP1/parent/pom.xml (rev 0) +++ core/branches/1.0.1-SP1/parent/pom.xml 2010-03-15 19:13:11 UTC (rev 6051) @@ -0,0 +1,180 @@ +<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> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-parent</artifactId> + <packaging>pom</packaging> + + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-bom</artifactId> + <version>1.0.1-SP1</version> + <relativePath>../bom</relativePath> + </parent> + + <name>Weld Core Parent</name> + + <!-- Full metadata --> + + <url>http://www.seamframework.org/Weld</url> + + <description> + Parent for Weld, the reference implementation of JSR 299: Contexts and Dependency Injection for Java EE + </description> + + <ciManagement> + <system>Hudson</system> + <url>http://hudson.jboss.org</url> + </ciManagement> + + <issueManagement> + <system>JIRA</system> + <url>http://jira.jboss.org/browse/WELD</url> + </issueManagement> + + <organization> + <name>Seam Framework</name> + <url>http://seamframework.org</url> + </organization> + + <inceptionYear>2008</inceptionYear> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0</url> + </license> + </licenses> + + <developers> + <developer> + <name>Pete Muir</name> + <roles> + <role>Project Lead</role> + </roles> + <email&gt;pete.muir(a)jboss.org&lt;/email&gt; + <organization>JBoss, a division of Red Hat</organization> + <url>http://in.relation.to/Bloggers/Pete</url> + </developer> + + <developer> + <name>Shane Bryzak</name> + <organization>JBoss, a division of Red Hat</organization> + </developer> + + <developer> + <name>David Allen</name> + </developer> + + <developer> + <name>Nicklas Karlsson</name> + </developer> + </developers> + + + <properties> + <glassfish.el.version>2.1.2-b04</glassfish.el.version> + <log4j.version>1.2.14</log4j.version> + <!-- Testing deps --> + <testng.version>5.10</testng.version> + <jboss.test.harness.version>1.1.0-CR5</jboss.test.harness.version> + <apache.httpclient.version>3.1</apache.httpclient.version> + <junit.version>4.7</junit.version> + <htmlunit.version>2.4</htmlunit.version> + </properties> + + + <!-- Specify Weld non-runtime dependencies (e.g. testing) --> + + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>${testng.version}</version> + <classifier>jdk15</classifier> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness</artifactId> + <version>${jboss.test.harness.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-jboss-as-50</artifactId> + <version>${jboss.test.harness.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-jboss-as-60</artifactId> + <version>${jboss.test.harness.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-jboss-embedded</artifactId> + <version>${jboss.test.harness.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-tomcat</artifactId> + <version>${jboss.test.harness.version}</version> + </dependency> + + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>${apache.httpclient.version}</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + </dependency> + + <dependency> + <groupId>net.sourceforge.htmlunit</groupId> + <artifactId>htmlunit</artifactId> + <version>${htmlunit.version}</version> + </dependency> + + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + <version>${glassfish.el.version}</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>${slf4j.version}</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <version>${slf4j.version}</version> + </dependency> + + </dependencies> + </dependencyManagement> + + <scm> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP... + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/bran... + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/parent</ur... + </scm> + +</project> + Deleted: core/branches/1.0.1-SP1/pom.xml =================================================================== --- core/tags/1.0.1-Final/pom.xml 2010-02-24 03:53:20 UTC (rev 5959) +++ core/branches/1.0.1-SP1/pom.xml 2010-03-15 19:13:11 UTC (rev 6051) @@ -1,95 +0,0 @@ -<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> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-build-aggregator</artifactId> - <packaging>pom</packaging> - <version>1.0.1-Final</version> - - <parent> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-parent</artifactId> - <version>9</version> - </parent> - - <name>Weld Build Aggregator</name> - - <prerequisites> - <maven>2.0.10</maven> - </prerequisites> - - - <!-- Minimal metadata --> - <description>The build aggregator for Weld, which takes care of calling the modules which make up Weld</description> - - <!-- SCM and distribution management --> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1... - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags... - <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-Final<... - </scm> - - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>bom</module> - <module>parent</module> - <module>impl</module> - <module>tests</module> - <module>porting-package</module> - <module>inject-tck-runner</module> - <module>jboss-tck-runner</module> - <module>osgi-bundle</module> - </modules> - </profile> - <profile> - <id>update-jboss-as</id> - <modules> - <module>bom</module> - <module>parent</module> - <module>impl</module> - <module>tests</module> - <module>porting-package</module> - <module>inject-tck-runner</module> - <module>jboss-tck-runner</module> - <module>osgi-bundle</module> - <module>jboss-as</module> - </modules> - </profile> - <profile> - <id>skip-tests</id> - <modules> - <module>bom</module> - <module>parent</module> - <module>impl</module> - <module>osgi-bundle</module> - </modules> - </profile> - </profiles> - - <!-- Minimal build configuration --> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <tagBase>https://svn.jboss.org/repos/weld/core/tags</tagBase> - <!-- As we need access to our own artifacts --> - <preparationGoals>install</preparationGoals> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> - -</project> Copied: core/branches/1.0.1-SP1/pom.xml (from rev 6050, core/tags/1.0.1-Final/pom.xml) =================================================================== --- core/branches/1.0.1-SP1/pom.xml (rev 0) +++ core/branches/1.0.1-SP1/pom.xml 2010-03-15 19:13:11 UTC (rev 6051) @@ -0,0 +1,95 @@ +<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> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-build-aggregator</artifactId> + <packaging>pom</packaging> + <version>1.0.1-SP1</version> + + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-parent</artifactId> + <version>9</version> + </parent> + + <name>Weld Build Aggregator</name> + + <prerequisites> + <maven>2.0.10</maven> + </prerequisites> + + + <!-- Minimal metadata --> + <description>The build aggregator for Weld, which takes care of calling the modules which make up Weld</description> + + <!-- SCM and distribution management --> + <scm> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP... + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/bran... + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1</url> + </scm> + + <profiles> + <profile> + <id>default</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>bom</module> + <module>parent</module> + <module>impl</module> + <module>tests</module> + <module>porting-package</module> + <module>inject-tck-runner</module> + <module>jboss-tck-runner</module> + <module>osgi-bundle</module> + </modules> + </profile> + <profile> + <id>update-jboss-as</id> + <modules> + <module>bom</module> + <module>parent</module> + <module>impl</module> + <module>tests</module> + <module>porting-package</module> + <module>inject-tck-runner</module> + <module>jboss-tck-runner</module> + <module>osgi-bundle</module> + <module>jboss-as</module> + </modules> + </profile> + <profile> + <id>skip-tests</id> + <modules> + <module>bom</module> + <module>parent</module> + <module>impl</module> + <module>osgi-bundle</module> + </modules> + </profile> + </profiles> + + <!-- Minimal build configuration --> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <tagBase>https://svn.jboss.org/repos/weld/core/tags</tagBase> + <!-- As we need access to our own artifacts --> + <preparationGoals>install</preparationGoals> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + +</project> Deleted: core/branches/1.0.1-SP1/porting-package/pom.xml =================================================================== --- core/tags/1.0.1-Final/porting-package/pom.xml 2010-02-24 03:53:20 UTC (rev 5959) +++ core/branches/1.0.1-SP1/porting-package/pom.xml 2010-03-15 19:13:11 UTC (rev 6051) @@ -1,63 +0,0 @@ -<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"> - <parent> - <artifactId>weld-core-parent</artifactId> - <groupId>org.jboss.weld</groupId> - <version>1.0.1-Final</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-porting-package</artifactId> - <name>Weld Porting Package for the CDI TCK</name> - - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <distribution>repo</distribution> - <url>http://www.apache.org/licenses/LICENSE-2.0.html</url> - </license> - </licenses> - <url>http://www.seamframework.org/Weld</url> - - - <dependencies> - - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.jsr299.tck</groupId> - <artifactId>jsr299-tck-api</artifactId> - </dependency> - - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - </dependency> - - <dependency> - <groupId>org.glassfish.web</groupId> - <artifactId>el-impl</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-test</artifactId> - </dependency> - - </dependencies> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1... - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags... - <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/porting... - </scm> - -</project> Copied: core/branches/1.0.1-SP1/porting-package/pom.xml (from rev 6050, core/tags/1.0.1-Final/porting-package/pom.xml) =================================================================== --- core/branches/1.0.1-SP1/porting-package/pom.xml (rev 0) +++ core/branches/1.0.1-SP1/porting-package/pom.xml 2010-03-15 19:13:11 UTC (rev 6051) @@ -0,0 +1,63 @@ +<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"> + <parent> + <artifactId>weld-core-parent</artifactId> + <groupId>org.jboss.weld</groupId> + <version>1.0.1-SP1</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-porting-package</artifactId> + <name>Weld Porting Package for the CDI TCK</name> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <distribution>repo</distribution> + <url>http://www.apache.org/licenses/LICENSE-2.0.html</url> + </license> + </licenses> + <url>http://www.seamframework.org/Weld</url> + + + <dependencies> + + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>jsr299-tck-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </dependency> + + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-test</artifactId> + </dependency> + + </dependencies> + + <scm> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP... + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/bran... + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/porting-packa... + </scm> + +</project> Deleted: core/branches/1.0.1-SP1/tests/pom.xml =================================================================== --- core/tags/1.0.1-Final/tests/pom.xml 2010-02-24 03:53:20 UTC (rev 5959) +++ core/branches/1.0.1-SP1/tests/pom.xml 2010-03-15 19:13:11 UTC (rev 6051) @@ -1,292 +0,0 @@ -<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"> - <parent> - <artifactId>weld-core-parent</artifactId> - <groupId>org.jboss.weld</groupId> - <version>1.0.1-Final</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-test</artifactId> - <name>Weld Core Tests</name> - <description>Tests for Weld, not including the CDI and AtInject TCKs</description> - - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <distribution>repo</distribution> - <url>http://www.apache.org/licenses/LICENSE-2.0.html</url> - </license> - </licenses> - <url>http://www.seamframework.org/Weld</url> - - - <dependencies> - - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - <exclusions> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-jboss-as-60</artifactId> - <exclusions> - <exclusion> - <groupId>org.jboss.slf4j</groupId> - <artifactId>slf4j-jboss-logging</artifactId> - </exclusion> - </exclusions> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - </dependency> - - <dependency> - <groupId>org.glassfish.web</groupId> - <artifactId>el-impl</artifactId> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-spi</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.interceptor</groupId> - <artifactId>jboss-interceptor-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.interceptor</groupId> - <artifactId>jboss-interceptor</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-api</artifactId> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </dependency> - - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - </dependency> - - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - </dependency> - - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <!-- override for testing compatibility w/ JSF 2.0 --> - <version>2.0.2-FCS</version> - </dependency> - - <dependency> - <groupId>net.sourceforge.htmlunit</groupId> - <artifactId>htmlunit</artifactId> - </dependency> - - </dependencies> - - <build> - <defaultGoal>test</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <suiteXmlFiles> - <suiteXmlFile>unit-tests.xml</suiteXmlFile> - </suiteXmlFiles> - <argLine>-Xmx128m</argLine> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <executions> - <execution> - <id>generate-test-report</id> - <phase>test</phase> - <goals> - <goal>report-only</goal> - </goals> - </execution> - </executions> - <configuration> - <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory> - <outputName>test-report</outputName> - </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>copy</goal> - </goals> - <configuration> - <stripVersion>true</stripVersion> - <artifactItems> - <artifactItem> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness</artifactId> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/classes/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.glassfish.web</groupId> - <artifactId>el-impl</artifactId> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>incontainer</id> - <activation> - <property> - <name>incontainer</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <suiteXmlFiles> - <suiteXmlFile>unit-tests.xml</suiteXmlFile> - </suiteXmlFiles> - <systemProperties> - <property> - <name>org.jboss.testharness.standalone</name> - <value>false</value> - </property> - <property> - <name>org.jboss.testharness.container.extraConfigurationDir</name> - <value>../jboss-as</value> - </property> - <property> - <name>org.jboss.testharness.container.forceRestart</name> - <value>true</value> - </property> - <property> - <name>org.jboss.testharness.runIntegrationTests</name> - <value>true</value> - </property> - <property> - <name>org.jboss.testharness.libraryDirectory</name> - <value>target/dependency/lib</value> - </property> - <property> - <name>org.jboss.testharness.outputDirectory</name> - <value>target</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>write-artifacts-to-disk</id> - <activation> - <property> - <name>dumpArtifacts</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-test-artifacts</id> - <phase>generate-test-sources</phase> - <goals> - <goal>java</goal> - </goals> - </execution> - </executions> - <configuration> - <mainClass>org.jboss.testharness.api.TCK</mainClass> - <classpathScope>test</classpathScope> - <systemProperties> - <systemProperty> - <key>dumpArtifacts</key> - <value>true</value> - </systemProperty> - <systemProperty> - <key>org.jboss.testharness.outputDirectory</key> - <value>target/test-artifacts</value> - </systemProperty> - <systemProperty> - <key>org.jboss.testharness.libraryDirectory</key> - <value>target/dependency/lib</value> - </systemProperty> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1... - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags... - <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/tests&l... - </scm> - -</project> Copied: core/branches/1.0.1-SP1/tests/pom.xml (from rev 6050, core/tags/1.0.1-Final/tests/pom.xml) =================================================================== --- core/branches/1.0.1-SP1/tests/pom.xml (rev 0) +++ core/branches/1.0.1-SP1/tests/pom.xml 2010-03-15 19:13:11 UTC (rev 6051) @@ -0,0 +1,292 @@ +<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"> + <parent> + <artifactId>weld-core-parent</artifactId> + <groupId>org.jboss.weld</groupId> + <version>1.0.1-SP1</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-test</artifactId> + <name>Weld Core Tests</name> + <description>Tests for Weld, not including the CDI and AtInject TCKs</description> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <distribution>repo</distribution> + <url>http://www.apache.org/licenses/LICENSE-2.0.html</url> + </license> + </licenses> + <url>http://www.seamframework.org/Weld</url> + + + <dependencies> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-jboss-as-60</artifactId> + <exclusions> + <exclusion> + <groupId>org.jboss.slf4j</groupId> + <artifactId>slf4j-jboss-logging</artifactId> + </exclusion> + </exclusions> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </dependency> + + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-spi</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-api</artifactId> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </dependency> + + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <!-- override for testing compatibility w/ JSF 2.0 --> + <version>2.0.2-FCS</version> + </dependency> + + <dependency> + <groupId>net.sourceforge.htmlunit</groupId> + <artifactId>htmlunit</artifactId> + </dependency> + + </dependencies> + + <build> + <defaultGoal>test</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>unit-tests.xml</suiteXmlFile> + </suiteXmlFiles> + <argLine>-Xmx128m</argLine> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <executions> + <execution> + <id>generate-test-report</id> + <phase>test</phase> + <goals> + <goal>report-only</goal> + </goals> + </execution> + </executions> + <configuration> + <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory> + <outputName>test-report</outputName> + </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>copy</goal> + </goals> + <configuration> + <stripVersion>true</stripVersion> + <artifactItems> + <artifactItem> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness</artifactId> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/classes/lib</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>incontainer</id> + <activation> + <property> + <name>incontainer</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>unit-tests.xml</suiteXmlFile> + </suiteXmlFiles> + <systemProperties> + <property> + <name>org.jboss.testharness.standalone</name> + <value>false</value> + </property> + <property> + <name>org.jboss.testharness.container.extraConfigurationDir</name> + <value>../jboss-as</value> + </property> + <property> + <name>org.jboss.testharness.container.forceRestart</name> + <value>true</value> + </property> + <property> + <name>org.jboss.testharness.runIntegrationTests</name> + <value>true</value> + </property> + <property> + <name>org.jboss.testharness.libraryDirectory</name> + <value>target/dependency/lib</value> + </property> + <property> + <name>org.jboss.testharness.outputDirectory</name> + <value>target</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>write-artifacts-to-disk</id> + <activation> + <property> + <name>dumpArtifacts</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-test-artifacts</id> + <phase>generate-test-sources</phase> + <goals> + <goal>java</goal> + </goals> + </execution> + </executions> + <configuration> + <mainClass>org.jboss.testharness.api.TCK</mainClass> + <classpathScope>test</classpathScope> + <systemProperties> + <systemProperty> + <key>dumpArtifacts</key> + <value>true</value> + </systemProperty> + <systemProperty> + <key>org.jboss.testharness.outputDirectory</key> + <value>target/test-artifacts</value> + </systemProperty> + <systemProperty> + <key>org.jboss.testharness.libraryDirectory</key> + <value>target/dependency/lib</value> + </systemProperty> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + + <scm> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP... + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/bran... + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/tests</url... + </scm> + +</project>