March 2009 - weld-commits - Jboss List Archives

[webbeans-commits] Webbeans SVN: r2117 - ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-03-19 19:05:24 -0400 (Thu, 19 Mar 2009) New Revision: 2117 Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedAnnotatedClass.java Log: minor Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedAnnotatedClass.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedAnnotatedClass.java 2009-03-19 22:54:09 UTC (rev 2116) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WrappedAnnotatedClass.java 2009-03-19 23:05:24 UTC (rev 2117) @@ -43,59 +43,38 @@ return annotationStore; } - /** - * @see org.jboss.webbeans.introspector.AnnotatedItem - */ public <A extends Annotation> A getAnnotation(Class<A> annotationType) { return getAnnotationStore().getAnnotation(annotationType); } - /** - * @see org.jboss.webbeans.introspector.AnnotatedItem - */ public Set<Annotation> getAnnotationsAsSet() { return getAnnotationStore().getAnnotations(); } - /** - * @see org.jboss.webbeans.introspector.AnnotatedItem - */ public Set<Annotation> getMetaAnnotations(Class<? extends Annotation> metaAnnotationType) { return getAnnotationStore().getMetaAnnotations(metaAnnotationType); } - /** - * @see org.jboss.webbeans.introspector.AnnotatedItem - */ public Annotation[] getMetaAnnotationsAsArray(Class<? extends Annotation> metaAnnotationType) { return getAnnotationStore().getMetaAnnotationsAsArray(metaAnnotationType); } - /** - * @see org.jboss.webbeans.introspector.AnnotatedItem - */ @Deprecated public Set<Annotation> getBindings() { return getAnnotationStore().getBindings(); } - /** - * @see org.jboss.webbeans.introspector.AnnotatedItem - */ @Deprecated public Annotation[] getBindingsAsArray() { return getAnnotationStore().getBindingsAsArray(); } - /** - * @see org.jboss.webbeans.introspector.AnnotatedItem - */ public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) { return getAnnotationStore().isAnnotationPresent(annotationType);

17 years

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2116 - in extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se: beans and 1 other directories.

by webbeans-commits＠lists.jboss.org

Author: peteroyle Date: 2009-03-19 18:54:09 -0400 (Thu, 19 Mar 2009) New Revision: 2116 Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/ShutdownManager.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/AbstractScanner.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/URLScanner.java Log: - Updated to new logging - Added String[] getArgsAsArry() to ParametersFactory for easier compatibility with existing apps. - WBRI-186 is now fixed, so reintroduced generics to List<String> getArgs(). Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/ShutdownManager.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/ShutdownManager.java 2009-03-19 22:49:24 UTC (rev 2115) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/ShutdownManager.java 2009-03-19 22:54:09 UTC (rev 2116) @@ -4,16 +4,17 @@ import javax.event.Observes; import javax.inject.manager.Manager; -import org.apache.log4j.Logger; import org.jboss.webbeans.bootstrap.api.Bootstrap; import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.environment.se.events.Shutdown; +import org.jboss.webbeans.log.LogProvider; +import org.jboss.webbeans.log.Logging; @ApplicationScoped public class ShutdownManager { - private static Logger log = Logger.getLogger(ShutdownManager.class); + private static LogProvider log = Logging.getLogProvider(ShutdownManager.class); private boolean hasShutdownBeenCalled = false; Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java 2009-03-19 22:49:24 UTC (rev 2115) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java 2009-03-19 22:54:09 UTC (rev 2116) @@ -37,21 +37,30 @@ public class ParametersFactory { private String[] args; + private List<String> argsList; /** - * Producer method for the injectible command line args. + * Producer method for the injectable command line args. * * @return The command line arguments. */ - @Produces - @Parameters - // TODO Give generic type - WBRI-186 - public List getArgs() + @Produces @Parameters + public List<String> getArgs() { - return Collections.unmodifiableList(new ArrayList<String>(Arrays.asList(this.args))); + return argsList; } - + /** + * Producer method for the injectable command line args. + * @return The command line arguments. + */ + @Produces @Parameters + public String[] getArgsAsArray( ) + { + return this.args; + } + + /** * StartMain passes in the command line args here. * * @param args @@ -60,5 +69,6 @@ public void setArgs(String[] args) { this.args = args; + this.argsList = Collections.unmodifiableList( new ArrayList<String>( Arrays.asList( args ) ) ); } } Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/AbstractScanner.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/AbstractScanner.java 2009-03-19 22:49:24 UTC (rev 2115) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/AbstractScanner.java 2009-03-19 22:54:09 UTC (rev 2116) @@ -17,9 +17,9 @@ package org.jboss.webbeans.environment.se.discovery; import java.net.URL; +import org.jboss.webbeans.log.LogProvider; +import org.jboss.webbeans.log.Logging; -import org.apache.log4j.Logger; - /** * Abstract base class for {@link Scanner} providing common functionality * @@ -31,7 +31,7 @@ public abstract class AbstractScanner implements Scanner { - private static final Logger log = Logger.getLogger(Scanner.class); + private static final LogProvider log = Logging.getLogProvider(Scanner.class); private final ClassLoader classLoader; private final SEWebBeanDiscovery webBeanDiscovery; Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/URLScanner.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/URLScanner.java 2009-03-19 22:49:24 UTC (rev 2115) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/URLScanner.java 2009-03-19 22:54:09 UTC (rev 2116) @@ -28,8 +28,9 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipException; import java.util.zip.ZipFile; +import org.jboss.webbeans.log.LogProvider; +import org.jboss.webbeans.log.Logging; -import org.apache.log4j.Logger; /** * Implementation of {@link Scanner} which can scan a {@link URLClassLoader} @@ -42,7 +43,7 @@ */ public class URLScanner extends AbstractScanner { - private static final Logger log = Logger.getLogger(URLScanner.class); + private static final LogProvider log = Logging.getLogProvider(URLScanner.class); public URLScanner(ClassLoader classLoader, SEWebBeanDiscovery webBeanDiscovery) {

17 years

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2115 - in ri/trunk/impl/src/main/java/org/jboss/webbeans: util and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: peteroyle Date: 2009-03-19 18:49:24 -0400 (Thu, 19 Mar 2009) New Revision: 2115 Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/EJBApiAbstraction.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/ApiAbstraction.java Log: Introduced dummy enum - used when lookup of PersistenceContextType fails Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/EJBApiAbstraction.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/EJBApiAbstraction.java 2009-03-19 18:38:11 UTC (rev 2114) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/EJBApiAbstraction.java 2009-03-19 22:49:24 UTC (rev 2115) @@ -39,7 +39,11 @@ EJB_ANNOTATION_CLASS = annotationTypeForName("javax.ejb.EJB"); RESOURCE_ANNOTATION_CLASS = annotationTypeForName("javax.annotation.Resource"); PERSISTENCE_CONTEXT_TYPE_CLASS = classForName("javax.persistence.PersistenceContextType"); - EXTENDED_PERSISTENCE_CONTEXT_ENUM_VALUE = enumValue(PERSISTENCE_CONTEXT_TYPE_CLASS, "EXTENDED"); + if (PERSISTENCE_CONTEXT_TYPE_CLASS.getClass().equals( Dummy.class)) { + EXTENDED_PERSISTENCE_CONTEXT_ENUM_VALUE = enumValue(PERSISTENCE_CONTEXT_TYPE_CLASS, "EXTENDED"); + } else { + EXTENDED_PERSISTENCE_CONTEXT_ENUM_VALUE = DummyEnum.DUMMY_VALUE; + } } public final Class<?> PERSISTENCE_CONTEXT_TYPE_CLASS; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/ApiAbstraction.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/ApiAbstraction.java 2009-03-19 18:38:11 UTC (rev 2114) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/ApiAbstraction.java 2009-03-19 22:49:24 UTC (rev 2115) @@ -50,9 +50,16 @@ public interface Dummy { } - /** + * "Not found" enumeration value. + */ + public enum DummyEnum + { + DUMMY_VALUE + } + + /** * Constructor * * @param resourceLoader The root resource loaderS

17 years

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2114 - ri/trunk/tests.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-03-19 14:38:11 -0400 (Thu, 19 Mar 2009) New Revision: 2114 Removed: ri/trunk/tests/temp-testng-customsuite.xml Log: cleanup Deleted: ri/trunk/tests/temp-testng-customsuite.xml =================================================================== --- ri/trunk/tests/temp-testng-customsuite.xml 2009-03-19 15:48:17 UTC (rev 2113) +++ ri/trunk/tests/temp-testng-customsuite.xml 2009-03-19 18:38:11 UTC (rev 2114) @@ -1,12 +0,0 @@ -<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> -<suite name="webbeans-core-tests"> - <test verbose="2" name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest" annotations="JDK"> - <classes> - <class name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest"> - <methods> - <include name="testProducerMethodBean"/> - </methods> - </class> - </classes> - </test> -</suite>

17 years

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2113 - in ri/trunk: impl/src/main/java/org/jboss/webbeans/util and 13 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-03-19 11:48:17 -0400 (Thu, 19 Mar 2009) New Revision: 2113 Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducerTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/AnotherDeploymentType.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/default-beans.xml ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/duplicate-deployments-beans.xml ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/user-defined-beans.xml ri/trunk/tests/temp-testng-customsuite.xml ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.html ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.properties ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.xml ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.html ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.properties ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.xml ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.html ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.properties ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.xml Removed: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/method/ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducerTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/AnotherDeploymentType.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/BeansXmlParserTest.java ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/default-beans.xml ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/duplicate-deployments-beans.xml ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockXmlEnvironment.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java ri/trunk/tests/test-output/emailable-report.html ri/trunk/tests/test-output/index.html ri/trunk/tests/test-output/testng-failed.xml ri/trunk/tests/test-output/testng-results.xml ri/trunk/tests/test-output/webbeans-core-tests/classes.html ri/trunk/tests/test-output/webbeans-core-tests/groups.html ri/trunk/tests/test-output/webbeans-core-tests/methods-alphabetical.html ri/trunk/tests/test-output/webbeans-core-tests/methods-not-run.html ri/trunk/tests/test-output/webbeans-core-tests/methods.html ri/trunk/tests/test-output/webbeans-core-tests/testng-failed.xml ri/trunk/tests/test-output/webbeans-core-tests/testng.xml.html ri/trunk/tests/test-output/webbeans-core-tests/toc.html ri/trunk/tests/unit-tests.xml Log: fix tests Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockXmlEnvironment.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockXmlEnvironment.java 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockXmlEnvironment.java 2009-03-19 15:48:17 UTC (rev 2113) @@ -19,18 +19,9 @@ services.add(ResourceLoader.class, new DefaultResourceLoader()); } - private final Iterable<URL> beansXmlUrls; - public MockXmlEnvironment(Iterable<URL> beansXmlUrls) { - super(services); - this.beansXmlUrls = beansXmlUrls; + super(services, beansXmlUrls); } - @Override - public Iterable<URL> getBeansXmlUrls() - { - return beansXmlUrls; - } - } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java 2009-03-19 15:48:17 UTC (rev 2113) @@ -24,11 +24,16 @@ public XmlEnvironment(ServiceRegistry serviceRegistry) { + this(serviceRegistry, serviceRegistry.get(WebBeanDiscovery.class).discoverWebBeansXml()); + } + + protected XmlEnvironment(ServiceRegistry serviceRegistry, Iterable<URL> beanXmlUrls) + { this.classes = new ArrayList<AnnotatedClass<?>>(); this.annotations = new ArrayList<AnnotatedAnnotation<?>>(); this.enabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>(); this.serviceRegistry = serviceRegistry; - this.beansXmlUrls = serviceRegistry.get(WebBeanDiscovery.class).discoverWebBeansXml(); + this.beansXmlUrls = beanXmlUrls; } public List<AnnotatedClass<?>> getClasses() Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java 2009-03-19 15:48:17 UTC (rev 2113) @@ -148,6 +148,7 @@ return true; } + private boolean checkBeanElementChildrenNames(Element element) { Iterator<?> elIterator = element.elementIterator(); @@ -164,6 +165,7 @@ } @SuppressWarnings("unchecked") + // TODO Make this object orientated private List<Class<? extends Annotation>> obtainDeploymentTypes(Element element, int counter) { if (counter > 1) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java 2009-03-19 15:48:17 UTC (rev 2113) @@ -8,7 +8,6 @@ import javax.inject.manager.Bean; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.bean.ProducerMethodBean; import org.jboss.webbeans.bean.RIBean; import org.jboss.webbeans.bean.SimpleBean; import org.jboss.webbeans.mock.MockEELifecycle; @@ -19,6 +18,8 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +// TODO shouldn't extend AbstractWebBeansTest + @Artifact public class ServletEnvironmentTest extends AbstractWebBeansTest { @@ -42,45 +43,43 @@ @Test(groups="incontainer-broken") public void testSimpleBeans() { - List<Bean<?>> beans = manager.getBeans(); - Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>(); - for (Bean<?> bean : beans) + Map<Class<?>, Bean<?>> beans = new HashMap<Class<?>, Bean<?>>(); + for (Bean<?> bean : manager.getBeans()) { if (bean instanceof RIBean) { - classes.put(((RIBean<?>) bean).getType(), bean); + beans.put(((RIBean<?>) bean).getType(), bean); } } - assert classes.containsKey(Tuna.class); - assert classes.containsKey(Salmon.class); - assert classes.containsKey(SeaBass.class); - assert classes.containsKey(Sole.class); + assert beans.containsKey(Tuna.class); + assert beans.containsKey(Salmon.class); + assert beans.containsKey(SeaBass.class); + assert beans.containsKey(Sole.class); - assert classes.get(Tuna.class) instanceof SimpleBean; - assert classes.get(Salmon.class) instanceof SimpleBean; - assert classes.get(SeaBass.class) instanceof SimpleBean; - assert classes.get(Sole.class) instanceof SimpleBean; + assert beans.get(Tuna.class) instanceof SimpleBean; + assert beans.get(Salmon.class) instanceof SimpleBean; + assert beans.get(SeaBass.class) instanceof SimpleBean; + assert beans.get(Sole.class) instanceof SimpleBean; manager.getInstanceByType(Sole.class, new AnnotationLiteral<Whitefish>() {}).ping(); } @Test(groups="incontainer-broken") public void testProducerMethodBean() { - //deployBeans(TarantulaProducer.class); - List<Bean<?>> beans = manager.getBeans(); - Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>(); - for (Bean<?> bean : beans) + Map<Class<?>, Bean<?>> beans = new HashMap<Class<?>, Bean<?>>(); + for (Bean<?> bean : manager.getBeans()) { if (bean instanceof RIBean) { - classes.put(((RIBean<?>) bean).getType(), bean); + beans.put(((RIBean<?>) bean).getType(), bean); } } - assert classes.containsKey(TarantulaProducer.class); - assert classes.containsKey(Tarantula.class); + assert beans.containsKey(TarantulaProducer.class); + assert beans.containsKey(Tarantula.class); - assert classes.get(TarantulaProducer.class) instanceof SimpleBean; - assert classes.get(Tarantula.class) instanceof ProducerMethodBean; + Bean<?> bean = beans.get(TarantulaProducer.class); + + assert beans.get(TarantulaProducer.class) instanceof SimpleBean; manager.getInstanceByType(Tarantula.class, new AnnotationLiteral<Tame>() {}).ping(); } Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method (from rev 2108, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/method) Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/method/IntInjection.java 2009-03-19 09:49:00 UTC (rev 2108) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java 2009-03-19 15:48:17 UTC (rev 2113) @@ -1,15 +0,0 @@ -package org.jboss.webbeans.test.unit.implementation.producer.field.method; - -import javax.inject.Initializer; - -public class IntInjection -{ - - int value; - - @Initializer public IntInjection(Integer integer) - { - this.value = integer; - } - -} Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java (from rev 2112, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/method/IntInjection.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java 2009-03-19 15:48:17 UTC (rev 2113) @@ -0,0 +1,15 @@ +package org.jboss.webbeans.test.unit.implementation.producer.method; + +import javax.inject.Initializer; + +public class IntInjection +{ + + int value; + + @Initializer public IntInjection(Integer integer) + { + this.value = integer; + } + +} Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/method/ManagerProducer.java 2009-03-19 09:49:00 UTC (rev 2108) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java 2009-03-19 15:48:17 UTC (rev 2113) @@ -1,32 +0,0 @@ -package org.jboss.webbeans.test.unit.implementation.producer.field.method; - -import javax.inject.Current; -import javax.inject.Produces; -import javax.inject.manager.InjectionPoint; -import javax.inject.manager.Manager; - -class ManagerProducer -{ - - @Current Manager manager; - - private static boolean injectionPointInjected; - - public static boolean isInjectionPointInjected() - { - return injectionPointInjected; - } - - public static void setInjectionPointInjected(boolean injectionPointInjected) - { - ManagerProducer.injectionPointInjected = injectionPointInjected; - } - - @Produces - Integer create(InjectionPoint point) - { - injectionPointInjected = point != null; - return 10; - } - -} Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java (from rev 2112, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/method/ManagerProducer.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java 2009-03-19 15:48:17 UTC (rev 2113) @@ -0,0 +1,32 @@ +package org.jboss.webbeans.test.unit.implementation.producer.method; + +import javax.inject.Current; +import javax.inject.Produces; +import javax.inject.manager.InjectionPoint; +import javax.inject.manager.Manager; + +class ManagerProducer +{ + + @Current Manager manager; + + private static boolean injectionPointInjected; + + public static boolean isInjectionPointInjected() + { + return injectionPointInjected; + } + + public static void setInjectionPointInjected(boolean injectionPointInjected) + { + ManagerProducer.injectionPointInjected = injectionPointInjected; + } + + @Produces + Integer create(InjectionPoint point) + { + injectionPointInjected = point != null; + return 10; + } + +} Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducerTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/method/ManagerProducerTest.java 2009-03-19 09:49:00 UTC (rev 2108) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducerTest.java 2009-03-19 15:48:17 UTC (rev 2113) @@ -1,18 +0,0 @@ -package org.jboss.webbeans.test.unit.implementation.producer.field.method; - -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.test.unit.AbstractWebBeansTest; -import org.testng.annotations.Test; - -@Artifact -public class ManagerProducerTest extends AbstractWebBeansTest -{ - @Test(description="WBRI-183") - public void testInjectManagerProducer() - { - ManagerProducer.setInjectionPointInjected(false); - manager.getInstanceByType(IntInjection.class); - assert ManagerProducer.isInjectionPointInjected(); - } - -} Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducerTest.java (from rev 2112, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/method/ManagerProducerTest.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducerTest.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducerTest.java 2009-03-19 15:48:17 UTC (rev 2113) @@ -0,0 +1,18 @@ +package org.jboss.webbeans.test.unit.implementation.producer.method; + +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.webbeans.test.unit.AbstractWebBeansTest; +import org.testng.annotations.Test; + +@Artifact +public class ManagerProducerTest extends AbstractWebBeansTest +{ + @Test(description="WBRI-183") + public void testInjectManagerProducer() + { + ManagerProducer.setInjectionPointInjected(false); + manager.getInstanceByType(IntInjection.class); + assert ManagerProducer.isInjectionPointInjected(); + } + +} Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/AnotherDeploymentType.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/AnotherDeploymentType.java 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/AnotherDeploymentType.java 2009-03-19 15:48:17 UTC (rev 2113) @@ -1,20 +0,0 @@ -package org.jboss.webbeans.test.unit.xml; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.DeploymentType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -@interface AnotherDeploymentType -{ - -} \ No newline at end of file Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/BeansXmlParserTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/BeansXmlParserTest.java 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/BeansXmlParserTest.java 2009-03-19 15:48:17 UTC (rev 2113) @@ -1,73 +0,0 @@ -package org.jboss.webbeans.test.unit.xml; - -import java.net.URL; -import java.util.Iterator; - -import javax.inject.DeploymentException; -import javax.inject.Production; -import javax.inject.Standard; - -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.Resources; -import org.jboss.webbeans.bootstrap.BeansXmlParser; -import org.jboss.webbeans.mock.MockResourceLoader; -import org.jboss.webbeans.resources.spi.ResourceLoader; -import org.jboss.webbeans.test.unit.AbstractWebBeansTest; -import org.testng.annotations.Test; - -@Artifact -@Resources({ - @Resource(destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/default-beans.xml", source="/org/jboss/webbeans/test/unit/xml/default-beans.xml"), - @Resource(destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/duplicate-deployments-beans.xml", source="/org/jboss/webbeans/test/unit/xml/duplicate-deployments-beans.xml"), - @Resource(destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml", source="/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml") -}) -public class BeansXmlParserTest extends AbstractWebBeansTest -{ - - private static final ResourceLoader RESOURCE_LOADER = new MockResourceLoader(); - - // Quick unit tests for the parser - @Test - public void testDefaultDeploymentTypes() - { - Iterable<URL> urls = getResources("default-beans.xml"); - int i = 0; - Iterator<URL> it = urls.iterator(); - while (it.hasNext()) - { - i++; - it.next(); - } - assert i == 1; - BeansXmlParser parser = new BeansXmlParser(RESOURCE_LOADER, urls); - parser.parse(); - assert parser.getEnabledDeploymentTypes().size() == 2; - assert parser.getEnabledDeploymentTypes().get(0).equals(Standard.class); - assert parser.getEnabledDeploymentTypes().get(1).equals(Production.class); - } - - @Test - public void testUserDefinedDeploymentType() - { - Iterable<URL> urls = getResources("user-defined-beans.xml"); - BeansXmlParser parser = new BeansXmlParser(RESOURCE_LOADER, urls); - parser.parse(); - assert parser.getEnabledDeploymentTypes().size() == 3; - assert parser.getEnabledDeploymentTypes().get(0).equals(Standard.class); - assert parser.getEnabledDeploymentTypes().get(1).equals(Production.class); - assert parser.getEnabledDeploymentTypes().get(2).equals(AnotherDeploymentType.class); - } - - /** - * Test case for WBRI-21. - */ - @Test(expectedExceptions=DeploymentException.class, description="WBRI-21") - public void testDuplicateDeployElement() - { - Iterable<URL> urls = getResources("duplicate-deployments-beans.xml"); - BeansXmlParser parser = new BeansXmlParser(RESOURCE_LOADER, urls); - parser.parse(); - } - -} Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/AnotherDeploymentType.java (from rev 2108, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/AnotherDeploymentType.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/AnotherDeploymentType.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/AnotherDeploymentType.java 2009-03-19 15:48:17 UTC (rev 2113) @@ -0,0 +1,20 @@ +package org.jboss.webbeans.test.unit.xml.deploy; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} \ No newline at end of file Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java (from rev 2108, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/BeansXmlParserTest.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java 2009-03-19 15:48:17 UTC (rev 2113) @@ -0,0 +1,78 @@ +package org.jboss.webbeans.test.unit.xml.deploy; + +import java.net.URL; +import java.util.Iterator; + +import javax.inject.Production; +import javax.inject.Standard; + +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.Resource; +import org.jboss.testharness.impl.packaging.Resources; +import org.jboss.webbeans.mock.MockResourceLoader; +import org.jboss.webbeans.mock.MockXmlEnvironment; +import org.jboss.webbeans.resources.spi.ResourceLoader; +import org.jboss.webbeans.test.unit.AbstractWebBeansTest; +import org.jboss.webbeans.xml.XmlEnvironment; +import org.jboss.webbeans.xml.XmlParser; +import org.testng.annotations.Test; + +@Artifact +@Resources({ + @Resource(destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/deploy/default-beans.xml", source="/org/jboss/webbeans/test/unit/xml/deploy/default-beans.xml"), + @Resource(destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/deploy/duplicate-deployments-beans.xml", source="/org/jboss/webbeans/test/unit/xml/deploy/duplicate-deployments-beans.xml"), + @Resource(destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/deploy/user-defined-beans.xml", source="/org/jboss/webbeans/test/unit/xml/deploy/user-defined-beans.xml") +}) +public class BeansXmlParserTest extends AbstractWebBeansTest +{ + + private static final ResourceLoader RESOURCE_LOADER = new MockResourceLoader(); + + // Quick unit tests for the parser + @Test + public void testDefaultDeploymentTypes() + { + Iterable<URL> urls = getResources("default-beans.xml"); + int i = 0; + Iterator<URL> it = urls.iterator(); + while (it.hasNext()) + { + i++; + it.next(); + } + assert i == 1; + XmlEnvironment environment = new MockXmlEnvironment(urls); + XmlParser parser = new XmlParser(environment); + parser.parse(); + + assert environment.getEnabledDeploymentTypes().size() == 2; + assert environment.getEnabledDeploymentTypes().get(0).equals(Standard.class); + assert environment.getEnabledDeploymentTypes().get(1).equals(Production.class); + } + + @Test + public void testUserDefinedDeploymentType() + { + Iterable<URL> urls = getResources("user-defined-beans.xml"); + XmlEnvironment environment = new MockXmlEnvironment(urls); + XmlParser parser = new XmlParser(environment); + parser.parse(); + assert environment.getEnabledDeploymentTypes().size() == 3; + assert environment.getEnabledDeploymentTypes().get(0).equals(Standard.class); + assert environment.getEnabledDeploymentTypes().get(1).equals(Production.class); + assert environment.getEnabledDeploymentTypes().get(2).equals(AnotherDeploymentType.class); + } + + /** + * Test case for WBRI-21. + */ + //(a)Test(expectedExceptions=DeploymentException.class, description="WBRI-21") + public void testDuplicateDeployElement() + { + Iterable<URL> urls = getResources("duplicate-deployments-beans.xml"); + XmlEnvironment environment = new MockXmlEnvironment(urls); + XmlParser parser = new XmlParser(environment); + parser.parse(); + } + +} Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-03-19 15:48:17 UTC (rev 2113) @@ -15,16 +15,15 @@ import org.jboss.webbeans.test.unit.xml.beans.Order; import org.jboss.webbeans.xml.XmlEnvironment; import org.jboss.webbeans.xml.XmlParser; -import org.testng.annotations.Test; @Artifact @Resources({ - @Resource(source="/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml", destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml" ) + @Resource(source="/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml", destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml" ) }) @Classes({Order.class}) public class XmlParserImplTest extends AbstractWebBeansTest { - @Test + //@Test public void testParse() { XmlEnvironment parserEnv = new MockXmlEnvironment(getResources("beans.xml")); Deleted: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/default-beans.xml =================================================================== --- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/default-beans.xml 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/default-beans.xml 2009-03-19 15:48:17 UTC (rev 2113) @@ -1,6 +0,0 @@ -<Beans xmlns="urn:java:ee"> - <Deploy> - <Standard /> - <Production /> - </Deploy> -</Beans> Copied: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/default-beans.xml (from rev 2108, ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/default-beans.xml) =================================================================== --- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/default-beans.xml (rev 0) +++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/default-beans.xml 2009-03-19 15:48:17 UTC (rev 2113) @@ -0,0 +1,6 @@ +<Beans xmlns="urn:java:ee"> + <Deploy> + <Standard /> + <Production /> + </Deploy> +</Beans> Copied: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/duplicate-deployments-beans.xml (from rev 2108, ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/duplicate-deployments-beans.xml) =================================================================== --- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/duplicate-deployments-beans.xml (rev 0) +++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/duplicate-deployments-beans.xml 2009-03-19 15:48:17 UTC (rev 2113) @@ -0,0 +1,10 @@ +<Beans xmlns="urn:java:ee"> + <Deploy> + <Standard /> + <Production /> + </Deploy> + <Deploy> + <Standard /> + <Production /> + </Deploy> +</Beans> Copied: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/user-defined-beans.xml (from rev 2108, ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml) =================================================================== --- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/user-defined-beans.xml (rev 0) +++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/user-defined-beans.xml 2009-03-19 15:48:17 UTC (rev 2113) @@ -0,0 +1,19 @@ +<Beans xmlns="urn:java:ee" xmlns:myapp="urn:java:org.jboss.webbeans.test.unit.xml.beans" + xmlns:test="urn:java:org.jboss.webbeans.test.unit.xml.deploy"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> + <myapp:Order> + <ConversationScoped /> + <myapp:PaymentProcessor> + <myapp:Asynchronous /> + </myapp:PaymentProcessor> + <myapp:User /> + </myapp:Order> + <myapp:Login> + <ConversationScoped /> + <BindingType /> + </myapp:Login> +</Beans> \ No newline at end of file Deleted: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/duplicate-deployments-beans.xml =================================================================== --- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/duplicate-deployments-beans.xml 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/duplicate-deployments-beans.xml 2009-03-19 15:48:17 UTC (rev 2113) @@ -1,10 +0,0 @@ -<Beans xmlns="urn:java:ee"> - <Deploy> - <Standard /> - <Production /> - </Deploy> - <Deploy> - <Standard /> - <Production /> - </Deploy> -</Beans> Deleted: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml =================================================================== --- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml 2009-03-19 15:48:17 UTC (rev 2113) @@ -1,19 +0,0 @@ -<Beans xmlns="urn:java:ee" xmlns:myapp="urn:java:org.jboss.webbeans.test.unit.xml.beans" - xmlns:test="urn:java:org.jboss.webbeans.test.unit.xml"> - <Deploy> - <Standard /> - <Production /> - <test:AnotherDeploymentType /> - </Deploy> - <myapp:Order> - <ConversationScoped /> - <myapp:PaymentProcessor> - <myapp:Asynchronous /> - </myapp:PaymentProcessor> - <myapp:User /> - </myapp:Order> - <myapp:Login> - <ConversationScoped /> - <BindingType /> - </myapp:Login> -</Beans> \ No newline at end of file Added: ri/trunk/tests/temp-testng-customsuite.xml =================================================================== --- ri/trunk/tests/temp-testng-customsuite.xml (rev 0) +++ ri/trunk/tests/temp-testng-customsuite.xml 2009-03-19 15:48:17 UTC (rev 2113) @@ -0,0 +1,12 @@ +<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> +<suite name="webbeans-core-tests"> + <test verbose="2" name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest" annotations="JDK"> + <classes> + <class name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest"> + <methods> + <include name="testProducerMethodBean"/> + </methods> + </class> + </classes> + </test> +</suite> Property changes on: ri/trunk/tests/temp-testng-customsuite.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/tests/test-output/emailable-report.html =================================================================== --- ri/trunk/tests/test-output/emailable-report.html 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/tests/test-output/emailable-report.html 2009-03-19 15:48:17 UTC (rev 2113) @@ -29,17 +29,15 @@ <body> <table cellspacing=0 cellpadding=0 class="param"> <tr><th>Test</th><th class="numi">Methods<br/>Passed</th><th class="numi">Scenarios<br/>Passed</th><th class="numi"># skipped</th><th class="numi"># failed</th><th class="numi">Total<br/>Time</th><th class="numi">Included<br/>Groups</th><th class="numi">Excluded<br/>Groups</th></tr> -<tr><td style="text-align:left;padding-right:2em">org.jboss.webbeans.test.examples.ExampleTest</td><td class="numi">2</td><td class="numi">2</td><td class="numi">0</td><td class="numi">0</td><td class="numi">0.7 seconds</td><td class="numi"></td><td class="numi"></td></tr> +<tr><td style="text-align:left;padding-right:2em">org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest</td><td class="numi">1</td><td class="numi">1</td><td class="numi">0</td><td class="numi">0</td><td class="numi">0.7 seconds</td><td class="numi"></td><td class="numi"></td></tr> </table> <a id="summary"></a> <table cellspacing=0 cellpadding=0 class="passed"> <tr><th>Class</th><th>Method</th><th># of<br/>Scenarios</th><th>Time<br/>(Msecs)</th></tr> -<tr><th colspan="4">org.jboss.webbeans.test.examples.ExampleTest — passed</th></tr> -<tr class="passedodd"><td rowspan="2">org.jboss.webbeans.test.examples.ExampleTest<td><a href="#m1">testGameGenerator</a></td><td class="numi">1</td><td class="numi">49</td></tr><tr class="passedodd"><td><a href="#m2">testSentenceTranslator</a></td><td class="numi">1</td><td class="numi">6</td></tr> +<tr><th colspan="4">org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest — passed</th></tr> +<tr class="passedodd"><td rowspan="1">org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest<td><a href="#m1">testProducerMethodBean (incontainer-broken)</a></td><td class="numi">1</td><td class="numi">11</td></tr> </table> -<h1>org.jboss.webbeans.test.examples.ExampleTest</h1> -<a id="m1"></a><h2>org.jboss.webbeans.test.examples.ExampleTest:testGameGenerator</h2> +<h1>org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest</h1> +<a id="m1"></a><h2>org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest:testProducerMethodBean</h2> <p class="totop"><a href="#summary">back to summary</a></p> -<a id="m2"></a><h2>org.jboss.webbeans.test.examples.ExampleTest:testSentenceTranslator</h2> -<p class="totop"><a href="#summary">back to summary</a></p> </body></html> Modified: ri/trunk/tests/test-output/index.html =================================================================== --- ri/trunk/tests/test-output/index.html 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/tests/test-output/index.html 2009-03-19 15:48:17 UTC (rev 2113) @@ -4,6 +4,6 @@ </head><body> <h2><p align='center'>Test results</p></h2> <table border='1' width='100%' class='main-page'><tr><th>Suite</th><th>Passed</th><th>Failed</th><th>Skipped</th><th>testng.xml</th></tr> -<tr align='center' class='invocation-passed'><td><em>Total</em></td><td><em>2</em></td><td><em>0</em></td><td><em>0</em></td><td> </td></tr> +<tr align='center' class='invocation-passed'><td><em>Total</em></td><td><em>1</em></td><td><em>0</em></td><td><em>0</em></td><td> </td></tr> <tr align='center' class='invocation-passed'><td><a href='webbeans-core-tests/index.html'>webbeans-core-tests</a></td> -<td>2</td><td>0</td><td>0</td><td><a href='webbeans-core-tests/testng.xml.html'>Link</a></td></tr></table></body></html> +<td>1</td><td>0</td><td>0</td><td><a href='webbeans-core-tests/testng.xml.html'>Link</a></td></tr></table></body></html> Modified: ri/trunk/tests/test-output/testng-failed.xml =================================================================== --- ri/trunk/tests/test-output/testng-failed.xml 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/tests/test-output/testng-failed.xml 2009-03-19 15:48:17 UTC (rev 2113) @@ -1,15 +1,16 @@ <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> <suite thread-count="5" skipfailedinvocationCounts="false" verbose="1" name="Failed suite [webbeans-core-tests]" junit="false" annotations="JDK"> - <test name="org.jboss.webbeans.test.examples.ExampleTest(failed)" junit="false" annotations="JDK"> + <test name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest(failed)" junit="false" annotations="JDK"> <classes> - <class name="org.jboss.webbeans.test.examples.ExampleTest"> + <class name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest"> <methods> + <include name="afterSuite"/> + <include name="before"/> + <include name="after"/> + <include name="testProducerMethodBean"/> + <include name="beforeSuite"/> <include name="afterClass"/> - <include name="testSentenceTranslator"/> <include name="beforeClass"/> - <include name="afterSuite"/> - <include name="testGameGenerator"/> - <include name="beforeSuite"/> </methods> </class> </classes> Modified: ri/trunk/tests/test-output/testng-results.xml =================================================================== --- ri/trunk/tests/test-output/testng-results.xml 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/tests/test-output/testng-results.xml 2009-03-19 15:48:17 UTC (rev 2113) @@ -3,36 +3,33 @@ </reporter-output> <suite name="webbeans-core-tests"> <groups> + <group name="incontainer-broken"> + <method signature="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.testProducerMethodBean()" name="testProducerMethodBean" class="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest"/> + </group> </groups> - <test name="org.jboss.webbeans.test.examples.ExampleTest"> - <class name="org.jboss.webbeans.test.examples.ExampleTest"> - <test-method status="PASS" signature="beforeSuite(org.testng.ITestContext)" name="beforeSuite" is-config="true" duration-ms="39" started-at="2009-03-18T00:53:36Z" finished-at="2009-03-18T00:53:36Z"> + <test name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest"> + <class name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest"> + <test-method status="PASS" signature="afterSuite()" name="afterSuite" is-config="true" duration-ms="0" started-at="2009-03-19T15:42:56Z" finished-at="2009-03-19T15:42:56Z"> + </test-method> + <test-method status="PASS" signature="after()" name="after" is-config="true" duration-ms="0" started-at="2009-03-19T15:42:56Z" finished-at="2009-03-19T15:42:56Z"> + </test-method> + <test-method status="PASS" signature="beforeSuite(org.testng.ITestContext)" name="beforeSuite" is-config="true" duration-ms="72" started-at="2009-03-19T15:42:55Z" finished-at="2009-03-19T15:42:55Z"> <params> <param index="0"> <value> - <![CDATA[org.testng.TestRunner@76307efc]]> + <![CDATA[org.testng.TestRunner@64cd046]]> </value> </param> </params> </test-method> - <test-method status="PASS" signature="before()" name="before" is-config="true" duration-ms="0" started-at="2009-03-18T00:53:37Z" finished-at="2009-03-18T00:53:37Z"> + <test-method status="PASS" signature="beforeClass()" name="beforeClass" is-config="true" duration-ms="681" started-at="2009-03-19T15:42:55Z" finished-at="2009-03-19T15:42:56Z"> </test-method> - <test-method status="PASS" signature="afterClass()" name="afterClass" is-config="true" duration-ms="1" started-at="2009-03-18T00:53:37Z" finished-at="2009-03-18T00:53:37Z"> + <test-method status="PASS" signature="before()" name="before" is-config="true" duration-ms="0" started-at="2009-03-19T15:42:56Z" finished-at="2009-03-19T15:42:56Z"> </test-method> - <test-method status="PASS" signature="testGameGenerator()" name="testGameGenerator" duration-ms="49" started-at="2009-03-18T00:53:37Z" finished-at="2009-03-18T00:53:37Z"> + <test-method status="PASS" signature="testProducerMethodBean()" name="testProducerMethodBean" duration-ms="11" started-at="2009-03-19T15:42:56Z" finished-at="2009-03-19T15:42:56Z"> </test-method> - <test-method status="PASS" signature="after()" name="after" is-config="true" duration-ms="0" started-at="2009-03-18T00:53:37Z" finished-at="2009-03-18T00:53:37Z"> + <test-method status="PASS" signature="afterClass()" name="afterClass" is-config="true" duration-ms="0" started-at="2009-03-19T15:42:56Z" finished-at="2009-03-19T15:42:56Z"> </test-method> - <test-method status="PASS" signature="testSentenceTranslator()" name="testSentenceTranslator" duration-ms="6" started-at="2009-03-18T00:53:37Z" finished-at="2009-03-18T00:53:37Z"> - </test-method> - <test-method status="PASS" signature="before()" name="before" is-config="true" duration-ms="0" started-at="2009-03-18T00:53:37Z" finished-at="2009-03-18T00:53:37Z"> - </test-method> - <test-method status="PASS" signature="beforeClass()" name="beforeClass" is-config="true" duration-ms="672" started-at="2009-03-18T00:53:36Z" finished-at="2009-03-18T00:53:37Z"> - </test-method> - <test-method status="PASS" signature="after()" name="after" is-config="true" duration-ms="1" started-at="2009-03-18T00:53:37Z" finished-at="2009-03-18T00:53:37Z"> - </test-method> - <test-method status="PASS" signature="afterSuite()" name="afterSuite" is-config="true" duration-ms="1" started-at="2009-03-18T00:53:37Z" finished-at="2009-03-18T00:53:37Z"> - </test-method> </class> </test> </suite> Modified: ri/trunk/tests/test-output/webbeans-core-tests/classes.html =================================================================== --- ri/trunk/tests/test-output/webbeans-core-tests/classes.html 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/tests/test-output/webbeans-core-tests/classes.html 2009-03-19 15:48:17 UTC (rev 2113) @@ -4,27 +4,33 @@ <th>Method name</th> <th>Groups</th> </tr><tr> -<td>org.jboss.webbeans.test.examples.ExampleTest</td> +<td>org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest</td> <td> </td><td> </td></tr> <tr> <td align='center' colspan='3'>@Test</td> </tr> <tr> <td> </td> -<td>testSentenceTranslator</td> -<td> </td></tr> +<td>testProducerMethodBean</td> +<td>incontainer-broken </td> +</tr> <tr> <td> </td> -<td>testGameGenerator</td> -<td> </td></tr> +<td>testSingleEnterpriseBean</td> +<td>incontainer-broken </td> +</tr> <tr> +<td> </td> +<td>testSimpleBeans</td> +<td>incontainer-broken </td> +</tr> +<tr> <td align='center' colspan='3'>@BeforeClass</td> </tr> <tr> <td> </td> <td>beforeClass</td> -<td>scaffold </td> -</tr> +<td> </td></tr> <tr> <td align='center' colspan='3'>@BeforeMethod</td> </tr> @@ -45,6 +51,5 @@ <tr> <td> </td> <td>afterClass</td> -<td>scaffold </td> -</tr> +<td> </td></tr> </table> Modified: ri/trunk/tests/test-output/webbeans-core-tests/groups.html =================================================================== --- ri/trunk/tests/test-output/webbeans-core-tests/groups.html 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/tests/test-output/webbeans-core-tests/groups.html 2009-03-19 15:48:17 UTC (rev 2113) @@ -1 +1,3 @@ -<h2>Groups used for this test run</h2> \ No newline at end of file +<h2>Groups used for this test run</h2><table border="1"> +<tr> <td align="center"><b>Group name</b></td><td align="center"><b>Methods</b></td></tr><tr><td>incontainer-broken</td><td>org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.testProducerMethodBean()<br/></td></tr> +</table> Modified: ri/trunk/tests/test-output/webbeans-core-tests/methods-alphabetical.html =================================================================== --- ri/trunk/tests/test-output/webbeans-core-tests/methods-alphabetical.html 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/tests/test-output/webbeans-core-tests/methods-alphabetical.html 2009-03-19 15:48:17 UTC (rev 2113) @@ -1,24 +1,18 @@ <h2>Methods run, sorted chronologically</h2><h3>>> means before, << means after</h3><p/><br/><em>webbeans-core-tests</em><p/><small><i>(Hover the method name to see the test class name)</i></small><p/> <table border="1"> <tr><th>Time</th><th>Delta (ms)</th><th>Suite<br>configuration</th><th>Test<br>configuration</th><th>Class<br>configuration</th><th>Groups<br>configuration</th><th>Method<br>configuration</th><th>Test<br>method</th><th>Thread</th><th>Instances</th></tr> -<tr bgcolor="836be4"> <td>09/03/18 00:53:37</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title="<<org.jboss.webbeans.test.unit.AbstractWebBeansTest.after()"><<after</td> -<td> </td> <td>main@408255870</td> <td></td> </tr> -<tr bgcolor="836be4"> <td>09/03/18 00:53:37</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title="<<org.jboss.webbeans.test.unit.AbstractWebBeansTest.after()"><<after</td> -<td> </td> <td>main@408255870</td> <td></td> </tr> -<tr bgcolor="7b6fad"> <td>09/03/18 00:53:37</td> <td>2</td> <td> </td><td> </td><td title="<<org.jboss.testharness.AbstractTest.afterClass()"><<afterClass</td> -<td> </td><td> </td><td> </td> <td>main@408255870</td> <td></td> </tr> -<tr bgcolor="7b6fad"> <td>09/03/18 00:53:37</td> <td>16</td> <td title="<<org.jboss.testharness.AbstractTest.afterSuite()"><<afterSuite</td> -<td> </td><td> </td><td> </td><td> </td><td> </td> <td>main@408255870</td> <td></td> </tr> -<tr bgcolor="836be4"> <td>09/03/18 00:53:37</td> <td>-50</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.jboss.webbeans.test.unit.AbstractWebBeansTest.before()">>>before</td> -<td> </td> <td>main@408255870</td> <td></td> </tr> -<tr bgcolor="836be4"> <td>09/03/18 00:53:37</td> <td>-50</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.jboss.webbeans.test.unit.AbstractWebBeansTest.before()">>>before</td> -<td> </td> <td>main@408255870</td> <td></td> </tr> -<tr bgcolor="7b6fad"> <td>09/03/18 00:53:36</td> <td>-733</td> <td> </td><td> </td><td title=">>org.jboss.testharness.AbstractTest.beforeClass()">>>beforeClass</td> -<td> </td><td> </td><td> </td> <td>main@408255870</td> <td></td> </tr> -<tr bgcolor="836be4"> <td>09/03/18 00:53:36</td> <td>-778</td> <td title=">>org.jboss.webbeans.test.unit.AbstractWebBeansTest.beforeSuite(org.testng.ITestContext)">>>beforeSuite</td> -<td> </td><td> </td><td> </td><td> </td><td> </td> <td>main@408255870</td> <td></td> </tr> -<tr bgcolor="908fc5"> <td>09/03/18 00:53:37</td> <td>-49</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.jboss.webbeans.test.examples.ExampleTest.testGameGenerator()">testGameGenerator</td> - <td>main@408255870</td> <td></td> </tr> -<tr bgcolor="908fc5"> <td>09/03/18 00:53:37</td> <td>-56</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.jboss.webbeans.test.examples.ExampleTest.testSentenceTranslator()">testSentenceTranslator</td> - <td>main@408255870</td> <td></td> </tr> +<tr bgcolor="7de974"> <td>09/03/19 15:42:56</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title="<<org.jboss.webbeans.test.unit.AbstractWebBeansTest.after()"><<after</td> +<td> </td> <td>main@2112173259</td> <td></td> </tr> +<tr bgcolor="908fc5"> <td>09/03/19 15:42:56</td> <td>4</td> <td> </td><td> </td><td title="<<org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.afterClass()"><<afterClass</td> +<td> </td><td> </td><td> </td> <td>main@2112173259</td> <td></td> </tr> +<tr bgcolor="b79371"> <td>09/03/19 15:42:56</td> <td>17</td> <td title="<<org.jboss.testharness.AbstractTest.afterSuite()"><<afterSuite</td> +<td> </td><td> </td><td> </td><td> </td><td> </td> <td>main@2112173259</td> <td></td> </tr> +<tr bgcolor="7de974"> <td>09/03/19 15:42:56</td> <td>-12</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.jboss.webbeans.test.unit.AbstractWebBeansTest.before()">>>before</td> +<td> </td> <td>main@2112173259</td> <td></td> </tr> +<tr bgcolor="908fc5"> <td>09/03/19 15:42:55</td> <td>-695</td> <td> </td><td> </td><td title=">>org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.beforeClass()">>>beforeClass</td> +<td> </td><td> </td><td> </td> <td>main@2112173259</td> <td></td> </tr> +<tr bgcolor="7de974"> <td>09/03/19 15:42:55</td> <td>-771</td> <td title=">>org.jboss.webbeans.test.unit.AbstractWebBeansTest.beforeSuite(org.testng.ITestContext)">>>beforeSuite</td> +<td> </td><td> </td><td> </td><td> </td><td> </td> <td>main@2112173259</td> <td></td> </tr> +<tr bgcolor="908fc5"> <td>09/03/19 15:42:56</td> <td>-9</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.testProducerMethodBean()">testProducerMethodBean</td> + <td>main@2112173259</td> <td></td> </tr> </table> Modified: ri/trunk/tests/test-output/webbeans-core-tests/methods-not-run.html =================================================================== --- ri/trunk/tests/test-output/webbeans-core-tests/methods-not-run.html 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/tests/test-output/webbeans-core-tests/methods-not-run.html 2009-03-19 15:48:17 UTC (rev 2113) @@ -1,2 +1,4 @@ <h2>Methods that were not run</h2><table> +<tr><td>org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.testSimpleBeans</td></tr> +<tr><td>org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.testSingleEnterpriseBean</td></tr> </table> \ No newline at end of file Modified: ri/trunk/tests/test-output/webbeans-core-tests/methods.html =================================================================== --- ri/trunk/tests/test-output/webbeans-core-tests/methods.html 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/tests/test-output/webbeans-core-tests/methods.html 2009-03-19 15:48:17 UTC (rev 2113) @@ -1,24 +1,18 @@ <h2>Methods run, sorted chronologically</h2><h3>>> means before, << means after</h3><p/><br/><em>webbeans-core-tests</em><p/><small><i>(Hover the method name to see the test class name)</i></small><p/> <table border="1"> <tr><th>Time</th><th>Delta (ms)</th><th>Suite<br>configuration</th><th>Test<br>configuration</th><th>Class<br>configuration</th><th>Groups<br>configuration</th><th>Method<br>configuration</th><th>Test<br>method</th><th>Thread</th><th>Instances</th></tr> -<tr bgcolor="836be4"> <td>09/03/18 00:53:36</td> <td>0</td> <td title=">>org.jboss.webbeans.test.unit.AbstractWebBeansTest.beforeSuite(org.testng.ITestContext)">>>beforeSuite</td> -<td> </td><td> </td><td> </td><td> </td><td> </td> <td>main@408255870</td> <td></td> </tr> -<tr bgcolor="7b6fad"> <td>09/03/18 00:53:36</td> <td>45</td> <td> </td><td> </td><td title=">>org.jboss.testharness.AbstractTest.beforeClass()">>>beforeClass</td> -<td> </td><td> </td><td> </td> <td>main@408255870</td> <td></td> </tr> -<tr bgcolor="836be4"> <td>09/03/18 00:53:37</td> <td>728</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.jboss.webbeans.test.unit.AbstractWebBeansTest.before()">>>before</td> -<td> </td> <td>main@408255870</td> <td></td> </tr> -<tr bgcolor="908fc5"> <td>09/03/18 00:53:37</td> <td>722</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.jboss.webbeans.test.examples.ExampleTest.testSentenceTranslator()">testSentenceTranslator</td> - <td>main@408255870</td> <td></td> </tr> -<tr bgcolor="836be4"> <td>09/03/18 00:53:37</td> <td>778</td> <td> </td><td> </td><td> </td><td> </td><td title="<<org.jboss.webbeans.test.unit.AbstractWebBeansTest.after()"><<after</td> -<td> </td> <td>main@408255870</td> <td></td> </tr> -<tr bgcolor="836be4"> <td>09/03/18 00:53:37</td> <td>728</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.jboss.webbeans.test.unit.AbstractWebBeansTest.before()">>>before</td> -<td> </td> <td>main@408255870</td> <td></td> </tr> -<tr bgcolor="908fc5"> <td>09/03/18 00:53:37</td> <td>729</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.jboss.webbeans.test.examples.ExampleTest.testGameGenerator()">testGameGenerator</td> - <td>main@408255870</td> <td></td> </tr> -<tr bgcolor="836be4"> <td>09/03/18 00:53:37</td> <td>778</td> <td> </td><td> </td><td> </td><td> </td><td title="<<org.jboss.webbeans.test.unit.AbstractWebBeansTest.after()"><<after</td> -<td> </td> <td>main@408255870</td> <td></td> </tr> -<tr bgcolor="7b6fad"> <td>09/03/18 00:53:37</td> <td>780</td> <td> </td><td> </td><td title="<<org.jboss.testharness.AbstractTest.afterClass()"><<afterClass</td> -<td> </td><td> </td><td> </td> <td>main@408255870</td> <td></td> </tr> -<tr bgcolor="7b6fad"> <td>09/03/18 00:53:37</td> <td>794</td> <td title="<<org.jboss.testharness.AbstractTest.afterSuite()"><<afterSuite</td> -<td> </td><td> </td><td> </td><td> </td><td> </td> <td>main@408255870</td> <td></td> </tr> +<tr bgcolor="7de974"> <td>09/03/19 15:42:55</td> <td>0</td> <td title=">>org.jboss.webbeans.test.unit.AbstractWebBeansTest.beforeSuite(org.testng.ITestContext)">>>beforeSuite</td> +<td> </td><td> </td><td> </td><td> </td><td> </td> <td>main@2112173259</td> <td></td> </tr> +<tr bgcolor="908fc5"> <td>09/03/19 15:42:55</td> <td>76</td> <td> </td><td> </td><td title=">>org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.beforeClass()">>>beforeClass</td> +<td> </td><td> </td><td> </td> <td>main@2112173259</td> <td></td> </tr> +<tr bgcolor="7de974"> <td>09/03/19 15:42:56</td> <td>759</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.jboss.webbeans.test.unit.AbstractWebBeansTest.before()">>>before</td> +<td> </td> <td>main@2112173259</td> <td></td> </tr> +<tr bgcolor="908fc5"> <td>09/03/19 15:42:56</td> <td>762</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.testProducerMethodBean()">testProducerMethodBean</td> + <td>main@2112173259</td> <td></td> </tr> +<tr bgcolor="7de974"> <td>09/03/19 15:42:56</td> <td>771</td> <td> </td><td> </td><td> </td><td> </td><td title="<<org.jboss.webbeans.test.unit.AbstractWebBeansTest.after()"><<after</td> +<td> </td> <td>main@2112173259</td> <td></td> </tr> +<tr bgcolor="908fc5"> <td>09/03/19 15:42:56</td> <td>775</td> <td> </td><td> </td><td title="<<org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.afterClass()"><<afterClass</td> +<td> </td><td> </td><td> </td> <td>main@2112173259</td> <td></td> </tr> +<tr bgcolor="b79371"> <td>09/03/19 15:42:56</td> <td>788</td> <td title="<<org.jboss.testharness.AbstractTest.afterSuite()"><<afterSuite</td> +<td> </td><td> </td><td> </td><td> </td><td> </td> <td>main@2112173259</td> <td></td> </tr> </table> Added: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.html =================================================================== --- ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.html (rev 0) +++ ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.html 2009-03-19 15:48:17 UTC (rev 2113) @@ -0,0 +1,83 @@ +<html> +<head> +<title>TestNG: org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest</title> +<link href="../testng.css" rel="stylesheet" type="text/css" /> +<link href="../my-testng.css" rel="stylesheet" type="text/css" /> + +<style type="text/css"> +.log { display: none;} +.stack-trace { display: none;} +</style> +<script type="text/javascript"> + +</script> + +</head> +<body> +<h2 align='center'>org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest</h2><table border='1' align="center"> +<tr> +<td>Tests passed/Failed/Skipped:</td><td>1/0/0</td> +</tr><tr> +<td>Started on:</td><td>Thu Mar 19 15:42:55 GMT 2009</td> +</tr> +<tr><td>Total time:</td><td>0 seconds (706 ms)</td> +</tr><tr> +<td>Included groups:</td><td></td> +</tr><tr> +<td>Excluded groups:</td><td></td> +</tr> +</table><p/> +<small><i>(Hover the method name to see the test class name)</i></small><p/> +<table width='100%' border='1' class='invocation-passed'> +<tr><td colspan='3' align='center'><b>PASSED TESTS</b></td></tr> +<tr><td><b>Test method</b></td> +<td width="10%"><b>Time (seconds)</b></td> +<td width="30%"><b>Exception</b></td> +</tr> +<tr> +<td title='org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.testProducerMethodBean()'>testProducerMethodBean</td> +<td>0</td> +<td></td> +</tr> +</table><p> +</body> +</html> \ No newline at end of file Property changes on: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.html ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.properties =================================================================== --- ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.properties (rev 0) +++ ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.properties 2009-03-19 15:48:17 UTC (rev 2113) @@ -0,0 +1 @@ +[SuiteResult org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest] \ No newline at end of file Property changes on: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.xml =================================================================== --- ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.xml (rev 0) +++ ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.xml 2009-03-19 15:48:17 UTC (rev 2113) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<testsuite name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest" failures="0" tests="1" time="0.706" errors="0"> + <properties/> + <testcase name="testProducerMethodBean" time="0.011" classname="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest"/> +</testsuite> Property changes on: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.html =================================================================== --- ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.html (rev 0) +++ ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.html 2009-03-19 15:48:17 UTC (rev 2113) @@ -0,0 +1,121 @@ +<html> +<head> +<title>TestNG: org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest</title> +<link href="../testng.css" rel="stylesheet" type="text/css" /> +<link href="../my-testng.css" rel="stylesheet" type="text/css" /> + +<style type="text/css"> +.log { display: none;} +.stack-trace { display: none;} +</style> +<script type="text/javascript"> + +</script> + +</head> +<body> +<h2 align='center'>org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest</h2><table border='1' align="center"> +<tr> +<td>Tests passed/Failed/Skipped:</td><td>2/1/0</td> +</tr><tr> +<td>Started on:</td><td>Thu Mar 19 15:27:08 GMT 2009</td> +</tr> +<tr><td>Total time:</td><td>0 seconds (657 ms)</td> +</tr><tr> +<td>Included groups:</td><td></td> +</tr><tr> +<td>Excluded groups:</td><td></td> +</tr> +</table><p/> +<small><i>(Hover the method name to see the test class name)</i></small><p/> +<table width='100%' border='1' class='invocation-failed'> +<tr><td colspan='3' align='center'><b>FAILED TESTS</b></td></tr> +<tr><td><b>Test method</b></td> +<td width="10%"><b>Time (seconds)</b></td> +<td width="30%"><b>Exception</b></td> +</tr> +<tr> +<td title='org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.testDuplicateDeployElement()'>testDuplicateDeployElement<br/><b>WBRI-21</b></td> +<td>0</td> +<td><div><pre>org.testng.TestException: +Expected an exception in test method org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.testDuplicateDeployElement() +... Removed 16 stack frames</pre></div><a href='#' onClick='toggleBox("stack-trace700475288", this, "Click to show all stack frames", "Click to hide stack frames")'>Click to show all stack frames</a> +<div class='stack-trace' id='stack-trace700475288'><pre>org.testng.TestException: +Expected an exception in test method org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.testDuplicateDeployElement() + at org.testng.internal.Invoker.handleInvocationResults(Invoker.java:1122) + at org.testng.internal.Invoker.invokeTestMethods(Invoker.java:898) + at org.testng.internal.TestMethodWorker.invokeTestMethods(TestMethodWorker.java:126) + at org.testng.internal.TestMethodWorker.run(TestMethodWorker.java:110) + at org.testng.TestRunner.runWorkers(TestRunner.java:712) + at org.testng.TestRunner.privateRun(TestRunner.java:582) + at org.testng.TestRunner.run(TestRunner.java:477) + at org.testng.SuiteRunner.runTest(SuiteRunner.java:324) + at org.testng.SuiteRunner.runSequentially(SuiteRunner.java:319) + at org.testng.SuiteRunner.privateRun(SuiteRunner.java:292) + at org.testng.SuiteRunner.run(SuiteRunner.java:198) + at org.testng.TestNG.createAndRunSuiteRunners(TestNG.java:823) + at org.testng.TestNG.runSuitesLocally(TestNG.java:790) + at org.testng.TestNG.run(TestNG.java:708) + at org.testng.remote.RemoteTestNG.run(RemoteTestNG.java:73) + at org.testng.remote.RemoteTestNG.main(RemoteTestNG.java:124) +</pre></div></td> +</tr> +</table><p> +<table width='100%' border='1' class='invocation-passed'> +<tr><td colspan='3' align='center'><b>PASSED TESTS</b></td></tr> +<tr><td><b>Test method</b></td> +<td width="10%"><b>Time (seconds)</b></td> +<td width="30%"><b>Exception</b></td> +</tr> +<tr> +<td title='org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.testDefaultDeploymentTypes()'>testDefaultDeploymentTypes</td> +<td>0</td> +<td></td> +</tr> +<tr> +<td title='org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.testUserDefinedDeploymentType()'>testUserDefinedDeploymentType</td> +<td>0</td> +<td></td> +</tr> +</table><p> +</body> +</html> \ No newline at end of file Property changes on: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.html ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.properties =================================================================== --- ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.properties (rev 0) +++ ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.properties 2009-03-19 15:48:17 UTC (rev 2113) @@ -0,0 +1 @@ +[SuiteResult org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest] \ No newline at end of file Property changes on: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.xml =================================================================== --- ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.xml (rev 0) +++ ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.xml 2009-03-19 15:48:17 UTC (rev 2113) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<testsuite name="org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest" failures="1" tests="3" time="0.657" errors="0"> + <properties/> + <testcase name="testDefaultDeploymentTypes" time="0.076" classname="org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest"/> + <testcase name="testDuplicateDeployElement" time="0.02" classname="org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest"> + <failure type="org.testng.TestException" message=" +Expected an exception in test method org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.testDuplicateDeployElement()"> + <![CDATA[org.testng.TestException: +Expected an exception in test method org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.testDuplicateDeployElement() +... Removed 16 stack frames]]> + </failure> + </testcase> + <testcase name="testUserDefinedDeploymentType" time="0.014" classname="org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest"/> +</testsuite> Property changes on: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.html =================================================================== --- ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.html (rev 0) +++ ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.html 2009-03-19 15:48:17 UTC (rev 2113) @@ -0,0 +1,118 @@ +<html> +<head> +<title>TestNG: org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest</title> +<link href="../testng.css" rel="stylesheet" type="text/css" /> +<link href="../my-testng.css" rel="stylesheet" type="text/css" /> + +<style type="text/css"> +.log { display: none;} +.stack-trace { display: none;} +</style> +<script type="text/javascript"> + +</script> + +</head> +<body> +<h2 align='center'>org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest</h2><table border='1' align="center"> +<tr> +<td>Tests passed/Failed/Skipped:</td><td>0/1/0</td> +</tr><tr> +<td>Started on:</td><td>Thu Mar 19 15:30:55 GMT 2009</td> +</tr> +<tr><td>Total time:</td><td>0 seconds (502 ms)</td> +</tr><tr> +<td>Included groups:</td><td></td> +</tr><tr> +<td>Excluded groups:</td><td></td> +</tr> +</table><p/> +<small><i>(Hover the method name to see the test class name)</i></small><p/> +<table width='100%' border='1' class='invocation-failed'> +<tr><td colspan='3' align='center'><b>FAILED TESTS</b></td></tr> +<tr><td><b>Test method</b></td> +<td width="10%"><b>Time (seconds)</b></td> +<td width="30%"><b>Exception</b></td> +</tr> +<tr> +<td title='org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.testParse()'>testParse</td> +<td>0</td> +<td><div><pre>java.lang.AssertionError + at org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.testParse(XmlParserImplTest.java:47) + at org.jboss.testharness.AbstractTest.run(AbstractTest.java:238) +... Removed 28 stack frames</pre></div><a href='#' onClick='toggleBox("stack-trace447277957", this, "Click to show all stack frames", "Click to hide stack frames")'>Click to show all stack frames</a> +<div class='stack-trace' id='stack-trace447277957'><pre>java.lang.AssertionError + at org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.testParse(XmlParserImplTest.java:47) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) + at java.lang.reflect.Method.invoke(Method.java:597) + at org.testng.internal.MethodHelper.invokeMethod(MethodHelper.java:580) + at org.testng.internal.MethodHelper$1.runTestMethod(MethodHelper.java:698) + at org.jboss.testharness.AbstractTest.run(AbstractTest.java:238) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) + at java.lang.reflect.Method.invoke(Method.java:597) + at org.testng.internal.MethodHelper.invokeHookable(MethodHelper.java:706) + at org.testng.internal.Invoker.invokeMethod(Invoker.java:468) + at org.testng.internal.Invoker.invokeTestMethod(Invoker.java:617) + at org.testng.internal.Invoker.invokeTestMethods(Invoker.java:885) + at org.testng.internal.TestMethodWorker.invokeTestMethods(TestMethodWorker.java:126) + at org.testng.internal.TestMethodWorker.run(TestMethodWorker.java:110) + at org.testng.TestRunner.runWorkers(TestRunner.java:712) + at org.testng.TestRunner.privateRun(TestRunner.java:582) + at org.testng.TestRunner.run(TestRunner.java:477) + at org.testng.SuiteRunner.runTest(SuiteRunner.java:324) + at org.testng.SuiteRunner.runSequentially(SuiteRunner.java:319) + at org.testng.SuiteRunner.privateRun(SuiteRunner.java:292) + at org.testng.SuiteRunner.run(SuiteRunner.java:198) + at org.testng.TestNG.createAndRunSuiteRunners(TestNG.java:823) + at org.testng.TestNG.runSuitesLocally(TestNG.java:790) + at org.testng.TestNG.run(TestNG.java:708) + at org.testng.remote.RemoteTestNG.run(RemoteTestNG.java:73) + at org.testng.remote.RemoteTestNG.main(RemoteTestNG.java:124) +</pre></div></td> +</tr> +</table><p> +</body> +</html> \ No newline at end of file Property changes on: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.html ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.properties =================================================================== --- ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.properties (rev 0) +++ ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.properties 2009-03-19 15:48:17 UTC (rev 2113) @@ -0,0 +1 @@ +[SuiteResult org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest] \ No newline at end of file Property changes on: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.xml =================================================================== --- ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.xml (rev 0) +++ ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.xml 2009-03-19 15:48:17 UTC (rev 2113) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<testsuite name="org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest" failures="1" tests="1" time="0.502" errors="0"> + <properties/> + <testcase name="testParse" time="0.0080" classname="org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest"> + <failure type="java.lang.AssertionError"> + <![CDATA[java.lang.AssertionError + at org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.testParse(XmlParserImplTest.java:47) + at org.jboss.testharness.AbstractTest.run(AbstractTest.java:238) +... Removed 28 stack frames]]> + </failure> + </testcase> +</testsuite> Property changes on: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/tests/test-output/webbeans-core-tests/testng-failed.xml =================================================================== --- ri/trunk/tests/test-output/webbeans-core-tests/testng-failed.xml 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/tests/test-output/webbeans-core-tests/testng-failed.xml 2009-03-19 15:48:17 UTC (rev 2113) @@ -1,15 +1,16 @@ <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> <suite thread-count="5" skipfailedinvocationCounts="false" verbose="1" name="Failed suite [webbeans-core-tests]" junit="false" annotations="JDK"> - <test name="org.jboss.webbeans.test.examples.ExampleTest(failed)" junit="false" annotations="JDK"> + <test name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest(failed)" junit="false" annotations="JDK"> <classes> - <class name="org.jboss.webbeans.test.examples.ExampleTest"> + <class name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest"> <methods> + <include name="afterSuite"/> + <include name="before"/> + <include name="after"/> + <include name="testProducerMethodBean"/> + <include name="beforeSuite"/> <include name="afterClass"/> - <include name="testSentenceTranslator"/> <include name="beforeClass"/> - <include name="afterSuite"/> - <include name="testGameGenerator"/> - <include name="beforeSuite"/> </methods> </class> </classes> Modified: ri/trunk/tests/test-output/webbeans-core-tests/testng.xml.html =================================================================== --- ri/trunk/tests/test-output/webbeans-core-tests/testng.xml.html 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/tests/test-output/webbeans-core-tests/testng.xml.html 2009-03-19 15:48:17 UTC (rev 2113) @@ -1 +1 @@ -<html><head><title>testng.xml for webbeans-core-tests</title></head><body><tt><!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"><br/><suite thread-count="5" skipfailedinvocationCounts="false" verbose="1" name="webbeans-core-tests" junit="false" annotations="JDK"><br/>  <test verbose="2" name="org.jboss.webbeans.test.examples.ExampleTest" junit="false" annotations="JDK"><br/>    <classes><br/>      <class name="org.jboss.webbeans.test.examples.ExampleTest"/><br/>    </classes><br/>  </test><br/></suite><br/></tt></body></html> \ No newline at end of file +<html><head><title>testng.xml for webbeans-core-tests</title></head><body><tt><!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"><br/><suite thread-count="5" skipfailedinvocationCounts="false" verbose="1" name="webbeans-core-tests" junit="false" annotations="JDK"><br/>  <test verbose="2" name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest" junit="false" annotations="JDK"><br/>    <classes><br/>      <class name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest"><br/>        <methods><br/>          <include name="testProducerMethodBean"/><br/>        </methods><br/>      </c! lass><br/>    </classes><br/>  </test><br/></suite><br/></tt></body></html> \ No newline at end of file Modified: ri/trunk/tests/test-output/webbeans-core-tests/toc.html =================================================================== --- ri/trunk/tests/test-output/webbeans-core-tests/toc.html 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/tests/test-output/webbeans-core-tests/toc.html 2009-03-19 15:48:17 UTC (rev 2113) @@ -10,20 +10,20 @@ <tr valign='top'> <td>1 test</td> <td><a target='mainFrame' href='classes.html'>1 class</a></td> -<td>2 methods:<br/> +<td>1 method:<br/>   <a target='mainFrame' href='methods.html'>chronological</a><br/>   <a target='mainFrame' href='methods-alphabetical.html'>alphabetical</a><br/> -  <a target='mainFrame' href='methods-not-run.html'>not run (0)</a></td> +  <a target='mainFrame' href='methods-not-run.html'>not run (2)</a></td> </tr> <tr> -<td><a target='mainFrame' href='groups.html'>0 group</a></td> +<td><a target='mainFrame' href='groups.html'>1 group</a></td> <td><a target='mainFrame' href='reporter-output.html'>reporter output</a></td> <td><a target='mainFrame' href='testng.xml.html'>testng.xml</a></td> </tr></table> <table width='100%' class='test-passed'> <tr><td> -<table style='width: 100%'><tr><td valign='top'>org.jboss.webbeans.test.examples.ExampleTest (2/0/0)</td><td valign='top' align='right'> - <a href='org.jboss.webbeans.test.examples.ExampleTest.html' target='mainFrame'>Results</a> +<table style='width: 100%'><tr><td valign='top'>org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest (1/0/0)</td><td valign='top' align='right'> + <a href='org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.html' target='mainFrame'>Results</a> </td></tr></table> </td></tr><p/> </table> Modified: ri/trunk/tests/unit-tests.xml =================================================================== --- ri/trunk/tests/unit-tests.xml 2009-03-19 14:46:23 UTC (rev 2112) +++ ri/trunk/tests/unit-tests.xml 2009-03-19 15:48:17 UTC (rev 2113) @@ -32,18 +32,32 @@ <exclude name="broken" /> </run> </groups> - <packages> + <packages > <package name="org.jboss.webbeans.test.examples" /> <package name="org.jboss.webbeans.test.unit.bootstrap" /> + <package name="org.jboss.webbeans.test.unit.bootstrap.environments" /> + <package name="org.jboss.webbeans.test.unit.bootstrap.environments.multipleEnterprise" /> + <package name="org.jboss.webbeans.test.unit.bootstrap.environments.multipleEnterpriseAndSimple" /> + <package name="org.jboss.webbeans.test.unit.bootstrap.environments.multipleSimple" /> + <package name="org.jboss.webbeans.test.unit.bootstrap.environments.singleEnterprise" /> + <package name="org.jboss.webbeans.test.unit.bootstrap.environments.singleProducerMethod" /> + \<package name="org.jboss.webbeans.test.unit.bootstrap.environments.singleSimple" /> <package name="org.jboss.webbeans.test.unit.context" /> <package name="org.jboss.webbeans.test.unit.definition" /> <package name="org.jboss.webbeans.test.unit.event" /> <package name="org.jboss.webbeans.test.unit.implementation" /> + <package name="org.jboss.webbeans.test.unit.implementation.annotatedItem" /> + <package name="org.jboss.webbeans.test.unit.implementation.enterpise" /> + <package name="org.jboss.webbeans.test.unit.implementation.enterprise.sbi" /> + <package name="org.jboss.webbeans.test.unit.implementation.newsimple" /> + <package name="org.jboss.webbeans.test.unit.implementation.producer.field" /> + <package name="org.jboss.webbeans.test.unit.implementation.producer.method" /> <package name="org.jboss.webbeans.test.unit.implementation.proxy" /> - <package name="org.jboss.webbeans.test.unit.implementation.exceptions" /> + <package name="org.jboss.webbeans.test.unit.implementation.proxy.enterprise" /> <package name="org.jboss.webbeans.test.unit.lookup" /> <package name="org.jboss.webbeans.test.unit.lookup.circular" /> - <package name="org.jboss.webbeans.test.unit.xml" /> + <package name="org.jboss.webbeans.test.unit.xml.deploy" /> + <package name="org.jboss.webbeans.test.unit.xml.parser" /> </packages> </test>

17 years

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2112 - extensions/trunk/tomcat/int.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-03-19 10:46:23 -0400 (Thu, 19 Mar 2009) New Revision: 2112 Modified: extensions/trunk/tomcat/int/ Log: ignores Property changes on: extensions/trunk/tomcat/int ___________________________________________________________________ Name: svn:ignore + .project .classpath target .settings

17 years

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2111 - in ri/trunk: impl/src/main/java/org/jboss/webbeans/mock and 4 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-03-19 10:44:25 -0400 (Thu, 19 Mar 2009) New Revision: 2111 Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/AnnotatedItemReceiver.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlConstants.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java Removed: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeansXmlParser.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/dom/ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/AnnotatedItemReceiver.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/ParseXmlHelper.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/XmlConstants.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/XmlParserImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironmentImpl.java Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockXmlEnvironment.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java Log: tidyup Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeansXmlParser.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeansXmlParser.java 2009-03-19 14:34:12 UTC (rev 2110) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeansXmlParser.java 2009-03-19 14:44:25 UTC (rev 2111) @@ -1,225 +0,0 @@ -package org.jboss.webbeans.bootstrap; - -import java.io.IOException; -import java.io.InputStream; -import java.lang.annotation.Annotation; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.inject.DefinitionException; -import javax.inject.DeploymentException; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; - -import org.jboss.webbeans.resources.spi.ResourceLoader; -import org.jboss.webbeans.util.dom.NodeListIterable; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.xml.sax.SAXException; - -/** - * Temporary XML parser to get essential data (like enabled deployment types) - * until we have a full XML parser/binder - * - * @author Pete Muir - * - */ -public class BeansXmlParser -{ - - private static class DeployElement - { - private URL file; - private Element element; - private Map<String, String> namespaces; - - public DeployElement(URL file, Element element, Map<String, String> namespaces) - { - super(); - this.file = file; - this.element = element; - this.namespaces = namespaces; - } - - public URL getFile() - { - return file; - } - - public Element getElement() - { - return element; - } - - public Map<String, String> getNamespaces() - { - return namespaces; - } - - @Override - public String toString() - { - return "File: " + getFile() + "; Node: " + getElement(); - } - - } - - public static final String EE_NAMESPACE = "urn:java:ee"; - - private final Iterable<URL> beansXml; - private final ResourceLoader resourceLoader; - - private List<Class<? extends Annotation>> enabledDeploymentTypes; - - public List<Class<? extends Annotation>> getEnabledDeploymentTypes() - { - return enabledDeploymentTypes; - } - - public BeansXmlParser(ResourceLoader resourceLoader, Iterable<URL> beansXml) - { - this.beansXml = beansXml; - this.resourceLoader = resourceLoader; - } - - public void parse() - { - DocumentBuilder documentBuilder; - try - { - documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); - } - catch (ParserConfigurationException e) - { - throw new DeploymentException("Error configuring XML parser", e); - } - List<DeployElement> deployElements = new ArrayList<DeployElement>(); - for (URL url : beansXml) - { - InputStream is; - boolean fileHasContents; - try - { - is = url.openStream(); - fileHasContents = is.available() > 0; - } - catch (IOException e) - { - throw new DeploymentException("Error loading beans.xml " + url.toString(), e); - } - if (fileHasContents) - { - Document document; - try - { - document = documentBuilder.parse(is); - document.normalize(); - } - catch (SAXException e) - { - throw new DeploymentException("Error parsing beans.xml " + url.toString(), e); - } - catch (IOException e) - { - throw new DeploymentException("Error loading beans.xml " + url.toString(), e); - } - Element beans = document.getDocumentElement(); - Map<String, String> namespaces = new HashMap<String, String>(); - for (int i = 0; i < beans.getAttributes().getLength(); i++) - { - Node child = beans.getAttributes().item(i); - if (child instanceof Attr) - { - Attr attr = (Attr) child; - if (attr.getName().startsWith("xmlns")) - { - String namespacePrefix; - if (attr.getName().length() == 5) - { - namespacePrefix = ""; - } - else - { - namespacePrefix = attr.getName().substring(6); - } - - String namespace = attr.getValue(); - namespaces.put(namespacePrefix, namespace); - } - } - } - for (Node child : new NodeListIterable(beans.getChildNodes())) - { - if (child instanceof Element && "Deploy".equals(child.getNodeName())) - { - deployElements.add(new DeployElement(url, (Element) child, namespaces)); - } - } - } - } - if (deployElements.size() > 1) - { - throw new DeploymentException("<Deploy> can only be specified once, but it is specified muliple times " + deployElements); - } - else if (deployElements.size() == 1) - { - DeployElement deployElement = deployElements.get(0); - enabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>(); - for (Node child : new NodeListIterable(deployElement.getElement().getChildNodes())) - { - if (child instanceof Element) - { - String className = getAsClassName(child.getNodeName(), deployElement.getNamespaces(), deployElement.getFile()); - if (className != null) - { - enabledDeploymentTypes.add(resourceLoader.classForName(className).asSubclass(Annotation.class)); - } - } - } - } - } - - private static String getAsClassName(String nodeName, Map<String, String> namespaces, URL file) - { - String namespacePrefix; - String simpleClassName; - if (nodeName.contains(":")) - { - namespacePrefix = nodeName.substring(0, nodeName.indexOf(":")); - simpleClassName = nodeName.substring(nodeName.indexOf(":") + 1); - } - else - { - namespacePrefix = ""; - simpleClassName = nodeName; - } - String namespace = namespaces.get(namespacePrefix); - if (namespace == null) - { - throw new DefinitionException("Prefix " + namespacePrefix + " has no namespace mapped in " + file.getPath()); - } - String packageName; - if (namespace.startsWith("urn:java:ee")) - { - // Hack for now to return the correct package for this composite package deployment types - packageName = "javax.inject"; - } - else if (namespace.startsWith("urn:java:")) - { - packageName = namespace.substring(9); - } - else - { - // Not a Java package - return null; - } - return packageName + "." + simpleClassName; - } - -} Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-03-19 14:34:12 UTC (rev 2110) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-03-19 14:44:25 UTC (rev 2111) @@ -55,9 +55,9 @@ import org.jboss.webbeans.servlet.HttpSessionManager; import org.jboss.webbeans.servlet.ServletApiAbstraction; import org.jboss.webbeans.transaction.spi.TransactionServices; -import org.jboss.webbeans.util.xml.XmlParserImpl; import org.jboss.webbeans.xml.XmlEnvironment; -import org.jboss.webbeans.xml.XmlEnvironmentImpl; +import org.jboss.webbeans.xml.XmlEnvironment; +import org.jboss.webbeans.xml.XmlParser; /** * Common bootstrapping functionality that is run at application startup and @@ -156,8 +156,8 @@ // bean is an EJB! manager.getEjbDescriptorCache().addAll(getServices().get(EjbServices.class).discoverEjbs()); } - XmlEnvironment xmlEnvironmentImpl = new XmlEnvironmentImpl(getServices()); - XmlParserImpl parser = new XmlParserImpl(xmlEnvironmentImpl); + XmlEnvironment xmlEnvironmentImpl = new XmlEnvironment(getServices()); + XmlParser parser = new XmlParser(xmlEnvironmentImpl); parser.parse(); List<Class<? extends Annotation>> enabledDeploymentTypes = xmlEnvironmentImpl.getEnabledDeploymentTypes(); if (enabledDeploymentTypes.size() > 0) Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockXmlEnvironment.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockXmlEnvironment.java 2009-03-19 14:34:12 UTC (rev 2110) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockXmlEnvironment.java 2009-03-19 14:44:25 UTC (rev 2111) @@ -6,9 +6,9 @@ import org.jboss.webbeans.bootstrap.api.helpers.SimpleServiceRegistry; import org.jboss.webbeans.resources.DefaultResourceLoader; import org.jboss.webbeans.resources.spi.ResourceLoader; -import org.jboss.webbeans.xml.XmlEnvironmentImpl; +import org.jboss.webbeans.xml.XmlEnvironment; -public class MockXmlEnvironment extends XmlEnvironmentImpl +public class MockXmlEnvironment extends XmlEnvironment { private static final ServiceRegistry services; Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/AnnotatedItemReceiver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/AnnotatedItemReceiver.java 2009-03-19 14:34:12 UTC (rev 2110) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/AnnotatedItemReceiver.java 2009-03-19 14:44:25 UTC (rev 2111) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.util.xml; - - -import org.dom4j.Element; -import org.jboss.webbeans.introspector.AnnotatedItem; - -public interface AnnotatedItemReceiver -{ - boolean accept(Element element); - - AnnotatedItem<?, ?> receiveAnnotatedItem(Element element); -} Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/ParseXmlHelper.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/ParseXmlHelper.java 2009-03-19 14:34:12 UTC (rev 2110) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/ParseXmlHelper.java 2009-03-19 14:44:25 UTC (rev 2111) @@ -1,268 +0,0 @@ -package org.jboss.webbeans.util.xml; - -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import javax.inject.DefinitionException; -import javax.jms.JMSException; -import javax.jms.Queue; -import javax.jms.Topic; - -import org.dom4j.Element; -import org.jboss.webbeans.CurrentManager; -import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.introspector.AnnotatedItem; -import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl; -import org.jboss.webbeans.resources.DefaultResourceLoader; -import org.jboss.webbeans.resources.spi.ResourceLoader; - -public class ParseXmlHelper -{ - private static List<AnnotatedItemReceiver> receivers; - - private static ResourceLoader resourceLoader; - - static - { - receivers = initializeReceivers(); - resourceLoader = new DefaultResourceLoader(); - } - - public static Set<AnnotatedItem<?, ?>> getBeanItems(List<Element> beans) - { - Set<AnnotatedItem<?, ?>> result = new HashSet<AnnotatedItem<?, ?>>(); - - for (Element bean : beans) - result.add(receiveBeanItem(bean)); - - return result; - } - - private static AnnotatedItem<?, ?> receiveBeanItem(Element element) - { - for (AnnotatedItemReceiver receiver : receivers) - { - if (receiver.accept(element)) - { - return receiver.receiveAnnotatedItem(element); - } - } - - throw new DefinitionException("definition of a bean " + element.getName() + " is incorrect"); - } - - private static List<AnnotatedItemReceiver> initializeReceivers() - { - List<AnnotatedItemReceiver> receivers = new ArrayList<AnnotatedItemReceiver>(); - - AnnotatedItemReceiver jmsResourceReceiver = new AnnotatedItemReceiver() - { - public boolean accept(Element element) - { - return isJMSResource(element); - } - - public AnnotatedItem<?, ?> receiveAnnotatedItem(Element element) - { - return receiveJMSResourceItem(element); - } - - }; - AnnotatedItemReceiver resourceReceiver = new AnnotatedItemReceiver() - { - public boolean accept(Element element) - { - return isResource(element); - } - - public AnnotatedItem<?, ?> receiveAnnotatedItem(Element element) - { - return receiveResourceItem(element); - } - - }; - AnnotatedItemReceiver sessionBeanReceiver = new AnnotatedItemReceiver() - { - public boolean accept(Element element) - { - return isSessionBean(element); - } - - public AnnotatedItem<?, ?> receiveAnnotatedItem(Element element) - { - return receiveSessionBeanItem(element); - } - - }; - AnnotatedItemReceiver simpleBeanReceiver = new AnnotatedItemReceiver() - { - public boolean accept(Element element) - { - return isSimpleBean(element); - } - - public AnnotatedItem<?, ?> receiveAnnotatedItem(Element element) - { - return receiveSimpleBeanItem(element); - } - - }; - - //order of elements is important - receivers.add(jmsResourceReceiver); - receivers.add(resourceReceiver); - receivers.add(sessionBeanReceiver); - receivers.add(simpleBeanReceiver); - - return receivers; - } - - private static boolean isJMSResource(Element element) - { - if (isJavaEeNamespace(element) && - (element.getName().equalsIgnoreCase(XmlConstants.TOPIC) || - element.getName().equalsIgnoreCase(XmlConstants.QUEUE))) - return true; - return false; - } - - private static AnnotatedItem<?, ?> receiveJMSResourceItem(Element element) - { - final Element jmsElement = element; - - if(jmsElement.getName().equalsIgnoreCase(XmlConstants.QUEUE)) - { - Queue queue = new Queue() - { - public String getQueueName() throws JMSException - { - return getJmsResourceName(jmsElement); - } - }; - - return AnnotatedClassImpl.of(queue.getClass()); - } - - Topic topic = new Topic() - { - public String getTopicName() throws JMSException - { - return getJmsResourceName(jmsElement); - } - }; - - return AnnotatedClassImpl.of(topic.getClass()); - } - - private static boolean isResource(Element element) - { - Iterator<?> elIterator = element.elementIterator(); - while (elIterator.hasNext()) - { - Element child = (Element) elIterator.next(); - if (isJavaEeNamespace(child) && - (child.getName().equalsIgnoreCase(XmlConstants.RESOURCE) || - child.getName().equalsIgnoreCase(XmlConstants.PERSISTENCE_CONTEXT) || - child.getName().equalsIgnoreCase(XmlConstants.PERSISTENCE_UNIT) || - child.getName().equalsIgnoreCase(XmlConstants.EJB) || - child.getName().equalsIgnoreCase(XmlConstants.WEB_SERVICE_REF))) - return true; - } - return false; - } - - private static AnnotatedItem<?, ?> receiveResourceItem(Element element) - { - // TODO: - return null; - } - - private static boolean isSessionBean(Element element) - { - ManagerImpl manager = CurrentManager.rootManager(); - if (manager.getEjbDescriptorCache().containsKey(element.getName()) || - element.attribute(XmlConstants.EJB_NAME) != null) - return true; - return false; - } - - private static AnnotatedItem<?, ?> receiveSessionBeanItem(Element element) - { - // TODO: - return null; - } - - private static boolean isSimpleBean(Element element) - { - Class<?> beanClass = loadClass(element); - - if (!Modifier.isAbstract(beanClass.getModifiers()) && - beanClass.getTypeParameters().length == 0) - return true; - - return false; - } - - private static AnnotatedItem<?, ?> receiveSimpleBeanItem(Element element) - { - Class<?> beanClass = loadClass(element); - - if (!Modifier.isStatic(beanClass.getModifiers()) && - beanClass.isMemberClass()) - throw new DefinitionException("class " + beanClass + " is a non-static inner class"); - - // if (beanClass.getTypeParameters().length > 0) - // throw new DefinitionException("class " + beanClass + - // " is a parameterized type"); - - // TODO: - // boolean isDecorator = false; - // if (Modifier.isAbstract(beanClass.getModifiers()) && !isDecorator) - // throw new DefinitionException("class " + beanClass + - // " is an abstract and not Decorator"); - - return AnnotatedClassImpl.of(beanClass); - } - - public static Class<?> loadClass(Element element) - { - String beanUri = element.getNamespace().getURI(); - String packageName = beanUri.replaceFirst(XmlConstants.URN_PREFIX, ""); - String classPath = packageName + "." + element.getName(); - return resourceLoader.classForName(classPath); - } - - private static String getJmsResourceName(Element element) - { - Iterator<?> elIterator = element.elementIterator(); - while (elIterator.hasNext()) - { - Element child = (Element) elIterator.next(); - if (isJavaEeNamespace(child) && - child.getName().equalsIgnoreCase(XmlConstants.RESOURCE)) - { - Iterator<?> chIterator = child.elementIterator(); - while(chIterator.hasNext()) - { - Element chChild = (Element) chIterator.next(); - if (isJavaEeNamespace(chChild) && - (chChild.getName().equalsIgnoreCase(XmlConstants.NAME) || - chChild.getName().equalsIgnoreCase(XmlConstants.MAPPED_NAME))) - { - return chChild.getName(); - } - } - } - } - throw new DefinitionException("Incorrect JMSResource declaration for " + element.getName()); - } - - public static boolean isJavaEeNamespace(Element element) - { - return element.getNamespace().getURI().equalsIgnoreCase(XmlConstants.JAVA_EE_NAMESPACE); - } -} Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/XmlConstants.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/XmlConstants.java 2009-03-19 14:34:12 UTC (rev 2110) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/XmlConstants.java 2009-03-19 14:44:25 UTC (rev 2111) @@ -1,70 +0,0 @@ -package org.jboss.webbeans.util.xml; - -enum JavaEePackage -{ - JAVA_LANG("java.lang"), - JAVA_UTIL("java.util"), - JAVAX_ANNOTATION("javax.annotation"), - JAVAX_INJECT("javax.inject"), - JAVAX_CONTEXT("javax.context"), - JAVAX_INTERCEPTOR("javax.interceptor"), - JAVAX_DECORATOR("javax.decorator"), - JAVAX_EVENT("javax.event"), - JAVAX_EJB("javax.ejb"), - JAVAX_PERSISTENCE("javax.persistence"), - JAVAX_XML_WS("javax.xml.ws"), - JAVAX_JMS("javax.jms"), - JAVAX_SQL("javax.sql"); - - private String packageName; - - JavaEePackage(String name) { - packageName = name; - } - - @Override - public String toString() { - return packageName; - } -} - -public class XmlConstants -{ - public static final String JAVA_EE_NAMESPACE = "urn:java:ee"; - - public static final String DEPLOY = "Deploy"; - - public static final String INTERCEPTORS = "Interceptors"; - - public static final String DECORATORS = "Decorators"; - - public static final String BINDING_TYPE = "BindingType"; - - public static final String INTERCEPTOR_BINDING_TYPE = "InterceptorBindingType"; - - public static final String STEREOTYPE = "Stereotype"; - - public static final String RESOURCE = "Resource"; - - public static final String PERSISTENCE_CONTEXT = "PersistenceContext"; - - public static final String PERSISTENCE_UNIT = "PersistenceUnit"; - - public static final String EJB = "EJB"; - - public static final String EJB_NAME = "ejbName"; - - public static final String WEB_SERVICE_REF = "WebServiceRef"; - - public static final String TOPIC = "Topic"; - - public static final String QUEUE = "Queue"; - - public static final String URN_PREFIX = "urn:java:"; - - public static final String NAME = "name"; - - public static final String MAPPED_NAME = "mappedName"; - - public static final String STANDARD = "Standard"; -} Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/XmlParserImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/XmlParserImpl.java 2009-03-19 14:34:12 UTC (rev 2110) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/XmlParserImpl.java 2009-03-19 14:44:25 UTC (rev 2111) @@ -1,219 +0,0 @@ -package org.jboss.webbeans.util.xml; - -import java.io.IOException; -import java.io.InputStream; -import java.lang.annotation.Annotation; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import javax.inject.DefinitionException; -import javax.inject.DeploymentException; -import javax.inject.DeploymentType; - -import org.dom4j.Document; -import org.dom4j.DocumentException; -import org.dom4j.Element; -import org.dom4j.Namespace; -import org.dom4j.io.SAXReader; -import org.jboss.webbeans.log.Log; -import org.jboss.webbeans.log.Logging; -import org.jboss.webbeans.xml.XmlEnvironment; - -public class XmlParserImpl -{ - private static Log log = Logging.getLog(XmlParserImpl.class); - - private final XmlEnvironment environment; - - public XmlParserImpl(XmlEnvironment environment) - { - this.environment = environment; - } - - public void parse() - { - // TODO extremely inefficient, no need to make dom4j parse each beans.xml multiple times, do as one parse over each document - parseForBeans(); - parseForDeploy(); - } - - private void parseForBeans() - { - - for (URL url : environment.getBeansXmlUrls()) - { - Document document = createDocument(url); - if (document != null) - { - List<Element> beanElements = findBeans(document); - // TODO Only pass in classes here - //environment.getClasses().addAll(ParseXmlHelper.getBeanItems(beanElements)); - } - } - - } - - private void parseForDeploy() - { - int counter = 0; - - for (URL url : environment.getBeansXmlUrls()) - { - Document document = createDocument(url); - if (document != null) - { - Element root = document.getRootElement(); - - Iterator<?> elIterator = root.elementIterator(); - while (elIterator.hasNext()) - { - Element element = (Element) elIterator.next(); - if (ParseXmlHelper.isJavaEeNamespace(element) && - element.getName().equalsIgnoreCase(XmlConstants.DEPLOY)) - environment.getEnabledDeploymentTypes().addAll(obtainDeploymentTypes(element, counter++)); - } - } - } - - } - - @SuppressWarnings("unchecked") - public boolean checkNamespaces(Document document) - { - //TODO: not finished - Element root = document.getRootElement(); - List<Namespace> declaredNamespaces = root.declaredNamespaces(); - - return true; - } - - private Document createDocument(URL url) - { - try - { - InputStream xmlStream; - - xmlStream = url.openStream(); - if (xmlStream.available() == 0) - { - return null; - } - SAXReader reader = new SAXReader(); - Document document = reader.read(xmlStream); - checkNamespaces(document); - return document; - } - catch (IOException e) - { - String message = "Can not open stream for " + url; - log.debug(message, e); - throw new DeploymentException(message, e); - } - catch (DocumentException e) - { - String message = "Error during the processing of a DOM4J document for " + url; - log.debug(message, e); - throw new DeploymentException(message, e); - } - } - - private List<Element> findBeans(Document document) - { - List<Element> beans = new ArrayList<Element>(); - - Element root = document.getRootElement(); - - Iterator<?> elIterator = root.elementIterator(); - while (elIterator.hasNext()) - { - Element element = (Element) elIterator.next(); - if (checkBeanElementName(element) && - checkBeanElementChildrenNames(element)) - beans.add(element); - } - - return beans; - } - - private boolean checkBeanElementName(Element element) - { - if (ParseXmlHelper.isJavaEeNamespace(element) && - (element.getName().equalsIgnoreCase(XmlConstants.DEPLOY) || - element.getName().equalsIgnoreCase(XmlConstants.INTERCEPTORS) || - element.getName().equalsIgnoreCase(XmlConstants.DECORATORS))) - return false; - return true; - } - - private boolean checkBeanElementChildrenNames(Element element) - { - Iterator<?> elIterator = element.elementIterator(); - while (elIterator.hasNext()) - { - Element child = (Element) elIterator.next(); - if (ParseXmlHelper.isJavaEeNamespace(child) && - (child.getName().equalsIgnoreCase(XmlConstants.BINDING_TYPE) || - child.getName().equalsIgnoreCase(XmlConstants.INTERCEPTOR_BINDING_TYPE) || - child.getName().equalsIgnoreCase(XmlConstants.STEREOTYPE))) - return false; - } - return true; - } - - @SuppressWarnings("unchecked") - private List<Class<? extends Annotation>> obtainDeploymentTypes(Element element, int counter) - { - if (counter > 1) - throw new DefinitionException("<Deploy> element is specified more than once"); - - List<Element> deployElements = element.elements(); - Set<Element> deployElementsSet = new HashSet<Element>(deployElements); - if(deployElements.size() - deployElementsSet.size() != 0) - throw new DefinitionException("The same deployment type is declared more than once"); - - String standardName = XmlConstants.STANDARD; - String standardPrefix = ""; - String standardUri = XmlConstants.JAVA_EE_NAMESPACE; - Namespace standardNamespace = new Namespace(standardPrefix, standardUri); - - List<Class<? extends Annotation>> deploymentClasses = new ArrayList<Class<? extends Annotation>>(); - List<Element> children = element.elements(); - for (Element child : children) - { - Class<?> deploymentClass; - - if (ParseXmlHelper.isJavaEeNamespace(child)) - deploymentClass = loadJavaEeDeploymentType(child); - else - deploymentClass = ParseXmlHelper.loadClass(child); - - if(!deploymentClass.isAnnotation()) - throw new DeploymentException("<Deploy> child " + element.getName() + " must be a Java annotation type"); - - if(deploymentClass.getAnnotation(DeploymentType.class) == null) - throw new DefinitionException("<Deploy> child " + element.getName() + " must be a deployment type"); - - deploymentClasses.add(deploymentClass.asSubclass(Annotation.class)); - } - return deploymentClasses; - } - - private Class<?> loadJavaEeDeploymentType(Element element) - { - for(JavaEePackage possiblePackage : JavaEePackage.values()) - { - String className = possiblePackage + "." + element.getName(); - try - { - return Class.forName(className); - } - catch (ClassNotFoundException e) - {} - } - throw new DefinitionException("Could not find " + element.getName() + "in the Java EE namespace"); - } -} Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/AnnotatedItemReceiver.java (from rev 2108, ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/AnnotatedItemReceiver.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/AnnotatedItemReceiver.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/AnnotatedItemReceiver.java 2009-03-19 14:44:25 UTC (rev 2111) @@ -0,0 +1,12 @@ +package org.jboss.webbeans.xml; + + +import org.dom4j.Element; +import org.jboss.webbeans.introspector.AnnotatedItem; + +public interface AnnotatedItemReceiver +{ + boolean accept(Element element); + + AnnotatedItem<?, ?> receiveAnnotatedItem(Element element); +} Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java (from rev 2108, ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/ParseXmlHelper.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java 2009-03-19 14:44:25 UTC (rev 2111) @@ -0,0 +1,268 @@ +package org.jboss.webbeans.xml; + +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import javax.inject.DefinitionException; +import javax.jms.JMSException; +import javax.jms.Queue; +import javax.jms.Topic; + +import org.dom4j.Element; +import org.jboss.webbeans.CurrentManager; +import org.jboss.webbeans.ManagerImpl; +import org.jboss.webbeans.introspector.AnnotatedItem; +import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl; +import org.jboss.webbeans.resources.DefaultResourceLoader; +import org.jboss.webbeans.resources.spi.ResourceLoader; + +public class ParseXmlHelper +{ + private static List<AnnotatedItemReceiver> receivers; + + private static ResourceLoader resourceLoader; + + static + { + receivers = initializeReceivers(); + resourceLoader = new DefaultResourceLoader(); + } + + public static Set<AnnotatedItem<?, ?>> getBeanItems(List<Element> beans) + { + Set<AnnotatedItem<?, ?>> result = new HashSet<AnnotatedItem<?, ?>>(); + + for (Element bean : beans) + result.add(receiveBeanItem(bean)); + + return result; + } + + private static AnnotatedItem<?, ?> receiveBeanItem(Element element) + { + for (AnnotatedItemReceiver receiver : receivers) + { + if (receiver.accept(element)) + { + return receiver.receiveAnnotatedItem(element); + } + } + + throw new DefinitionException("definition of a bean " + element.getName() + " is incorrect"); + } + + private static List<AnnotatedItemReceiver> initializeReceivers() + { + List<AnnotatedItemReceiver> receivers = new ArrayList<AnnotatedItemReceiver>(); + + AnnotatedItemReceiver jmsResourceReceiver = new AnnotatedItemReceiver() + { + public boolean accept(Element element) + { + return isJMSResource(element); + } + + public AnnotatedItem<?, ?> receiveAnnotatedItem(Element element) + { + return receiveJMSResourceItem(element); + } + + }; + AnnotatedItemReceiver resourceReceiver = new AnnotatedItemReceiver() + { + public boolean accept(Element element) + { + return isResource(element); + } + + public AnnotatedItem<?, ?> receiveAnnotatedItem(Element element) + { + return receiveResourceItem(element); + } + + }; + AnnotatedItemReceiver sessionBeanReceiver = new AnnotatedItemReceiver() + { + public boolean accept(Element element) + { + return isSessionBean(element); + } + + public AnnotatedItem<?, ?> receiveAnnotatedItem(Element element) + { + return receiveSessionBeanItem(element); + } + + }; + AnnotatedItemReceiver simpleBeanReceiver = new AnnotatedItemReceiver() + { + public boolean accept(Element element) + { + return isSimpleBean(element); + } + + public AnnotatedItem<?, ?> receiveAnnotatedItem(Element element) + { + return receiveSimpleBeanItem(element); + } + + }; + + //order of elements is important + receivers.add(jmsResourceReceiver); + receivers.add(resourceReceiver); + receivers.add(sessionBeanReceiver); + receivers.add(simpleBeanReceiver); + + return receivers; + } + + private static boolean isJMSResource(Element element) + { + if (isJavaEeNamespace(element) && + (element.getName().equalsIgnoreCase(XmlConstants.TOPIC) || + element.getName().equalsIgnoreCase(XmlConstants.QUEUE))) + return true; + return false; + } + + private static AnnotatedItem<?, ?> receiveJMSResourceItem(Element element) + { + final Element jmsElement = element; + + if(jmsElement.getName().equalsIgnoreCase(XmlConstants.QUEUE)) + { + Queue queue = new Queue() + { + public String getQueueName() throws JMSException + { + return getJmsResourceName(jmsElement); + } + }; + + return AnnotatedClassImpl.of(queue.getClass()); + } + + Topic topic = new Topic() + { + public String getTopicName() throws JMSException + { + return getJmsResourceName(jmsElement); + } + }; + + return AnnotatedClassImpl.of(topic.getClass()); + } + + private static boolean isResource(Element element) + { + Iterator<?> elIterator = element.elementIterator(); + while (elIterator.hasNext()) + { + Element child = (Element) elIterator.next(); + if (isJavaEeNamespace(child) && + (child.getName().equalsIgnoreCase(XmlConstants.RESOURCE) || + child.getName().equalsIgnoreCase(XmlConstants.PERSISTENCE_CONTEXT) || + child.getName().equalsIgnoreCase(XmlConstants.PERSISTENCE_UNIT) || + child.getName().equalsIgnoreCase(XmlConstants.EJB) || + child.getName().equalsIgnoreCase(XmlConstants.WEB_SERVICE_REF))) + return true; + } + return false; + } + + private static AnnotatedItem<?, ?> receiveResourceItem(Element element) + { + // TODO: + return null; + } + + private static boolean isSessionBean(Element element) + { + ManagerImpl manager = CurrentManager.rootManager(); + if (manager.getEjbDescriptorCache().containsKey(element.getName()) || + element.attribute(XmlConstants.EJB_NAME) != null) + return true; + return false; + } + + private static AnnotatedItem<?, ?> receiveSessionBeanItem(Element element) + { + // TODO: + return null; + } + + private static boolean isSimpleBean(Element element) + { + Class<?> beanClass = loadClass(element); + + if (!Modifier.isAbstract(beanClass.getModifiers()) && + beanClass.getTypeParameters().length == 0) + return true; + + return false; + } + + private static AnnotatedItem<?, ?> receiveSimpleBeanItem(Element element) + { + Class<?> beanClass = loadClass(element); + + if (!Modifier.isStatic(beanClass.getModifiers()) && + beanClass.isMemberClass()) + throw new DefinitionException("class " + beanClass + " is a non-static inner class"); + + // if (beanClass.getTypeParameters().length > 0) + // throw new DefinitionException("class " + beanClass + + // " is a parameterized type"); + + // TODO: + // boolean isDecorator = false; + // if (Modifier.isAbstract(beanClass.getModifiers()) && !isDecorator) + // throw new DefinitionException("class " + beanClass + + // " is an abstract and not Decorator"); + + return AnnotatedClassImpl.of(beanClass); + } + + public static Class<?> loadClass(Element element) + { + String beanUri = element.getNamespace().getURI(); + String packageName = beanUri.replaceFirst(XmlConstants.URN_PREFIX, ""); + String classPath = packageName + "." + element.getName(); + return resourceLoader.classForName(classPath); + } + + private static String getJmsResourceName(Element element) + { + Iterator<?> elIterator = element.elementIterator(); + while (elIterator.hasNext()) + { + Element child = (Element) elIterator.next(); + if (isJavaEeNamespace(child) && + child.getName().equalsIgnoreCase(XmlConstants.RESOURCE)) + { + Iterator<?> chIterator = child.elementIterator(); + while(chIterator.hasNext()) + { + Element chChild = (Element) chIterator.next(); + if (isJavaEeNamespace(chChild) && + (chChild.getName().equalsIgnoreCase(XmlConstants.NAME) || + chChild.getName().equalsIgnoreCase(XmlConstants.MAPPED_NAME))) + { + return chChild.getName(); + } + } + } + } + throw new DefinitionException("Incorrect JMSResource declaration for " + element.getName()); + } + + public static boolean isJavaEeNamespace(Element element) + { + return element.getNamespace().getURI().equalsIgnoreCase(XmlConstants.JAVA_EE_NAMESPACE); + } +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlConstants.java (from rev 2108, ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/XmlConstants.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlConstants.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlConstants.java 2009-03-19 14:44:25 UTC (rev 2111) @@ -0,0 +1,70 @@ +package org.jboss.webbeans.xml; + +enum JavaEePackage +{ + JAVA_LANG("java.lang"), + JAVA_UTIL("java.util"), + JAVAX_ANNOTATION("javax.annotation"), + JAVAX_INJECT("javax.inject"), + JAVAX_CONTEXT("javax.context"), + JAVAX_INTERCEPTOR("javax.interceptor"), + JAVAX_DECORATOR("javax.decorator"), + JAVAX_EVENT("javax.event"), + JAVAX_EJB("javax.ejb"), + JAVAX_PERSISTENCE("javax.persistence"), + JAVAX_XML_WS("javax.xml.ws"), + JAVAX_JMS("javax.jms"), + JAVAX_SQL("javax.sql"); + + private String packageName; + + JavaEePackage(String name) { + packageName = name; + } + + @Override + public String toString() { + return packageName; + } +} + +public class XmlConstants +{ + public static final String JAVA_EE_NAMESPACE = "urn:java:ee"; + + public static final String DEPLOY = "Deploy"; + + public static final String INTERCEPTORS = "Interceptors"; + + public static final String DECORATORS = "Decorators"; + + public static final String BINDING_TYPE = "BindingType"; + + public static final String INTERCEPTOR_BINDING_TYPE = "InterceptorBindingType"; + + public static final String STEREOTYPE = "Stereotype"; + + public static final String RESOURCE = "Resource"; + + public static final String PERSISTENCE_CONTEXT = "PersistenceContext"; + + public static final String PERSISTENCE_UNIT = "PersistenceUnit"; + + public static final String EJB = "EJB"; + + public static final String EJB_NAME = "ejbName"; + + public static final String WEB_SERVICE_REF = "WebServiceRef"; + + public static final String TOPIC = "Topic"; + + public static final String QUEUE = "Queue"; + + public static final String URN_PREFIX = "urn:java:"; + + public static final String NAME = "name"; + + public static final String MAPPED_NAME = "mappedName"; + + public static final String STANDARD = "Standard"; +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlConstants.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java 2009-03-19 14:34:12 UTC (rev 2110) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java 2009-03-19 14:44:25 UTC (rev 2111) @@ -1,25 +0,0 @@ -package org.jboss.webbeans.xml; - -import java.lang.annotation.Annotation; -import java.net.URL; -import java.util.List; - -import org.jboss.webbeans.introspector.AnnotatedAnnotation; -import org.jboss.webbeans.introspector.AnnotatedClass; - -public interface XmlEnvironment -{ - - public List<AnnotatedClass<?>> getClasses(); - - public List<AnnotatedAnnotation<?>> getAnnotations(); - - public Iterable<URL> getBeansXmlUrls(); - - public <T> AnnotatedClass<? extends T> loadClass(String className, Class<T> expectedType); - - public <T extends Annotation> AnnotatedAnnotation<? extends T> loadAnnotation(String className, Class<T> expectedType); - - public List<Class<? extends Annotation>> getEnabledDeploymentTypes(); - -} \ No newline at end of file Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java (from rev 2110, ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironmentImpl.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java 2009-03-19 14:44:25 UTC (rev 2111) @@ -0,0 +1,64 @@ +package org.jboss.webbeans.xml; + +import java.lang.annotation.Annotation; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import org.jboss.webbeans.bootstrap.api.ServiceRegistry; +import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; +import org.jboss.webbeans.introspector.AnnotatedAnnotation; +import org.jboss.webbeans.introspector.AnnotatedClass; +import org.jboss.webbeans.introspector.jlr.AnnotatedAnnotationImpl; +import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl; +import org.jboss.webbeans.resources.spi.ResourceLoader; + +public class XmlEnvironment +{ + + private final List<AnnotatedClass<?>> classes; + private final List<AnnotatedAnnotation<?>> annotations; + private final ServiceRegistry serviceRegistry; + private final List<Class<? extends Annotation>> enabledDeploymentTypes; + private final Iterable<URL> beansXmlUrls; + + public XmlEnvironment(ServiceRegistry serviceRegistry) + { + this.classes = new ArrayList<AnnotatedClass<?>>(); + this.annotations = new ArrayList<AnnotatedAnnotation<?>>(); + this.enabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>(); + this.serviceRegistry = serviceRegistry; + this.beansXmlUrls = serviceRegistry.get(WebBeanDiscovery.class).discoverWebBeansXml(); + } + + public List<AnnotatedClass<?>> getClasses() + { + return classes; + } + + public List<AnnotatedAnnotation<?>> getAnnotations() + { + return annotations; + } + + public Iterable<URL> getBeansXmlUrls() + { + return beansXmlUrls; + } + + public <T> AnnotatedClass<? extends T> loadClass(String className, Class<T> expectedType) + { + return AnnotatedClassImpl.of(serviceRegistry.get(ResourceLoader.class).classForName(className).asSubclass(expectedType)); + } + + public <T extends Annotation> AnnotatedAnnotation<? extends T> loadAnnotation(String className, Class<T> expectedType) + { + return AnnotatedAnnotationImpl.of(serviceRegistry.get(ResourceLoader.class).classForName(className).asSubclass(expectedType)); + } + + public List<Class<? extends Annotation>> getEnabledDeploymentTypes() + { + return enabledDeploymentTypes; + } + +} Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironmentImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironmentImpl.java 2009-03-19 14:34:12 UTC (rev 2110) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironmentImpl.java 2009-03-19 14:44:25 UTC (rev 2111) @@ -1,64 +0,0 @@ -package org.jboss.webbeans.xml; - -import java.lang.annotation.Annotation; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import org.jboss.webbeans.bootstrap.api.ServiceRegistry; -import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; -import org.jboss.webbeans.introspector.AnnotatedAnnotation; -import org.jboss.webbeans.introspector.AnnotatedClass; -import org.jboss.webbeans.introspector.jlr.AnnotatedAnnotationImpl; -import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl; -import org.jboss.webbeans.resources.spi.ResourceLoader; - -public class XmlEnvironmentImpl implements XmlEnvironment -{ - - private final List<AnnotatedClass<?>> classes; - private final List<AnnotatedAnnotation<?>> annotations; - private final ServiceRegistry serviceRegistry; - private final List<Class<? extends Annotation>> enabledDeploymentTypes; - private final Iterable<URL> beansXmlUrls; - - public XmlEnvironmentImpl(ServiceRegistry serviceRegistry) - { - this.classes = new ArrayList<AnnotatedClass<?>>(); - this.annotations = new ArrayList<AnnotatedAnnotation<?>>(); - this.enabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>(); - this.serviceRegistry = serviceRegistry; - this.beansXmlUrls = serviceRegistry.get(WebBeanDiscovery.class).discoverWebBeansXml(); - } - - public List<AnnotatedClass<?>> getClasses() - { - return classes; - } - - public List<AnnotatedAnnotation<?>> getAnnotations() - { - return annotations; - } - - public Iterable<URL> getBeansXmlUrls() - { - return beansXmlUrls; - } - - public <T> AnnotatedClass<? extends T> loadClass(String className, Class<T> expectedType) - { - return AnnotatedClassImpl.of(serviceRegistry.get(ResourceLoader.class).classForName(className).asSubclass(expectedType)); - } - - public <T extends Annotation> AnnotatedAnnotation<? extends T> loadAnnotation(String className, Class<T> expectedType) - { - return AnnotatedAnnotationImpl.of(serviceRegistry.get(ResourceLoader.class).classForName(className).asSubclass(expectedType)); - } - - public List<Class<? extends Annotation>> getEnabledDeploymentTypes() - { - return enabledDeploymentTypes; - } - -} Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java (from rev 2110, ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/XmlParserImpl.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java 2009-03-19 14:44:25 UTC (rev 2111) @@ -0,0 +1,218 @@ +package org.jboss.webbeans.xml; + +import java.io.IOException; +import java.io.InputStream; +import java.lang.annotation.Annotation; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import javax.inject.DefinitionException; +import javax.inject.DeploymentException; +import javax.inject.DeploymentType; + +import org.dom4j.Document; +import org.dom4j.DocumentException; +import org.dom4j.Element; +import org.dom4j.Namespace; +import org.dom4j.io.SAXReader; +import org.jboss.webbeans.log.Log; +import org.jboss.webbeans.log.Logging; + +public class XmlParser +{ + private static Log log = Logging.getLog(XmlParser.class); + + private final XmlEnvironment environment; + + public XmlParser(XmlEnvironment environment) + { + this.environment = environment; + } + + public void parse() + { + // TODO extremely inefficient, no need to make dom4j parse each beans.xml multiple times, do as one parse over each document + parseForBeans(); + parseForDeploy(); + } + + private void parseForBeans() + { + + for (URL url : environment.getBeansXmlUrls()) + { + Document document = createDocument(url); + if (document != null) + { + List<Element> beanElements = findBeans(document); + // TODO Only pass in classes here + //environment.getClasses().addAll(ParseXmlHelper.getBeanItems(beanElements)); + } + } + + } + + private void parseForDeploy() + { + int counter = 0; + + for (URL url : environment.getBeansXmlUrls()) + { + Document document = createDocument(url); + if (document != null) + { + Element root = document.getRootElement(); + + Iterator<?> elIterator = root.elementIterator(); + while (elIterator.hasNext()) + { + Element element = (Element) elIterator.next(); + if (ParseXmlHelper.isJavaEeNamespace(element) && + element.getName().equalsIgnoreCase(XmlConstants.DEPLOY)) + environment.getEnabledDeploymentTypes().addAll(obtainDeploymentTypes(element, counter++)); + } + } + } + + } + + @SuppressWarnings("unchecked") + public boolean checkNamespaces(Document document) + { + //TODO: not finished + Element root = document.getRootElement(); + List<Namespace> declaredNamespaces = root.declaredNamespaces(); + + return true; + } + + private Document createDocument(URL url) + { + try + { + InputStream xmlStream; + + xmlStream = url.openStream(); + if (xmlStream.available() == 0) + { + return null; + } + SAXReader reader = new SAXReader(); + Document document = reader.read(xmlStream); + checkNamespaces(document); + return document; + } + catch (IOException e) + { + String message = "Can not open stream for " + url; + log.debug(message, e); + throw new DeploymentException(message, e); + } + catch (DocumentException e) + { + String message = "Error during the processing of a DOM4J document for " + url; + log.debug(message, e); + throw new DeploymentException(message, e); + } + } + + private List<Element> findBeans(Document document) + { + List<Element> beans = new ArrayList<Element>(); + + Element root = document.getRootElement(); + + Iterator<?> elIterator = root.elementIterator(); + while (elIterator.hasNext()) + { + Element element = (Element) elIterator.next(); + if (checkBeanElementName(element) && + checkBeanElementChildrenNames(element)) + beans.add(element); + } + + return beans; + } + + private boolean checkBeanElementName(Element element) + { + if (ParseXmlHelper.isJavaEeNamespace(element) && + (element.getName().equalsIgnoreCase(XmlConstants.DEPLOY) || + element.getName().equalsIgnoreCase(XmlConstants.INTERCEPTORS) || + element.getName().equalsIgnoreCase(XmlConstants.DECORATORS))) + return false; + return true; + } + + private boolean checkBeanElementChildrenNames(Element element) + { + Iterator<?> elIterator = element.elementIterator(); + while (elIterator.hasNext()) + { + Element child = (Element) elIterator.next(); + if (ParseXmlHelper.isJavaEeNamespace(child) && + (child.getName().equalsIgnoreCase(XmlConstants.BINDING_TYPE) || + child.getName().equalsIgnoreCase(XmlConstants.INTERCEPTOR_BINDING_TYPE) || + child.getName().equalsIgnoreCase(XmlConstants.STEREOTYPE))) + return false; + } + return true; + } + + @SuppressWarnings("unchecked") + private List<Class<? extends Annotation>> obtainDeploymentTypes(Element element, int counter) + { + if (counter > 1) + throw new DefinitionException("<Deploy> element is specified more than once"); + + List<Element> deployElements = element.elements(); + Set<Element> deployElementsSet = new HashSet<Element>(deployElements); + if(deployElements.size() - deployElementsSet.size() != 0) + throw new DefinitionException("The same deployment type is declared more than once"); + + String standardName = XmlConstants.STANDARD; + String standardPrefix = ""; + String standardUri = XmlConstants.JAVA_EE_NAMESPACE; + Namespace standardNamespace = new Namespace(standardPrefix, standardUri); + + List<Class<? extends Annotation>> deploymentClasses = new ArrayList<Class<? extends Annotation>>(); + List<Element> children = element.elements(); + for (Element child : children) + { + Class<?> deploymentClass; + + if (ParseXmlHelper.isJavaEeNamespace(child)) + deploymentClass = loadJavaEeDeploymentType(child); + else + deploymentClass = ParseXmlHelper.loadClass(child); + + if(!deploymentClass.isAnnotation()) + throw new DeploymentException("<Deploy> child " + element.getName() + " must be a Java annotation type"); + + if(deploymentClass.getAnnotation(DeploymentType.class) == null) + throw new DefinitionException("<Deploy> child " + element.getName() + " must be a deployment type"); + + deploymentClasses.add(deploymentClass.asSubclass(Annotation.class)); + } + return deploymentClasses; + } + + private Class<?> loadJavaEeDeploymentType(Element element) + { + for(JavaEePackage possiblePackage : JavaEePackage.values()) + { + String className = possiblePackage + "." + element.getName(); + try + { + return Class.forName(className); + } + catch (ClassNotFoundException e) + {} + } + throw new DefinitionException("Could not find " + element.getName() + "in the Java EE namespace"); + } +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-03-19 14:34:12 UTC (rev 2110) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-03-19 14:44:25 UTC (rev 2111) @@ -13,8 +13,8 @@ import org.jboss.webbeans.mock.MockXmlEnvironment; import org.jboss.webbeans.test.unit.AbstractWebBeansTest; import org.jboss.webbeans.test.unit.xml.beans.Order; -import org.jboss.webbeans.util.xml.XmlParserImpl; -import org.jboss.webbeans.xml.XmlEnvironmentImpl; +import org.jboss.webbeans.xml.XmlEnvironment; +import org.jboss.webbeans.xml.XmlParser; import org.testng.annotations.Test; @Artifact @@ -27,7 +27,7 @@ @Test public void testParse() { - XmlEnvironmentImpl parserEnv = new MockXmlEnvironment(getResources("beans.xml")); + XmlEnvironment parserEnv = new MockXmlEnvironment(getResources("beans.xml")); AnnotatedClass<?> aClass = parserEnv.loadClass("org.jboss.webbeans.test.unit.xml.beans.Order", Order.class); Set<URL> xmls = new HashSet<URL>(); @@ -36,7 +36,7 @@ for (URL url : urls) xmls.add(url); - XmlParserImpl parser = new XmlParserImpl(parserEnv); + XmlParser parser = new XmlParser(parserEnv); parser.parse(); for (AnnotatedItem<?, ?> aElement : parserEnv.getClasses())

17 years

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2110 - in ri/trunk: impl/src/main/java/org/jboss/webbeans/bootstrap and 5 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-03-19 10:34:12 -0400 (Thu, 19 Mar 2009) New Revision: 2110 Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockXmlEnvironment.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironmentImpl.java Removed: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParserEnvironment.java Modified: ri/trunk/impl/pom.xml ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/XmlParserImpl.java ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/SimpleServiceRegistry.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java Log: Wire in the new XML parser Deploy stuff Modified: ri/trunk/impl/pom.xml =================================================================== --- ri/trunk/impl/pom.xml 2009-03-19 13:24:44 UTC (rev 2109) +++ ri/trunk/impl/pom.xml 2009-03-19 14:34:12 UTC (rev 2110) @@ -87,6 +87,7 @@ <dependency> <groupId>javax.jms</groupId> <artifactId>jms</artifactId> + <optional>true</optional> </dependency> <dependency> <groupId>javax.el</groupId> Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-03-19 13:24:44 UTC (rev 2109) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-03-19 14:34:12 UTC (rev 2110) @@ -55,6 +55,9 @@ import org.jboss.webbeans.servlet.HttpSessionManager; import org.jboss.webbeans.servlet.ServletApiAbstraction; import org.jboss.webbeans.transaction.spi.TransactionServices; +import org.jboss.webbeans.util.xml.XmlParserImpl; +import org.jboss.webbeans.xml.XmlEnvironment; +import org.jboss.webbeans.xml.XmlEnvironmentImpl; /** * Common bootstrapping functionality that is run at application startup and @@ -153,10 +156,11 @@ // bean is an EJB! manager.getEjbDescriptorCache().addAll(getServices().get(EjbServices.class).discoverEjbs()); } - BeansXmlParser parser = new BeansXmlParser(getServices().get(ResourceLoader.class), getServices().get(WebBeanDiscovery.class).discoverWebBeansXml()); + XmlEnvironment xmlEnvironmentImpl = new XmlEnvironmentImpl(getServices()); + XmlParserImpl parser = new XmlParserImpl(xmlEnvironmentImpl); parser.parse(); - List<Class<? extends Annotation>> enabledDeploymentTypes = parser.getEnabledDeploymentTypes(); - if (enabledDeploymentTypes != null) + List<Class<? extends Annotation>> enabledDeploymentTypes = xmlEnvironmentImpl.getEnabledDeploymentTypes(); + if (enabledDeploymentTypes.size() > 0) { manager.setEnabledDeploymentTypes(enabledDeploymentTypes); } Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockXmlEnvironment.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockXmlEnvironment.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockXmlEnvironment.java 2009-03-19 14:34:12 UTC (rev 2110) @@ -0,0 +1,36 @@ +package org.jboss.webbeans.mock; + +import java.net.URL; + +import org.jboss.webbeans.bootstrap.api.ServiceRegistry; +import org.jboss.webbeans.bootstrap.api.helpers.SimpleServiceRegistry; +import org.jboss.webbeans.resources.DefaultResourceLoader; +import org.jboss.webbeans.resources.spi.ResourceLoader; +import org.jboss.webbeans.xml.XmlEnvironmentImpl; + +public class MockXmlEnvironment extends XmlEnvironmentImpl +{ + + private static final ServiceRegistry services; + + static + { + services = new SimpleServiceRegistry(); + services.add(ResourceLoader.class, new DefaultResourceLoader()); + } + + private final Iterable<URL> beansXmlUrls; + + public MockXmlEnvironment(Iterable<URL> beansXmlUrls) + { + super(services); + this.beansXmlUrls = beansXmlUrls; + } + + @Override + public Iterable<URL> getBeansXmlUrls() + { + return beansXmlUrls; + } + +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockXmlEnvironment.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/XmlParserImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/XmlParserImpl.java 2009-03-19 13:24:44 UTC (rev 2109) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/XmlParserImpl.java 2009-03-19 14:34:12 UTC (rev 2110) @@ -13,66 +13,72 @@ import javax.inject.DefinitionException; import javax.inject.DeploymentException; import javax.inject.DeploymentType; -import javax.inject.Production; -import javax.inject.Standard; import org.dom4j.Document; import org.dom4j.DocumentException; import org.dom4j.Element; import org.dom4j.Namespace; -import org.dom4j.QName; import org.dom4j.io.SAXReader; -import org.jboss.webbeans.CurrentManager; -import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.introspector.AnnotatedItem; import org.jboss.webbeans.log.Log; import org.jboss.webbeans.log.Logging; +import org.jboss.webbeans.xml.XmlEnvironment; -public class XmlParserImpl // implements XmlParser +public class XmlParserImpl { private static Log log = Logging.getLog(XmlParserImpl.class); + + private final XmlEnvironment environment; + + public XmlParserImpl(XmlEnvironment environment) + { + this.environment = environment; + } + + public void parse() + { + // TODO extremely inefficient, no need to make dom4j parse each beans.xml multiple times, do as one parse over each document + parseForBeans(); + parseForDeploy(); + } - public Set<AnnotatedItem<?, ?>> parseForBeans(Set<URL> xmls) + private void parseForBeans() { - Set<AnnotatedItem<?, ?>> result = new HashSet<AnnotatedItem<?, ?>>(); - for (URL url : xmls) + for (URL url : environment.getBeansXmlUrls()) { - Document document = createDocument(url); - List<Element> beanElements = findBeans(document); - result.addAll(ParseXmlHelper.getBeanItems(beanElements)); + Document document = createDocument(url); + if (document != null) + { + List<Element> beanElements = findBeans(document); + // TODO Only pass in classes here + //environment.getClasses().addAll(ParseXmlHelper.getBeanItems(beanElements)); + } } - return result; + } - public void parseForDeploy(Set<URL> xmls) + private void parseForDeploy() { - List<Class<? extends Annotation>> deploymentClasses = new ArrayList<Class<? extends Annotation>>(); int counter = 0; - for (URL url : xmls) + for (URL url : environment.getBeansXmlUrls()) { Document document = createDocument(url); - Element root = document.getRootElement(); - - Iterator<?> elIterator = root.elementIterator(); - while (elIterator.hasNext()) + if (document != null) { - Element element = (Element) elIterator.next(); - if (ParseXmlHelper.isJavaEeNamespace(element) && - element.getName().equalsIgnoreCase(XmlConstants.DEPLOY)) - deploymentClasses.addAll(obtainDeploymentTypes(element, counter++)); - } + Element root = document.getRootElement(); + + Iterator<?> elIterator = root.elementIterator(); + while (elIterator.hasNext()) + { + Element element = (Element) elIterator.next(); + if (ParseXmlHelper.isJavaEeNamespace(element) && + element.getName().equalsIgnoreCase(XmlConstants.DEPLOY)) + environment.getEnabledDeploymentTypes().addAll(obtainDeploymentTypes(element, counter++)); + } + } } - if(deploymentClasses.size() == 0) - { - deploymentClasses.add(Standard.class); - deploymentClasses.add(Production.class); - } - - ManagerImpl manager = CurrentManager.rootManager(); - manager.setEnabledDeploymentTypes(deploymentClasses); } @SuppressWarnings("unchecked") @@ -92,6 +98,10 @@ InputStream xmlStream; xmlStream = url.openStream(); + if (xmlStream.available() == 0) + { + return null; + } SAXReader reader = new SAXReader(); Document document = reader.read(xmlStream); checkNamespaces(document); @@ -169,10 +179,6 @@ String standardPrefix = ""; String standardUri = XmlConstants.JAVA_EE_NAMESPACE; Namespace standardNamespace = new Namespace(standardPrefix, standardUri); - QName qName = new QName(standardName, standardNamespace); - Element standardElement = element.element(qName); - if (standardElement == null) - throw new DeploymentException("The @Standard deployment type must be declared"); List<Class<? extends Annotation>> deploymentClasses = new ArrayList<Class<? extends Annotation>>(); List<Element> children = element.elements(); Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java 2009-03-19 14:34:12 UTC (rev 2110) @@ -0,0 +1,25 @@ +package org.jboss.webbeans.xml; + +import java.lang.annotation.Annotation; +import java.net.URL; +import java.util.List; + +import org.jboss.webbeans.introspector.AnnotatedAnnotation; +import org.jboss.webbeans.introspector.AnnotatedClass; + +public interface XmlEnvironment +{ + + public List<AnnotatedClass<?>> getClasses(); + + public List<AnnotatedAnnotation<?>> getAnnotations(); + + public Iterable<URL> getBeansXmlUrls(); + + public <T> AnnotatedClass<? extends T> loadClass(String className, Class<T> expectedType); + + public <T extends Annotation> AnnotatedAnnotation<? extends T> loadAnnotation(String className, Class<T> expectedType); + + public List<Class<? extends Annotation>> getEnabledDeploymentTypes(); + +} \ No newline at end of file Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironmentImpl.java (from rev 2108, ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParserEnvironment.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironmentImpl.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironmentImpl.java 2009-03-19 14:34:12 UTC (rev 2110) @@ -0,0 +1,64 @@ +package org.jboss.webbeans.xml; + +import java.lang.annotation.Annotation; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import org.jboss.webbeans.bootstrap.api.ServiceRegistry; +import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; +import org.jboss.webbeans.introspector.AnnotatedAnnotation; +import org.jboss.webbeans.introspector.AnnotatedClass; +import org.jboss.webbeans.introspector.jlr.AnnotatedAnnotationImpl; +import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl; +import org.jboss.webbeans.resources.spi.ResourceLoader; + +public class XmlEnvironmentImpl implements XmlEnvironment +{ + + private final List<AnnotatedClass<?>> classes; + private final List<AnnotatedAnnotation<?>> annotations; + private final ServiceRegistry serviceRegistry; + private final List<Class<? extends Annotation>> enabledDeploymentTypes; + private final Iterable<URL> beansXmlUrls; + + public XmlEnvironmentImpl(ServiceRegistry serviceRegistry) + { + this.classes = new ArrayList<AnnotatedClass<?>>(); + this.annotations = new ArrayList<AnnotatedAnnotation<?>>(); + this.enabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>(); + this.serviceRegistry = serviceRegistry; + this.beansXmlUrls = serviceRegistry.get(WebBeanDiscovery.class).discoverWebBeansXml(); + } + + public List<AnnotatedClass<?>> getClasses() + { + return classes; + } + + public List<AnnotatedAnnotation<?>> getAnnotations() + { + return annotations; + } + + public Iterable<URL> getBeansXmlUrls() + { + return beansXmlUrls; + } + + public <T> AnnotatedClass<? extends T> loadClass(String className, Class<T> expectedType) + { + return AnnotatedClassImpl.of(serviceRegistry.get(ResourceLoader.class).classForName(className).asSubclass(expectedType)); + } + + public <T extends Annotation> AnnotatedAnnotation<? extends T> loadAnnotation(String className, Class<T> expectedType) + { + return AnnotatedAnnotationImpl.of(serviceRegistry.get(ResourceLoader.class).classForName(className).asSubclass(expectedType)); + } + + public List<Class<? extends Annotation>> getEnabledDeploymentTypes() + { + return enabledDeploymentTypes; + } + +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironmentImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParserEnvironment.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParserEnvironment.java 2009-03-19 13:24:44 UTC (rev 2109) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParserEnvironment.java 2009-03-19 14:34:12 UTC (rev 2110) @@ -1,62 +0,0 @@ -package org.jboss.webbeans.xml; - -import java.lang.annotation.Annotation; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import org.jboss.webbeans.introspector.AnnotatedAnnotation; -import org.jboss.webbeans.introspector.AnnotatedClass; -import org.jboss.webbeans.introspector.jlr.AnnotatedAnnotationImpl; -import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl; -import org.jboss.webbeans.resources.spi.ResourceLoader; - -public class XmlParserEnvironment -{ - - private final List<AnnotatedClass<?>> classes; - private final List<AnnotatedAnnotation<?>> annotations; - private final Iterable<URL> webBeansXml; - private final List<AnnotatedAnnotation<?>> enabledDeploymentTypes; - private final ResourceLoader resourceLoader; - - public XmlParserEnvironment(ResourceLoader resourceLoader, Iterable<URL> webBeansXml) - { - this.classes = new ArrayList<AnnotatedClass<?>>(); - this.annotations = new ArrayList<AnnotatedAnnotation<?>>(); - this.enabledDeploymentTypes = new ArrayList<AnnotatedAnnotation<?>>(); - this.webBeansXml = webBeansXml; - this.resourceLoader = resourceLoader; - } - - public Iterable<URL> getWebBeansXml() - { - return webBeansXml; - } - - public List<AnnotatedClass<?>> getClasses() - { - return classes; - } - - public List<AnnotatedAnnotation<?>> getAnnotations() - { - return annotations; - } - - public <T> AnnotatedClass<? extends T> loadClass(String className, Class<T> expectedType) - { - return AnnotatedClassImpl.of(resourceLoader.classForName(className).asSubclass(expectedType)); - } - - public <T extends Annotation> AnnotatedAnnotation<? extends T> loadAnnotation(String className, Class<T> expectedType) - { - return AnnotatedAnnotationImpl.of(resourceLoader.classForName(className).asSubclass(expectedType)); - } - - public List<AnnotatedAnnotation<?>> getEnabledDeploymentTypes() - { - return enabledDeploymentTypes; - } - -} Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/SimpleServiceRegistry.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/SimpleServiceRegistry.java 2009-03-19 13:24:44 UTC (rev 2109) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/SimpleServiceRegistry.java 2009-03-19 14:34:12 UTC (rev 2110) @@ -28,7 +28,7 @@ * @author Pete Muir * */ -class SimpleServiceRegistry implements ServiceRegistry +public class SimpleServiceRegistry implements ServiceRegistry { private final Map<Class<? extends Service>, Service> services; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-03-19 13:24:44 UTC (rev 2109) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-03-19 14:34:12 UTC (rev 2110) @@ -10,11 +10,11 @@ import org.jboss.testharness.impl.packaging.Resources; import org.jboss.webbeans.introspector.AnnotatedClass; import org.jboss.webbeans.introspector.AnnotatedItem; -import org.jboss.webbeans.resources.DefaultResourceLoader; +import org.jboss.webbeans.mock.MockXmlEnvironment; import org.jboss.webbeans.test.unit.AbstractWebBeansTest; import org.jboss.webbeans.test.unit.xml.beans.Order; import org.jboss.webbeans.util.xml.XmlParserImpl; -import org.jboss.webbeans.xml.XmlParserEnvironment; +import org.jboss.webbeans.xml.XmlEnvironmentImpl; import org.testng.annotations.Test; @Artifact @@ -27,7 +27,7 @@ @Test public void testParse() { - XmlParserEnvironment parserEnv = new XmlParserEnvironment(new DefaultResourceLoader(), getResources("beans.xml")); + XmlEnvironmentImpl parserEnv = new MockXmlEnvironment(getResources("beans.xml")); AnnotatedClass<?> aClass = parserEnv.loadClass("org.jboss.webbeans.test.unit.xml.beans.Order", Order.class); Set<URL> xmls = new HashSet<URL>(); @@ -36,15 +36,15 @@ for (URL url : urls) xmls.add(url); - XmlParserImpl parser = new XmlParserImpl(); - Set<AnnotatedItem<?, ?>> aSet = parser.parseForBeans(xmls); + XmlParserImpl parser = new XmlParserImpl(parserEnv); + parser.parse(); - for (AnnotatedItem<?, ?> aElement : aSet) + for (AnnotatedItem<?, ?> aElement : parserEnv.getClasses()) { assert aElement.equals(aClass); } - assert aSet.size() == 1; + assert parserEnv.getClasses().size() == 1; } }

17 years

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2109 - in extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd: helpers and 1 other directories.

by webbeans-commits＠lists.jboss.org

Author: nickarls Date: 2009-03-19 09:24:44 -0400 (Thu, 19 Mar 2009) New Revision: 2109 Added: extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/ConstructorModel.java Modified: extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/PackageSchemaGenerator.java extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/Schema.java extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/helpers/DataSetter.java extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/helpers/XSDHelper.java extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/ClassModel.java extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/MethodModel.java Log: refactor Modified: extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/PackageSchemaGenerator.java =================================================================== --- extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/PackageSchemaGenerator.java 2009-03-19 09:49:00 UTC (rev 2108) +++ extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/PackageSchemaGenerator.java 2009-03-19 13:24:44 UTC (rev 2109) @@ -18,9 +18,7 @@ package org.jboss.webbeans.xsd; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Set; import javax.annotation.processing.AbstractProcessor; @@ -30,7 +28,7 @@ import javax.annotation.processing.SupportedSourceVersion; import javax.lang.model.SourceVersion; import javax.lang.model.element.Element; -import javax.lang.model.element.PackageElement; +import javax.lang.model.element.ElementKind; import javax.lang.model.element.TypeElement; import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeKind; @@ -64,23 +62,24 @@ @Override public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnvironment) { - Map<String, PackageElement> packageModels = new HashMap<String, PackageElement>(); List<ClassModel> workingSet = new ArrayList<ClassModel>(); // Iterates over the classes compiled, creates a model of the classes and // add them to a working set for (Element element : roundEnvironment.getRootElements()) { - ClassModel classModel = inspectClass(element); - workingSet.add(classModel); - packageModels.put(classModel.getPackage(), processingEnv.getElementUtils().getPackageOf(element)); + if (ElementKind.CLASS.equals(element.getKind()) || ElementKind.ANNOTATION_TYPE.equals(element.getKind())) + { + ClassModel classModel = inspectClass(element); + workingSet.add(classModel); + } } if (!roundEnvironment.processingOver()) { // Update the package XSDs for the files changed helper.updateSchemas(workingSet); // And flush the changes to disk - helper.writeSchemas(packageModels); + helper.writeSchemas(); } return false; } @@ -94,7 +93,7 @@ private ClassModel inspectClass(Element element) { TypeElement typeElement = (TypeElement) element; - ClassModel classModel = ClassModel.of(typeElement); + ClassModel classModel = ClassModel.of(typeElement, processingEnv.getElementUtils().getPackageOf(typeElement)); // If the class has superclass's, scan them recursively if (typeElement.getSuperclass().getKind() != TypeKind.NONE) @@ -118,7 +117,7 @@ // Filter out the constructors and populate the model for (Element constructor : ElementFilter.constructorsIn(element.getEnclosedElements())) { - DataSetter.populateMethodModel(classModel, constructor); + DataSetter.populateConstructorModel(classModel, constructor); } // Place the new class model in the cache helper.cacheClassModel(classModel); Modified: extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/Schema.java =================================================================== --- extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/Schema.java 2009-03-19 09:49:00 UTC (rev 2108) +++ extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/Schema.java 2009-03-19 13:24:44 UTC (rev 2109) @@ -49,17 +49,19 @@ private NamespaceHandler namespaceHandler; // The set of classes to update private Set<ClassModel> classModels; - + private PackageElement packageElement; + /** * Creates a new package * * @param packageName The name of the package */ - public Schema(String packageName) + public Schema(String packageName, PackageElement packageElement) { this.packageName = packageName; namespaceHandler = new NamespaceHandler(packageName); classModels = new HashSet<ClassModel>(); + this.packageElement = packageElement; } /** @@ -113,7 +115,7 @@ * @param FQN The full name of the class * @return True if present, false otherwise */ - private boolean isClassInPackage(PackageElement packageElement, String FQN) + private boolean isClassInPackage(String FQN) { for (javax.lang.model.element.Element classElement : packageElement.getEnclosedElements()) { @@ -130,12 +132,12 @@ * Cleans out XSD for files that are no longer present in the package * @param packageElement */ - private void cleanRemovedClasses(PackageElement packageElement) + private void cleanRemovedClasses() { for (Object xsdClass : document.selectNodes("/xs:schema/xs:element")) { String FQN = packageName + "." + ((Element) xsdClass).attributeValue("name"); - if (!isClassInPackage(packageElement, FQN)) + if (!isClassInPackage(FQN)) { ((Element) xsdClass).detach(); } @@ -192,9 +194,9 @@ * * @param packageElement The package abstraction */ - public void rebuild(PackageElement packageElement) + public void rebuild() { - cleanRemovedClasses(packageElement); + cleanRemovedClasses(); updateNamespaces(); for (ClassModel classModel : classModels) Modified: extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/helpers/DataSetter.java =================================================================== --- extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/helpers/DataSetter.java 2009-03-19 09:49:00 UTC (rev 2108) +++ extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/helpers/DataSetter.java 2009-03-19 13:24:44 UTC (rev 2109) @@ -22,6 +22,7 @@ import javax.lang.model.element.Modifier; import org.jboss.webbeans.xsd.model.ClassModel; +import org.jboss.webbeans.xsd.model.ConstructorModel; import org.jboss.webbeans.xsd.model.MethodModel; import org.jboss.webbeans.xsd.model.NamedModel; @@ -62,29 +63,29 @@ } /** - * Inspects a method or constructor and populates a class model + * Inspects a constructor and populates a class model * * @param classModel The class model to populate * @param element The element to inspect */ - public static void populateMethodModel(ClassModel classModel, Element element) + public static void populateConstructorModel(ClassModel classModel, Element element) { if (!isPublic(element)) { return; } - MethodModel method = MethodModel.of((ExecutableElement) element); + ConstructorModel constructor = ConstructorModel.of((ExecutableElement) element); + classModel.addConstructor(constructor); + } - // OK, cheating a little with a common model for methods and constructors - if ("<init>".equals(method.getName())) + public static void populateMethodModel(ClassModel classModel, Element element) + { + if (!isPublic(element)) { - method.setName(classModel.getSimpleName()); - classModel.addConstructor(method); + return; } - else - { - classModel.addMethod(method); - } + MethodModel method = MethodModel.of((ExecutableElement) element); + classModel.addMethod(method); } } Modified: extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/helpers/XSDHelper.java =================================================================== --- extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/helpers/XSDHelper.java 2009-03-19 09:49:00 UTC (rev 2108) +++ extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/helpers/XSDHelper.java 2009-03-19 13:24:44 UTC (rev 2109) @@ -73,9 +73,9 @@ * @throws DocumentException If the schema could not be parsed * @throws IOException If the schema could not be read */ - private Schema createSchema(String packageName) throws DocumentException, IOException + private Schema createSchema(String packageName, PackageElement packageElement) throws DocumentException, IOException { - Schema schema = new Schema(packageName); + Schema schema = new Schema(packageName, packageElement); Document document = readSchema(packageName); if (document == null) { @@ -158,7 +158,7 @@ { try { - schema = createSchema(packageName); + schema = createSchema(packageName, classModel.getPackageElement()); } catch (DocumentException e) { @@ -179,11 +179,11 @@ * * @param packageModels */ - public void writeSchemas(Map<String, PackageElement> packageModels) + public void writeSchemas() { for (Schema schema : schemaMap.values()) { - schema.rebuild(packageModels.get(schema.getPackageName())); + schema.rebuild(); System.out.println(schema.getDocument().asXML()); try { Modified: extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/ClassModel.java =================================================================== --- extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/ClassModel.java 2009-03-19 09:49:00 UTC (rev 2108) +++ extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/ClassModel.java 2009-03-19 13:24:44 UTC (rev 2109) @@ -22,6 +22,8 @@ import java.util.List; import java.util.Set; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.PackageElement; import javax.lang.model.element.TypeElement; import org.dom4j.DocumentFactory; @@ -36,21 +38,31 @@ */ public class ClassModel extends NamedModel { + // The package of the class + private PackageElement packageElement; // The parent (or null if top-level) private ClassModel parent; - // The fields of the class private List<NamedModel> fields = new ArrayList<NamedModel>(); // The methods of the class private List<MethodModel> methods = new ArrayList<MethodModel>(); // The constructors of the class - private List<MethodModel> constructors = new ArrayList<MethodModel>(); + private List<ConstructorModel> constructors = new ArrayList<ConstructorModel>(); + // The kind of class + private ElementKind kind; - protected ClassModel(String name) + protected ClassModel(String name, ElementKind kind, PackageElement packageElement) { super(name); + this.kind = kind; + this.packageElement = packageElement; } + public static ClassModel of(TypeElement typeElement, PackageElement packageElement) + { + return new ClassModel(typeElement.getQualifiedName().toString(), typeElement.getKind(), packageElement); + } + /** * Adds a field to the class model * @@ -66,7 +78,7 @@ * * @param constructor The constructor to add */ - public void addConstructor(MethodModel constructor) + public void addConstructor(ConstructorModel constructor) { constructors.add(constructor); } @@ -107,9 +119,9 @@ * * @return The set of constructors available */ - public Set<MethodModel> getMergedConstructors() + public Set<ConstructorModel> getMergedConstructors() { - return new HashSet<MethodModel>(constructors); + return new HashSet<ConstructorModel>(constructors); } /** @@ -219,6 +231,11 @@ return lastDot < 0 ? name : name.substring(lastDot + 1); } + public PackageElement getPackageElement() + { + return packageElement; + } + @Override public String toString() { @@ -230,11 +247,6 @@ return buffer.toString(); } - public static ClassModel of(TypeElement typeElement) - { - return new ClassModel(typeElement.getQualifiedName().toString()); - } - @Override public Element toXSD(NamespaceHandler namespaceHandler) { @@ -244,18 +256,27 @@ Element anyElement = DocumentFactory.getInstance().createElement("xs:any"); complexElement.add(anyElement); classElement.add(complexElement); - for (MethodModel constructor : getMergedConstructors()) + + Element choice = DocumentFactory.getInstance().createElement("xs:choice"); + for (ConstructorModel constructor : getMergedConstructors()) { - anyElement.add(constructor.toXSD(namespaceHandler)); + if (!constructor.getParameters().isEmpty()) + { + choice.add(constructor.toXSD(namespaceHandler)); + } } + anyElement.add(choice); + + for (MethodModel method : getMergedMethods()) + { + anyElement.add(method.toXSD(namespaceHandler)); + } + for (NamedModel field : getMergedFields()) { anyElement.add(field.toXSD(namespaceHandler)); } - for (MethodModel method : getMergedMethods()) - { - anyElement.add(method.toXSD(namespaceHandler)); - } + return classElement; } Added: extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/ConstructorModel.java =================================================================== --- extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/ConstructorModel.java (rev 0) +++ extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/ConstructorModel.java 2009-03-19 13:24:44 UTC (rev 2109) @@ -0,0 +1,47 @@ +package org.jboss.webbeans.xsd.model; + +import javax.lang.model.element.ExecutableElement; + +import org.dom4j.DocumentFactory; +import org.dom4j.Element; +import org.jboss.webbeans.xsd.NamespaceHandler; + +public class ConstructorModel extends MethodModel +{ + + protected ConstructorModel(ExecutableElement executableElement) + { + super(executableElement); + name = null; + } + + public static ConstructorModel of(ExecutableElement executableElement) + { + return new ConstructorModel(executableElement); + } + + @Override + public boolean equals(Object other) + { + ConstructorModel otherModel = (ConstructorModel) other; + return parameters.equals(otherModel.getParameters()); + } + + @Override + public int hashCode() + { + return parameters.hashCode(); + } + + @Override + public Element toXSD(NamespaceHandler namespaceHandler) + { + Element constructor = DocumentFactory.getInstance().createElement("xs:sequence"); + for (TypedModel parameter : parameters) + { + constructor.add(parameter.toXSD(namespaceHandler)); + } + return constructor; + } + +} Modified: extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/MethodModel.java =================================================================== --- extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/MethodModel.java 2009-03-19 09:49:00 UTC (rev 2108) +++ extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/MethodModel.java 2009-03-19 13:24:44 UTC (rev 2109) @@ -44,7 +44,7 @@ } }; - private List<TypedModel> parameters = new ArrayList<TypedModel>(); + protected List<TypedModel> parameters = new ArrayList<TypedModel>(); protected MethodModel(ExecutableElement executableElement) {

17 years

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2108 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: xmlmetadata and 3 other directories.

by webbeans-commits＠lists.jboss.org

Author: vitold Date: 2009-03-19 05:49:00 -0400 (Thu, 19 Mar 2009) New Revision: 2108 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xmlmetadata/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xmlmetadata/declaration/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xmlmetadata/declaration/bean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xmlmetadata/declaration/bean/BeanDeclarationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xmlmetadata/declaration/bean/child/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xmlmetadata/declaration/bean/child/BeanChildDeclarationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xmlmetadata/declaration/interceptor/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xmlmetadata/declaration/stereotype/ Log: add some stubs for section 9.5 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xmlmetadata/declaration/bean/BeanDeclarationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xmlmetadata/declaration/bean/BeanDeclarationTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xmlmetadata/declaration/bean/BeanDeclarationTest.java 2009-03-19 09:49:00 UTC (rev 2108) @@ -0,0 +1,68 @@ +package org.jboss.jsr299.tck.tests.xmlmetadata.declaration.bean; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.testng.annotations.Test; + +@Artifact +public class BeanDeclarationTest extends AbstractJSR299Test +{ + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "9.5", id = "a") + public void testDirectRootChildren() + { + assert false; + } + + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "9.5", id = "b") + public void testDeclaredJavaType() + { + assert false; + } + + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "9.5", id = "c") + public void testIsElementJmsResource() + { + assert false; + } + + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "9.5", id = "d") + public void testIsElementResource() + { + assert false; + } + + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "9.5", id = "e") + public void testIsElementSessionBean() + { + assert false; + } + + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "9.5", id = "f") + public void testIsElementSimpleBean() + { + assert false; + } + + @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "9.5", id = "g") + public void testDefinitionErrorInWebbeansXml() + { + assert false; + } + + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "9.5", id = "h") + public void testInlineBeanDeclaration() + { + assert false; + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xmlmetadata/declaration/bean/child/BeanChildDeclarationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xmlmetadata/declaration/bean/child/BeanChildDeclarationTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xmlmetadata/declaration/bean/child/BeanChildDeclarationTest.java 2009-03-19 09:49:00 UTC (rev 2108) @@ -0,0 +1,65 @@ +package org.jboss.jsr299.tck.tests.xmlmetadata.declaration.bean.child; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.testng.annotations.Test; + +@Artifact +public class BeanChildDeclarationTest extends AbstractJSR299Test +{ + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertions( { + @SpecAssertion(section = "9.5.1", id = "a"), + @SpecAssertion(section = "9.5.2", id = "a"), + @SpecAssertion(section = "9.5.2", id = "b") }) + public void testIsChildElementTypeLevelMetadata() + { + assert false; + } + + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "9.5.1", id = "b") + public void testIsChildElementConstructorParameter() + { + assert false; + } + + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "9.5.1", id = "c") + public void testIsChildElementMethodOrField() + { + assert false; + } + + @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "9.5.1", id = "d") + public void testIsChildElementNameMatchesMethodAndField() + { + assert false; + } + + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "9.5.1", id = "e") + public void testIsChildElementMethod() + { + assert false; + } + + @Test(groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "9.5.1", id = "f") + public void testIsChildElementField() + { + assert false; + } + + @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "webbeansxml" }) + @SpecAssertion(section = "9.5.1", id = "g") + public void test() + { + assert false; + } +}

17 years

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits March 2009