Branch: refs/heads/2.0 Home: https://github.com/weld/core Commit: 1ac92424f0004783f99b6c81d05449f6bff4d0d8 https://github.com/weld/core/commit/1ac92424f0004783f99b6c81d05449f6bff4d0d8 Author: Anthony OGIER <aogier(a)iorga.com&gt; Date: 2012-06-06 (Wed, 06 Jun 2012) Changed paths: A tests-arquillian/src/test/java/org/jboss/weld/tests/ejb/EJBCallTest.java Log Message: ----------- Adding a test to test a simple EJB method call during Arquillian test. See https://issues.jboss.org/browse/WELD-1086 Commit: 07dfc5c646f03ffaf67ccd3c35f2490d5f13fb71 https://github.com/weld/core/commit/07dfc5c646f03ffaf67ccd3c35f2490d5f13fb71 Author: Marko Luksa <marko.luksa(a)gmail.com&gt; Date: 2012-06-06 (Wed, 06 Jun 2012) Changed paths: M impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java Log Message: ----------- Fix potentially buggy push/pop of CurrentInjectionPoint & simplify code Conflicts: impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java Commit: 2e0ce2eed7e2713f7c479f724f453adcd88ee226 https://github.com/weld/core/commit/2e0ce2eed7e2713f7c479f724f453adcd88ee226 Author: Jozef Hartinger <jharting(a)redhat.com&gt; Date: 2012-06-06 (Wed, 06 Jun 2012) Changed paths: M tests-arquillian/src/test/java/org/jboss/weld/tests/ejb/EJBCallTest.java Log Message: ----------- Exclude the test for WELD-1086 temporarily Commit: c2f02d1a9e5f9a8cdb3be36d77342ef33c76ea40 https://github.com/weld/core/commit/c2f02d1a9e5f9a8cdb3be36d77342ef33c76ea40 Author: Marko Luksa <marko.luksa(a)gmail.com&gt; Date: 2012-06-06 (Wed, 06 Jun 2012) Changed paths: M impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java Log Message: ----------- WELD-1110 Should be able to Decorate EJB (fixed NPE) Conflicts: impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java Commit: eebf9cbd35a3a15f93689d3f7c86c4b5ef2ddd37 https://github.com/weld/core/commit/eebf9cbd35a3a15f93689d3f7c86c4b5ef2ddd37 Author: Marko Luksa <marko.luksa(a)gmail.com&gt; Date: 2012-06-06 (Wed, 06 Jun 2012) Changed paths: M pom.xml M tests-arquillian/pom.xml M tests-arquillian/src/main/java/org/jboss/shrinkwrap/impl/BeansXml.java A tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/weld1110/Message.java A tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/weld1110/MessageDecorator.java A tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/weld1110/MessageSender.java A tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/weld1110/MessageSenderTest.java M tests-arquillian/src/test/resources/arquillian.xml Log Message: ----------- WELD-1110 Add test case (cherry picked from commit c95c6d0) Conflicts: tests-arquillian/src/main/java/org/jboss/shrinkwrap/impl/BeansXml.java Commit: 90d88eaf23d4671e0ef8af1cd129cfcb5679d883 https://github.com/weld/core/commit/90d88eaf23d4671e0ef8af1cd129cfcb5679d883 Author: Marko Luksa <marko.luksa(a)gmail.com&gt; Date: 2012-06-06 (Wed, 06 Jun 2012) Changed paths: R tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/weld1110/Message.java M tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/weld1110/MessageDecorator.java M tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/weld1110/MessageSender.java A tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/weld1110/MessageSenderImpl.java M tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/weld1110/MessageSenderTest.java A tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/weld1110/RestFacade.java Log Message: ----------- Corrected and improved WELD-1110 test Commit: 681328907c20fce6d95dfb9006c0301a4f348766 https://github.com/weld/core/commit/681328907c20fce6d95dfb9006c0301a4f348766 Author: Ales Justin <ales.justin(a)gmail.com&gt; Date: 2012-06-06 (Wed, 06 Jun 2012) Changed paths: M tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/weld1110/MessageSenderTest.java M tests-arquillian/src/test/java/org/jboss/weld/tests/ejb/EJBCallTest.java Log Message: ----------- Ignore tests atm. Conflicts: tests-arquillian/src/test/java/org/jboss/weld/tests/ejb/EJBCallTest.java Commit: 98360353e9851516cda81d73b97e69e60b0dd05a https://github.com/weld/core/commit/98360353e9851516cda81d73b97e69e60b0dd05a Author: Marko Luksa <marko.luksa(a)gmail.com&gt; Date: 2012-06-07 (Thu, 07 Jun 2012) Changed paths: M impl/src/main/java/org/jboss/weld/bean/proxy/DecorationHelper.java M impl/src/main/java/org/jboss/weld/injection/producer/AbstractDecoratorApplyingInstantiator.java M impl/src/main/java/org/jboss/weld/injection/producer/SubclassDecoratorApplyingInstantiator.java M impl/src/main/java/org/jboss/weld/injection/producer/ejb/ProxyDecoratorApplyingSessionBeanInstantiator.java Log Message: ----------- Remove duplication in SessionBean.applyDecorators; minor clean-up of DecorationHelper Conflicts: impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java impl/src/main/java/org/jboss/weld/bean/SessionBean.java Commit: 9b947385d38b18d12ec3ac9a17bdb42e310a6e38 https://github.com/weld/core/commit/9b947385d38b18d12ec3ac9a17bdb42e310a6e38 Author: Marko Luksa <marko.luksa(a)gmail.com&gt; Date: 2012-06-07 (Thu, 07 Jun 2012) Changed paths: M impl/src/main/java/org/jboss/weld/bean/proxy/DecorationHelper.java M impl/src/main/java/org/jboss/weld/injection/producer/AbstractDecoratorApplyingInstantiator.java Log Message: ----------- Additional code cleanup Conflicts: impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java Commit: 6d862a06d886002309df6078cb0ddc2c537b1048 https://github.com/weld/core/commit/6d862a06d886002309df6078cb0ddc2c537b1048 Author: Marko Luksa <marko.luksa(a)gmail.com&gt; Date: 2012-06-07 (Thu, 07 Jun 2012) Changed paths: M impl/src/main/java/org/jboss/weld/bean/proxy/DecorationHelper.java M impl/src/main/java/org/jboss/weld/bean/proxy/DecoratorProxyMethodHandler.java M impl/src/main/java/org/jboss/weld/injection/producer/ejb/SessionBeanInstantiator.java M impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java Log Message: ----------- Improve code readability Conflicts: impl/src/main/java/org/jboss/weld/bean/SessionBean.java impl/src/main/java/org/jboss/weld/bean/proxy/DecoratorProxyMethodHandler.java Commit: 206226aae12c4712cf9930bf78003f3a196a19ec https://github.com/weld/core/commit/206226aae12c4712cf9930bf78003f3a196a19ec Author: Marko Luksa <marko.luksa(a)gmail.com&gt; Date: 2012-06-07 (Thu, 07 Jun 2012) Changed paths: M impl/src/main/java/org/jboss/weld/bean/DecoratorImpl.java M impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseBeanProxyMethodHandler.java Log Message: ----------- Minor code cleanup Conflicts: impl/src/main/java/org/jboss/weld/bean/DecoratorImpl.java Commit: 69cfeff00e69b019f8e9747cfb8001edab783409 https://github.com/weld/core/commit/69cfeff00e69b019f8e9747cfb8001edab783409 Author: Marko Luksa <marko.luksa(a)gmail.com&gt; Date: 2012-06-07 (Thu, 07 Jun 2012) Changed paths: M impl/src/main/java/org/jboss/weld/bean/proxy/DecorationHelper.java Log Message: ----------- WELD-1110 AssertionError instead of NPE Commit: 75d117aae064d92cfb9b184ea8547499042c72f8 https://github.com/weld/core/commit/75d117aae064d92cfb9b184ea8547499042c72f8 Author: Marko Luksa <marko.luksa(a)gmail.com&gt; Date: 2012-06-07 (Thu, 07 Jun 2012) Changed paths: M tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/SimpleBean.java M tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/SimpleBeanImpl.java M tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java Log Message: ----------- Corrected basic decorator tests Commit: 4da2e1696013e8c43989022eeddc434eea203a26 https://github.com/weld/core/commit/4da2e1696013e8c43989022eeddc434eea203a26 Author: Ron Smeral <rsmeral(a)redhat.com&gt; Date: 2012-06-07 (Thu, 07 Jun 2012) Changed paths: M examples/jsf/permalink/src/ftest/java/org/jboss/weld/examples/permalink/ftest/PermalinkTest.java Log Message: ----------- WELD-1137 PermalinkTest fails due to dependence between test methods Compare: https://github.com/weld/core/compare/9c8fd73...4da2e16