You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by th...@apache.org on 2014/01/07 19:36:59 UTC

[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tapestry-5

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tapestry-5


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/77072b3a
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/77072b3a
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/77072b3a

Branch: refs/heads/master
Commit: 77072b3ab6666d7601d65e63595f8923197e9b1d
Parents: af355be bf2c8a4
Author: Thiago H. de Paula Figueiredo <th...@apache.org>
Authored: Tue Jan 7 16:36:23 2014 -0200
Committer: Thiago H. de Paula Figueiredo <th...@apache.org>
Committed: Tue Jan 7 16:36:23 2014 -0200

----------------------------------------------------------------------
 settings.gradle                                 |   1 +
 tapestry-cdi/LICENSE.txt                        | 437 ++++++++++++++++++
 tapestry-cdi/build.gradle                       | 114 +++++
 .../org/apache/tapestry5/cdi/BeanHelper.java    | 153 +++++++
 .../org/apache/tapestry5/cdi/BeanInstance.java  |  50 +++
 .../apache/tapestry5/cdi/CDIInjectModule.java   |  45 ++
 .../tapestry5/cdi/CDIInjectionProvider.java     | 151 +++++++
 .../apache/tapestry5/cdi/CDIObjectProvider.java |  56 +++
 .../cdi/extension/BeanManagerHolder.java        |  42 ++
 .../cdi/extension/TapestryExtension.java        |  49 +++
 .../cdi/internal/utils/InternalUtils.java       | 134 ++++++
 .../src/main/resources/META-INF/beans.xml       |  22 +
 .../javax.enterprise.inject.spi.Extension       |   2 +
 .../apache/tapestry5/cdi/test/InjectTest.java   | 439 +++++++++++++++++++
 .../tapestry5/cdi/test/annotation/Choco.java    |  28 ++
 .../cdi/test/annotation/CustomDessert.java      |  28 ++
 .../cdi/test/annotation/DessertTime.java        |  28 ++
 .../tapestry5/cdi/test/annotation/Iced.java     |  30 ++
 .../cdi/test/annotation/MyStereotype.java       |  33 ++
 .../tapestry5/cdi/test/beans/BrownieImpl.java   |  49 +++
 .../tapestry5/cdi/test/beans/Counter.java       |  33 ++
 .../cdi/test/beans/CounterService.java          |  29 ++
 .../tapestry5/cdi/test/beans/Dessert.java       |  29 ++
 .../cdi/test/beans/DessertFactory.java          |  49 +++
 .../tapestry5/cdi/test/beans/DessertImpl.java   |  46 ++
 .../tapestry5/cdi/test/beans/IceCreamImpl.java  |  48 ++
 .../apache/tapestry5/cdi/test/beans/Menu.java   |  39 ++
 .../tapestry5/cdi/test/beans/NamedPojo.java     |  27 ++
 .../apache/tapestry5/cdi/test/beans/Pojo.java   |  25 ++
 .../apache/tapestry5/cdi/test/beans/Soup.java   |  40 ++
 .../cdi/test/beans/StatefulEJBBean.java         |  27 ++
 .../cdi/test/beans/StatefulEJBBeanImpl.java     |  39 ++
 .../cdi/test/beans/StatelessEJBBean.java        |  24 +
 .../cdi/test/beans/StatelessEJBBeanImpl.java    |  27 ++
 .../tapestry5/cdi/test/beans/Stereotyped.java   |  47 ++
 .../tapestry5/cdi/test/beans/Vegetable.java     |  61 +++
 .../cdi/test/beans/ws/HelloWorldService.java    |  37 ++
 .../test/beans/ws/HelloWorldServiceImpl.java    |  36 ++
 .../cdi/test/components/DumbComponent.java      |  32 ++
 .../tapestry5/cdi/test/pages/DessertPage.java   |  94 ++++
 .../apache/tapestry5/cdi/test/pages/Index.java  | 121 +++++
 .../cdi/test/pages/InvalidateSessionPage.java   |  29 ++
 .../cdi/test/pages/RequestScopePage.java        |  36 ++
 .../cdi/test/pages/SessionScopePage.java        |  38 ++
 .../tapestry5/cdi/test/pages/SomePage.java      |  18 +
 .../tapestry5/cdi/test/pages/StatefulPage.java  |  41 ++
 .../cdi/test/pages/StereotypePage.java          |  42 ++
 .../tapestry5/cdi/test/pages/VegetablePage.java |  37 ++
 .../apache/tapestry5/cdi/test/pages/WSPage.java |  34 ++
 .../ClasspathURLConverterJBoss7Dot1.java        |  99 +++++
 .../tapestry5/cdi/test/services/PojoModule.java |  30 ++
 tapestry-cdi/src/test/resources/arquillian.xml  |  34 ++
 tapestry-cdi/src/test/resources/log4j.xml       |  59 +++
 .../cdi/test/components/DumbComponent.tml       |   7 +
 .../tapestry5/cdi/test/pages/DessertPage.tml    |  10 +
 .../tapestry5/cdi/test/pages/Index.properties   |  18 +
 .../apache/tapestry5/cdi/test/pages/Index.tml   |  22 +
 .../cdi/test/pages/InvalidateSessionPage.tml    |   2 +
 .../cdi/test/pages/RequestScopePage.tml         |   3 +
 .../cdi/test/pages/SessionScopePage.tml         |   3 +
 .../tapestry5/cdi/test/pages/SomePage.tml       |   2 +
 .../tapestry5/cdi/test/pages/StatefulPage.tml   |   6 +
 .../tapestry5/cdi/test/pages/StereotypePage.tml |   5 +
 .../tapestry5/cdi/test/pages/VegetablePage.tml  |   4 +
 .../apache/tapestry5/cdi/test/pages/WSPage.tml  |   3 +
 65 files changed, 3383 insertions(+)
----------------------------------------------------------------------