[weld/api] 998bcf: WELD-679, Improve Javadoc
by noreply＠github.com
Branch: refs/heads/master
Home: http://github.com/weld/api
Commit: 998bcfb64d576fdf594e679121ce7d39722e6484
http://github.com/weld/api/commit/998bcfb64d576fdf594e679121ce7d39722e6484
Author: Pete Muir <pmuir(a)bleepbleep.org.uk>
Date: 2010-09-22 (Wed, 22 Sep 2010)
Changed paths:
M weld/src/main/java/org/jboss/weld/context/ApplicationContext.java
M weld/src/main/java/org/jboss/weld/context/ConversationContext.java
M weld/src/main/java/org/jboss/weld/context/DependentContext.java
M weld/src/main/java/org/jboss/weld/context/ManagedContext.java
M weld/src/main/java/org/jboss/weld/context/ManagedConversation.java
M weld/src/main/java/org/jboss/weld/context/RequestContext.java
M weld/src/main/java/org/jboss/weld/context/SessionContext.java
M weld/src/main/java/org/jboss/weld/context/SingletonContext.java
M weld/src/main/java/org/jboss/weld/context/bound/Bound.java
M weld/src/main/java/org/jboss/weld/context/bound/BoundRequest.java
M weld/src/main/java/org/jboss/weld/context/bound/MutableBoundRequest.java
M weld/src/main/java/org/jboss/weld/context/ejb/Ejb.java
M weld/src/main/java/org/jboss/weld/context/ejb/EjbRequestContext.java
M weld/src/main/java/org/jboss/weld/context/http/Http.java
M weld/src/main/java/org/jboss/weld/context/http/HttpRequestContext.java
M weld/src/main/java/org/jboss/weld/context/http/HttpSessionContext.java
M weld/src/main/java/org/jboss/weld/context/unbound/Unbound.java
Log Message:
-----------
WELD-679, Improve Javadoc
Commit: c5136a356d2445fa99a43fd64b7bf6fe8394bea2
http://github.com/weld/api/commit/c5136a356d2445fa99a43fd64b7bf6fe8394bea2
Author: Pete Muir <pmuir(a)bleepbleep.org.uk>
Date: 2010-09-22 (Wed, 22 Sep 2010)
Changed paths:
M weld/src/main/java/org/jboss/weld/context/BoundContext.java
Log Message:
-----------
WELD-679, require disociate to be called
Commit: 43b4df5c9ad579f598facb6178652515986f1a23
http://github.com/weld/api/commit/43b4df5c9ad579f598facb6178652515986f1a23
Author: marius.bogoevici(a)gmail.com <marius.bogoevici(a)gmail.com>
Date: 2010-09-22 (Wed, 22 Sep 2010)
Changed paths:
M weld-spi/src/main/java/org/jboss/weld/manager/api/WeldManager.java
Log Message:
-----------
WELD-690
13 years, 7 months
[weld/core] d4c982: CDITCK-181
by noreply＠github.com
Branch: refs/heads/master
Home: http://github.com/weld/core
Commit: d4c982f254aa76d0038896f2e5cc75061cbc7bf8
http://github.com/weld/core/commit/d4c982f254aa76d0038896f2e5cc75061cbc7bf8
Author: Pete Muir <pmuir(a)bleepbleep.org.uk>
Date: 2010-09-21 (Tue, 21 Sep 2010)
Changed paths:
M jboss-tck-runner/src/test/resources/tck-tests.xml
Log Message:
-----------
CDITCK-181
Commit: 757e0384de6a25b4bc84e6a29a54f9c5af940072
http://github.com/weld/core/commit/757e0384de6a25b4bc84e6a29a54f9c5af940072
Author: Pete Muir <pmuir(a)bleepbleep.org.uk>
Date: 2010-09-22 (Wed, 22 Sep 2010)
Changed paths:
M arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/ConversationLifeCycleDestroyer.java
M arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/RequestLifeCycleDestroyer.java
M arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/SessionLifeCycleDestroyer.java
M arquillian/weld-ee-container/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationConversationScopeTestCase.java
M impl/src/main/java/org/jboss/weld/context/AbstractConversationContext.java
M impl/src/main/java/org/jboss/weld/context/AbstractManagedContext.java
M impl/src/main/java/org/jboss/weld/context/bound/BoundRequestContextImpl.java
M impl/src/main/java/org/jboss/weld/context/bound/BoundSessionContextImpl.java
M impl/src/main/java/org/jboss/weld/context/ejb/EjbRequestContextImpl.java
M impl/src/main/java/org/jboss/weld/context/http/HttpRequestContextImpl.java
M impl/src/main/java/org/jboss/weld/context/http/HttpSessionContextImpl.java
M impl/src/main/java/org/jboss/weld/context/unbound/ApplicationContextImpl.java
M impl/src/main/java/org/jboss/weld/ejb/SessionBeanInterceptor.java
M impl/src/main/java/org/jboss/weld/servlet/WeldListener.java
M tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/ClientConversationContextTest.java
M tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/Cloud.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/Hailstorm.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/Thunderstorm.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/exceptionInPhaseListener/ClientConversationContextTest.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/exceptionInPhaseListener/Cloud.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/exceptionInPhaseListener/ConversationTestPhaseListener.java
M tests-arquillian/src/test/resources/org/jboss/weld/tests/contexts/conversation/cloud.jsf
A tests-arquillian/src/test/resources/org/jboss/weld/tests/contexts/conversation/exceptionInPhaseListener/cloud.jsf
A tests-arquillian/src/test/resources/org/jboss/weld/tests/contexts/conversation/exceptionInPhaseListener/faces-config.xml
A tests-arquillian/src/test/resources/org/jboss/weld/tests/contexts/conversation/exceptionInPhaseListener/thunderstorm.jsf
A tests-arquillian/src/test/resources/org/jboss/weld/tests/contexts/conversation/exceptionInPhaseListener/web.xml
M tests-arquillian/src/test/resources/org/jboss/weld/tests/contexts/conversation/faces-config.xml
A tests-arquillian/src/test/resources/org/jboss/weld/tests/contexts/conversation/hailstorm.jsf
A tests-arquillian/src/test/resources/org/jboss/weld/tests/contexts/conversation/thunderstorm.jsf
Log Message:
-----------
WELD-679, exception handling
* Tests for exceptions thrown during bean creation
and destroy
* Explicit cleanup of threadlocals
* Ensure discociate is always called
Commit: e3928c22bcd16578d97831511e76d2acab28e0e0
http://github.com/weld/core/commit/e3928c22bcd16578d97831511e76d2acab28e0e0
Author: Pete Muir <pmuir(a)bleepbleep.org.uk>
Date: 2010-09-22 (Wed, 22 Sep 2010)
Changed paths:
M jboss-tck-runner/src/test/resources/tck-tests.xml
Log Message:
-----------
oops
Commit: 6badc4669cceac33e915f01f640690c87fbd0180
http://github.com/weld/core/commit/6badc4669cceac33e915f01f640690c87fbd0180
Author: Pete Muir <pmuir(a)bleepbleep.org.uk>
Date: 2010-09-22 (Wed, 22 Sep 2010)
Changed paths:
A tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleRemoteTest.java
M tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/RemoteClient.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/scope/RemoteClient.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/scope/RemoteScopeTest.java
M tests-arquillian/src/test/java/org/jboss/weld/tests/scope/ScopeTest.java
M tests/src/main/java/org/jboss/weld/test/Utils.java
Log Message:
-----------
WELD-679, convert tests to remote tests
Commit: 0363416fc482410c3edd17e2fceb61d532f9d462
http://github.com/weld/core/commit/0363416fc482410c3edd17e2fceb61d532f9d462
Author: Pete Muir <pmuir(a)bleepbleep.org.uk>
Date: 2010-09-22 (Wed, 22 Sep 2010)
Changed paths:
M .gitignore
R tests-arquillian/src/test/resources/org/jboss/weld/tests/contexts/conversation/.faces-config.xml.jsfdia
Log Message:
-----------
ignores
13 years, 7 months
[weld/extensions] 8f094e: WELDX-135 update default bean implementation
by noreply＠github.com
Branch: refs/heads/master
Home: http://github.com/weld/extensions
Commit: 8f094ebd5f4fdb2b2dcb906493d274f03dba50bc
http://github.com/weld/extensions/commit/8f094ebd5f4fdb2b2dcb906493d274f0...
Author: Stuart Douglas <stuart.w.douglas(a)gmail.com>
Date: 2010-09-22 (Wed, 22 Sep 2010)
Changed paths:
A impl/src/main/java/org/jboss/weld/extensions/defaultbean/AbstactDefaultBean.java
A impl/src/main/java/org/jboss/weld/extensions/defaultbean/AbstractDefaultProducerBean.java
M impl/src/main/java/org/jboss/weld/extensions/defaultbean/DefaultBean.java
R impl/src/main/java/org/jboss/weld/extensions/defaultbean/DefaultBeanDefinition.java
M impl/src/main/java/org/jboss/weld/extensions/defaultbean/DefaultBeanExtension.java
A impl/src/main/java/org/jboss/weld/extensions/defaultbean/DefaultManagedBean.java
A impl/src/main/java/org/jboss/weld/extensions/defaultbean/DefaultObserverMethod.java
A impl/src/main/java/org/jboss/weld/extensions/defaultbean/DefaultProducerField.java
A impl/src/main/java/org/jboss/weld/extensions/defaultbean/DefaultProducerMethod.java
M impl/src/main/java/org/jboss/weld/extensions/el/ELResolverImpl.java
M impl/src/main/java/org/jboss/weld/extensions/el/FunctionMapperImpl.java
M impl/src/main/java/org/jboss/weld/extensions/el/VariableMapperImpl.java
M impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
A impl/src/test/java/org/jboss/weld/extensions/test/defaultbean/BigLaptopHardDrive.java
M impl/src/test/java/org/jboss/weld/extensions/test/defaultbean/CDDrive.java
A impl/src/test/java/org/jboss/weld/extensions/test/defaultbean/CPU.java
A impl/src/test/java/org/jboss/weld/extensions/test/defaultbean/ChipManufacturer.java
M impl/src/test/java/org/jboss/weld/extensions/test/defaultbean/DefaultBeanTest.java
M impl/src/test/java/org/jboss/weld/extensions/test/defaultbean/FloppyDrive.java
A impl/src/test/java/org/jboss/weld/extensions/test/defaultbean/GPU.java
A impl/src/test/java/org/jboss/weld/extensions/test/defaultbean/HardDrive.java
A impl/src/test/java/org/jboss/weld/extensions/test/defaultbean/HardDriveFactory.java
A impl/src/test/java/org/jboss/weld/extensions/test/defaultbean/HardDriveImpl.java
A impl/src/test/java/org/jboss/weld/extensions/test/defaultbean/LaptopHardDrive.java
A impl/src/test/java/org/jboss/weld/extensions/test/defaultbean/SASHardDrive.java
A impl/src/test/java/org/jboss/weld/extensions/test/defaultbean/SmallHardDriveFactory.java
A impl/src/test/java/org/jboss/weld/extensions/test/defaultbean/SuperChargedCPU.java
A impl/src/test/java/org/jboss/weld/extensions/test/defaultbean/WriteEvent.java
Log Message:
-----------
WELDX-135 update default bean implementation
- Default beans may now have observers and producers
Default beans are now implemented in a similar way to generic
beans, a synthetic qualifier is added to all default beans and
a forwarding bean is re-added later if the default bean needs
to be installed.
13 years, 7 months
[weld/extensions] 02c3e1: WELDX-150, implement @RequiredClasses
by noreply＠github.com
Branch: refs/heads/master
Home: http://github.com/weld/extensions
Commit: 02c3e1e0aee429f602abcb9ffd5a87063aa98b2e
http://github.com/weld/extensions/commit/02c3e1e0aee429f602abcb9ffd5a8706...
Author: Stuart Douglas <stuart.w.douglas(a)gmail.com>
Date: 2010-09-21 (Tue, 21 Sep 2010)
Changed paths:
M impl/src/main/java/org/jboss/weld/extensions/core/CoreExtension.java
A impl/src/main/java/org/jboss/weld/extensions/core/RequireClasses.java
M impl/src/test/java/org/jboss/weld/extensions/test/core/CoreTest.java
A impl/src/test/java/org/jboss/weld/extensions/test/core/InstalledService.java
A impl/src/test/java/org/jboss/weld/extensions/test/core/OptionalService.java
Log Message:
-----------
WELDX-150, implement @RequiredClasses
Commit: abbef189084330527d8cba842711ff676dd90707
http://github.com/weld/extensions/commit/abbef189084330527d8cba842711ff67...
Author: Pete Muir <pmuir(a)bleepbleep.org.uk>
Date: 2010-09-21 (Tue, 21 Sep 2010)
Changed paths:
M impl/src/main/java/org/jboss/weld/extensions/core/RequireClasses.java
M impl/src/main/java/org/jboss/weld/extensions/core/Veto.java
Log Message:
-----------
Javadoc improvements
Commit: c3052e0c30483817afe5bdf05b4bc4a98a86d070
http://github.com/weld/extensions/commit/c3052e0c30483817afe5bdf05b4bc4a9...
Author: Stuart Douglas <stuart.w.douglas(a)gmail.com>
Date: 2010-09-22 (Wed, 22 Sep 2010)
Changed paths:
M impl/src/main/java/org/jboss/weld/extensions/core/CoreExtension.java
R impl/src/main/java/org/jboss/weld/extensions/core/RequireClasses.java
A impl/src/main/java/org/jboss/weld/extensions/core/Requires.java
M impl/src/main/java/org/jboss/weld/extensions/util/Reflections.java
M impl/src/test/java/org/jboss/weld/extensions/test/core/InstalledService.java
M impl/src/test/java/org/jboss/weld/extensions/test/core/OptionalService.java
Log Message:
-----------
Refactor and rename @RequireClasses
- Rename to @Requires
- Catch LinkageErrors as well as ClassNotFoundException
- Add logging at info level
- Refactor Reflections.classForName to allow the use of additional classloaders
13 years, 7 months
[weld/core] e71137: WELD-685 Added GlassFish profiles to Weld Core Tes...
by noreply＠github.com
Branch: refs/heads/master
Home: http://github.com/weld/core
Commit: e711374a186239ab09efc6535215bafa4aa6fb8a
http://github.com/weld/core/commit/e711374a186239ab09efc6535215bafa4aa6fb8a
Author: Aslak Knutsen <aslak(a)redhat.com>
Date: 2010-09-21 (Tue, 21 Sep 2010)
Changed paths:
M parent/pom.xml
M tests-arquillian/pom.xml
A tests-arquillian/src/test/jboss-resources/jndi.properties
M tests-arquillian/src/test/resources/arquillian.xml
R tests-arquillian/src/test/resources/jndi.properties
Log Message:
-----------
WELD-685 Added GlassFish profiles to Weld Core Test Suite
Added two new profiles glassfish-embedded and glassfish-remote
mvn test -P glassfish-embedded -Dglassfish.version=xxx
mvn test -P glassfish-remote -Dglassfish.version=xxx
Default both profiles execute the whole IntegrationSuite but -Dtest=some.class can be given as argument to limit the scope.
Commit: bafa28686af54eabe7aaed266fa26d0cac700f87
http://github.com/weld/core/commit/bafa28686af54eabe7aaed266fa26d0cac700f87
Author: Aslak Knutsen <aslak(a)redhat.com>
Date: 2010-09-21 (Tue, 21 Sep 2010)
Changed paths:
A tests-arquillian/src/test/java/org/jboss/weld/tests/Categories.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/IntegrationPerformanceSuite.java
M tests-arquillian/src/test/java/org/jboss/weld/tests/IntegrationSuite.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/NormalPerformanceSuite.java
M tests-arquillian/src/test/java/org/jboss/weld/tests/NormalSuite.java
M tests-arquillian/src/test/java/org/jboss/weld/tests/category/Broken.java
R tests-arquillian/src/test/java/org/jboss/weld/tests/category/ExcludeFromNormalSuite.java
M tests-arquillian/src/test/java/org/jboss/weld/tests/category/Integration.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/category/Performance.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/category/Slow.java
Log Message:
-----------
WELD-689 Add Performance Category
Change contain
new category: Performance
new Suites: NormalPerformanceSuite and IntegrationPerformanceSuite
Change Categories runner to support multiple Include/Exclude Categories pr Suite. Needed to support e.
@IncludeCategory({Integration.class, Performance.class})
@ExcludeCategory(Broken.class)
public class IntegrationPerformanceSuite
Contain locally changed/patched JUnit Categories runner.
Pushed upstream, see http://github.com/KentBeck/junit/issuesearch?state=open&q=category#issue/142
Commit: c7c34d1b123638f503f90ffba8ca1989378df4ec
http://github.com/weld/core/commit/c7c34d1b123638f503f90ffba8ca1989378df4ec
Author: Aslak Knutsen <aslak(a)redhat.com>
Date: 2010-09-21 (Tue, 21 Sep 2010)
Changed paths:
M tests-arquillian/pom.xml
Log Message:
-----------
WELD-689 Add Performance Maven profiles
standalone-perf
Running Weld EE Embedded container and the NormalPerformanceSuite
incontainer-perf
Running JBoss AS Managed container and the IntegrationPerformanceSuite
13 years, 7 months
[weld/extensions] 2dac53: WELDX-144 rename @ManagedProducer to @Unwraps
by noreply＠github.com
Branch: refs/heads/master
Home: http://github.com/weld/extensions
Commit: 2dac538be2e2bd49ede6b6029e99cb0b1032a42d
http://github.com/weld/extensions/commit/2dac538be2e2bd49ede6b6029e99cb0b...
Author: Stuart Douglas <stuart.w.douglas(a)gmail.com>
Date: 2010-09-21 (Tue, 21 Sep 2010)
Changed paths:
R impl/src/main/java/org/jboss/weld/extensions/managedproducer/ManagedProducer.java
R impl/src/main/java/org/jboss/weld/extensions/managedproducer/ManagedProducerBean.java
R impl/src/main/java/org/jboss/weld/extensions/managedproducer/ManagedProducerExtension.java
R impl/src/main/java/org/jboss/weld/extensions/managedproducer/ManagedProducerInvocationHandler.java
A impl/src/main/java/org/jboss/weld/extensions/unwraps/Unwraps.java
A impl/src/main/java/org/jboss/weld/extensions/unwraps/UnwrapsExtension.java
A impl/src/main/java/org/jboss/weld/extensions/unwraps/UnwrapsInvocationHandler.java
A impl/src/main/java/org/jboss/weld/extensions/unwraps/UnwrapsProducerBean.java
M impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
R impl/src/test/java/org/jboss/weld/extensions/test/managedproducer/BeanProducer.java
R impl/src/test/java/org/jboss/weld/extensions/test/managedproducer/Lion.java
R impl/src/test/java/org/jboss/weld/extensions/test/managedproducer/LionTamer.java
R impl/src/test/java/org/jboss/weld/extensions/test/managedproducer/MPType.java
R impl/src/test/java/org/jboss/weld/extensions/test/managedproducer/ManagedProducerTest.java
R impl/src/test/java/org/jboss/weld/extensions/test/managedproducer/ManagedReciever.java
R impl/src/test/java/org/jboss/weld/extensions/test/managedproducer/ProducedBean.java
R impl/src/test/java/org/jboss/weld/extensions/test/managedproducer/ProducedInterface.java
A impl/src/test/java/org/jboss/weld/extensions/test/unwraps/BeanProducer.java
A impl/src/test/java/org/jboss/weld/extensions/test/unwraps/Lion.java
A impl/src/test/java/org/jboss/weld/extensions/test/unwraps/LionTamer.java
A impl/src/test/java/org/jboss/weld/extensions/test/unwraps/MPType.java
A impl/src/test/java/org/jboss/weld/extensions/test/unwraps/ManagedReciever.java
A impl/src/test/java/org/jboss/weld/extensions/test/unwraps/ProducedBean.java
A impl/src/test/java/org/jboss/weld/extensions/test/unwraps/ProducedInterface.java
A impl/src/test/java/org/jboss/weld/extensions/test/unwraps/UnwrapsTest.java
Log Message:
-----------
WELDX-144 rename @ManagedProducer to @Unwraps
Commit: 174633861bfc9052f4ed74498d747c0d237860c8
http://github.com/weld/extensions/commit/174633861bfc9052f4ed74498d747c0d...
Author: Pete Muir <pmuir(a)bleepbleep.org.uk>
Date: 2010-09-21 (Tue, 21 Sep 2010)
Changed paths:
M impl/src/main/java/org/jboss/weld/extensions/unwraps/Unwraps.java
Log Message:
-----------
Improve Javadoc for @Unwraps
13 years, 7 months
[weld/core] f9e4b0: WELD-676, WELD-677, WELD-681
by noreply＠github.com
Branch: refs/heads/master
Home: http://github.com/weld/core
Commit: f9e4b050b8cbef481fed6bf47504cfa5680eddd1
http://github.com/weld/core/commit/f9e4b050b8cbef481fed6bf47504cfa5680eddd1
Author: Stuart Douglas <stuart.w.douglas(a)gmail.com>
Date: 2010-09-21 (Tue, 21 Sep 2010)
Changed paths:
M impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployerEnvironment.java
M impl/src/main/java/org/jboss/weld/resolution/ResolvableBuilder.java
M impl/src/main/java/org/jboss/weld/resolution/TypeSafeBeanResolver.java
M impl/src/main/java/org/jboss/weld/resolution/TypeSafeResolver.java
Log Message:
-----------
WELD-676, WELD-677, WELD-681
* equals() and hashCode() not implemented properly for
TypeSafeResolver.Key causing memory leak and collisions at high
throughput
* create a disposal method resolver that matches on declaring bean
as well as types and qualifiers (needed due to equals/hashCode
fix)
* Defensivly copy the sets used in disambiguatedBeans
Commit: 58a67a94bab9c4379cbb820c694ce56d64a4ff96
http://github.com/weld/core/commit/58a67a94bab9c4379cbb820c694ce56d64a4ff96
Author: Stuart Douglas <stuart.w.douglas(a)gmail.com>
Date: 2010-09-21 (Tue, 21 Sep 2010)
Changed paths:
M impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployerEnvironment.java
M impl/src/main/java/org/jboss/weld/resolution/ForwardingInterceptorResolvable.java
M impl/src/main/java/org/jboss/weld/resolution/ForwardingResolvable.java
M impl/src/main/java/org/jboss/weld/resolution/InterceptorResolvableBuilder.java
M impl/src/main/java/org/jboss/weld/resolution/Resolvable.java
M impl/src/main/java/org/jboss/weld/resolution/ResolvableBuilder.java
M impl/src/main/java/org/jboss/weld/resolution/TypeSafeDisposerResolver.java
M impl/src/main/java/org/jboss/weld/resolution/TypeSafeResolver.java
Log Message:
-----------
WELD-682
* Remove TypeSafeResolver.Key and allow Resolvables to be compared
directly
13 years, 7 months