[weld-commits] [weld/core] ac5afc: WELD-1715, WELD-1714, WELD-1658 Extensive refactor...

Branch: refs/heads/master Home: https://github.com/weld/core Commit: ac5afc0b6184b8bcc3d3c017db010fae808a2a1e https://github.com/weld/core/commit/ac5afc0b6184b8bcc3d3c017db010fae808a2a1e Author: Martin Kouba <mkouba(a)redhat.com&gt; Date: 2014-08-26 (Tue, 26 Aug 2014) Changed paths: A environments/common/pom.xml A environments/common/src/main/java/org/jboss/weld/environment/WeldProvider.java A environments/common/src/main/java/org/jboss/weld/environment/deployment/AbstractWeldBeanDeploymentArchive.java A environments/common/src/main/java/org/jboss/weld/environment/deployment/AbstractWeldDeployment.java A environments/common/src/main/java/org/jboss/weld/environment/deployment/WeldBeanDeploymentArchive.java A environments/common/src/main/java/org/jboss/weld/environment/deployment/WeldDeployment.java A environments/common/src/main/java/org/jboss/weld/environment/deployment/WeldResourceLoader.java A environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/AbstractDiscoveryStrategy.java A environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/BeanArchiveBuilder.java A environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/BeanArchiveHandler.java A environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/BeanArchiveScanner.java A environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DefaultBeanArchiveScanner.java A environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DefaultDiscoveryStrategy.java A environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DiscoveryStrategy.java A environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DiscoveryStrategyFactory.java A environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/FileSystemBeanArchiveHandler.java A environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/ReflectionDiscoveryStrategy.java A environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/JandexClassFileInfo.java A environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/JandexClassFileServices.java A environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/JandexDiscoveryStrategy.java A environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/JandexFileSystemBeanArchiveHandler.java A environments/common/src/main/java/org/jboss/weld/environment/logging/Category.java A environments/common/src/main/java/org/jboss/weld/environment/logging/CommonLogger.java A environments/common/src/main/java/org/jboss/weld/environment/logging/WeldEnvironmentLogger.java A environments/common/src/main/java/org/jboss/weld/environment/util/Collections.java A environments/common/src/main/java/org/jboss/weld/environment/util/Reflections.java A environments/common/src/main/resources/checkstyle-suppressions.xml A environments/common/src/main/resources/checkstyle.xml A environments/common/src/test/java/org/jboss/weld/environment/util/ReflectionsTest.java M environments/se/core/pom.xml M environments/se/core/src/main/java/org/jboss/weld/environment/se/Weld.java R environments/se/core/src/main/java/org/jboss/weld/environment/se/WeldSEProvider.java R environments/se/core/src/main/java/org/jboss/weld/environment/se/discovery/AbstractWeldSEBeanDeploymentArchive.java R environments/se/core/src/main/java/org/jboss/weld/environment/se/discovery/AbstractWeldSEDeployment.java R environments/se/core/src/main/java/org/jboss/weld/environment/se/discovery/WeldSEBeanDeploymentArchive.java R environments/se/core/src/main/java/org/jboss/weld/environment/se/discovery/WeldSEClassFileInfo.java R environments/se/core/src/main/java/org/jboss/weld/environment/se/discovery/WeldSEClassFileServices.java R environments/se/core/src/main/java/org/jboss/weld/environment/se/discovery/url/BeanArchiveBuilder.java R environments/se/core/src/main/java/org/jboss/weld/environment/se/discovery/url/ClasspathScanningException.java R environments/se/core/src/main/java/org/jboss/weld/environment/se/discovery/url/DefaultDiscoveryStrategy.java R environments/se/core/src/main/java/org/jboss/weld/environment/se/discovery/url/DiscoveryStrategy.java R environments/se/core/src/main/java/org/jboss/weld/environment/se/discovery/url/FileSystemURLHandler.java R environments/se/core/src/main/java/org/jboss/weld/environment/se/discovery/url/JandexEnabledDiscoveryStrategy.java R environments/se/core/src/main/java/org/jboss/weld/environment/se/discovery/url/JandexEnabledFileSystemURLHandler.java R environments/se/core/src/main/java/org/jboss/weld/environment/se/discovery/url/URLHandler.java R environments/se/core/src/main/java/org/jboss/weld/environment/se/discovery/url/URLScanner.java R environments/se/core/src/main/java/org/jboss/weld/environment/se/discovery/url/WeldSEResourceLoader.java R environments/se/core/src/main/java/org/jboss/weld/environment/se/discovery/url/WeldSEUrlDeployment.java M environments/se/core/src/main/java/org/jboss/weld/environment/se/logging/WeldSELogger.java M environments/se/core/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider M environments/se/core/src/test/java/org/jboss/weld/environment/se/test/arquillian/WeldSEDeployableContainer.java M environments/servlet/core/pom.xml M environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/EnhancedListener.java R environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/ExactListener.java M environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/Listener.java R environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/TomcatListener.java M environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/WeldServletLifecycle.java R environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/deployment/ExactScanner.java A environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/deployment/ServletContextBeanArchiveHandler.java R environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/deployment/ServletDeployment.java R environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/deployment/TomcatScanner.java R environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/deployment/URLScanner.java R environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/deployment/VFSURLScanner.java A environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/deployment/WebAppBeanArchiveScanner.java R environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/deployment/WebAppBeanDeploymentArchive.java M environments/servlet/core/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider R environments/servlet/core/src/main/resources/META-INF/services/org.jboss.weld.extensions.beanManager.BeanManagerProvider A environments/servlet/core/src/test/java/org/jboss/weld/environment/servlet/deployment/ServletContextBeanArchiveHandlerTest.java R environments/servlet/core/src/test/java/org/jboss/weld/environment/servlet/deployment/WebAppBeanDeploymentArchiveTest.java M environments/servlet/tests/base/pom.xml M environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/bootstrap/BootstrapOrderingTestBase.java M environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/bootstrap/MyExtension.java M environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/bootstrap/MyServletContextListener.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/bootstrap/beansxml/BeansXmlAlternativeLocationTestBase.java M environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/bootstrap/duplicates/DuplicateBeansXmlMergingTestBase.java M environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/config/ConfigTestBase.java M environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/crosscontext/CrossContextForwardTestBase.java M environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/deployment/structure/ContainerLifecycleObserver.java M environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/deployment/structure/DeploymentOrderingTestBase.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/BeanDiscoveryInjectionTestBase.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/Cat.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/Cow.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/Decorable.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/Dog.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/DogInterface.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/Flat.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/House.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/InterceptorBindingAnnotation.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/Plant.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/Stone.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/Tree.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/alternatives/AlternativeDiscoveryTestBase.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/alternatives/AlternativeDog.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/alternatives/AlternativeFlat.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/alternatives/AlternativeStone.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/alternatives/AlternativeTree.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/decorators/ClassicDecorator.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/decorators/DecoratorDiscoveryTestBase.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/interceptors/ClassicInterceptor.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/interceptors/InterceptorDiscoveryTestBase.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/scope/Baz.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/scope/CustomNormalScopeDiscoveryTestBase.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/scope/Foo.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/scope/FooScoped.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/stereotype/Bar.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/stereotype/Baz.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/stereotype/Foo.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/stereotype/FooStereotype.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/discovery/stereotype/StereotypeDiscoveryTestBase.java M environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/ExampleTestBase.java M environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/MockExampleTestBase.java M environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/Random.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/isolation/Camera.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/isolation/CameraDecorator.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/isolation/DSLR.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/isolation/Digital.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/isolation/IsolationDisabledTestBase.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/isolation/PinholeCamera.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/isolation/RangefinderCamera.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/isolation/Zoom.java A environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/isolation/ZoomInterceptor.java M environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/libraries/LibrariesDiscoveredTestBase.java M environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/provider/TestCDI.java R environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/util/BeansXml.java M environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/util/Deployments.java A environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/bootstrap/beansxml/BeansXmlAlternativeLocationTest.java M environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/config/ConfigWithoutJettyEnvTest.java M environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/crosscontext/CrossContextForwardTest.java A environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/discovery/BeanDiscoveryInjectionTest.java A environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/discovery/alternatives/AlternativeDiscoveryTest.java A environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/discovery/decorators/DecoratorDiscoveryTest.java A environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/discovery/interceptors/InterceptorDiscoveryTest.java A environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/discovery/scope/CustomNormalScopeDiscoveryTest.java A environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/discovery/stereotype/StereotypeDiscoveryTest.java A environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/isolation/IsolationDisabledTest.java A environments/servlet/tests/tomcat/src/test/java/org/jboss/weld/environment/servlet/test/bootstrap/beansxml/BeansXmlAlternativeLocationTest.java A environments/servlet/tests/tomcat/src/test/java/org/jboss/weld/environment/servlet/test/discovery/BeanDiscoveryInjectionTest.java A environments/servlet/tests/tomcat/src/test/java/org/jboss/weld/environment/servlet/test/discovery/alternatives/AlternativeDiscoveryTest.java A environments/servlet/tests/tomcat/src/test/java/org/jboss/weld/environment/servlet/test/discovery/decorators/DecoratorDiscoveryTest.java A environments/servlet/tests/tomcat/src/test/java/org/jboss/weld/environment/servlet/test/discovery/interceptors/InterceptorDiscoveryTest.java A environments/servlet/tests/tomcat/src/test/java/org/jboss/weld/environment/servlet/test/discovery/scope/CustomNormalScopeDiscoveryTest.java A environments/servlet/tests/tomcat/src/test/java/org/jboss/weld/environment/servlet/test/discovery/stereotype/StereotypeDiscoveryTest.java A environments/servlet/tests/tomcat/src/test/java/org/jboss/weld/environment/servlet/test/isolation/IsolationDisabledTest.java M impl/src/main/java/org/jboss/weld/resources/ManagerObjectFactory.java M impl/src/main/java/org/jboss/weld/servlet/WeldInitialListener.java M pom.xml Log Message: ----------- WELD-1715, WELD-1714, WELD-1658 Extensive refactoring of weld-se and weld-servlet - extract common logic into a new module - unify the deployment and bean discovery process Weld Servlet - bean-discovery-mode="annotated" support and isolated bean archives - add support for WEB-INF/classes/META-INF/beans.xml location - adapt discovery/isolation tests from Weld SE - drop outdated/deprecated stuff (TomcatListener, VFSURLScanner, etc.) Commit: 194b20e95c0d375a50ed0313e9e235e79f3c1d29 https://github.com/weld/core/commit/194b20e95c0d375a50ed0313e9e235e79f3c1d29 Author: Jozef Hartinger <jharting(a)redhat.com&gt; Date: 2014-08-26 (Tue, 26 Aug 2014) Changed paths: M environments/common/pom.xml M environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DiscoveryStrategy.java R environments/common/src/main/resources/checkstyle-suppressions.xml R environments/common/src/main/resources/checkstyle.xml Log Message: ----------- Remove temporary checkstyle workaround Commit: 8b25fdbc62e0fe579baad4903bd2535f3d9dd69a https://github.com/weld/core/commit/8b25fdbc62e0fe579baad4903bd2535f3d9dd69a Author: Jozef Hartinger <jharting(a)redhat.com&gt; Date: 2014-08-26 (Tue, 26 Aug 2014) Changed paths: M examples/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/Generator.java M examples/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/MessageGenerator.java M examples/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/NumberGuessFrame.java M examples/se/numberguess/src/main/resources/META-INF/beans.xml Log Message: ----------- Switch weld-se-numberguess to use bean-discovery-mode="annotated" Commit: f04f3d37cffd9a021dac702940c59a9697cdf014 https://github.com/weld/core/commit/f04f3d37cffd9a021dac702940c59a9697cdf014 Author: Jozef Hartinger <jharting(a)redhat.com&gt; Date: 2014-08-26 (Tue, 26 Aug 2014) Changed paths: M environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/AbstractDiscoveryStrategy.java M environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/BeanArchiveBuilder.java M environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/BeanArchiveScanner.java M environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DefaultBeanArchiveScanner.java M environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DefaultDiscoveryStrategy.java M environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DiscoveryStrategy.java M environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/FileSystemBeanArchiveHandler.java M environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/JandexDiscoveryStrategy.java A environments/common/src/main/java/org/jboss/weld/environment/util/URLUtils.java M environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/WeldServletLifecycle.java M environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/deployment/ServletContextBeanArchiveHandler.java M environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/deployment/WebAppBeanArchiveScanner.java Log Message: ----------- Do not call handlers from scanner Commit: f98dfb0fbf0a123c2b70558cf422646003adef15 https://github.com/weld/core/commit/f98dfb0fbf0a123c2b70558cf422646003adef15 Author: Jozef Hartinger <jharting(a)redhat.com&gt; Date: 2014-08-26 (Tue, 26 Aug 2014) Changed paths: M environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/deployment/WebAppBeanArchiveScanner.java M impl/src/main/java/org/jboss/weld/resources/ManagerObjectFactory.java Log Message: ----------- Minor Commit: 6d41f79b4c56ff8b5a2d5b9eb23d9679e39e1538 https://github.com/weld/core/commit/6d41f79b4c56ff8b5a2d5b9eb23d9679e39e1538 Author: Jozef Hartinger <jharting(a)redhat.com&gt; Date: 2014-08-26 (Tue, 26 Aug 2014) Changed paths: R environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DefaultDiscoveryStrategy.java M environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DiscoveryStrategyFactory.java M environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/ReflectionDiscoveryStrategy.java M environments/common/src/main/java/org/jboss/weld/environment/logging/CommonLogger.java M environments/se/core/src/main/java/org/jboss/weld/environment/se/Weld.java M environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/WeldServletLifecycle.java Log Message: ----------- Unify how weld-se and weld-servlet behave on bean-discovery-mode="annotated" w/o Jandex Commit: d2eded34f45b9f41c4157bfd14ec3822e137903c https://github.com/weld/core/commit/d2eded34f45b9f41c4157bfd14ec3822e137903c Author: Jozef Hartinger <jharting(a)redhat.com&gt; Date: 2014-08-26 (Tue, 26 Aug 2014) Changed paths: M environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DefaultBeanArchiveScanner.java Log Message: ----------- Fix WebStart support Commit: de1048a9124337962cdbf7423bf9402dd4b5d967 https://github.com/weld/core/commit/de1048a9124337962cdbf7423bf9402dd4b5d967 Author: Jozef Hartinger <jharting(a)redhat.com&gt; Date: 2014-08-26 (Tue, 26 Aug 2014) Changed paths: M environments/se/core/pom.xml Log Message: ----------- Groovy should be an optional dependency Commit: 5a5476260d6896d79580ffdd4139fdd5137d65a3 https://github.com/weld/core/commit/5a5476260d6896d79580ffdd4139fdd5137d65a3 Author: Jozef Hartinger <jharting(a)redhat.com&gt; Date: 2014-08-26 (Tue, 26 Aug 2014) Changed paths: M examples/pom.xml A examples/webstart/README.md A examples/webstart/pom.xml A examples/webstart/src/main/jnlp/template.vm A examples/webstart/src/main/webapp/WEB-INF/web.xml A examples/webstart/src/main/webapp/index.html Log Message: ----------- Added weld-se-numberguess-webstart example Compare: https://github.com/weld/core/compare/4277bb03f100...5a5476260d68