Weld SVN: r6847 - core/trunk/tests-arquillian.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-07-29 14:01:34 -0400 (Thu, 29 Jul 2010)
New Revision: 6847
Modified:
core/trunk/tests-arquillian/pom.xml
Log:
add a profile that enables surefire 2.6-SNAPSHOT
Modified: core/trunk/tests-arquillian/pom.xml
===================================================================
--- core/trunk/tests-arquillian/pom.xml 2010-07-29 17:50:29 UTC (rev 6846)
+++ core/trunk/tests-arquillian/pom.xml 2010-07-29 18:01:34 UTC (rev 6847)
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -26,32 +27,40 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>provided</scope> <!-- should be test, but we need junit for compiling AbstractClusterTest -->
+ <scope>provided</scope>
+ <!--
+ should be test, but we need junit for compiling
+ AbstractClusterTest
+ -->
</dependency>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-junit</artifactId>
- <scope>provided</scope><!-- should be test, but we need shrinkwrap-impl for compiling BeanArchive -->
+ <scope>provided</scope>
+ <!--
+ should be test, but we need shrinkwrap-impl for compiling
+ BeanArchive
+ -->
</dependency>
<dependency>
- <groupId>org.jboss.spec.javax.servlet</groupId>
- <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.metadata</groupId>
+ <groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- <scope>test</scope>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ <scope>test</scope>
</dependency>
-
-
+
+
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
@@ -151,9 +160,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <!--
- Set parallel none to force a more modern JUnitCore provider that understands Suites,
- http://old.nabble.com/Maven-Surefire-and-newer-junit-features-td28539796....
+ <!--
+ Set parallel none to force a more modern JUnitCore
+ provider that understands Suites,
+ http://old.nabble.com/Maven-Surefire-and-newer-junit-features-td28539796....
-->
<parallel>none</parallel>
</configuration>
@@ -174,10 +184,14 @@
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-weld-ee-embedded-1.1</artifactId>
- <scope>provided</scope> <!-- should be test, but we need shrinkwrap-impl for compiling BeanArchive,
- having this in test scopes override the shrinkwrap-api scope. ?? -->
+ <scope>provided</scope>
+ <!--
+ should be test, but we need shrinkwrap-impl for
+ compiling BeanArchive, having this in test scopes
+ override the shrinkwrap-api scope. ??
+ -->
</dependency>
- </dependencies>
+ </dependencies>
<build>
<plugins>
<plugin>
@@ -193,7 +207,7 @@
<profile>
<id>incontainer</id>
<activation>
- <activeByDefault>false</activeByDefault>
+ <activeByDefault>false</activeByDefault>
<property>
<name>incontainer</name>
</property>
@@ -231,54 +245,72 @@
</plugins>
</build>
</profile>
-<!--
<profile>
- <id>write-artifacts-to-disk</id>
+ <id>surefireSnapshot</id>
<activation>
- <property>
- <name>dumpArtifacts</name>
- </property>
+ <activeByDefault>false</activeByDefault>
</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>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[${minimum.maven.version},)</version>
+ </requireMavenVersion>
+ <requirePluginVersions>
+ <unCheckedPlugins>
+ <unCheckedPlugin>org.apache.maven.plugins:maven-eclipse-plugin</unCheckedPlugin>
+ <unCheckedPlugin>org.codehaus.mojo:versions-maven-plugin</unCheckedPlugin>
+ <unCheckedPlugin>org.apache.maven.plugins:maven-surefire-plugin</unCheckedPlugin>
+ </unCheckedPlugins>
+ </requirePluginVersions>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.6-SNAPSHOT</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</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>
+ <scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/tests-arquillian</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk/tests-arquillian</developerConnection>
<url>http://fisheye.jboss.org/browse/weld/core/trunk/tests-arquillian</url>
14 years, 4 months
Weld SVN: r6846 - build/trunk/parent.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-07-29 13:50:29 -0400 (Thu, 29 Jul 2010)
New Revision: 6846
Modified:
build/trunk/parent/pom.xml
Log:
ws
Modified: build/trunk/parent/pom.xml
===================================================================
--- build/trunk/parent/pom.xml 2010-07-29 17:26:16 UTC (rev 6845)
+++ build/trunk/parent/pom.xml 2010-07-29 17:50:29 UTC (rev 6846)
@@ -309,9 +309,7 @@
<unCheckedPlugin>org.codehaus.mojo:versions-maven-plugin</unCheckedPlugin>
</unCheckedPlugins>
</requirePluginVersions>
-
</rules>
-
</configuration>
</execution>
</executions>
14 years, 4 months
Weld SVN: r6845 - in core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests: builtinBeans and 6 other directories.
by weld-commits@lists.jboss.org
Author: aslak
Date: 2010-07-29 13:26:16 -0400 (Thu, 29 Jul 2010)
New Revision: 6845
Added:
core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/builtinBeans/
core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/builtinBeans/ee/
core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/builtinBeans/ee/persistence.xml
core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/enterprise/
core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/enterprise/ejb-jar.xml
core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/nonContextual/
core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/nonContextual/web.xml
core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/resolution/
core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/resolution/circular/
core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/resolution/circular/resource/
core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/resolution/circular/resource/persistence.xml
Log:
WELD-493 Added missing test resources
Added: core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/builtinBeans/ee/persistence.xml
===================================================================
--- core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/builtinBeans/ee/persistence.xml (rev 0)
+++ core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/builtinBeans/ee/persistence.xml 2010-07-29 17:26:16 UTC (rev 6845)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+ version="1.0">
+ <persistence-unit name="test">
+ <jta-data-source>java:/DefaultDS</jta-data-source>
+ </persistence-unit>
+</persistence>
\ No newline at end of file
Added: core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/enterprise/ejb-jar.xml
===================================================================
--- core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/enterprise/ejb-jar.xml (rev 0)
+++ core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/enterprise/ejb-jar.xml 2010-07-29 17:26:16 UTC (rev 6845)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
+ version="3.1">
+
+</ejb-jar>
\ No newline at end of file
Added: core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/nonContextual/web.xml
===================================================================
--- core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/nonContextual/web.xml (rev 0)
+++ core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/nonContextual/web.xml 2010-07-29 17:26:16 UTC (rev 6845)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
+ <display-name>Weld Core Tests - nonContextual</display-name>
+
+ <listener>
+ <listener-class>org.jboss.weld.tests.nonContextual.ServletContextListenerImpl</listener-class>
+ </listener>
+
+</web-app>
\ No newline at end of file
Added: core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/resolution/circular/resource/persistence.xml
===================================================================
--- core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/resolution/circular/resource/persistence.xml (rev 0)
+++ core/trunk/tests-arquillian/src/test/resources/org/jboss/weld/tests/resolution/circular/resource/persistence.xml 2010-07-29 17:26:16 UTC (rev 6845)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+ version="1.0">
+ <persistence-unit name="test">
+ <jta-data-source>java:/DefaultDS</jta-data-source>
+ </persistence-unit>
+</persistence>
\ No newline at end of file
14 years, 4 months
Weld SVN: r6844 - in core/trunk/tests-arquillian/src: test/java/org/jboss/weld/tests/builtinBeans and 1 other directories.
by weld-commits@lists.jboss.org
Author: aslak
Date: 2010-07-29 13:12:39 -0400 (Thu, 29 Jul 2010)
New Revision: 6844
Modified:
core/trunk/tests-arquillian/src/main/java/org/jboss/weld/test/Utils.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/builtinBeans/Consumer.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java
Log:
WELD-493 Fixed failing test
Modified: core/trunk/tests-arquillian/src/main/java/org/jboss/weld/test/Utils.java
===================================================================
--- core/trunk/tests-arquillian/src/main/java/org/jboss/weld/test/Utils.java 2010-07-29 17:09:30 UTC (rev 6843)
+++ core/trunk/tests-arquillian/src/main/java/org/jboss/weld/test/Utils.java 2010-07-29 17:12:39 UTC (rev 6844)
@@ -31,11 +31,12 @@
import java.util.List;
import java.util.Set;
+import javassist.util.proxy.ProxyObject;
+
import javax.el.ELContext;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.util.TypeLiteral;
-import org.jboss.weld.bean.proxy.Proxy;
import org.jboss.weld.exceptions.UnsatisfiedResolutionException;
import org.jboss.weld.manager.BeanManagerImpl;
import org.jboss.weld.mock.el.EL;
@@ -172,6 +173,6 @@
public static boolean isProxy(Object proxy)
{
- return proxy instanceof Proxy;
+ return proxy instanceof ProxyObject;
}
}
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/builtinBeans/Consumer.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/builtinBeans/Consumer.java 2010-07-29 17:09:30 UTC (rev 6843)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/builtinBeans/Consumer.java 2010-07-29 17:12:39 UTC (rev 6844)
@@ -28,6 +28,8 @@
import javax.validation.Validator;
import javax.validation.ValidatorFactory;
+import junit.framework.Assert;
+
@SessionScoped
public class Consumer implements Serializable
{
@@ -60,15 +62,15 @@
public void check()
{
- assert Checker.checkBeanManager(beanManager);
+ Assert.assertTrue(Checker.checkBeanManager(beanManager));
// Not working incontainer as there is no principal
//assert Checker.checkPrincipal(principal);
- assert Checker.checkUserTransaction(userTransaction);
- assert Checker.checkValidator(validator);
- assert Checker.checkValidatorFactory(validatorFactory);
- assert Checker.checkInstance(cow);
- assert Checker.checkEvent(event, observer);
+ Assert.assertTrue(Checker.checkUserTransaction(userTransaction));
+ Assert.assertTrue(Checker.checkValidator(validator));
+ Assert.assertTrue(Checker.checkValidatorFactory(validatorFactory));
+ Assert.assertTrue(Checker.checkInstance(cow));
+ Assert.assertTrue(Checker.checkEvent(event, observer));
}
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java 2010-07-29 17:09:30 UTC (rev 6843)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java 2010-07-29 17:12:39 UTC (rev 6844)
@@ -37,7 +37,8 @@
public static Archive<?> deploy()
{
return ShrinkWrap.create(BeanArchive.class)
- .addPackage(SerializationTest.class.getPackage());
+ .addPackage(SerializationTest.class.getPackage())
+ .addClass(Utils.class);
}
/*
14 years, 4 months
Weld SVN: r6843 - core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/builtinBeans.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-07-29 13:09:30 -0400 (Thu, 29 Jul 2010)
New Revision: 6843
Modified:
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/builtinBeans/Cow.java
Log:
arq starts a session for the whole test case, but a request per method, so cow's name get lost
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/builtinBeans/Cow.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/builtinBeans/Cow.java 2010-07-29 16:48:23 UTC (rev 6842)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/builtinBeans/Cow.java 2010-07-29 17:09:30 UTC (rev 6843)
@@ -16,9 +16,9 @@
*/
package org.jboss.weld.tests.builtinBeans;
-import javax.enterprise.context.RequestScoped;
+import javax.enterprise.context.ApplicationScoped;
-@RequestScoped
+@ApplicationScoped
public class Cow
{
14 years, 4 months
Weld SVN: r6842 - archetypes/javaee6-webapp/trunk.
by weld-commits@lists.jboss.org
Author: dan.j.allen
Date: 2010-07-29 12:48:23 -0400 (Thu, 29 Jul 2010)
New Revision: 6842
Modified:
archetypes/javaee6-webapp/trunk/readme.txt
Log:
add not about importing Maven project
Modified: archetypes/javaee6-webapp/trunk/readme.txt
===================================================================
--- archetypes/javaee6-webapp/trunk/readme.txt 2010-07-29 16:42:48 UTC (rev 6841)
+++ archetypes/javaee6-webapp/trunk/readme.txt 2010-07-29 16:48:23 UTC (rev 6842)
@@ -172,14 +172,21 @@
ready to import the project into Eclipse.
NOTE:
- We strongly recommend Eclipse Helios (3.6) - http://www.eclipse.org/helios
+ We strongly recommend Eclipse 3.6 (Helios) - http://www.eclipse.org/helios
- Select File > Import... and select "Existing Maven Projects" and navigate to
- your project directory. Click Finish and m2eclipse will take it from there.
+ Select File > Import... and choose the Maven > Existing Maven Projects option.
+ Navigate to the root directory of your project. Eclipse should recognize the
+ Maven project and preselect it in the Project box. Click Finish and m2eclipse
+ will take it from there.
+ NOTE:
+ You cannot use the import option General > Existing Projects into Workspace
+ because Eclipse does not recognize Maven projects as Eclipse projects
+ natively. You must use the importer provided by m2eclipse as just described.
+
Additional configuration is required to get Eclipse to generate the JPA
- metamodel. The archetype includes the necessary Eclipse config files in your project.
- To enable this feature, right click on the project and select:
+ metamodel. The archetype includes the necessary Eclipse config files in your
+ project. To enable this feature, right click on the project and select:
Properties > Java Compiler > Annotation Processing
14 years, 4 months
Weld SVN: r6841 - archetypes/javaee6-webapp/trunk.
by weld-commits@lists.jboss.org
Author: dan.j.allen
Date: 2010-07-29 12:42:48 -0400 (Thu, 29 Jul 2010)
New Revision: 6841
Modified:
archetypes/javaee6-webapp/trunk/pom.xml
Log:
switch to Arquillian 1.0.0.Alpha3
Modified: archetypes/javaee6-webapp/trunk/pom.xml
===================================================================
--- archetypes/javaee6-webapp/trunk/pom.xml 2010-07-29 16:36:33 UTC (rev 6840)
+++ archetypes/javaee6-webapp/trunk/pom.xml 2010-07-29 16:42:48 UTC (rev 6841)
@@ -21,7 +21,7 @@
<!-- By default, we assign it to the value of the JBOSS_HOME envrionment variable -->
<jboss.home>${env.JBOSS_HOME}</jboss.home>
<jboss.domain>default</jboss.domain>
- <arquillian.version>1.0.0-SNAPSHOT</arquillian.version>
+ <arquillian.version>1.0.0.Alpha3</arquillian.version>
<jboss-javaee6-spec.version>1.0.0.Beta7</jboss-javaee6-spec.version>
</properties>
14 years, 4 months
Weld SVN: r6840 - in core/trunk/impl/src/main/java/org/jboss/weld: util and 1 other directory.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-07-29 12:36:33 -0400 (Thu, 29 Jul 2010)
New Revision: 6840
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldParameterImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/util/Names.java
Log:
improve error message
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldParameterImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldParameterImpl.java 2010-07-29 16:35:36 UTC (rev 6839)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldParameterImpl.java 2010-07-29 16:36:33 UTC (rev 6840)
@@ -140,7 +140,7 @@
@Override
public String toString()
{
- return Names.parameterToString(getJavaClass(), getAnnotations(), getActualTypeArguments());
+ return Names.parameterToString(getPosition(), getDeclaringCallable().getJavaMember(), getJavaClass(), getAnnotations(), getActualTypeArguments());
}
public AnnotatedCallable<X> getDeclaringCallable()
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Names.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/Names.java 2010-07-29 16:35:36 UTC (rev 6839)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/Names.java 2010-07-29 16:36:33 UTC (rev 6840)
@@ -19,6 +19,7 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
+import java.lang.reflect.Member;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
@@ -95,9 +96,9 @@
return new NamesStringBuilder("constructor for " + constructor.getDeclaringClass().getName()).add(modifiersToString(constructor.getModifiers())).add(annotationsToString(annotations)).add(constructor.getName()).add(typesToString(actualTypeArguments)).add(parametersToString(parameters)).toString();
}
- public static String parameterToString(Class<?> rawType, Set<Annotation> annotations, Type[] actualTypeArguments)
+ public static String parameterToString(int position, Member member, Class<?> rawType, Set<Annotation> annotations, Type[] actualTypeArguments)
{
- return new NamesStringBuilder().add(modifiersToString(rawType.getModifiers())).add(annotationsToString(annotations)).add(rawType.getName()).add(typesToString(actualTypeArguments)).toString();
+ return new NamesStringBuilder().add("parameter " + position + " on " + member + "; " + modifiersToString(rawType.getModifiers())).add(annotationsToString(annotations)).add(rawType.getName()).add(typesToString(actualTypeArguments)).toString();
}
/**
14 years, 4 months
Weld SVN: r6839 - core/trunk/impl/src/main/java/org/jboss/weld/util/reflection.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-07-29 12:35:36 -0400 (Thu, 29 Jul 2010)
New Revision: 6839
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/Reflections.java
Log:
minor
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/Reflections.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/Reflections.java 2010-07-29 12:21:41 UTC (rev 6838)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/Reflections.java 2010-07-29 16:35:36 UTC (rev 6839)
@@ -41,8 +41,6 @@
import org.slf4j.cal10n.LocLogger;
import org.slf4j.ext.XLogger;
-import ch.qos.cal10n.IMessageConveyor;
-
/**
* Utility class for static reflection-type operations
*
@@ -55,9 +53,6 @@
static final LocLogger log = loggerFactory().getLogger(UTIL);
static final XLogger xLog = loggerFactory().getXLogger(UTIL);
- // Exception messages
- private static final IMessageConveyor messageConveyer = loggerFactory().getMessageConveyor();
-
public static final Type[] EMPTY_TYPES = {};
public static final Annotation[] EMPTY_ANNOTATIONS = {};
public static final Class<?>[] EMPTY_CLASSES = new Class<?>[0];
@@ -391,7 +386,7 @@
public static boolean isAssignableFrom(Type type1, Type type2)
{
- if (type1 instanceof Class)
+ if (type1 instanceof Class<?>)
{
Class<?> clazz = (Class<?>) type1;
if (isAssignableFrom(clazz, EMPTY_TYPES, type2))
@@ -402,7 +397,7 @@
if (type1 instanceof ParameterizedType)
{
ParameterizedType parameterizedType1 = (ParameterizedType) type1;
- if (parameterizedType1.getRawType() instanceof Class)
+ if (parameterizedType1.getRawType() instanceof Class<?>)
{
if (isAssignableFrom((Class<?>) parameterizedType1.getRawType(), parameterizedType1.getActualTypeArguments(), type2))
{
@@ -458,7 +453,7 @@
if (type1 instanceof ParameterizedType)
{
ParameterizedType parameterizedType1 = (ParameterizedType) type1;
- if (parameterizedType1.getRawType() instanceof Class)
+ if (parameterizedType1.getRawType() instanceof Class<?>)
{
if (matches((Class<?>) parameterizedType1.getRawType(), parameterizedType1.getActualTypeArguments(), type2))
{
@@ -525,7 +520,7 @@
if (type2 instanceof ParameterizedType)
{
ParameterizedType parameterizedType = (ParameterizedType) type2;
- if (parameterizedType.getRawType() instanceof Class)
+ if (parameterizedType.getRawType() instanceof Class<?>)
{
if (isAssignableFrom(rawType1, actualTypeArguments1, (Class<?>) parameterizedType.getRawType(), parameterizedType.getActualTypeArguments()))
{
@@ -533,7 +528,7 @@
}
}
}
- else if (type2 instanceof Class)
+ else if (type2 instanceof Class<?>)
{
Class<?> clazz = (Class<?>) type2;
if (isAssignableFrom(rawType1, actualTypeArguments1, clazz, EMPTY_TYPES))
@@ -541,9 +536,9 @@
return true;
}
}
- else if (type2 instanceof TypeVariable)
+ else if (type2 instanceof TypeVariable<?>)
{
- TypeVariable typeVariable = (TypeVariable) type2;
+ TypeVariable<?> typeVariable = (TypeVariable<?>) type2;
if (isTypeBounded(rawType1, actualTypeArguments1, typeVariable.getBounds()))
{
return true;
14 years, 4 months