August 2010 - weld-commits - Jboss List Archives

[weld/core] f1c10f: General tidy up of testsuite - move all test infra...

by noreply＠github.com

Branch: refs/heads/master Home: http://github.com/weld/core Commit: f1c10f31aff2ad8607af598dd6f3dda81257c3a9 http://github.com/weld/core/commit/f1c10f31aff2ad8607af598dd6f3dda81257c3a9 Author: Pete Muir <pmuir(a)bleepbleep.org.uk> Date: 2010-08-23 (Mon, 23 Aug 2010) Changed paths: R arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/BeanUtils.java M arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/ConversationLifeCycleDestoryer.java A arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/Utils.java M arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEEMockContainer.java A arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/mock/AbstractDeployment.java R arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/mock/AbstractMockDeployment.java A arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/mock/BeanDeploymentArchiveImpl.java A arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/mock/FlatDeployment.java R arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/mock/MockBeanDeploymentArchive.java R arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/mock/MockDeployment.java R arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/mock/MockEELifecycle.java A arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/mock/MockJpaInjectionServices.java R arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/mock/MockJpaServices.java M arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/mock/MockLifecycle.java A arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/mock/MockResourceInjetionServices.java R arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/mock/MockResourceServices.java R arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/mock/MockServletLifecycle.java M arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/mock/TestContainer.java R arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/mock/el/EL.java R arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/shrinkwrap/ShrinkWrapClassLoader.java R arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/shrinkwrap/ShrinkwrapBeanDeploymentArchive.java R arquillian/weld-ee-container/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java M impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java M inject-tck-runner/pom.xml M inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/AtInjectTCK.java M jboss-tck-runner/pom.xml M porting-package/src/main/java/org/jboss/weld/tck/ELImpl.java M tests-arquillian/pom.xml R tests-arquillian/src/main/java/org/jboss/weld/mock/AbstractMockDeployment.java R tests-arquillian/src/main/java/org/jboss/weld/mock/MockBeanDeploymentArchive.java R tests-arquillian/src/main/java/org/jboss/weld/mock/MockDeployment.java R tests-arquillian/src/main/java/org/jboss/weld/mock/MockEELifecycle.java R tests-arquillian/src/main/java/org/jboss/weld/mock/MockEjBServices.java R tests-arquillian/src/main/java/org/jboss/weld/mock/MockEjbDescriptor.java R tests-arquillian/src/main/java/org/jboss/weld/mock/MockEjbInjectionServices.java R tests-arquillian/src/main/java/org/jboss/weld/mock/MockHttpSession.java R tests-arquillian/src/main/java/org/jboss/weld/mock/MockJpaServices.java R tests-arquillian/src/main/java/org/jboss/weld/mock/MockLifecycle.java R tests-arquillian/src/main/java/org/jboss/weld/mock/MockResourceLoader.java R tests-arquillian/src/main/java/org/jboss/weld/mock/MockResourceServices.java R tests-arquillian/src/main/java/org/jboss/weld/mock/MockSecurityServices.java R tests-arquillian/src/main/java/org/jboss/weld/mock/MockServletContext.java R tests-arquillian/src/main/java/org/jboss/weld/mock/MockServletLifecycle.java R tests-arquillian/src/main/java/org/jboss/weld/mock/MockServletServices.java R tests-arquillian/src/main/java/org/jboss/weld/mock/MockTransactionServices.java R tests-arquillian/src/main/java/org/jboss/weld/mock/MockValidationServices.java R tests-arquillian/src/main/java/org/jboss/weld/mock/MockValidator.java R tests-arquillian/src/main/java/org/jboss/weld/mock/TestContainer.java R tests-arquillian/src/main/java/org/jboss/weld/mock/cluster/AbstractClusterTest.java R tests-arquillian/src/main/java/org/jboss/weld/mock/cluster/ClusterClassLoader.java R tests-arquillian/src/main/java/org/jboss/weld/mock/cluster/SwitchableCLProxyServices.java R tests-arquillian/src/main/java/org/jboss/weld/mock/cluster/SwitchableMockEELifecycle.java R tests-arquillian/src/main/java/org/jboss/weld/mock/cluster/SwitchableSingletonProvider.java R tests-arquillian/src/main/java/org/jboss/weld/mock/el/EL.java R tests-arquillian/src/main/java/org/jboss/weld/test/Utils.java M tests-arquillian/src/test/java/org/jboss/weld/tests/AllTestRunner.java R tests-arquillian/src/test/java/org/jboss/weld/tests/MyTest.java M tests-arquillian/src/test/java/org/jboss/weld/tests/activities/current/ELCurrentActivityTest.java M tests-arquillian/src/test/java/org/jboss/weld/tests/el/resolver/ELResolverTest.java M tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeEjbExtension.java M tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/annotatedType/ejb/AnnotatedTypeSessionBeanTest.java M tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtension.java M tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtensionTest.java M tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/MultipleBeansExtension.java M tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/multipleBeans/MultipleBeansTest.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/bootstrap/Bar.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/bootstrap/CheckableInjectionServices.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/bootstrap/ContainerStatusTest.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/bootstrap/DiscoverFailsBootstrapTest.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/bootstrap/Foo.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/bootstrap/InjectionServicesTest.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/bootstrap/PreinstantiateBeanManagerTest.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/bootstrap/WeldBean.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/bootstrap/WeldStartupTest.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Alt.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/BeansXmlTest.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Dec.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Int.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/IntBind.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Plain.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Bar.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver1.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver2.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Foo.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/NonBdaExtensionTest.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Observer1.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Observer2.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/ObserverBase.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Alt.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Bar.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Basic.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/BasicInterceptor.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Baz.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Blah.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/BlahDecorator.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/BlahImpl.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/BlahImpl2.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Complex.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Foo.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Simple.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/TransitiveResolutionTest.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/AccessibleManagerResolutionTest.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Cat.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Chicken.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Cow.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Horse.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Pig.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Animal.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DeadlyAnimal.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DeadlySpider.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/environments/servlet/DefangedTarantula.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Hound.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/environments/servlet/HoundLocal.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Salmon.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ScottishFish.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/environments/servlet/SeaBass.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ServletEnvironmentTest.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/environments/servlet/ServletLifecycleTest.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Sole.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Spider.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tame.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tarantula.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/environments/servlet/TarantulaProducer.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Tuna.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/environments/servlet/Whitefish.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/jsf/JsfApiAbstractionTest.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/util/AnnotatedTypesTest.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/util/Chair.java R tests-arquillian/src/test/java/org/jboss/weld/tests/unit/util/ComfyChair.java R tests-arquillian/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedCallable.java R tests-arquillian/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedElement.java R tests-arquillian/src/test/java/org/jboss/weld/tests/util/annotated/AbstractTestAnnotatedMember.java R tests-arquillian/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedConstructor.java R tests-arquillian/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedField.java R tests-arquillian/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedMethod.java R tests-arquillian/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedParameter.java R tests-arquillian/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedType.java R tests-arquillian/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotatedTypeBuilder.java R tests-arquillian/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotationBuilder.java R tests-arquillian/src/test/java/org/jboss/weld/tests/util/annotated/TestAnnotationStore.java R tests-arquillian/src/test/java/org/jboss/weld/tests/util/annotated/TestTypeClosureBuilder.java R tests-arquillian/src/test/resources/org/jboss/weld/tests/unit/bootstrap/javax.enterprise.inject.spi.Extension R tests-arquillian/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/alternative.xml R tests-arquillian/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/decorator.xml R tests-arquillian/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/interceptor.xml R tests-arquillian/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleAlternativeBlocks.xml R tests-arquillian/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleDecoratorBlocks.xml R tests-arquillian/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleInterceptorsBlocks.xml R tests-arquillian/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/namespaced.xml R tests-arquillian/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/nonDefaultNamespaced.xml R tests-arquillian/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/nonPrettyPrinted.xml R tests-arquillian/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/unloadable.xml R tests-arquillian/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/unparseable.xml R tests-arquillian/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/extensions/javax.enterprise.inject.spi.Extension R tests-arquillian/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/beans.xml M tests/pom.xml R tests/src/main/java/org/jboss/weld/mock/AbstractMockDeployment.java R tests/src/main/java/org/jboss/weld/mock/MockBeanDeploymentArchive.java R tests/src/main/java/org/jboss/weld/mock/MockDeployment.java R tests/src/main/java/org/jboss/weld/mock/MockEELifecycle.java R tests/src/main/java/org/jboss/weld/mock/MockEjBServices.java R tests/src/main/java/org/jboss/weld/mock/MockEjbDescriptor.java R tests/src/main/java/org/jboss/weld/mock/MockEjbInjectionServices.java R tests/src/main/java/org/jboss/weld/mock/MockHttpSession.java R tests/src/main/java/org/jboss/weld/mock/MockJpaServices.java R tests/src/main/java/org/jboss/weld/mock/MockLifecycle.java R tests/src/main/java/org/jboss/weld/mock/MockResourceLoader.java R tests/src/main/java/org/jboss/weld/mock/MockResourceServices.java R tests/src/main/java/org/jboss/weld/mock/MockSecurityServices.java R tests/src/main/java/org/jboss/weld/mock/MockServletContext.java R tests/src/main/java/org/jboss/weld/mock/MockServletLifecycle.java R tests/src/main/java/org/jboss/weld/mock/MockServletServices.java R tests/src/main/java/org/jboss/weld/mock/MockTransactionServices.java R tests/src/main/java/org/jboss/weld/mock/MockValidationServices.java R tests/src/main/java/org/jboss/weld/mock/MockValidator.java R tests/src/main/java/org/jboss/weld/mock/TestContainer.java M tests/src/main/java/org/jboss/weld/mock/cluster/AbstractClusterTest.java R tests/src/main/java/org/jboss/weld/mock/cluster/SwitchableMockEELifecycle.java R tests/src/main/java/org/jboss/weld/mock/el/EL.java M tests/src/main/java/org/jboss/weld/test/AbstractWeldTest.java M tests/src/main/java/org/jboss/weld/test/BeanManagerLocator.java M tests/src/main/java/org/jboss/weld/test/Utils.java A tests/src/main/java/org/jboss/weld/test/el/EL.java M tests/src/main/java/org/jboss/weld/test/harness/AbstractStandaloneContainersImpl.java R tests/src/main/java/org/jboss/weld/test/harness/ServletLifecycleContainersImpl.java M tests/src/main/java/org/jboss/weld/test/harness/StandaloneContainersImpl.java A tests/src/main/java/org/jboss/weld/test/util/annotated/AbstractTestAnnotatedCallable.java A tests/src/main/java/org/jboss/weld/test/util/annotated/AbstractTestAnnotatedElement.java A tests/src/main/java/org/jboss/weld/test/util/annotated/AbstractTestAnnotatedMember.java A tests/src/main/java/org/jboss/weld/test/util/annotated/TestAnnotatedConstructor.java A tests/src/main/java/org/jboss/weld/test/util/annotated/TestAnnotatedField.java A tests/src/main/java/org/jboss/weld/test/util/annotated/TestAnnotatedMethod.java A tests/src/main/java/org/jboss/weld/test/util/annotated/TestAnnotatedParameter.java A tests/src/main/java/org/jboss/weld/test/util/annotated/TestAnnotatedType.java A tests/src/main/java/org/jboss/weld/test/util/annotated/TestAnnotatedTypeBuilder.java A tests/src/main/java/org/jboss/weld/test/util/annotated/TestAnnotationBuilder.java A tests/src/main/java/org/jboss/weld/test/util/annotated/TestAnnotationStore.java A tests/src/main/java/org/jboss/weld/test/util/annotated/TestTypeClosureBuilder.java A tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/Bar.java A tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/CheckableInjectionServices.java A tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/ContainerStatusTest.java A tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/DiscoverFailsBootstrapTest.java A tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/Foo.java A tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/InjectionServicesTest.java A tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/WeldBean.java A tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Alt.java A tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/BeansXmlTest.java A tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Dec.java A tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Int.java A tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/IntBind.java A tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Plain.java M tests/src/test/java/org/jboss/weld/tests/unit/cluster/NaiveClusterTest.java M tests/src/test/java/org/jboss/weld/tests/unit/cluster/SwitchableContainerTest.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Bar.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver1.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/CountingObserver2.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Foo.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/NonBdaExtensionTest.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Observer1.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/Observer2.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/extensions/ObserverBase.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Alt.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Bar.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Basic.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/BasicInterceptor.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Baz.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Blah.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/BlahDecorator.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/BlahImpl.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/BlahImpl2.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Complex.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Foo.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/Simple.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/TransitiveResolutionTest.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/AccessibleManagerResolutionTest.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Cat.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Chicken.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Cow.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Horse.java A tests/src/test/java/org/jboss/weld/tests/unit/deployment/structure/resolution/Pig.java A tests/src/test/java/org/jboss/weld/tests/unit/jsf/JsfApiAbstractionTest.java A tests/src/test/java/org/jboss/weld/tests/unit/util/AnnotatedTypesTest.java A tests/src/test/java/org/jboss/weld/tests/unit/util/Chair.java A tests/src/test/java/org/jboss/weld/tests/unit/util/ComfyChair.java A tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/javax.enterprise.inject.spi.Extension A tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/alternative.xml A tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/decorator.xml A tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/interceptor.xml A tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleAlternativeBlocks.xml A tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleDecoratorBlocks.xml A tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/multipleInterceptorsBlocks.xml A tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/namespaced.xml A tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/nonDefaultNamespaced.xml A tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/nonPrettyPrinted.xml A tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/unloadable.xml A tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/unparseable.xml A tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/extensions/javax.enterprise.inject.spi.Extension A tests/src/test/resources/org/jboss/weld/tests/unit/deployment/structure/nonTransitiveResolution/beans.xml Log Message: ----------- General tidy up of testsuite - move all test infra code to arquillian, refactor TestContainer in arquillian to be useful outside of Arquillian, move unit tests back to core-test, for later move to final home

14 years, 3 months

1
0
0 / 0

[weld/core] 38686d: remove dependency with bad pom

by noreply＠github.com

Branch: refs/heads/master Home: http://github.com/weld/core Commit: 38686d930badd884492bc50f1fa7f0e22cb41ad8 http://github.com/weld/core/commit/38686d930badd884492bc50f1fa7f0e22cb41ad8 Author: Pete Muir <pmuir(a)bleepbleep.org.uk> Date: 2010-08-22 (Sun, 22 Aug 2010) Changed paths: M parent/pom.xml Log Message: ----------- remove dependency with bad pom Commit: 7ac582e4a006508c83587a339d44a2fdc9b01483 http://github.com/weld/core/commit/7ac582e4a006508c83587a339d44a2fdc9b01483 Author: Marius Bogoevici <marius.bogoevici(a)gmail.com> Date: 2010-08-22 (Sun, 22 Aug 2010) Changed paths: M impl/src/main/java/org/jboss/weld/util/Proxies.java Log Message: ----------- WELD-630 The superclass of any TypeInfo is at least Object.class

14 years, 3 months

1
0
0 / 0

[weld/api] 136e3f: switch to using org.jboss.spec artifacts

by noreply＠github.com

Branch: refs/heads/master Home: http://github.com/weld/api Commit: 136e3f4f64f93d15639228730eb0d3e2484967c9 http://github.com/weld/api/commit/136e3f4f64f93d15639228730eb0d3e2484967c9 Author: Pete Muir <pmuir(a)bleepbleep.org.uk> Date: 2010-08-20 (Fri, 20 Aug 2010) Changed paths: M bom/pom.xml M weld-spi/pom.xml Log Message: ----------- switch to using org.jboss.spec artifacts Commit: ad7ab476ef7b540dfe3833272a2885f4a2d0e748 http://github.com/weld/api/commit/ad7ab476ef7b540dfe3833272a2885f4a2d0e748 Author: Pete Muir <pmuir(a)bleepbleep.org.uk> Date: 2010-08-20 (Fri, 20 Aug 2010) Changed paths: M weld-spi/pom.xml Log Message: ----------- remove junit exclusion

14 years, 3 months

1
0
0 / 0

Weld SVN: r7005 - archetypes/javaee6-webapp/tags/1.0.1.Beta1.

by weld-commits＠lists.jboss.org

Author: dan.j.allen Date: 2010-08-20 17:40:51 -0400 (Fri, 20 Aug 2010) New Revision: 7005 Modified: archetypes/javaee6-webapp/tags/1.0.1.Beta1/pom.xml Log: update tag version Modified: archetypes/javaee6-webapp/tags/1.0.1.Beta1/pom.xml =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/pom.xml 2010-08-20 21:38:11 UTC (rev 7004) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/pom.xml 2010-08-20 21:40:51 UTC (rev 7005) @@ -73,8 +73,8 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/javaee6-webapp/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/javaee6-webapp/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/weld/archetypes/javaee6-webapp/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/javaee6-webapp/tag...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/javaee6-webapp/tags/1...</developerConnection> + <url>http://fisheye.jboss.org/browse/weld/archetypes/javaee6-webapp/tags/1.0.1...</url> </scm> </project>

14 years, 3 months

1
0
0 / 0

Weld SVN: r7004 - in archetypes/javaee6-webapp/tags: 1.0.1.Beta1 and 34 other directories.

by weld-commits＠lists.jboss.org

Author: dan.j.allen Date: 2010-08-20 17:38:11 -0400 (Fri, 20 Aug 2010) New Revision: 7004 Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/pom.xml archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/META-INF/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/META-INF/maven/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/META-INF/maven/archetype-metadata.xml archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/.factorypath archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/.settings/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.apt.core.prefs archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/pom.xml archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/readme.html archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/readme.txt archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/controller/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/controller/MemberRegistration.java archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/data/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/data/MemberListProducer.java archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/data/MemberRepository.java archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/data/MemberRepositoryProducer.java archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/data/SeedDataImporter.java archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/model/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/model/Member.java archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/rest/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/rest/JaxRsActivator.java archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/rest/MemberResourceRESTService.java archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/resources-jbossas/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/resources-jbossas/default-ds.xml archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/resources/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/resources/META-INF/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/resources/import.sql archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/META-INF/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/META-INF/MANIFEST.MF archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/index.jsf archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/index.xhtml archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/css/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/banner.png archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/weld.png archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/java/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/java/test/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/java/test/MavenArtifactResolver.java archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/java/test/MemberRegistrationTest.java archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources-glassfish-embedded/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources-glassfish-embedded/sun-resources.xml archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources-glassfish-embedded/test-persistence.xml archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources-jbossas/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources-jbossas/jndi.properties archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources-jbossas/test-persistence.xml archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources/arquillian.xml archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/test/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/test/resources/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/test/resources/projects/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/test/resources/projects/basic/ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/test/resources/projects/basic/archetype.properties archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/test/resources/projects/basic/goal.txt Log: cut tag Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/pom.xml =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/pom.xml (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/pom.xml 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-parent</artifactId> + <version>12</version> + </parent> + + <groupId>org.jboss.weld.archetypes</groupId> + <artifactId>jboss-javaee6-webapp</artifactId> + <version>1.0.1.Beta1</version> + <packaging>maven-archetype</packaging> + + <name>JBoss Java EE 6 Webapp</name> + + <description>An archetype that generates a starter Java EE 6 webapp project</description> + + <url>http://seamframework.org/Documentation/WeldQuickstartForMavenUsers</url> + + <developers> + <developer> + <name>Steven Boscarine</name> + <roles> + <role>Weld archetypes lead</role> + </roles> + <email>stevenboscarine(a)gmail.com</email> + <organization>Community Volunteer</organization> + <organizationUrl>http://chip.org/</organizationUrl> + <url>http://www.beacon16.com/</url> + </developer> + <developer> + <name>Dan Allen</name> + <roles> + <role>Weld archetypes lead</role> + </roles> + <email>dan.j.allen(a)gmail.com</email> + <organization>JBoss, by Red Hat</organization> + <organizationUrl>http://redhat.com/jboss</organizationUrl> + <url>http://community.jboss.org/people/dan.j.allen</url> + </developer> + <developer> + <name>Pete Muir</name> + <roles> + <role>Weld project lead</role> + </roles> + <email>pete.muir(a)jboss.org</email> + <organization>Red Hat Inc.</organization> + <organizationUrl>http://redhat.com/jboss</organizationUrl> + <url>http://in.relation.to/Bloggers/Pete</url> + </developer> + </developers> + + <build> + <extensions> + <extension> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>archetype-packaging</artifactId> + <version>2.0-alpha-5</version> + </extension> + </extensions> + + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-archetype-plugin</artifactId> + <version>2.0-alpha-5</version> + <extensions>true</extensions> + </plugin> + </plugins> + </pluginManagement> + </build> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/javaee6-webapp/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/javaee6-webapp/trunk</developerConnection> + <url>http://fisheye.jboss.org/browse/weld/archetypes/javaee6-webapp/trunk</url> + </scm> +</project> Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/META-INF/maven/archetype-metadata.xml =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/META-INF/maven/archetype-metadata.xml (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/META-INF/maven/archetype-metadata.xml 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="UTF-8"?> +<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descript... http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="jboss-javaee6-webapp-src" + xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descript..." + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <requiredProperties> + <requiredProperty key="name"> + <defaultValue>Java EE 6 project</defaultValue> + </requiredProperty> + </requiredProperties> + <fileSets> + <fileSet filtered="true" packaged="true" encoding="UTF-8"> + <directory>src/main/java</directory> + <includes> + <include>**/*.java</include> + </includes> + </fileSet> + <fileSet encoding="UTF-8"> + <directory>src/main/webapp</directory> + <includes> + <include>**/*.MF</include> + <include>**/*.png</include> + <include>**/*.xhtml</include> + <include>**/*.xml</include> + <include>**/*.css</include> + <include>**/*.jsf</include> + </includes> + </fileSet> + <fileSet encoding="UTF-8"> + <directory>src/main/resources</directory> + <includes> + <include>**/*.sql</include> + <include>**/*.xml</include> + </includes> + </fileSet> + <fileSet encoding="UTF-8"> + <directory>src/main/resources-jbossas</directory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="true" encoding="UTF-8"> + <directory>src/test/java</directory> + <includes> + <include>**/*.java</include> + </includes> + </fileSet> + <fileSet encoding="UTF-8"> + <directory>src/test/resources</directory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + <fileSet encoding="UTF-8"> + <directory>src/test/resources-glassfish-embedded</directory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + <fileSet encoding="UTF-8"> + <directory>src/test/resources-jbossas</directory> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </fileSet> + <fileSet encoding="UTF-8"> + <directory>.settings</directory> + <includes> + <include>**/*.prefs</include> + </includes> + </fileSet> + <fileSet encoding="UTF-8"> + <directory></directory> + <includes> + <include>**/*.factorypath</include> + </includes> + </fileSet> + <fileSet filtered="true" encoding="UTF-8"> + <directory></directory> + <includes> + <include>readme.txt</include> + <include>readme.html</include> + </includes> + </fileSet> + <fileSet encoding="UTF-8"> + <directory></directory> + <includes> + <include>archetype-pom.xml</include> + <include>build.sh</include> + </includes> + </fileSet> + </fileSets> +</archetype-descriptor> Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/.factorypath =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/.factorypath (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/.factorypath 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,5 @@ +<factorypath> + <factorypathentry kind="PLUGIN" id="org.eclipse.jst.ws.annotations.core" enabled="true" runInBatchMode="false"/> + <factorypathentry kind="VARJAR" id="M2_REPO/org/hibernate/hibernate-jpamodelgen/1.0.0.Final/hibernate-jpamodelgen-1.0.0.Final.jar" enabled="true" runInBatchMode="false"/> + <factorypathentry kind="VARJAR" id="M2_REPO/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.0.Final/hibernate-jpa-2.0-api-1.0.0.Final.jar" enabled="true" runInBatchMode="false"/> +</factorypath> Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.apt.core.prefs =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.apt.core.prefs (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.apt.core.prefs 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.apt.aptEnabled=false +org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations +org.eclipse.jdt.apt.reconcileEnabled=true Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/pom.xml =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/pom.xml (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/pom.xml 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,320 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>${groupId}</groupId> + <artifactId>${artifactId}</artifactId> + <version>${version}</version> + <packaging>war</packaging> + + <name>${name}</name> + <description>A starter Java EE 6 webapp project generated from the jboss-javaee6-webapp archetype</description> + + <properties> +  +  + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> +  +  + <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format> +  +  + <jboss.home>${env.JBOSS_HOME}</jboss.home> + <jboss.domain>default</jboss.domain> + <arquillian.version>1.0.0.Alpha3</arquillian.version> + <jboss-javaee6-spec.version>1.0.0.Beta7</jboss-javaee6-spec.version> + </properties> + + <repositories> +  +  +  + <repository> + <id>jboss-public-repository</id> + <name>JBoss Repository</name> + <url>https://repository.jboss.org/nexus/content/groups/public</url> +  + <releases> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <updatePolicy>daily</updatePolicy> + </snapshots> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>jboss-public-repository</id> + <name>JBoss Repository</name> + <url>https://repository.jboss.org/nexus/content/groups/public</url> +  + <releases> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> +  + <updatePolicy>daily</updatePolicy> + </snapshots> + </pluginRepository> + </pluginRepositories> + + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-jpamodelgen</artifactId> + <version>1.0.0.Final</version> + <scope>provided</scope> +  + <exclusions> + <exclusion> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + </exclusion> + </exclusions> + </dependency> + +  + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-extensions</artifactId> + <version>1.0.0.Alpha2</version> + </dependency> + +  +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.10</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <version>1.5.10</version> + <scope>runtime</scope> + </dependency> + +  +  +  + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>4.0.0.GA</version> + <scope>provided</scope> + </dependency> + +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + <scope>test</scope> + </dependency> + +  +  + <dependency> + <groupId>org.jboss.arquillian</groupId> + <artifactId>arquillian-junit</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <finalName>${project.artifactId}</finalName> + <plugins> +  + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3.1</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + <compilerArgument>-proc:none</compilerArgument> + </configuration> + <executions> + <execution> + <id>run-annotation-processors-only</id> + <phase>generate-sources</phase> + <configuration> + <compilerArgument>-proc:only</compilerArgument> +  + <includes> + <include>**/model/*.java</include> + </includes> + </configuration> + <goals> + <goal>compile</goal> + </goals> + </execution> + </executions> + </plugin> +  + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.5</version> + <executions> + <execution> + <phase>process-sources</phase> + <configuration> + <sources> + <source>${project.build.directory}/generated-sources/annotations</source> + </sources> + </configuration> + <goals> + <goal>add-source</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + <profile> +  +  + <id>default</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> +  +  + <dependency> + <groupId>org.jboss.spec</groupId> + <artifactId>jboss-javaee-6.0</artifactId> + <version>${jboss-javaee6-spec.version}</version> + <type>pom</type> + <scope>provided</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> +  +  + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jboss-maven-plugin</artifactId> + <version>1.4.1</version> + <configuration> + <jbossHome>${jboss.home}</jbossHome> + <serverName>${jboss.domain}</serverName> + <fileNames> + <fileName>${project.build.directory}/${project.build.finalName}.war</fileName> +  + <fileName>src/main/resources-jbossas/default-ds.xml</fileName> + </fileNames> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <profile> +  +  + <id>glassfish-embedded-3</id> + <dependencies> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-glassfish-embedded-3</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency> +  + <dependency> + <groupId>org.glassfish.extras</groupId> + <artifactId>glassfish-embedded-all</artifactId> + <version>3.0.1-b20</version> + <scope>provided</scope> + </dependency> + </dependencies> + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + </testResource> +  +  + <testResource> + <directory>src/test/resources-glassfish-embedded</directory> + </testResource> + </testResources> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> +  + <version>2.4.3</version> + <configuration> + <systemProperties> +  + <property> + <name>derby.stream.error.file</name> +  + <value>target/derby.log</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> +  +  + <id>jbossas-remote-6</id> + <dependencies> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-jbossas-remote-6</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency> +  +  + <dependency> + <groupId>org.jboss.spec</groupId> + <artifactId>jboss-javaee-6.0</artifactId> + <version>${jboss-javaee6-spec.version}</version> + <type>pom</type> + <scope>provided</scope> + </dependency> +  + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-client</artifactId> + <version>6.0.0.20100721-M4</version> + <type>pom</type> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + </testResource> +  +  + <testResource> + <directory>src/test/resources-jbossas</directory> + </testResource> + </testResources> + </build> + </profile> + </profiles> +</project> Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/readme.html =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/readme.html (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/readme.html 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,201 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<title></title> +<meta name="generator" content="HTML::TextToHTML v2.51"/> +</head> +<body> +<h1><a name="section_1">${artifactId}</a></h1> +<p> <strong>Source archetype:</strong> jboss-javaee6-webapp +</p><h2><a name="section_1_1">What is it?</a></h2> +<p> This is your project! It's a sample, deployable Maven 2 project to help you + get your foot in the door developing with Java EE 6. This project is setup to + allow you to create a compliant Java EE 6 application using JSF 2.0, CDI 1.0, + EJB 3.1, JPA 2.0 and Bean Validation 1.0) that can run on a certified + application server (Full or Web Profile). It includes a persistence unit and + some sample persistence and transaction code to help you get your feet wet + with database access in enterprise Java. +</p><h2><a name="section_1_2">System requirements</a></h2> +<p> All you need to run this project is Java 5.0 (Java SDK 1.5) or greator and + Maven 2.0.10 or greater. However, we strongly recommend Java 6.0 and Maven 3. + This application is configured to be run on a Java EE 6 application server. + We've tested it on both GlassFish 3.0.1 and JBoss AS 6.0.0.M4. +</p><dl> + <dt>NOTE</dt> +<dd> This project retrieves artifacts from the JBoss Community Maven repository, a + superset of the Maven central repository, because there are certain Java EE + API JARs that are not published to Maven central (for details, see the JIRA + <a href="https://jira.jboss.org/jira/browse/WELD-222">https://jira.jboss.org/jira/browse/WELD-222</a>). The integration testing + framework used by the project, Arquillian, is also only available in the JBoss + Community Maven repository. </dd><dt>TIP</dt> +<dd> As of JBoss AS 6.0.0.M4, modifications are required to get the sample JAX-RS + resource working. See the JaxRsActivator class in this project for instructions. + +</dd></dl> +<p> Deploying the application +</p><hr/> +<p> To deploy the application, first produce the archive to deploy: +</p><pre> + mvn package</pre> +<p> If you want to deploy the application on JBoss AS (standalone), make sure that + your JBOSS_HOME environment variable points to a JBoss AS 6.0 installation. +</p><p> Alternatively, you can set the location of JBoss AS using the following + profile defintion in the .m2/settings.xml file in your home directory: +</p><pre> + <?xml version="1.0" encoding="UTF-8"?> + <settings + xmlns="<a href="http://maven.apache.org/POM/4.0.0">http://maven.apache.org/POM/4.0.0</a>" + xmlns:xsi="<a href="http://www.w3.org/2001/XMLSchema-instance">http://www.w3.org/2001/XMLSchema-instance</a>" + xsi:schemaLocation="<a href="http://maven.apache.org/POM/4.0.0">http://maven.apache.org/POM/4.0.0</a> <a href="http://maven.apache.org/xsd/settings-1.0.0.xsd">http://maven.apache.org/xsd/settings-1.0.0.xsd</a>"> + + <profiles> + <profile> + <id>environment</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <jboss.home>/path/to/jboss-as-6.0.0.M4</jboss.home> + </properties> + </profile> + </profiles> + + </settings></pre> +<p> Once you've set either the JBOSS_HOME environment variable or the jboss.home + Maven property, you can deploy to JBoss AS by executing the following command: +</p><pre> + mvn package jboss:hard-deploy</pre> +<p> This will deploy two artifacts, target/${artifactId}.war and + default-ds.xml. + +</p><dl> + <dt>IMPORTANT</dt> +<dd> Don't forget to deploy default-ds.xml! </dd><dt>NOTE</dt> +<dd> The default-ds.xml file installs a data source named jdbc/__default, so that + both JBoss AS and GlassFish have a data source with the same name.</dd></dl> +<p> You can also set jboss.home on the commandline: +</p><pre> + mvn package jboss:hard-deploy -Djboss.home=/path/to/jboss-as-6.0.0.M4</pre> +<p> In all, you have three options to set the path of your JBoss AS installation: +</p><ol> + <li>Set the JBOSS_HOME environment variable (e.g., export JBOSS_HOME=/path/to/jboss-as) + </li><li>Define the jboss.home Maven property in ${symbol_dollar}HOME/.m2/settings.xml + </li><li>Override the jboss.home Maven property from the commandline using -Djboss.home=/path/to/jboss-as</li></ol> +<p> Now start JBoss AS. The application will be running at the following URL: +</p><ul> + <li><a href="http://localhost:8080/${artifactId}/">http://localhost:8080/${artifactId}/</a></li></ul> +<p> To undeploy from JBoss AS, run this command: +</p><pre> + mvn jboss:hard-undeploy</pre> +<p> There are several ways to deploy the archive to GlassFish. The recommended + approach is to open the project in NetBeans 6.8, right-click on the project + and select "Run" from the context menu. That starts JavaDB, GlassFish and + deploys the application. NetBeans then provides incremental deployment of web + resources. +</p><p> You can also start GlassFish from the commandline. Change to the glassfish/bin + directory in the GlassFish install root and run these three commands (leading + ./ not required on Windows): +</p><pre> + ./asadmin start-database + ./asadmin start-domain domain1</pre> +<dl> + <dt>IMPORTANT</dt> +<dd> Don't forget to start the JavaDB database! </dd><dt>NOTE</dt> +<dd> NetBeans starts the database automatically when it starts up GlassFish. If you + have the GlassFish Tools Eclipse plug-in, you have to enable this feature. + Select Window > Preferences > GlassFish Server Preferences and check the + option "Start JavaDB database process when > Starting GlassFish Server"</dd></dl> +<p> Now you can either deploy the target/${artifactId}.war through the + web-based GlassFish admininstration console, or you can again use asadmin: +</p><pre> + ./asadmin deploy /path/to/project/target/${artifactId}.war</pre> +<p> To undeploy the application, run: +</p><pre> + ./asadmin undeploy ${artifactId}</pre> +<h2><a name="section_1_3">Running the Arquillian tests</a></h2> +<p> By default, tests are configured to be skipped. The reason is that the sample + test is an Arquillian test, which requires the use of a container. You can + activate this test by selecting one of the two container configurations + provided, JBoss AS 6 (remote) or GlassFish 3 (embedded). +</p><p> To run the test in Embedded GlassFish, first make sure that you don't have a + GlassFish container running (to avoid port conflicts). Then run the test goal + with the following profile activated: +</p><pre> + mvn clean test -Pglassfish-embedded-3</pre> +<p> (The clean goal is only required when you switch between containers) +</p><p> To run the test in JBoss AS 6, first start a JBoss AS 6 instance. Then, run the + test goal with the following profile activated: +</p><pre> + mvn clean test -Pjbossas-remote-6</pre> +<p> Consult the Arquillian reference documentation to register profiles for any + supported container. +</p><ul> + <li><a href="http://docs.jboss.org/arquillian/reference/latest/en-US/html/containers.h...">http://docs.jboss.org/arquillian/reference/latest/en-US/html/containers.h...</a></li></ul> +<h2><a name="section_1_4">Importing the project into an IDE</a></h2> +<p> If you created the project using the Maven 2 archetype wizard in your IDE + (Eclipse, NetBeans or IntelliJ IDEA), then there is nothing to do. You should + already have an IDE project. +</p><p> If you created the project from the commandline using archetype:generate, then + you need to import the project into your IDE. If you are using NetBeans 6.8 or + IntelliJ IDEA 9, then all you have to do is open the project as an existing + project. Both of these IDEs recognize Maven 2 projects natively. +</p><p> To import the project into Eclipse, you need the m2eclipse. To install this + plugin, add the m2eclipse update site <a href="http://m2eclipse.sonatype.org/update/">http://m2eclipse.sonatype.org/update/</a> to + Eclipse (or use the Help > Eclipse Marketplace. . .) and then install the + m2eclipse plugin and required dependencies. Once that's installed, you'll be + ready to import the project into Eclipse. +</p><dl> + <dt>NOTE</dt> +<dd> If you are using Eclipse as your IDE, we we strongly recommend that you use + Eclipse 3.6 (Helios) - <a href="http://www.eclipse.org/helios">http://www.eclipse.org/helios</a></dd></dl> +<p> Select File > Import. . . and choose the Maven > Existing Maven Projects option. + Navigate to the root directory of your project. Eclipse should recognize the + Maven project and preselect it in the Project box. Click Finish and m2eclipse + will take it from there. +</p><dl> + <dt>NOTE</dt> +<dd> You cannot use the import option General > Existing Projects into Workspace + because Eclipse does not recognize Maven projects as Eclipse projects + natively. You must use the importer provided by m2eclipse as just described.</dd></dl> +<p> Additional configuration is required to get Eclipse to generate the JPA + metamodel. The archetype includes the necessary Eclipse config files in your + project. To enable this feature, right click on the project and select: +</p><pre> + Properties > Java Compiler > Annotation Processing</pre> +<p> Check "Enable annotation processing" then click OK and OK again when your are + prompted to run a project build. +</p><p> This configuration is described in further detail in the Hibernate JPA documentation: +</p><ul> + <li><a href="http://docs.jboss.org/hibernate/stable/jpamodelgen/reference/en-US/html_s...">http://docs.jboss.org/hibernate/stable/jpamodelgen/reference/en-US/html_s...</a></li></ul> +<p> Once the project is imported into the IDE, you can execute the Maven commands + through the IDE controls to deploy the application to a container. +</p><p> To deploy to GlassFish from Eclipse, you'll need the GlassFish Tools Bundle, + available at the update site <a href="http://download.java.net/glassfish/eclipse/helios">http://download.java.net/glassfish/eclipse/helios</a> + or from the Help > Eclipse Marketplace. . . +</p><h2><a name="section_1_5">Downloading the sources and Javadocs</a></h2> +<p> If you want to be able to debug into the source code or look at the Javadocs + of any library in the project, you can run either of the following two + commands to pull them into your local repository. The IDE should then detect + them. +</p><pre> + mvn dependency:sources + mvn dependency:resolve -Dclassifier=javadoc</pre> +<h2><a name="section_1_6">Resources</a></h2> +<ul> + <li>Weld archetypes + <ul> + <li>Quickstart: <a href="http://seamframework.org/Documentation/WeldQuickstartForMavenUsers">http://seamframework.org/Documentation/WeldQuickstartForMavenUsers</a> + </li><li>Issue tracker: <a href="https://jira.jboss.org/jira/browse/WELDRAD">https://jira.jboss.org/jira/browse/WELDRAD</a> + </li><li>Source code: <a href="http://anonsvn.jboss.org/repos/weld/archetypes">http://anonsvn.jboss.org/repos/weld/archetypes</a> + </li><li>Forums: <a href="http://seamframework.org/Community/WeldUsers">http://seamframework.org/Community/WeldUsers</a> + </li></ul> + </li><li>JSR-299 overview: <a href="http://seamframework.org/Weld">http://seamframework.org/Weld</a> + </li><li>JSF community site: <a href="http://www.javaserverfaces.org">http://www.javaserverfaces.org</a> +</li></ul> + +</body> +</html> Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/readme.txt =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/readme.txt (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/readme.txt 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,236 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) + ${artifactId} + ************************ + + ${symbol_pound}Source archetype:${symbol_pound} jboss-javaee6-webapp + + What is it? + =========== + + This is your project! It's a sample, deployable Maven 2 project to help you + get your foot in the door developing with Java EE 6. This project is setup to + allow you to create a compliant Java EE 6 application using JSF 2.0, CDI 1.0, + EJB 3.1, JPA 2.0 and Bean Validation 1.0) that can run on a certified + application server (Full or Web Profile). It includes a persistence unit and + some sample persistence and transaction code to help you get your feet wet + with database access in enterprise Java. + + System requirements + =================== + + All you need to run this project is Java 5.0 (Java SDK 1.5) or greator and + Maven 2.0.10 or greater. However, we strongly recommend Java 6.0 and Maven 3. + This application is configured to be run on a Java EE 6 application server. + We've tested it on both GlassFish 3.0.1 and JBoss AS 6.0.0.M4. + + NOTE: + This project retrieves artifacts from the JBoss Community Maven repository, a + superset of the Maven central repository, because there are certain Java EE + API JARs that are not published to Maven central (for details, see the JIRA + https://jira.jboss.org/jira/browse/WELD-222). The integration testing + framework used by the project, Arquillian, is also only available in the JBoss + Community Maven repository. + + TIP: + As of JBoss AS 6.0.0.M4, modifications are required to get the sample JAX-RS + resource working. See the JaxRsActivator class in this project for instructions. + + Deploying the application + ========================= + + To deploy the application, first produce the archive to deploy: + + mvn package + + If you want to deploy the application on JBoss AS (standalone), make sure that + your JBOSS_HOME environment variable points to a JBoss AS 6.0 installation. + + Alternatively, you can set the location of JBoss AS using the following + profile defintion in the .m2/settings.xml file in your home directory: + + <?xml version="1.0" encoding="UTF-8"?> + <settings + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> + + <profiles> + <profile> + <id>environment</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <jboss.home>/path/to/jboss-as-6.0.0.M4</jboss.home> + </properties> + </profile> + </profiles> + + </settings> + + Once you've set either the JBOSS_HOME environment variable or the jboss.home + Maven property, you can deploy to JBoss AS by executing the following command: + + mvn package jboss:hard-deploy + + This will deploy two artifacts, target/${artifactId}.war and + default-ds.xml. + + IMPORTANT: + Don't forget to deploy default-ds.xml! + + NOTE: + The default-ds.xml file installs a data source named jdbc/__default, so that + both JBoss AS and GlassFish have a data source with the same name. + + You can also set jboss.home on the commandline: + + mvn package jboss:hard-deploy -Djboss.home=/path/to/jboss-as-6.0.0.M4 + + In all, you have three options to set the path of your JBoss AS installation: + + 1. Set the JBOSS_HOME environment variable (e.g., export JBOSS_HOME=/path/to/jboss-as) + 2. Define the jboss.home Maven property in ${symbol_dollar}HOME/.m2/settings.xml + 3. Override the jboss.home Maven property from the commandline using -Djboss.home=/path/to/jboss-as + + Now start JBoss AS. The application will be running at the following URL: + + - http://localhost:8080/${artifactId}/ + + To undeploy from JBoss AS, run this command: + + mvn jboss:hard-undeploy + + There are several ways to deploy the archive to GlassFish. The recommended + approach is to open the project in NetBeans 6.8, right-click on the project + and select "Run" from the context menu. That starts JavaDB, GlassFish and + deploys the application. NetBeans then provides incremental deployment of web + resources. + + You can also start GlassFish from the commandline. Change to the glassfish/bin + directory in the GlassFish install root and run these three commands (leading + ./ not required on Windows): + + ./asadmin start-database + ./asadmin start-domain domain1 + + IMPORTANT: + Don't forget to start the JavaDB database! + + NOTE: + NetBeans starts the database automatically when it starts up GlassFish. If you + have the GlassFish Tools Eclipse plug-in, you have to enable this feature. + Select Window > Preferences > GlassFish Server Preferences and check the + option "Start JavaDB database process when > Starting GlassFish Server" + + Now you can either deploy the target/${artifactId}.war through the + web-based GlassFish admininstration console, or you can again use asadmin: + + ./asadmin deploy /path/to/project/target/${artifactId}.war + + To undeploy the application, run: + + ./asadmin undeploy ${artifactId} + + Running the Arquillian tests + ============================ + + By default, tests are configured to be skipped. The reason is that the sample + test is an Arquillian test, which requires the use of a container. You can + activate this test by selecting one of the two container configurations + provided, JBoss AS 6 (remote) or GlassFish 3 (embedded). + + To run the test in Embedded GlassFish, first make sure that you don't have a + GlassFish container running (to avoid port conflicts). Then run the test goal + with the following profile activated: + + mvn clean test -Pglassfish-embedded-3 + + (The clean goal is only required when you switch between containers) + + To run the test in JBoss AS 6, first start a JBoss AS 6 instance. Then, run the + test goal with the following profile activated: + + mvn clean test -Pjbossas-remote-6 + + Consult the Arquillian reference documentation to register profiles for any + supported container. + + - http://docs.jboss.org/arquillian/reference/latest/en-US/html/containers.h... + + Importing the project into an IDE + ================================= + + If you created the project using the Maven 2 archetype wizard in your IDE + (Eclipse, NetBeans or IntelliJ IDEA), then there is nothing to do. You should + already have an IDE project. + + If you created the project from the commandline using archetype:generate, then + you need to import the project into your IDE. If you are using NetBeans 6.8 or + IntelliJ IDEA 9, then all you have to do is open the project as an existing + project. Both of these IDEs recognize Maven 2 projects natively. + + To import the project into Eclipse, you need the m2eclipse. To install this + plugin, add the m2eclipse update site http://m2eclipse.sonatype.org/update/ to + Eclipse (or use the Help > Eclipse Marketplace. . .) and then install the + m2eclipse plugin and required dependencies. Once that's installed, you'll be + ready to import the project into Eclipse. + + NOTE: + If you are using Eclipse as your IDE, we we strongly recommend that you use + Eclipse 3.6 (Helios) - http://www.eclipse.org/helios + + Select File > Import. . . and choose the Maven > Existing Maven Projects option. + Navigate to the root directory of your project. Eclipse should recognize the + Maven project and preselect it in the Project box. Click Finish and m2eclipse + will take it from there. + + NOTE: + You cannot use the import option General > Existing Projects into Workspace + because Eclipse does not recognize Maven projects as Eclipse projects + natively. You must use the importer provided by m2eclipse as just described. + + Additional configuration is required to get Eclipse to generate the JPA + metamodel. The archetype includes the necessary Eclipse config files in your + project. To enable this feature, right click on the project and select: + + Properties > Java Compiler > Annotation Processing + + Check "Enable annotation processing" then click OK and OK again when your are + prompted to run a project build. + + This configuration is described in further detail in the Hibernate JPA documentation: + + - http://docs.jboss.org/hibernate/stable/jpamodelgen/reference/en-US/html_s... + + Once the project is imported into the IDE, you can execute the Maven commands + through the IDE controls to deploy the application to a container. + + To deploy to GlassFish from Eclipse, you'll need the GlassFish Tools Bundle, + available at the update site http://download.java.net/glassfish/eclipse/helios + or from the Help > Eclipse Marketplace. . . + + Downloading the sources and Javadocs + ==================================== + + If you want to be able to debug into the source code or look at the Javadocs + of any library in the project, you can run either of the following two + commands to pull them into your local repository. The IDE should then detect + them. + + mvn dependency:sources + mvn dependency:resolve -Dclassifier=javadoc + + Resources + ========= + + - Weld archetypes + - Quickstart: http://seamframework.org/Documentation/WeldQuickstartForMavenUsers + - Issue tracker: https://jira.jboss.org/jira/browse/WELDRAD + - Source code: http://anonsvn.jboss.org/repos/weld/archetypes + - Forums: http://seamframework.org/Community/WeldUsers + - JSR-299 overview: http://seamframework.org/Weld + - JSF community site: http://www.javaserverfaces.org + Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/controller/MemberRegistration.java =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/controller/MemberRegistration.java (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/controller/MemberRegistration.java 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,64 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +package ${package}.controller; + +import ${package}.data.MemberRepository; +import ${package}.model.Member; +import javax.annotation.PostConstruct; +import javax.enterprise.event.Event; +import javax.enterprise.inject.Model; +import javax.enterprise.inject.Produces; +import javax.inject.Inject; +import javax.inject.Named; +import javax.persistence.EntityManager; +import javax.transaction.UserTransaction; +import org.slf4j.Logger; + +// Adding the @Stateful annotation eliminates need for manual transaction demarcation +// @javax.ejb.Stateful +// The @Model stereotype is a convenience mechanism to make this a request-scoped bean that has an EL name +// Read more about the @Model stereotype in this FAQ: http://seamframework.org/Documentation/WhatIsThePurposeOfTheModelAnnotation +@Model +public class MemberRegistration +{ + @Inject + private Logger log; + + @Inject + @MemberRepository + private EntityManager em; + + @Inject + private UserTransaction utx; + + @Inject + private Event<Member> memberEventSrc; + + private Member newMember; + + @Produces + @Named + public Member getNewMember() + { + return newMember; + } + + public void register() throws Exception + { + log.info("Registering " + newMember.getName()); + // UserTransaction only needed when bean is not an EJB + utx.begin(); + em.joinTransaction(); + em.persist(newMember); + utx.commit(); + memberEventSrc.fire(newMember); + initNewMember(); + } + + @PostConstruct + public void initNewMember() + { + newMember = new Member(); + } +} Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/data/MemberListProducer.java =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/data/MemberListProducer.java (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/data/MemberListProducer.java 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,54 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +package ${package}.data; + +import ${package}.model.Member; +import java.util.List; +import javax.annotation.PostConstruct; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.event.Observes; +import javax.enterprise.event.Reception; + +import javax.enterprise.inject.Produces; +import javax.inject.Inject; +import javax.inject.Named; +import javax.persistence.EntityManager; +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.CriteriaQuery; +import javax.persistence.criteria.Root; + +@RequestScoped +public class MemberListProducer +{ + @Inject + @MemberRepository + private EntityManager em; + + private List<Member> members; + + // The @Named annotation allows us to access the return value via the EL variable name "member" in the UI (e.g., Facelets or JSP view) + @Produces + @Named + public List<Member> getMembers() + { + return members; + } + + public void onMemberListChanged(@Observes(notifyObserver = Reception.IF_EXISTS) final Member member) + { + retrieveAllMembersOrderedByName(); + } + + @PostConstruct + public void retrieveAllMembersOrderedByName() + { + CriteriaBuilder cb = em.getCriteriaBuilder(); + CriteriaQuery<Member> criteria = cb.createQuery(Member.class); + Root<Member> member = criteria.from(Member.class); + // Uncomment if you would like to try out typesafe criteria queries, a new feature in JPA 2.0 + // criteria.select(member).orderBy(cb.asc(member.get(Member_.name))); + criteria.select(member).orderBy(cb.asc(member.get("name"))); + members = em.createQuery(criteria).getResultList(); + } +} Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/data/MemberRepository.java =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/data/MemberRepository.java (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/data/MemberRepository.java 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,24 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +package ${package}.data; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; + +/** + * A qualifier used to differentiate between multiple data repositories. + * + * If you only have 1 EntityManager, this annotation is optional + */ +@Qualifier +@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER }) +(a)Retention(RetentionPolicy.RUNTIME) +public @interface MemberRepository +{ + /* class body intentionally left blank */ +} Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/data/MemberRepositoryProducer.java =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/data/MemberRepositoryProducer.java (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/data/MemberRepositoryProducer.java 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,23 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +package ${package}.data; + +import javax.enterprise.inject.Produces; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + +/** + * This class uses CDI to produce EntityManager instances qualified that are + * qualified as @MemberRepository. Therefore, to inject an instance, @Inject + * must be followed by @MemberRepository. + */ +public class MemberRepositoryProducer +{ + // use @SuppressWarnings to tell IDE to ignore warnings about field not being referenced directly + @SuppressWarnings("unused") + @Produces + @MemberRepository + @PersistenceContext + private EntityManager em; +} Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/data/SeedDataImporter.java =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/data/SeedDataImporter.java (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/data/SeedDataImporter.java 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,64 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +package ${package}.data; + +import ${package}.model.Member; +import javax.annotation.PostConstruct; +import javax.ejb.Singleton; +import javax.ejb.Startup; +import javax.inject.Inject; +import javax.persistence.EntityManager; +import javax.persistence.TransactionRequiredException; +import javax.transaction.UserTransaction; +import org.slf4j.Logger; + +/** + * Import seed data into the database on application startup using + * a startup singleton EJB. + * + * @author Dan Allen + */ +@Startup +@Singleton +public class SeedDataImporter +{ + @Inject + private Logger log; + + @Inject + @MemberRepository + private EntityManager em; + + @Inject + private UserTransaction tx; + + @PostConstruct + public void importData() + { + Member member1 = new Member(); + member1.setName("John Smith"); + member1.setEmail("john.smith(a)mailinator.com"); + member1.setPhoneNumber("2125551212"); + try + { + try + { + em.persist(member1); + } + catch (TransactionRequiredException e) + { + // manual transaction control required in @PostConstruct method + // only use if enforced by JPA provider (due to bug in GlassFish) + tx.begin(); + em.persist(member1); + tx.commit(); + } + log.info("Successfully imported seed data."); + } + catch (Exception e) + { + log.warn("Seed data import failed.", e); + } + } +} Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/model/Member.java =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/model/Member.java (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/model/Member.java 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,86 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +package ${package}.model; + +import java.io.Serializable; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.UniqueConstraint; +import javax.validation.constraints.Digits; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; +import javax.xml.bind.annotation.XmlRootElement; +import org.hibernate.validator.constraints.Email; +import org.hibernate.validator.constraints.NotEmpty; + +@Entity +@XmlRootElement +@Table(uniqueConstraints = @UniqueConstraint(columnNames = "email")) +public class Member implements Serializable +{ + private Long id; + private String name; + private String email; + private String phoneNumber; + + @Id + @GeneratedValue + public Long getId() + { + return id; + } + + public void setId(Long id) + { + this.id = id; + } + + @NotNull + @Size(min = 1, max = 25) + @Pattern(regexp = "[A-Za-z ]*", message = "must contain only letters and spaces") + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + @NotNull + @NotEmpty + @Email + public String getEmail() + { + return email; + } + + public void setEmail(String email) + { + this.email = email; + } + + @NotNull + @Size(min = 10, max = 12) + @Digits(fraction = 0, integer = 12) + @Column(name = "phone_number") + public String getPhoneNumber() + { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) + { + this.phoneNumber = phoneNumber; + } + + /** Default value included to remove warning. Remove or modify at will. */ + private static final long serialVersionUID = 1L; +} \ No newline at end of file Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/rest/JaxRsActivator.java =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/rest/JaxRsActivator.java (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/rest/JaxRsActivator.java 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,44 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +package ${package}.rest; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +/** + * A class extending {@link Application} and annotated with @ApplicationPath + * is the Java EE 6 "no XML" approach to activating JAX-RS. + * + * <p>Resources are served relative to the servlet path specified in the {@link + * ApplicationPath} annotation.</p> + * + * <p><strong>NOTE</strong><br/>The following modifications are required to get + * JAX-RS working on JBoss AS 6.0.0.M4:</p> + * + * <ol> + * <li>Remove (or comment out) the <code>extends Application</code> clause on this class</li> + * <li>Remove (or comment out) the <code>@ApplicationPath</code> annotation on this class</li> + * <li>Open up web.xml and add the following XML snippet: + * <pre> + * <context-param> + * <param-name>resteasy.scan</param-name> + * <param-value>true</param-value> + * </context-param> + + * <context-param> + * <param-name>resteasy.servlet.mapping.prefix</param-name> + * <param-value>/rest</param-value> + * </context-param> + * </pre> + * <p>The mapping prefix should match the value that was in the + * <code>@ApplicationPath</code> annotation, prepended with a forward slash (/) + * if not already present.</p> + * </li> + * </ol> + */ +@ApplicationPath("/rest") +public class JaxRsActivator extends Application +{ + /* class body intentionally left blank */ +} Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/rest/MemberResourceRESTService.java =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/rest/MemberResourceRESTService.java (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/rest/MemberResourceRESTService.java 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,46 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +package ${package}.rest; + +import ${package}.model.Member; +import ${package}.data.MemberRepository; +import java.util.List; +import javax.enterprise.context.RequestScoped; +import javax.inject.Inject; +import javax.persistence.EntityManager; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; + +/** + * JAX-RS Example + * + * This class produces a RESTful service to read the contents of the members table. + */ +@Path("/members") +@RequestScoped +public class MemberResourceRESTService +{ + @Inject + @MemberRepository + private EntityManager em; + + @GET + public List<Member> listAllMembers() + { + // Use @SupressWarnings to force IDE to ignore warnings about "genericizing" the results of this query + @SuppressWarnings("unchecked") + // We recommend centralizing inline queries such as this one into @NamedQuery annotations on the @Entity class + // as described in the named query blueprint: https://blueprints.dev.java.net/bpcatalog/ee5/persistence/namedquery.html + final List<Member> results = em.createQuery("select m from Member m order by m.name").getResultList(); + return results; + } + + @GET + @Path("/{id:[1-9][0-9]*}") + public Member lookupMemberById(@PathParam("id") long id) + { + return em.find(Member.class, id); + } +} Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<persistence version="2.0" + xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://java.sun.com/xml/ns/persistence + http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"> + <persistence-unit name="primary"> +  +  + +  +  + <jta-data-source>jdbc/__default</jta-data-source> + <properties> +  + <property name="hibernate.hbm2ddl.auto" value="create-drop"/> + <property name="hibernate.show_sql" value="true"/> + <property name="hibernate.format_sql" value="false"/> + +  + <property name="eclipselink.ddl-generation" value="drop-and-create-tables"/> + <property name="eclipselink.logging.level" value="FINE"/> + </properties> + </persistence-unit> +</persistence> Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/resources/import.sql =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/resources/import.sql (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/resources/import.sql 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,2 @@ +-- If you are using Hibernate as the JPA provider, you can use this file to load seed data into the database using SQL statements +-- The portable approach is to use a startup component (such as the @PostConstruct method of a @Startup @Singleton) \ No newline at end of file Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/resources-jbossas/default-ds.xml =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/resources-jbossas/default-ds.xml (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/resources-jbossas/default-ds.xml 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE datasources PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" + "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> +<datasources> + <local-tx-datasource> + <jndi-name>jdbc/__default</jndi-name> + <use-java-context>false</use-java-context> + <connection-url>jdbc:hsqldb:.</connection-url> + <driver-class>org.hsqldb.jdbcDriver</driver-class> + <user-name>sa</user-name> + <password></password> + <min-pool-size>5</min-pool-size> + <max-pool-size>20</max-pool-size> + </local-tx-datasource> +</datasources> Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/META-INF/MANIFEST.MF =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/META-INF/MANIFEST.MF (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/META-INF/MANIFEST.MF 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<Context> +  + <Manager pathname=""/> +</Context> Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://java.sun.com/xml/ns/javaee + http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"> + <alternatives/> + <decorators/> + <interceptors/> +</beans> Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<faces-config version="2.0" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://java.sun.com/xml/ns/javaee + http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"> + +  + +</faces-config> Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,52 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets"> + <h:head> + <title>Java EE 6 Starter Application</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <h:outputStylesheet name="css/screen.css"/> + </h:head> + <h:body> + <div id="container"> + <div id="content"> + <div id="sidebar"> + <h3>Find out more</h3> + <p> + Explore JavaServer Faces. + </p> + <ul> + <li><a href="http://www.javaserverfaces.org">JSF community site</a></li> + </ul> + <p> + Learn more about Java EE 6 and the extensions provided by Weld and Seam. + </p> + <ul> + <li><a href="http://seamframework.org/Weld">Overview</a></li> + <li><a href="http://seamframework.org">Project site</a></li> + <li><a href="http://seamframework.org/Documentation/SeamDocumentation#H-WeldReferenceD...">Documentation</a></li> + <li><a href="http://seamframework.org/Community/Forums">User forums</a></li> + <li><a href="http://seamframework.org/Community/MailingLists">Mailing lists</a></li> + <li><a href="https://jira.jboss.org/browse/WELDRAD">Issue tracker</a></li> + </ul> + <p> + If you have an add-on, please <a href="http://seamframework.org/Community/Forums">let us know</a> and + consider <a href="http://seamframework.org/Community/Contribute">contributing</a> it back to the + community! + </p> + </div> + <ui:insert name="content"> + [Template content will be inserted here] + </ui:insert> + </div> + <div id="footer"> + <h:graphicImage value="/resources/gfx/weld.png" alt="Weld logo"/> + <p> + This project was generated from a Maven archetype maintained by the Weld team.<br/> + Weld is the reference implementation of CDI, released under the Apache License, Version 2.0.<br/> + </p> + </div> + </div> + </h:body> +</html> Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://java.sun.com/xml/ns/javaee + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> + +  +  + <context-param> + <param-name>javax.faces.PROJECT_STAGE</param-name> + <param-value>Development</param-value> + </context-param> + +  + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + +  + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + +  + <welcome-file-list> +  + <welcome-file>index.jsf</welcome-file> + </welcome-file-list> +</web-app> Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/index.jsf =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/index.jsf (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/index.jsf 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,8 @@ +The contents of this file will not be displayed! + +Having this file is a trick to get JBoss AS to redirect to the path index.jsf +when the root application URL is requested (or any subdirectory). + +See https://jira.jboss.org/browse/JBAS-8224 + +If you are using other containers, such as Glassfish, this file will be ignored and you may delete at will. \ No newline at end of file Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/index.xhtml =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/index.xhtml (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/index.xhtml 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + template="/WEB-INF/templates/default.xhtml"> + <ui:define name="content"> + <h1>Welcome to Java EE 6!</h1> + + <p>You have successfully deployed a Java EE 6 web application.</p> + + <h:form id="reg"> + <h2>Register (Bean Validation example)</h2> + <p>Enforces annotation-based constraints defined on the model class.</p> + <table> + <tr> + <th style="text-align: right;"> + <h:outputLabel for="name" value="Name:"/> + </th> + <td> + <h:inputText id="name" value="#{newMember.name}"/> + <h:message for="name" errorClass="invalid"/> + </td> + </tr> + <tr> + <th style="text-align: right;"> + <h:outputLabel for="email" value="Email:"/> + </th> + <td> + <h:inputText id="email" value="#{newMember.email}"/> + <h:message for="email" errorClass="invalid"/> + </td> + </tr> + <tr> + <th style="text-align: right;"> + <h:outputLabel for="phoneNumber" value="Phone #:"/> + </th> + <td> + <h:inputText id="phoneNumber" value="#{newMember.phoneNumber}"/> + <h:message for="phoneNumber" errorClass="invalid"/> + </td> + </tr> + </table> + <p> + <h:commandButton id="register" action="#{memberRegistration.register}" value="Register"/> + <h:outputText value=" Registered!" rendered="#{facesContext.postback and empty facesContext.messageList}" style="color: green;"/> + </p> + </h:form> + <h2>Members</h2> + <h:panelGroup rendered="#{empty members}"> + <em>No registered members.</em> + </h:panelGroup> + <h:dataTable var="_member" value="#{members}" rendered="#{not empty members}"> + <h:column> + <f:facet name="header">Id</f:facet> + #{_member.id} + </h:column> + <h:column> + <f:facet name="header">Name</f:facet> + #{_member.name} + </h:column> + <h:column> + <f:facet name="header">Email</f:facet> + #{_member.email} + </h:column> + <h:column> + <f:facet name="header">Phone #</f:facet> + #{_member.phoneNumber} + </h:column> + <h:column> + <f:facet name="header">REST URL</f:facet> + <a href="#{request.contextPath}/rest/members/#{_member.id}">/rest/members/#{_member.id}</a> + </h:column> + <f:facet name="footer"> + REST URL for all members: <a href="#{request.contextPath}/rest/members">/rest/members</a> + </f:facet> + </h:dataTable> + </ui:define> +</ui:composition> Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,40 @@ +body { + margin: 0; + padding: 0; + background-color: #EAECEE; + font-family: Verdana, sans-serif; + font-size: 0.9em; +} +#container { + margin: 0 auto; + padding: 0 20px 10px 20px; + border: 1px solid #666666; + width: 865px; /* subtract 40px from banner width for padding */ + background: #FFFFFF url(#{request.contextPath}/resources/gfx/banner.png) no-repeat; + padding-top: 110px; +} +#sidebar { + font-size: 0.9em; + width: 225px; + float: right; + border: 1px solid #666666; + background: #EAECEE; + padding: 0 15px 5px 15px; +} +#sidebar ul { + padding-left: 30px; +} +#footer { + clear: both; + text-align: center; + color: #666666; + font-size: 0.85em; + padding: 3em 0 0 0; +} +code { + font-size: 1.1em; +} +span.invalid { + padding-left: 3px; + color: red; +} Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/banner.png =================================================================== (Binary files differ) Property changes on: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/banner.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/weld.png =================================================================== (Binary files differ) Property changes on: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/weld.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/java/test/MavenArtifactResolver.java =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/java/test/MavenArtifactResolver.java (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/java/test/MavenArtifactResolver.java 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,67 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +package ${package}.test; + +import java.io.File; + +/** + * A temporary resolver that converts a Maven artifact reference + * into a {@link java.io.File} object. + * + * <p>This approach is an interim solution for Maven projects + * until the open feature request to add formally add artifacts + * to a test (<a href="https://jira.jboss.org/browse/ARQ-66">ARQ-66</a>) is implementated.</p> + * + * <p>The testCompile goal will resolve any test dependencies and + * put them in your local Maven repository. By the time the test + * executes, you can be sure that the JAR files you need will be + * in your local repository.</p> + * + * <p>Example usage:</p> + * + * <pre> + * WebArchive war = ShrinkWrap.create("test.war", WebArchive.class) + * .addLibrary(MavenArtifactResolver.resolve("commons-lang:commons-lang:2.5")); + * </pre> + + * <p>If you are using an alternate local Maven repository, you need to pass it + * to the Maven surefire plugin using the following stanza in the plugin + * configuration element:</p> + * + * <pre> + * <systemProperties> + * <property> + * <name>maven.repo.local</name> + * <value>${symbol_dollar}{maven.repo.local}</value> + * </property> + * </systemProperties> + * </pre> + * + * <p>Another approach to pull in a library is to add packages recursively from the + * root library package.</p> + * + * @author Dan Allen + */ +public class MavenArtifactResolver +{ + private static final String LOCAL_MAVEN_REPO = + System.getProperty("maven.repo.local") != null ? System.getProperty("maven.repo.local") : + (System.getProperty("user.home") + File.separatorChar + + ".m2" + File.separatorChar + "repository"); + + public static File resolve(String groupId, String artifactId, String version) + { + return new File(LOCAL_MAVEN_REPO + File.separatorChar + + groupId.replace(".", File.separator) + File.separatorChar + + artifactId + File.separatorChar + + version + File.separatorChar + + artifactId + "-" + version + ".jar"); + } + + public static File resolve(String qualifiedArtifactId) + { + String[] segments = qualifiedArtifactId.split(":"); + return resolve(segments[0], segments[1], segments[2]); + } +} Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/java/test/MemberRegistrationTest.java =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/java/test/MemberRegistrationTest.java (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/java/test/MemberRegistrationTest.java 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,62 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +package ${package}.test; + +import ${package}.controller.MemberRegistration; +import ${package}.data.MemberRepository; +import ${package}.data.MemberRepositoryProducer; +import ${package}.model.Member; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.InjectionPoint; +import static org.junit.Assert.*; +import javax.inject.Inject; +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +(a)RunWith(Arquillian.class) +public class MemberRegistrationTest +{ + @Deployment + public static Archive<?> createTestArchive() { + return ShrinkWrap.create(WebArchive.class, "test.war") + .addClasses(Member.class, MemberRegistration.class, MemberRepository.class, MemberRepositoryProducer.class) + // SLF4J libraries required only if not available on the container classpath +// .addLibraries( +// MavenArtifactResolver.resolve("org.slf4j:slf4j-api:1.5.10"), +// MavenArtifactResolver.resolve("org.slf4j:slf4j-jdk14:1.5.10") +// ) + .addWebResource("test-persistence.xml", "classes/META-INF/persistence.xml") + .addWebResource(new ByteArrayAsset(new byte[0]), "beans.xml"); + } + + @Inject MemberRegistration memberRegistration; + + @Inject Logger log; + + @Test + public void testRegister() throws Exception + { + Member newMember = memberRegistration.getNewMember(); + newMember.setName("Jane Doe"); + newMember.setEmail("jane(a)mailinator.com"); + newMember.setPhoneNumber("2125551234"); + memberRegistration.register(); + assertNotNull(newMember.getId()); + log.info(newMember.getName() + " was persisted with id " + newMember.getId()); + } + + @Produces + public Logger produceLog(InjectionPoint injectionPoint) + { + return LoggerFactory.getLogger(injectionPoint.getMember().getDeclaringClass()); + } +} Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources/arquillian.xml =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources/arquillian.xml (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources/arquillian.xml 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<arquillian xmlns="http://jboss.com/arquillian" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:jbossas-remote="urn:arq:org.jboss.arquillian.container.jbossas.remote_6" + xmlns:glassfish-embedded="urn:arq:org.jboss.arquillian.container.glassfish.embedded_3"> + +  +  + +  + <glassfish-embedded:container> + <glassfish-embedded:bindHttpPort>7070</glassfish-embedded:bindHttpPort> + <glassfish-embedded:sunResourcesXml>src/test/resources-glassfish-embedded/sun-resources.xml</glassfish-embedded:sunResourcesXml> + </glassfish-embedded:container> + +  + <jbossas-remote:container> + <jbossas-remote:remoteServerHttpPort>8080</jbossas-remote:remoteServerHttpPort> + </jbossas-remote:container> + +</arquillian> Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources-glassfish-embedded/sun-resources.xml =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources-glassfish-embedded/sun-resources.xml (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources-glassfish-embedded/sun-resources.xml 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE resources PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Resource Definitions //EN" + "http://www.sun.com/software/appserver/dtds/sun-resources_1_4.dtd"> +<resources> + <jdbc-resource pool-name="ArquillianEmbeddedDerbyPool" + jndi-name="jdbc/arquillian"/> + <jdbc-connection-pool name="ArquillianEmbeddedDerbyPool" + res-type="javax.sql.DataSource" + datasource-classname="org.apache.derby.jdbc.EmbeddedDataSource" + is-isolation-level-guaranteed="false"> + <property name="databaseName" value="target/databases/derby"/> + <property name="createDatabase" value="create"/> + </jdbc-connection-pool> +</resources> Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources-glassfish-embedded/test-persistence.xml =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources-glassfish-embedded/test-persistence.xml (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources-glassfish-embedded/test-persistence.xml 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<persistence version="2.0" + xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://java.sun.com/xml/ns/persistence + http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"> + <persistence-unit name="primary"> + <jta-data-source>jdbc/arquillian</jta-data-source> + <properties> +  + <property name="eclipselink.ddl-generation" value="drop-and-create-tables"/> + <property name="eclipselink.logging.level" value="FINE"/> + </properties> + </persistence-unit> +</persistence> Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources-jbossas/jndi.properties =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources-jbossas/jndi.properties (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources-jbossas/jndi.properties 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,3 @@ +java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory +java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces +java.naming.provider.url=jnp://localhost:1099 Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources-jbossas/test-persistence.xml =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources-jbossas/test-persistence.xml (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources-jbossas/test-persistence.xml 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<persistence version="2.0" + xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://java.sun.com/xml/ns/persistence + http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"> + <persistence-unit name="primary"> + <jta-data-source>java:/DefaultDS</jta-data-source> + <properties> +  + <property name="hibernate.hbm2ddl.auto" value="create-drop"/> + <property name="hibernate.show_sql" value="true"/> + <property name="hibernate.format_sql" value="false"/> + </properties> + </persistence-unit> +</persistence> Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/test/resources/projects/basic/archetype.properties =================================================================== --- archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/test/resources/projects/basic/archetype.properties (rev 0) +++ archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/test/resources/projects/basic/archetype.properties 2010-08-20 21:38:11 UTC (rev 7004) @@ -0,0 +1,5 @@ +#Fri Aug 20 17:36:09 EDT 2010 +version=0.1-SNAPSHOT +name=Java EE 6 project +groupId=archetype.it +artifactId=basic Added: archetypes/javaee6-webapp/tags/1.0.1.Beta1/src/test/resources/projects/basic/goal.txt ===================================================================

14 years, 3 months

1
0
0 / 0

Weld SVN: r7003 - archetypes/javaee6-webapp/tags.

by weld-commits＠lists.jboss.org

Author: dan.j.allen Date: 2010-08-20 17:36:45 -0400 (Fri, 20 Aug 2010) New Revision: 7003 Removed: archetypes/javaee6-webapp/tags/1.0.1.Beta1/ Log: redo

14 years, 3 months

1
0
0 / 0

Weld SVN: r7002 - in archetypes/javaee6-webapp/trunk: src/main/java/com/mycompany and 6 other directories.

by weld-commits＠lists.jboss.org

Author: dan.j.allen Date: 2010-08-20 17:35:21 -0400 (Fri, 20 Aug 2010) New Revision: 7002 Added: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/controller/ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/controller/MemberRegistration.java archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberListProducer.java archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberRepository.java archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberRepositoryProducer.java archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/SeedDataImporter.java archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/model/ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/model/Member.java archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/rest/ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/rest/JaxRsActivator.java archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/rest/MemberResourceRESTService.java archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/ archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MavenArtifactResolver.java archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MemberRegistrationTest.java Removed: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/JaxRsActivator.java archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/Member.java archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberListProducer.java archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberRegistration.java archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberRepository.java archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberRepositoryProducer.java archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberResourceRESTService.java archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/SeedDataImporter.java archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/MavenArtifactResolver.java archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/MemberRegistrationTest.java Modified: archetypes/javaee6-webapp/trunk/pom.xml Log: introduce package structure Modified: archetypes/javaee6-webapp/trunk/pom.xml =================================================================== --- archetypes/javaee6-webapp/trunk/pom.xml 2010-08-20 21:31:58 UTC (rev 7001) +++ archetypes/javaee6-webapp/trunk/pom.xml 2010-08-20 21:35:21 UTC (rev 7002) @@ -149,11 +149,9 @@ <configuration> <compilerArgument>-proc:only</compilerArgument>  -  </configuration> <goals> <goal>compile</goal> Deleted: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/JaxRsActivator.java =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/JaxRsActivator.java 2010-08-20 21:31:58 UTC (rev 7001) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/JaxRsActivator.java 2010-08-20 21:35:21 UTC (rev 7002) @@ -1,41 +0,0 @@ -package com.mycompany; - -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; - -/** - * A class extending {@link Application} and annotated with @ApplicationPath - * is the Java EE 6 "no XML" approach to activating JAX-RS. - * - * <p>Resources are served relative to the servlet path specified in the {@link - * ApplicationPath} annotation.</p> - * - * <p><strong>NOTE</strong><br/>The following modifications are required to get - * JAX-RS working on JBoss AS 6.0.0.M4:</p> - * - * <ol> - * <li>Remove (or comment out) the <code>extends Application</code> clause on this class</li> - * <li>Remove (or comment out) the <code>@ApplicationPath</code> annotation on this class</li> - * <li>Open up web.xml and add the following XML snippet: - * <pre> - * <context-param> - * <param-name>resteasy.scan</param-name> - * <param-value>true</param-value> - * </context-param> - - * <context-param> - * <param-name>resteasy.servlet.mapping.prefix</param-name> - * <param-value>/rest</param-value> - * </context-param> - * </pre> - * <p>The mapping prefix should match the value that was in the - * <code>@ApplicationPath</code> annotation, prepended with a forward slash (/) - * if not already present.</p> - * </li> - * </ol> - */ -@ApplicationPath("/rest") -public class JaxRsActivator extends Application -{ - /* class body intentionally left blank */ -} Deleted: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/Member.java =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/Member.java 2010-08-20 21:31:58 UTC (rev 7001) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/Member.java 2010-08-20 21:35:21 UTC (rev 7002) @@ -1,83 +0,0 @@ -package com.mycompany; - -import java.io.Serializable; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import org.hibernate.validator.constraints.Email; -import org.hibernate.validator.constraints.NotEmpty; - -@Entity -@XmlRootElement -@Table(uniqueConstraints = @UniqueConstraint(columnNames = "email")) -public class Member implements Serializable -{ - private Long id; - private String name; - private String email; - private String phoneNumber; - - @Id - @GeneratedValue - public Long getId() - { - return id; - } - - public void setId(Long id) - { - this.id = id; - } - - @NotNull - @Size(min = 1, max = 25) - @Pattern(regexp = "[A-Za-z ]*", message = "must contain only letters and spaces") - public String getName() - { - return name; - } - - public void setName(String name) - { - this.name = name; - } - - @NotNull - @NotEmpty - @Email - public String getEmail() - { - return email; - } - - public void setEmail(String email) - { - this.email = email; - } - - @NotNull - @Size(min = 10, max = 12) - @Digits(fraction = 0, integer = 12) - @Column(name = "phone_number") - public String getPhoneNumber() - { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) - { - this.phoneNumber = phoneNumber; - } - - /** Default value included to remove warning. Remove or modify at will. */ - private static final long serialVersionUID = 1L; -} \ No newline at end of file Deleted: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberListProducer.java =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberListProducer.java 2010-08-20 21:31:58 UTC (rev 7001) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberListProducer.java 2010-08-20 21:35:21 UTC (rev 7002) @@ -1,50 +0,0 @@ -package com.mycompany; - -import java.util.List; -import javax.annotation.PostConstruct; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.event.Observes; -import javax.enterprise.event.Reception; - -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Named; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; - -@RequestScoped -public class MemberListProducer -{ - @Inject - @MemberRepository - private EntityManager em; - - private List<Member> members; - - // The @Named annotation allows us to access the return value via the EL variable name "member" in the UI (e.g., Facelets or JSP view) - @Produces - @Named - public List<Member> getMembers() - { - return members; - } - - public void onMemberListChanged(@Observes(notifyObserver = Reception.IF_EXISTS) final Member member) - { - retrieveAllMembersOrderedByName(); - } - - @PostConstruct - public void retrieveAllMembersOrderedByName() - { - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery<Member> criteria = cb.createQuery(Member.class); - Root<Member> member = criteria.from(Member.class); - // Uncomment if you would like to try out typesafe criteria queries, a new feature in JPA 2.0 - // criteria.select(member).orderBy(cb.asc(member.get(Member_.name))); - criteria.select(member).orderBy(cb.asc(member.get("name"))); - members = em.createQuery(criteria).getResultList(); - } -} Deleted: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberRegistration.java =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberRegistration.java 2010-08-20 21:31:58 UTC (rev 7001) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberRegistration.java 2010-08-20 21:35:21 UTC (rev 7002) @@ -1,59 +0,0 @@ -package com.mycompany; - -import javax.annotation.PostConstruct; -import javax.enterprise.event.Event; -import javax.enterprise.inject.Model; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Named; -import javax.persistence.EntityManager; -import javax.transaction.UserTransaction; -import org.slf4j.Logger; - -// Adding the @Stateful annotation eliminates need for manual transaction demarcation -// @javax.ejb.Stateful -// The @Model stereotype is a convenience mechanism to make this a request-scoped bean that has an EL name -// Read more about the @Model stereotype in this FAQ: http://seamframework.org/Documentation/WhatIsThePurposeOfTheModelAnnotation -@Model -public class MemberRegistration -{ - @Inject - private Logger log; - - @Inject - @MemberRepository - private EntityManager em; - - @Inject - private UserTransaction utx; - - @Inject - private Event<Member> memberEventSrc; - - private Member newMember; - - @Produces - @Named - public Member getNewMember() - { - return newMember; - } - - public void register() throws Exception - { - log.info("Registering " + newMember.getName()); - // UserTransaction only needed when bean is not an EJB - utx.begin(); - em.joinTransaction(); - em.persist(newMember); - utx.commit(); - memberEventSrc.fire(newMember); - initNewMember(); - } - - @PostConstruct - public void initNewMember() - { - newMember = new Member(); - } -} Deleted: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberRepository.java =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberRepository.java 2010-08-20 21:31:58 UTC (rev 7001) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberRepository.java 2010-08-20 21:35:21 UTC (rev 7002) @@ -1,21 +0,0 @@ -package com.mycompany; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import javax.inject.Qualifier; - -/** - * A qualifier used to differentiate between multiple data repositories. - * - * If you only have 1 EntityManager, this annotation is optional - */ -@Qualifier -@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER }) -(a)Retention(RetentionPolicy.RUNTIME) -public @interface MemberRepository -{ - /* class body intentionally left blank */ -} Deleted: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberRepositoryProducer.java =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberRepositoryProducer.java 2010-08-20 21:31:58 UTC (rev 7001) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberRepositoryProducer.java 2010-08-20 21:35:21 UTC (rev 7002) @@ -1,20 +0,0 @@ -package com.mycompany; - -import javax.enterprise.inject.Produces; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; - -/** - * This class uses CDI to produce EntityManager instances qualified that are - * qualified as @MemberRepository. Therefore, to inject an instance, @Inject - * must be followed by @MemberRepository. - */ -public class MemberRepositoryProducer -{ - // use @SuppressWarnings to tell IDE to ignore warnings about field not being referenced directly - @SuppressWarnings("unused") - @Produces - @MemberRepository - @PersistenceContext - private EntityManager em; -} Deleted: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberResourceRESTService.java =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberResourceRESTService.java 2010-08-20 21:31:58 UTC (rev 7001) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberResourceRESTService.java 2010-08-20 21:35:21 UTC (rev 7002) @@ -1,41 +0,0 @@ -package com.mycompany; - -import java.util.List; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; - -/** - * JAX-RS Example - * - * This class produces a RESTful service to read the contents of the members table. - */ -@Path("/members") -@RequestScoped -public class MemberResourceRESTService -{ - @Inject - @MemberRepository - private EntityManager em; - - @GET - public List<Member> listAllMembers() - { - // Use @SupressWarnings to force IDE to ignore warnings about "genericizing" the results of this query - @SuppressWarnings("unchecked") - // We recommend centralizing inline queries such as this one into @NamedQuery annotations on the @Entity class - // as described in the named query blueprint: https://blueprints.dev.java.net/bpcatalog/ee5/persistence/namedquery.html - final List<Member> results = em.createQuery("select m from Member m order by m.name").getResultList(); - return results; - } - - @GET - @Path("/{id:[1-9][0-9]*}") - public Member lookupMemberById(@PathParam("id") long id) - { - return em.find(Member.class, id); - } -} Deleted: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/SeedDataImporter.java =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/SeedDataImporter.java 2010-08-20 21:31:58 UTC (rev 7001) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/SeedDataImporter.java 2010-08-20 21:35:21 UTC (rev 7002) @@ -1,60 +0,0 @@ -package com.mycompany; - -import javax.annotation.PostConstruct; -import javax.ejb.Singleton; -import javax.ejb.Startup; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.TransactionRequiredException; -import javax.transaction.UserTransaction; -import org.slf4j.Logger; - -/** - * Import seed data into the database on application startup using - * a startup singleton EJB. - * - * @author Dan Allen - */ -@Startup -@Singleton -public class SeedDataImporter -{ - @Inject - private Logger log; - - @Inject - @MemberRepository - private EntityManager em; - - @Inject - private UserTransaction tx; - - @PostConstruct - public void importData() - { - Member member1 = new Member(); - member1.setName("John Smith"); - member1.setEmail("john.smith(a)mailinator.com"); - member1.setPhoneNumber("2125551212"); - try - { - try - { - em.persist(member1); - } - catch (TransactionRequiredException e) - { - // manual transaction control required in @PostConstruct method - // only use if enforced by JPA provider (due to bug in GlassFish) - tx.begin(); - em.persist(member1); - tx.commit(); - } - log.info("Successfully imported seed data."); - } - catch (Exception e) - { - log.warn("Seed data import failed.", e); - } - } -} Copied: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/controller/MemberRegistration.java (from rev 6888, archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberRegistration.java) =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/controller/MemberRegistration.java (rev 0) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/controller/MemberRegistration.java 2010-08-20 21:35:21 UTC (rev 7002) @@ -0,0 +1,61 @@ +package com.mycompany.controller; + +import com.mycompany.data.MemberRepository; +import com.mycompany.model.Member; +import javax.annotation.PostConstruct; +import javax.enterprise.event.Event; +import javax.enterprise.inject.Model; +import javax.enterprise.inject.Produces; +import javax.inject.Inject; +import javax.inject.Named; +import javax.persistence.EntityManager; +import javax.transaction.UserTransaction; +import org.slf4j.Logger; + +// Adding the @Stateful annotation eliminates need for manual transaction demarcation +// @javax.ejb.Stateful +// The @Model stereotype is a convenience mechanism to make this a request-scoped bean that has an EL name +// Read more about the @Model stereotype in this FAQ: http://seamframework.org/Documentation/WhatIsThePurposeOfTheModelAnnotation +@Model +public class MemberRegistration +{ + @Inject + private Logger log; + + @Inject + @MemberRepository + private EntityManager em; + + @Inject + private UserTransaction utx; + + @Inject + private Event<Member> memberEventSrc; + + private Member newMember; + + @Produces + @Named + public Member getNewMember() + { + return newMember; + } + + public void register() throws Exception + { + log.info("Registering " + newMember.getName()); + // UserTransaction only needed when bean is not an EJB + utx.begin(); + em.joinTransaction(); + em.persist(newMember); + utx.commit(); + memberEventSrc.fire(newMember); + initNewMember(); + } + + @PostConstruct + public void initNewMember() + { + newMember = new Member(); + } +} Copied: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberListProducer.java (from rev 6886, archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberListProducer.java) =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberListProducer.java (rev 0) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberListProducer.java 2010-08-20 21:35:21 UTC (rev 7002) @@ -0,0 +1,51 @@ +package com.mycompany.data; + +import com.mycompany.model.Member; +import java.util.List; +import javax.annotation.PostConstruct; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.event.Observes; +import javax.enterprise.event.Reception; + +import javax.enterprise.inject.Produces; +import javax.inject.Inject; +import javax.inject.Named; +import javax.persistence.EntityManager; +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.CriteriaQuery; +import javax.persistence.criteria.Root; + +@RequestScoped +public class MemberListProducer +{ + @Inject + @MemberRepository + private EntityManager em; + + private List<Member> members; + + // The @Named annotation allows us to access the return value via the EL variable name "member" in the UI (e.g., Facelets or JSP view) + @Produces + @Named + public List<Member> getMembers() + { + return members; + } + + public void onMemberListChanged(@Observes(notifyObserver = Reception.IF_EXISTS) final Member member) + { + retrieveAllMembersOrderedByName(); + } + + @PostConstruct + public void retrieveAllMembersOrderedByName() + { + CriteriaBuilder cb = em.getCriteriaBuilder(); + CriteriaQuery<Member> criteria = cb.createQuery(Member.class); + Root<Member> member = criteria.from(Member.class); + // Uncomment if you would like to try out typesafe criteria queries, a new feature in JPA 2.0 + // criteria.select(member).orderBy(cb.asc(member.get(Member_.name))); + criteria.select(member).orderBy(cb.asc(member.get("name"))); + members = em.createQuery(criteria).getResultList(); + } +} Copied: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberRepository.java (from rev 6882, archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberRepository.java) =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberRepository.java (rev 0) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberRepository.java 2010-08-20 21:35:21 UTC (rev 7002) @@ -0,0 +1,21 @@ +package com.mycompany.data; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; + +/** + * A qualifier used to differentiate between multiple data repositories. + * + * If you only have 1 EntityManager, this annotation is optional + */ +@Qualifier +@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER }) +(a)Retention(RetentionPolicy.RUNTIME) +public @interface MemberRepository +{ + /* class body intentionally left blank */ +} Copied: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberRepositoryProducer.java (from rev 6885, archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberRepositoryProducer.java) =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberRepositoryProducer.java (rev 0) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberRepositoryProducer.java 2010-08-20 21:35:21 UTC (rev 7002) @@ -0,0 +1,20 @@ +package com.mycompany.data; + +import javax.enterprise.inject.Produces; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + +/** + * This class uses CDI to produce EntityManager instances qualified that are + * qualified as @MemberRepository. Therefore, to inject an instance, @Inject + * must be followed by @MemberRepository. + */ +public class MemberRepositoryProducer +{ + // use @SuppressWarnings to tell IDE to ignore warnings about field not being referenced directly + @SuppressWarnings("unused") + @Produces + @MemberRepository + @PersistenceContext + private EntityManager em; +} Copied: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/SeedDataImporter.java (from rev 6998, archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/SeedDataImporter.java) =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/SeedDataImporter.java (rev 0) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/SeedDataImporter.java 2010-08-20 21:35:21 UTC (rev 7002) @@ -0,0 +1,61 @@ +package com.mycompany.data; + +import com.mycompany.model.Member; +import javax.annotation.PostConstruct; +import javax.ejb.Singleton; +import javax.ejb.Startup; +import javax.inject.Inject; +import javax.persistence.EntityManager; +import javax.persistence.TransactionRequiredException; +import javax.transaction.UserTransaction; +import org.slf4j.Logger; + +/** + * Import seed data into the database on application startup using + * a startup singleton EJB. + * + * @author Dan Allen + */ +@Startup +@Singleton +public class SeedDataImporter +{ + @Inject + private Logger log; + + @Inject + @MemberRepository + private EntityManager em; + + @Inject + private UserTransaction tx; + + @PostConstruct + public void importData() + { + Member member1 = new Member(); + member1.setName("John Smith"); + member1.setEmail("john.smith(a)mailinator.com"); + member1.setPhoneNumber("2125551212"); + try + { + try + { + em.persist(member1); + } + catch (TransactionRequiredException e) + { + // manual transaction control required in @PostConstruct method + // only use if enforced by JPA provider (due to bug in GlassFish) + tx.begin(); + em.persist(member1); + tx.commit(); + } + log.info("Successfully imported seed data."); + } + catch (Exception e) + { + log.warn("Seed data import failed.", e); + } + } +} Copied: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/model/Member.java (from rev 6882, archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/Member.java) =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/model/Member.java (rev 0) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/model/Member.java 2010-08-20 21:35:21 UTC (rev 7002) @@ -0,0 +1,83 @@ +package com.mycompany.model; + +import java.io.Serializable; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.UniqueConstraint; +import javax.validation.constraints.Digits; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; +import javax.xml.bind.annotation.XmlRootElement; +import org.hibernate.validator.constraints.Email; +import org.hibernate.validator.constraints.NotEmpty; + +@Entity +@XmlRootElement +@Table(uniqueConstraints = @UniqueConstraint(columnNames = "email")) +public class Member implements Serializable +{ + private Long id; + private String name; + private String email; + private String phoneNumber; + + @Id + @GeneratedValue + public Long getId() + { + return id; + } + + public void setId(Long id) + { + this.id = id; + } + + @NotNull + @Size(min = 1, max = 25) + @Pattern(regexp = "[A-Za-z ]*", message = "must contain only letters and spaces") + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + @NotNull + @NotEmpty + @Email + public String getEmail() + { + return email; + } + + public void setEmail(String email) + { + this.email = email; + } + + @NotNull + @Size(min = 10, max = 12) + @Digits(fraction = 0, integer = 12) + @Column(name = "phone_number") + public String getPhoneNumber() + { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) + { + this.phoneNumber = phoneNumber; + } + + /** Default value included to remove warning. Remove or modify at will. */ + private static final long serialVersionUID = 1L; +} \ No newline at end of file Copied: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/rest/JaxRsActivator.java (from rev 7000, archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/JaxRsActivator.java) =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/rest/JaxRsActivator.java (rev 0) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/rest/JaxRsActivator.java 2010-08-20 21:35:21 UTC (rev 7002) @@ -0,0 +1,41 @@ +package com.mycompany.rest; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +/** + * A class extending {@link Application} and annotated with @ApplicationPath + * is the Java EE 6 "no XML" approach to activating JAX-RS. + * + * <p>Resources are served relative to the servlet path specified in the {@link + * ApplicationPath} annotation.</p> + * + * <p><strong>NOTE</strong><br/>The following modifications are required to get + * JAX-RS working on JBoss AS 6.0.0.M4:</p> + * + * <ol> + * <li>Remove (or comment out) the <code>extends Application</code> clause on this class</li> + * <li>Remove (or comment out) the <code>@ApplicationPath</code> annotation on this class</li> + * <li>Open up web.xml and add the following XML snippet: + * <pre> + * <context-param> + * <param-name>resteasy.scan</param-name> + * <param-value>true</param-value> + * </context-param> + + * <context-param> + * <param-name>resteasy.servlet.mapping.prefix</param-name> + * <param-value>/rest</param-value> + * </context-param> + * </pre> + * <p>The mapping prefix should match the value that was in the + * <code>@ApplicationPath</code> annotation, prepended with a forward slash (/) + * if not already present.</p> + * </li> + * </ol> + */ +@ApplicationPath("/rest") +public class JaxRsActivator extends Application +{ + /* class body intentionally left blank */ +} Copied: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/rest/MemberResourceRESTService.java (from rev 6990, archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberResourceRESTService.java) =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/rest/MemberResourceRESTService.java (rev 0) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/rest/MemberResourceRESTService.java 2010-08-20 21:35:21 UTC (rev 7002) @@ -0,0 +1,43 @@ +package com.mycompany.rest; + +import com.mycompany.model.Member; +import com.mycompany.data.MemberRepository; +import java.util.List; +import javax.enterprise.context.RequestScoped; +import javax.inject.Inject; +import javax.persistence.EntityManager; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; + +/** + * JAX-RS Example + * + * This class produces a RESTful service to read the contents of the members table. + */ +@Path("/members") +@RequestScoped +public class MemberResourceRESTService +{ + @Inject + @MemberRepository + private EntityManager em; + + @GET + public List<Member> listAllMembers() + { + // Use @SupressWarnings to force IDE to ignore warnings about "genericizing" the results of this query + @SuppressWarnings("unchecked") + // We recommend centralizing inline queries such as this one into @NamedQuery annotations on the @Entity class + // as described in the named query blueprint: https://blueprints.dev.java.net/bpcatalog/ee5/persistence/namedquery.html + final List<Member> results = em.createQuery("select m from Member m order by m.name").getResultList(); + return results; + } + + @GET + @Path("/{id:[1-9][0-9]*}") + public Member lookupMemberById(@PathParam("id") long id) + { + return em.find(Member.class, id); + } +} Deleted: archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/MavenArtifactResolver.java =================================================================== --- archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/MavenArtifactResolver.java 2010-08-20 21:31:58 UTC (rev 7001) +++ archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/MavenArtifactResolver.java 2010-08-20 21:35:21 UTC (rev 7002) @@ -1,64 +0,0 @@ -package com.mycompany; - -import java.io.File; - -/** - * A temporary resolver that converts a Maven artifact reference - * into a {@link java.io.File} object. - * - * <p>This approach is an interim solution for Maven projects - * until the open feature request to add formally add artifacts - * to a test (<a href="https://jira.jboss.org/browse/ARQ-66">ARQ-66</a>) is implementated.</p> - * - * <p>The testCompile goal will resolve any test dependencies and - * put them in your local Maven repository. By the time the test - * executes, you can be sure that the JAR files you need will be - * in your local repository.</p> - * - * <p>Example usage:</p> - * - * <pre> - * WebArchive war = ShrinkWrap.create("test.war", WebArchive.class) - * .addLibrary(MavenArtifactResolver.resolve("commons-lang:commons-lang:2.5")); - * </pre> - - * <p>If you are using an alternate local Maven repository, you need to pass it - * to the Maven surefire plugin using the following stanza in the plugin - * configuration element:</p> - * - * <pre> - * <systemProperties> - * <property> - * <name>maven.repo.local</name> - * <value>${maven.repo.local}</value> - * </property> - * </systemProperties> - * </pre> - * - * <p>Another approach to pull in a library is to add packages recursively from the - * root library package.</p> - * - * @author Dan Allen - */ -public class MavenArtifactResolver -{ - private static final String LOCAL_MAVEN_REPO = - System.getProperty("maven.repo.local") != null ? System.getProperty("maven.repo.local") : - (System.getProperty("user.home") + File.separatorChar + - ".m2" + File.separatorChar + "repository"); - - public static File resolve(String groupId, String artifactId, String version) - { - return new File(LOCAL_MAVEN_REPO + File.separatorChar + - groupId.replace(".", File.separator) + File.separatorChar + - artifactId + File.separatorChar + - version + File.separatorChar + - artifactId + "-" + version + ".jar"); - } - - public static File resolve(String qualifiedArtifactId) - { - String[] segments = qualifiedArtifactId.split(":"); - return resolve(segments[0], segments[1], segments[2]); - } -} Deleted: archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/MemberRegistrationTest.java =================================================================== --- archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/MemberRegistrationTest.java 2010-08-20 21:31:58 UTC (rev 7001) +++ archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/MemberRegistrationTest.java 2010-08-20 21:35:21 UTC (rev 7002) @@ -1,55 +0,0 @@ -package com.mycompany; - -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.InjectionPoint; -import static org.junit.Assert.*; -import javax.inject.Inject; -import org.jboss.arquillian.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.Archive; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -(a)RunWith(Arquillian.class) -public class MemberRegistrationTest -{ - @Deployment - public static Archive<?> createTestArchive() { - return ShrinkWrap.create(WebArchive.class, "test.war") - .addClasses(Member.class, MemberRegistration.class, MemberRepository.class, MemberRepositoryProducer.class) - // SLF4J libraries required only if not available on the container classpath -// .addLibraries( -// MavenArtifactResolver.resolve("org.slf4j:slf4j-api:1.5.10"), -// MavenArtifactResolver.resolve("org.slf4j:slf4j-jdk14:1.5.10") -// ) - .addWebResource("test-persistence.xml", "classes/META-INF/persistence.xml") - .addWebResource(new ByteArrayAsset(new byte[0]), "beans.xml"); - } - - @Inject MemberRegistration memberRegistration; - - @Inject Logger log; - - @Test - public void testRegister() throws Exception - { - Member newMember = memberRegistration.getNewMember(); - newMember.setName("Jane Doe"); - newMember.setEmail("jane(a)mailinator.com"); - newMember.setPhoneNumber("2125551234"); - memberRegistration.register(); - assertNotNull(newMember.getId()); - log.info(newMember.getName() + " was persisted with id " + newMember.getId()); - } - - @Produces - public Logger produceLog(InjectionPoint injectionPoint) - { - return LoggerFactory.getLogger(injectionPoint.getMember().getDeclaringClass()); - } -} Copied: archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MavenArtifactResolver.java (from rev 6882, archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/MavenArtifactResolver.java) =================================================================== --- archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MavenArtifactResolver.java (rev 0) +++ archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MavenArtifactResolver.java 2010-08-20 21:35:21 UTC (rev 7002) @@ -0,0 +1,64 @@ +package com.mycompany.test; + +import java.io.File; + +/** + * A temporary resolver that converts a Maven artifact reference + * into a {@link java.io.File} object. + * + * <p>This approach is an interim solution for Maven projects + * until the open feature request to add formally add artifacts + * to a test (<a href="https://jira.jboss.org/browse/ARQ-66">ARQ-66</a>) is implementated.</p> + * + * <p>The testCompile goal will resolve any test dependencies and + * put them in your local Maven repository. By the time the test + * executes, you can be sure that the JAR files you need will be + * in your local repository.</p> + * + * <p>Example usage:</p> + * + * <pre> + * WebArchive war = ShrinkWrap.create("test.war", WebArchive.class) + * .addLibrary(MavenArtifactResolver.resolve("commons-lang:commons-lang:2.5")); + * </pre> + + * <p>If you are using an alternate local Maven repository, you need to pass it + * to the Maven surefire plugin using the following stanza in the plugin + * configuration element:</p> + * + * <pre> + * <systemProperties> + * <property> + * <name>maven.repo.local</name> + * <value>${maven.repo.local}</value> + * </property> + * </systemProperties> + * </pre> + * + * <p>Another approach to pull in a library is to add packages recursively from the + * root library package.</p> + * + * @author Dan Allen + */ +public class MavenArtifactResolver +{ + private static final String LOCAL_MAVEN_REPO = + System.getProperty("maven.repo.local") != null ? System.getProperty("maven.repo.local") : + (System.getProperty("user.home") + File.separatorChar + + ".m2" + File.separatorChar + "repository"); + + public static File resolve(String groupId, String artifactId, String version) + { + return new File(LOCAL_MAVEN_REPO + File.separatorChar + + groupId.replace(".", File.separator) + File.separatorChar + + artifactId + File.separatorChar + + version + File.separatorChar + + artifactId + "-" + version + ".jar"); + } + + public static File resolve(String qualifiedArtifactId) + { + String[] segments = qualifiedArtifactId.split(":"); + return resolve(segments[0], segments[1], segments[2]); + } +} Copied: archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MemberRegistrationTest.java (from rev 6883, archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/MemberRegistrationTest.java) =================================================================== --- archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MemberRegistrationTest.java (rev 0) +++ archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MemberRegistrationTest.java 2010-08-20 21:35:21 UTC (rev 7002) @@ -0,0 +1,59 @@ +package com.mycompany.test; + +import com.mycompany.controller.MemberRegistration; +import com.mycompany.data.MemberRepository; +import com.mycompany.data.MemberRepositoryProducer; +import com.mycompany.model.Member; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.InjectionPoint; +import static org.junit.Assert.*; +import javax.inject.Inject; +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +(a)RunWith(Arquillian.class) +public class MemberRegistrationTest +{ + @Deployment + public static Archive<?> createTestArchive() { + return ShrinkWrap.create(WebArchive.class, "test.war") + .addClasses(Member.class, MemberRegistration.class, MemberRepository.class, MemberRepositoryProducer.class) + // SLF4J libraries required only if not available on the container classpath +// .addLibraries( +// MavenArtifactResolver.resolve("org.slf4j:slf4j-api:1.5.10"), +// MavenArtifactResolver.resolve("org.slf4j:slf4j-jdk14:1.5.10") +// ) + .addWebResource("test-persistence.xml", "classes/META-INF/persistence.xml") + .addWebResource(new ByteArrayAsset(new byte[0]), "beans.xml"); + } + + @Inject MemberRegistration memberRegistration; + + @Inject Logger log; + + @Test + public void testRegister() throws Exception + { + Member newMember = memberRegistration.getNewMember(); + newMember.setName("Jane Doe"); + newMember.setEmail("jane(a)mailinator.com"); + newMember.setPhoneNumber("2125551234"); + memberRegistration.register(); + assertNotNull(newMember.getId()); + log.info(newMember.getName() + " was persisted with id " + newMember.getId()); + } + + @Produces + public Logger produceLog(InjectionPoint injectionPoint) + { + return LoggerFactory.getLogger(injectionPoint.getMember().getDeclaringClass()); + } +}

14 years, 3 months

1
0
0 / 0

Weld SVN: r7001 - archetypes/javaee6-webapp/trunk.

by weld-commits＠lists.jboss.org

Author: dan.j.allen Date: 2010-08-20 17:31:58 -0400 (Fri, 20 Aug 2010) New Revision: 7001 Modified: archetypes/javaee6-webapp/trunk/readme.txt Log: add note about stopping glassfish container before running embedded tests Modified: archetypes/javaee6-webapp/trunk/readme.txt =================================================================== --- archetypes/javaee6-webapp/trunk/readme.txt 2010-08-20 21:12:02 UTC (rev 7000) +++ archetypes/javaee6-webapp/trunk/readme.txt 2010-08-20 21:31:58 UTC (rev 7001) @@ -139,8 +139,9 @@ activate this test by selecting one of the two container configurations provided, JBoss AS 6 (remote) or GlassFish 3 (embedded). - To run the test in GlassFish Embedded, simply run the test goal with the - following profile activated: + To run the test in Embedded GlassFish, first make sure that you don't have a + GlassFish container running (to avoid port conflicts). Then run the test goal + with the following profile activated: mvn clean test -Pglassfish-embedded-3

14 years, 3 months

1
0
0 / 0

Weld SVN: r7000 - archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany.

by weld-commits＠lists.jboss.org

Author: dan.j.allen Date: 2010-08-20 17:12:02 -0400 (Fri, 20 Aug 2010) New Revision: 7000 Modified: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/JaxRsActivator.java Log: prefix path with / to make it work on JBoss AS 6 M4 Modified: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/JaxRsActivator.java =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/JaxRsActivator.java 2010-08-20 21:10:27 UTC (rev 6999) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/JaxRsActivator.java 2010-08-20 21:12:02 UTC (rev 7000) @@ -28,11 +28,13 @@ * <param-value>/rest</param-value> * </context-param> * </pre> - * <p>The mapping prefix should match the value that was in the <code>@ApplicationPath</code> annotation, prefixed - * with a forward slash (/).</p></li> + * <p>The mapping prefix should match the value that was in the + * <code>@ApplicationPath</code> annotation, prepended with a forward slash (/) + * if not already present.</p> + * </li> * </ol> */ -@ApplicationPath("rest") +@ApplicationPath("/rest") public class JaxRsActivator extends Application { /* class body intentionally left blank */

14 years, 3 months

1
0
0 / 0

Weld SVN: r6999 - archetypes/javaee6-webapp/trunk/src/main/resources.

by weld-commits＠lists.jboss.org

Author: dan.j.allen Date: 2010-08-20 17:10:27 -0400 (Fri, 20 Aug 2010) New Revision: 6999 Modified: archetypes/javaee6-webapp/trunk/src/main/resources/import.sql Log: switch to portable seed data importer Modified: archetypes/javaee6-webapp/trunk/src/main/resources/import.sql =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/resources/import.sql 2010-08-20 21:10:11 UTC (rev 6998) +++ archetypes/javaee6-webapp/trunk/src/main/resources/import.sql 2010-08-20 21:10:27 UTC (rev 6999) @@ -1 +1,2 @@ -insert into Member (name, email, phone_number) values ('John Smith', 'john(a)mailinator.com', '2125551212') +-- If you are using Hibernate as the JPA provider, you can use this file to load seed data into the database using SQL statements +-- The portable approach is to use a startup component (such as the @PostConstruct method of a @Startup @Singleton) \ No newline at end of file

14 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits August 2010