Weld SVN: r4747 - examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-07 15:12:47 -0500 (Sat, 07 Nov 2009)
New Revision: 4747
Modified:
examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/jetty-env.xml
Log:
change id to match resource name
Modified: examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/jetty-env.xml
===================================================================
--- examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/jetty-env.xml 2009-11-07 20:05:46 UTC (rev 4746)
+++ examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/jetty-env.xml 2009-11-07 20:12:47 UTC (rev 4747)
@@ -2,7 +2,7 @@
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN"
"http://jetty.mortbay.org/configure.dtd">
<Configure id="webAppCtx" class="org.mortbay.jetty.webapp.WebAppContext">
- <New id="appManager" class="org.mortbay.jetty.plus.naming.Resource">
+ <New id="beanManager" class="org.mortbay.jetty.plus.naming.Resource">
<Arg><Ref id="webAppCtx"/></Arg>
<Arg>BeanManager</Arg>
<Arg>
16 years, 5 months
Weld SVN: r4746 - in cdi-tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/decorators/custom and 2 other directories.
by weld-commits＠lists.jboss.org
Author: jharting
Date: 2009-11-07 15:05:46 -0500 (Sat, 07 Nov 2009)
New Revision: 4746
Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/AfterBeanDiscoveryObserver.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/Bus.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/CustomDecoratorImplementation.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/CustomDecoratorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/Vehicle.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/VehicleDecorator.java
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/custom/
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/custom/beans.xml
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/custom/javax.enterprise.inject.spi.Extension
Log:
Test for custom implementation of the Decorator interface.
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/AfterBeanDiscoveryObserver.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/AfterBeanDiscoveryObserver.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/AfterBeanDiscoveryObserver.java 2009-11-07 20:05:46 UTC (rev 4746)
@@ -0,0 +1,30 @@
+package org.jboss.jsr299.tck.tests.decorators.custom;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.Extension;
+import javax.inject.Inject;
+
+
+public class AfterBeanDiscoveryObserver implements Extension
+{
+ @Inject
+ private BeanManager manager;
+
+ private static CustomDecoratorImplementation decorator;
+
+ @SuppressWarnings("unchecked")
+ public void addInterceptors(@Observes AfterBeanDiscovery event) {
+ AnnotatedField<VehicleDecorator> annotatedField = (AnnotatedField<VehicleDecorator>) manager.createAnnotatedType(VehicleDecorator.class).getFields().iterator().next();
+ decorator = new CustomDecoratorImplementation(annotatedField);
+
+ event.addBean(decorator);
+ }
+
+ public static CustomDecoratorImplementation getDecorator()
+ {
+ return decorator;
+ }
+}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/Bus.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/Bus.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/Bus.java 2009-11-07 20:05:46 UTC (rev 4746)
@@ -0,0 +1,15 @@
+package org.jboss.jsr299.tck.tests.decorators.custom;
+
+class Bus implements Vehicle
+{
+
+ public String start()
+ {
+ return "Bus started";
+ }
+
+ public String stop()
+ {
+ return "Bus stopped";
+ }
+}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/CustomDecoratorImplementation.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/CustomDecoratorImplementation.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/CustomDecoratorImplementation.java 2009-11-07 20:05:46 UTC (rev 4746)
@@ -0,0 +1,168 @@
+package org.jboss.jsr299.tck.tests.decorators.custom;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Member;
+import java.lang.reflect.Type;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Annotated;
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.Decorator;
+import javax.enterprise.inject.spi.InjectionPoint;
+
+class CustomDecoratorImplementation implements Decorator<VehicleDecorator>
+{
+
+ private boolean getDecoratedTypesCalled = false;
+ private boolean getDelegateQualifiersCalled = false;
+ private boolean getDelegateTypeCalled = false;
+
+ private AnnotatedField<VehicleDecorator> annotatedField;
+ private Set<Type> decoratedTypes = new HashSet<Type>();
+
+ public CustomDecoratorImplementation(AnnotatedField<VehicleDecorator> annotatedField)
+ {
+ this.annotatedField = annotatedField;
+ decoratedTypes.add(Vehicle.class);
+ }
+
+ public Set<Type> getDecoratedTypes()
+ {
+ getDecoratedTypesCalled = true;
+ return decoratedTypes;
+ }
+
+ public Set<Annotation> getDelegateQualifiers()
+ {
+ getDelegateQualifiersCalled = true;
+ return Collections.emptySet();
+ }
+
+ public Type getDelegateType()
+ {
+ getDelegateTypeCalled = true;
+ return Vehicle.class;
+ }
+
+ public Class<?> getBeanClass()
+ {
+ return VehicleDecorator.class;
+ }
+
+ public Set<InjectionPoint> getInjectionPoints()
+ {
+ InjectionPoint ip = new InjectionPoint()
+ {
+
+ public boolean isTransient()
+ {
+ return false;
+ }
+
+ public boolean isDelegate()
+ {
+ return true;
+ }
+
+ public Type getType()
+ {
+ return Bus.class;
+ }
+
+ public Set<Annotation> getQualifiers()
+ {
+ return Collections.emptySet();
+ }
+
+ public Member getMember()
+ {
+ try
+ {
+ return VehicleDecorator.class.getDeclaredField("delegate");
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public Bean<?> getBean()
+ {
+ return AfterBeanDiscoveryObserver.getDecorator();
+ }
+
+ public Annotated getAnnotated()
+ {
+ return annotatedField;
+ }
+ };
+
+ return new HashSet<InjectionPoint>(Arrays.asList(ip));
+ }
+
+ public String getName()
+ {
+ return null;
+ }
+
+ public Set<Annotation> getQualifiers()
+ {
+ return Collections.emptySet();
+ }
+
+ public Class<? extends Annotation> getScope()
+ {
+ return Dependent.class;
+ }
+
+ public Set<Class<? extends Annotation>> getStereotypes()
+ {
+ return Collections.emptySet();
+ }
+
+ public Set<Type> getTypes()
+ {
+ return new HashSet<Type>(Arrays.asList(VehicleDecorator.class, Object.class));
+ }
+
+ public boolean isAlternative()
+ {
+ return false;
+ }
+
+ public boolean isNullable()
+ {
+ return false;
+ }
+
+ public VehicleDecorator create(CreationalContext<VehicleDecorator> arg0)
+ {
+ return new VehicleDecorator();
+ }
+
+ public void destroy(VehicleDecorator arg0, CreationalContext<VehicleDecorator> arg1)
+ {
+ arg1.release();
+ }
+
+ public boolean isGetDecoratedTypesCalled()
+ {
+ return getDecoratedTypesCalled;
+ }
+
+ public boolean isGetDelegateQualifiersCalled()
+ {
+ return getDelegateQualifiersCalled;
+ }
+
+ public boolean isGetDelegateTypeCalled()
+ {
+ return getDelegateTypeCalled;
+ }
+}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/CustomDecoratorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/CustomDecoratorTest.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/CustomDecoratorTest.java 2009-11-07 20:05:46 UTC (rev 4746)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, 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.jsr299.tck.tests.decorators.custom;
+
+import java.lang.reflect.Type;
+import java.util.Arrays;
+import java.util.HashSet;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+@Artifact
+@BeansXml("beans.xml")
+@SpecVersion(spec = "cdi", version = "20091101")
+@IntegrationTest
+public class CustomDecoratorTest extends AbstractJSR299Test
+{
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section = "8.3", id = "b")
+ // WELD-269
+ public void testCustomImplementationOfDecoratorInterface() {
+ assert AfterBeanDiscoveryObserver.getDecorator().isGetDecoratedTypesCalled();
+ assert AfterBeanDiscoveryObserver.getDecorator().isGetDelegateQualifiersCalled();
+ assert AfterBeanDiscoveryObserver.getDecorator().isGetDelegateTypeCalled();
+ assert !getCurrentManager().resolveDecorators(new HashSet<Type>(Arrays.asList(Vehicle.class))).isEmpty();
+ assert !getCurrentManager().resolveDecorators(new HashSet<Type>(Arrays.asList(Bus.class))).isEmpty();
+ assert getInstanceByType(Vehicle.class).start().equals("Bus started and decorated.");
+ assert getInstanceByType(Vehicle.class).start().equals("Bus stopped and decorated.");
+ }
+}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/Vehicle.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/Vehicle.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/Vehicle.java 2009-11-07 20:05:46 UTC (rev 4746)
@@ -0,0 +1,7 @@
+package org.jboss.jsr299.tck.tests.decorators.custom;
+
+interface Vehicle
+{
+ String start();
+ String stop();
+}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/VehicleDecorator.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/VehicleDecorator.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/VehicleDecorator.java 2009-11-07 20:05:46 UTC (rev 4746)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.tests.decorators.custom;
+
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+class VehicleDecorator implements Vehicle
+{
+ @Inject @Delegate
+ private Vehicle delegate;
+
+ public String start()
+ {
+ return delegate.start() + " and decorated.";
+ }
+
+ public String stop()
+ {
+ return delegate.stop() + " and decorated.";
+ }
+}
Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/custom/beans.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/custom/beans.xml (rev 0)
+++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/custom/beans.xml 2009-11-07 20:05:46 UTC (rev 4746)
@@ -0,0 +1,5 @@
+<beans>
+ <decorators>
+ <class>org.jboss.jsr299.tck.tests.decorators.custom.VehicleDecorator</class>
+ </decorators>
+</beans>
Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/custom/javax.enterprise.inject.spi.Extension
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/custom/javax.enterprise.inject.spi.Extension (rev 0)
+++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/custom/javax.enterprise.inject.spi.Extension 2009-11-07 20:05:46 UTC (rev 4746)
@@ -0,0 +1 @@
+org.jboss.jsr299.tck.tests.decorators.custom.AfterBeanDiscoveryObserver
\ No newline at end of file
16 years, 5 months
Weld SVN: r4745 - core/trunk/tests/src/main/java/org/jboss/weld/mock.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-07 14:58:03 -0500 (Sat, 07 Nov 2009)
New Revision: 4745
Added:
core/trunk/tests/src/main/java/org/jboss/weld/mock/MockValidator.java
Modified:
core/trunk/tests/src/main/java/org/jboss/weld/mock/MockSecurityServices.java
core/trunk/tests/src/main/java/org/jboss/weld/mock/MockTransactionServices.java
core/trunk/tests/src/main/java/org/jboss/weld/mock/MockValidationServices.java
Log:
improve mocks
Modified: core/trunk/tests/src/main/java/org/jboss/weld/mock/MockSecurityServices.java
===================================================================
--- core/trunk/tests/src/main/java/org/jboss/weld/mock/MockSecurityServices.java 2009-11-07 19:56:51 UTC (rev 4744)
+++ core/trunk/tests/src/main/java/org/jboss/weld/mock/MockSecurityServices.java 2009-11-07 19:58:03 UTC (rev 4745)
@@ -27,13 +27,16 @@
public class MockSecurityServices implements SecurityServices
{
- /* (non-Javadoc)
- * @see org.jboss.weld.security.spi.SecurityServices#getPrincipal()
- */
public Principal getPrincipal()
{
- // TODO Auto-generated method stub
- return null;
+ return new Principal()
+ {
+
+ public String getName()
+ {
+ return null;
+ }
+ };
}
public void cleanup() {}
Modified: core/trunk/tests/src/main/java/org/jboss/weld/mock/MockTransactionServices.java
===================================================================
--- core/trunk/tests/src/main/java/org/jboss/weld/mock/MockTransactionServices.java 2009-11-07 19:56:51 UTC (rev 4744)
+++ core/trunk/tests/src/main/java/org/jboss/weld/mock/MockTransactionServices.java 2009-11-07 19:58:03 UTC (rev 4745)
@@ -17,7 +17,12 @@
package org.jboss.weld.mock;
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
import javax.transaction.Synchronization;
+import javax.transaction.SystemException;
import javax.transaction.UserTransaction;
import org.jboss.weld.transaction.spi.TransactionServices;
@@ -44,7 +49,39 @@
public UserTransaction getUserTransaction()
{
- return null;
+ return new UserTransaction()
+ {
+
+ public void setTransactionTimeout(int arg0) throws SystemException
+ {
+
+ }
+
+ public void setRollbackOnly() throws IllegalStateException, SystemException
+ {
+
+ }
+
+ public void rollback() throws IllegalStateException, SecurityException, SystemException
+ {
+
+ }
+
+ public int getStatus() throws SystemException
+ {
+ return 0;
+ }
+
+ public void commit() throws RollbackException, HeuristicMixedException, HeuristicRollbackException, SecurityException, IllegalStateException, SystemException
+ {
+
+ }
+
+ public void begin() throws NotSupportedException, SystemException
+ {
+
+ }
+ };
}
public void cleanup() {}
Modified: core/trunk/tests/src/main/java/org/jboss/weld/mock/MockValidationServices.java
===================================================================
--- core/trunk/tests/src/main/java/org/jboss/weld/mock/MockValidationServices.java 2009-11-07 19:56:51 UTC (rev 4744)
+++ core/trunk/tests/src/main/java/org/jboss/weld/mock/MockValidationServices.java 2009-11-07 19:58:03 UTC (rev 4745)
@@ -19,6 +19,7 @@
import javax.validation.ConstraintValidatorFactory;
import javax.validation.MessageInterpolator;
import javax.validation.TraversableResolver;
+import javax.validation.ValidationException;
import javax.validation.Validator;
import javax.validation.ValidatorContext;
import javax.validation.ValidatorFactory;
@@ -45,14 +46,19 @@
public <T> T unwrap(Class<T> type)
{
- // TODO Auto-generated method stub
- return null;
+ if (type.equals(ValidatorFactory.class))
+ {
+ return type.cast(this);
+ }
+ else
+ {
+ throw new ValidationException();
+ }
}
public Validator getValidator()
{
- // TODO Auto-generated method stub
- return null;
+ return new MockValidator();
}
public TraversableResolver getTraversableResolver()
Added: core/trunk/tests/src/main/java/org/jboss/weld/mock/MockValidator.java
===================================================================
--- core/trunk/tests/src/main/java/org/jboss/weld/mock/MockValidator.java (rev 0)
+++ core/trunk/tests/src/main/java/org/jboss/weld/mock/MockValidator.java 2009-11-07 19:58:03 UTC (rev 4745)
@@ -0,0 +1,50 @@
+package org.jboss.weld.mock;
+
+import java.util.Set;
+
+import javax.validation.ConstraintViolation;
+import javax.validation.ValidationException;
+import javax.validation.Validator;
+import javax.validation.metadata.BeanDescriptor;
+
+public class MockValidator implements Validator
+{
+
+ public BeanDescriptor getConstraintsForClass(Class<?> clazz)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public <T> T unwrap(Class<T> type)
+ {
+ if (type.equals(Validator.class))
+ {
+ return type.cast(this);
+ }
+ else
+ {
+ throw new ValidationException();
+ }
+ }
+
+ public <T> Set<ConstraintViolation<T>> validate(T object, Class<?>... groups)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public <T> Set<ConstraintViolation<T>> validateProperty(T object, String propertyName, Class<?>... groups)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public <T> Set<ConstraintViolation<T>> validateValue(Class<T> beanType, String propertyName, Object value, Class<?>... groups)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
+}
Property changes on: core/trunk/tests/src/main/java/org/jboss/weld/mock/MockValidator.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
16 years, 5 months
Weld SVN: r4744 - core/trunk/impl/src/main/java/org/jboss/weld/util.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-07 14:56:51 -0500 (Sat, 07 Nov 2009)
New Revision: 4744
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/util/Names.java
Log:
reduce code duplication
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 2009-11-07 19:56:06 UTC (rev 4743)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/Names.java 2009-11-07 19:56:51 UTC (rev 4744)
@@ -23,6 +23,7 @@
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -162,23 +163,8 @@
return modifiers;
}
- /**
- * Gets a string representation from an array of annotations
- *
- * @param annotations The annotations
- * @return The string representation
- */
- private static String annotationsToString(Annotation[] annotations)
- {
- StringBuilder buffer = new StringBuilder();
- for (Annotation annotation : annotations)
- {
- buffer.append("@" + annotation.annotationType().getSimpleName());
- buffer.append(" ");
- }
- return buffer.toString();
- }
+
/**
* Gets a string representation from a field
*
@@ -315,24 +301,35 @@
return buffer.toString();
}
- public static String annotationsToString(Set<Annotation> annotations)
+ public static String annotationsToString(Iterable<Annotation> annotations)
{
- StringBuilder buffer = new StringBuilder();
+ StringBuilder builder = new StringBuilder();
int i = 0;
- buffer.append("[");
+ builder.append("[");
for (Annotation annotation : annotations)
{
if (i > 0)
{
- buffer.append(", ");
+ builder.append(", ");
}
- buffer.append("@").append(annotation.annotationType().getSimpleName());
+ builder.append("@").append(annotation.annotationType().getSimpleName());
i++;
}
- buffer.append("]");
- return buffer.toString();
+ builder.append("]");
+ return builder.toString();
}
+ /**
+ * Gets a string representation from an array of annotations
+ *
+ * @param annotations The annotations
+ * @return The string representation
+ */
+ public static String annotationsToString(Annotation[] annotations)
+ {
+ return annotationsToString(Arrays.asList(annotations));
+ }
+
public static String version(Package pkg)
{
if (pkg != null)
16 years, 5 months
Weld SVN: r4743 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-07 14:56:06 -0500 (Sat, 07 Nov 2009)
New Revision: 4743
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java
Log:
switch to jboss-as-broken, we do support this in Weld
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java 2009-11-07 19:55:29 UTC (rev 4742)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java 2009-11-07 19:56:06 UTC (rev 4743)
@@ -26,7 +26,7 @@
* to any EJB message driven bean.
*/
// WELD-12
- @Test(groups = { "ri-broken", "contexts", "ejb3.1", "integration" })
+ @Test(groups = { "jboss-as-broken", "contexts", "ejb3.1", "integration" })
@SpecAssertion(section = "6.7.1", id = "gc")
public void testRequestScopeActiveDuringCallToEjbTimeoutMethod() throws Exception
{
@@ -41,7 +41,7 @@
* timeout or message delivery completes.
*/
// WELD-12
- @Test(groups = { "ri-broken", "contexts", "ejb3.1", "integration" })
+ @Test(groups = { "jboss-as-broken", "contexts", "ejb3.1", "integration" })
@SpecAssertion(section = "6.7.1", id = "hc")
public void testRequestScopeDestroyedAfterCallToEjbTimeoutMethod() throws Exception
{
16 years, 5 months
Weld SVN: r4742 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-07 14:55:29 -0500 (Sat, 07 Nov 2009)
New Revision: 4742
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java
Log:
switch to jboss-as-broken, we do support this in Weld
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java 2009-11-07 19:54:06 UTC (rev 4741)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java 2009-11-07 19:55:29 UTC (rev 4742)
@@ -32,7 +32,7 @@
public class SessionBeanInjectionOrderingTest extends AbstractJSR299Test
{
- @Test(groups="ri-broken")
+ @Test(groups="jboss-as-broken")
@SpecAssertion(section = "5.5.2", id = "bb")
public void testInitializerCalledAfterFieldInjectionOfSuperclass()
{
@@ -40,7 +40,7 @@
assert house.isInitializerCalledAfterSuperclassInjection();
}
- @Test(groups="ri-broken")
+ @Test(groups="jboss-as-broken")
@SpecAssertion(section = "5.5.2", id = "bf")
public void testPostConstructCalledAfterInitializerOfSuperclass()
{
16 years, 5 months
Weld SVN: r4741 - core/trunk/tests.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-07 14:54:06 -0500 (Sat, 07 Nov 2009)
New Revision: 4741
Modified:
core/trunk/tests/pom.xml
Log:
increase heap space.
Modified: core/trunk/tests/pom.xml
===================================================================
--- core/trunk/tests/pom.xml 2009-11-07 19:53:23 UTC (rev 4740)
+++ core/trunk/tests/pom.xml 2009-11-07 19:54:06 UTC (rev 4741)
@@ -125,6 +125,7 @@
<suiteXmlFiles>
<suiteXmlFile>unit-tests.xml</suiteXmlFile>
</suiteXmlFiles>
+ <argLine>-Xmx256m</argLine>
</configuration>
</plugin>
<plugin>
16 years, 5 months
Weld SVN: r4740 - core/trunk/jboss-tck-runner.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-07 14:53:23 -0500 (Sat, 07 Nov 2009)
New Revision: 4740
Modified:
core/trunk/jboss-tck-runner/pom.xml
Log:
increase heap space.
Modified: core/trunk/jboss-tck-runner/pom.xml
===================================================================
--- core/trunk/jboss-tck-runner/pom.xml 2009-11-07 19:52:56 UTC (rev 4739)
+++ core/trunk/jboss-tck-runner/pom.xml 2009-11-07 19:53:23 UTC (rev 4740)
@@ -94,7 +94,7 @@
<suiteXmlFiles>
<suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-suite.xml</suiteXmlFile>
</suiteXmlFiles>
- <argLine>-Xmx256m</argLine>
+ <argLine>-Xmx748m</argLine>
<forkMode>once</forkMode>
</configuration>
</plugin>
16 years, 5 months
Weld SVN: r4739 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-07 14:52:56 -0500 (Sat, 07 Nov 2009)
New Revision: 4739
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
Log:
switch to jboss-as-broken, we do support this in Weld
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-11-07 19:52:08 UTC (rev 4738)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-11-07 19:52:56 UTC (rev 4739)
@@ -71,7 +71,7 @@
assert !dogBean.getTypes().contains(Pitbull.class);
}
- @Test(groups = { "ejb 3.1", "ri-broken" })
+ @Test(groups = { "ejb 3.1", "jboss-as-broken" })
@SpecAssertion(section = "3.2.2", id = "ba")
// WBRI-231
public void testEnterpriseBeanClassLocalView()
16 years, 5 months
Weld SVN: r4738 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-07 14:52:08 -0500 (Sat, 07 Nov 2009)
New Revision: 4738
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java
Log:
switch to jboss-as-broken, we do support this in Weld
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-11-07 19:51:34 UTC (rev 4737)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-11-07 19:52:08 UTC (rev 4738)
@@ -40,7 +40,7 @@
public class AddingPassivatingScopeTest extends AbstractJSR299Test
{
- @Test(groups="ri-broken")
+ @Test(groups="jboss-as-broken")
// WBRI-312
@SpecAssertion(section="11.5.1", id="ac")
public void testAddingScopeType()
16 years, 5 months