[jboss-cvs] JBossAS SVN: r67628 - in trunk: ejb3 and 116 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 29 16:13:28 EST 2007
Author: ALRubinger
Date: 2007-11-29 16:13:26 -0500 (Thu, 29 Nov 2007)
New Revision: 67628
Added:
trunk/ejb3/src/main/org/jboss/ejb3/annotation/
trunk/ejb3/src/main/org/jboss/ejb3/annotation/impl/
trunk/ejb3/src/main/org/jboss/ejb3/annotation/impl/ClusteredImpl.java
trunk/ejb3/src/main/org/jboss/ejb3/cache/persistence/
trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/StatefulSessionFilePersistenceManagerFactory.java
Removed:
trunk/ejb3/src/main/org/jboss/annotation/IgnoreDependencyImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/AspectDomainImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/ClusteredImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/ConsumerImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessageImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/DefaultActivationSpecsImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/DependsImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/ExcludeClassInterceptorsImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/ExcludeDefaultInterceptorsImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/JndiBindingPolicyImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/LocalBindingImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/LocalHomeBindingImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/LocalHomeImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/LocalImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/ManagementImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/MessagePropertiesImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/PoolImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/RemoteBindingImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/RemoteBindingsImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/RemoteHomeBindingImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/RemoteHomeImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapterImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccessImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/ServiceImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeoutImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheConfigImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/
trunk/ejb3/src/main/org/jboss/annotation/internal/
trunk/ejb3/src/main/org/jboss/annotation/security/
trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DeploymentSummary.java
trunk/ejb3/src/main/org/jboss/ejb3/jndipolicy/
trunk/ejb3/src/main/org/jboss/ejb3/mdb/ProducerImpl.java
trunk/ejb3/src/main/org/jboss/ejb3/mdb/ProducersImpl.java
Modified:
trunk/build/build-distr.xml
trunk/build/build-thirdparty.xml
trunk/ejb3/.classpath
trunk/ejb3/build-test.xml
trunk/ejb3/build.xml
trunk/ejb3/src/main/org/jboss/ejb3/EJB3Util.java
trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
trunk/ejb3/src/main/org/jboss/ejb3/EJBContextImpl.java
trunk/ejb3/src/main/org/jboss/ejb3/EJBMetaDataLoader.java
trunk/ejb3/src/main/org/jboss/ejb3/Ejb3AnnotationHandler.java
trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java
trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
trunk/ejb3/src/main/org/jboss/ejb3/ProxyFactoryHelper.java
trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java
trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
trunk/ejb3/src/main/org/jboss/ejb3/iiop/IORFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/interceptor/EJB3InterceptorsFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/mdb/ConsumerContainer.java
trunk/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptorFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/mdb/LocalProducerFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/mdb/MDB.java
trunk/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java
trunk/ejb3/src/main/org/jboss/ejb3/mdb/ProducerFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/mdb/ProducerManagerImpl.java
trunk/ejb3/src/main/org/jboss/ejb3/mdb/RemoteProducerFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptor.java
trunk/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptorv2.java
trunk/ejb3/src/main/org/jboss/ejb3/security/JaccHelper.java
trunk/ejb3/src/main/org/jboss/ejb3/security/RoleBasedAuthorizationInterceptorFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/security/RoleBasedAuthorizationInterceptorv2.java
trunk/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorv2.java
trunk/ejb3/src/main/org/jboss/ejb3/service/ServiceContainer.java
trunk/ejb3/src/main/org/jboss/ejb3/service/ServiceLocalProxyFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/service/ServiceRemoteProxyFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/session/BaseSessionProxyFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/session/ProxyDeployer.java
trunk/ejb3/src/main/org/jboss/ejb3/session/SessionContainer.java
trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java
trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulInstanceInterceptor.java
trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxyFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessContainer.java
trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxyFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxyFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/tx/TxInterceptorFactory.java
trunk/ejb3/src/main/org/jboss/injection/DependsHandler.java
trunk/ejb3/src/main/org/jboss/injection/EJBRemoteHandler.java
trunk/ejb3/src/main/org/jboss/injection/JndiInjectHandler.java
trunk/ejb3/src/main/org/jboss/injection/PersistenceContextHandler.java
trunk/ejb3/src/main/org/jboss/injection/PersistenceUnitHandler.java
trunk/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml
trunk/ejb3/src/resources/ejb3-interceptors-aop.xml
trunk/ejb3/src/resources/test-configs/ejb3-jacc/deploy/ejb3-interceptors-aop.xml
trunk/ejb3/src/resources/test-configs/removedislocal/deploy/ejb3-interceptors-aop.xml
trunk/ejb3/src/resources/test/circulardependency/META-INF/jboss.xml
trunk/ejb3/src/resources/test/defaultremotebindings/default-ejb3-interceptors-aop.xml
trunk/ejb3/src/resources/test/strictpool/META-INF/jboss.xml
trunk/ejb3/src/test/org/jboss/ejb3/test/arjuna/StatefulTxBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/DeploymentDescriptorStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/SecuredStatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/ServiceBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/StatefulClusteredBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/StatelessClusteredBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/bank/TellerRemoteProxyFactory.java
trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/cache/SimpleStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/cache/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/cachepassivation/MockBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean1.java
trunk/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean2.java
trunk/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30Bean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/classloader/SharedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/classloader/UnsharedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/QueueTestMDB.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/IgnoreReplicationStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OptimizedStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideAnnotationStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/SessionBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedContainedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalContainedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalNestedStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredParentStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteContainedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteNestedStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredShoppingCartBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTest.java
trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestConsumer.java
trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestLocal.java
trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestRemote.java
trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestXA.java
trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTest.java
trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTestConsumer.java
trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTestLocal.java
trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTestRemote.java
trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTestXA.java
trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/TestStatusBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatusBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/dd/override/FooBean1.java
trunk/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Session30Bean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/defaultremotebindings/StatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependencyBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulLocalOnlyBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1040/TestStatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1057/DelegateBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1057/TestBusinessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1071/DelegateBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1071/StatefulLocalBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1071/StatefulRemoteBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1075/homeonly/RemoteHomeOnly21Bean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1075/remoteonly/RemoteInterfaceOnly21Bean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1082/ABean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1082/BBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1122/TestServiceBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1122/TestStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1122/TestStatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyManagedServiceBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyServiceBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree785/MyStatelessLocal.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree785/MyStatelessRemote.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree785/Tester.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree786/DelegateBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree786/Ejb21ViewBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree786/StatefulRemoveBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree786/StatelessRemoveBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree921/MyStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree963/MyStateful.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree973/RunAsSpyBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree973/SpyAllowedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree973/WhoAmIBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree973/WhoAmIMDB.java
trunk/ejb3/src/test/org/jboss/ejb3/test/entity/EntityTestBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/enventry/ExtendedTestEnvEntryBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/factory/MyServiceBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/factory/Session2Bean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyServiceBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/homeinterface/DuplicateStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/homeinterface/DuplicateStatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/homeinterface/ExplicitStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/homeinterface/ExplicitStatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/homeinterface/TestBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/HomedStatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/MyServiceBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/MySessionBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTesterBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/initial/InterceptedSFTestBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/initial/SecuredTestBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/initial/TestBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyBaseInterceptor.java
trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyInterceptor.java
trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSB.java
trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyConsumer.java
trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyProducer.java
trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyService.java
trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSB.java
trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSB.java
trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConsumer.java
trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedProducer.java
trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/jacc/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/jacc/StatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSMDBBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzMDBBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/TestMDBMessageListener.java
trunk/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClusteredBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClusteredBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/longlived/ContainedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/longlived/HibernateShoppingCartBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/longlived/ShoppingCartBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMailBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/BMTQueueTestMDB.java
trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/CMTQueueTestMDB.java
trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/DefaultedQueueTestMDB.java
trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/ExpirationTestMDB.java
trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/MismatchedQueueMDB.java
trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/NondurableQueueTestMDB.java
trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideDefaultedQueueTestMDB.java
trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideTestMDB.java
trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/QueueTestMDB.java
trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/RollbackCMTQueueTestMDB.java
trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/StatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/TransactionQueueTestMDB.java
trunk/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/StatelessFacadeBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful2Bean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulOverrideBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/pool/ExampleTimerBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/reference21_30/GlobalSession30Bean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/reference21_30/HomedStatefulSession30Bean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Bean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Bean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Bean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/regression/PassivationTestBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyServiceBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/NonExtendedStatefuBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulTransientBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/InheritanceDemo.java
trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/CalleeBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean2.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/CallerFacadeBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/FacadeTargetBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/JobDAOBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/Level1CallerBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/PrivateSessionBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionFacade.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextTargetBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean2.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean3.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBeanInDomain.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean_test.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/TimerTesterBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanFirst.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanLast.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/security/UnsecuredStatelessSessionBean2.java
trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFive.java
trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFour.java
trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceOne.java
trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSeven.java
trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenManagement.java
trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSix.java
trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixManagement.java
trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceThree.java
trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceTwo.java
trunk/ejb3/src/test/org/jboss/ejb3/test/service/Session.java
trunk/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionService.java
trunk/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionServiceIF.java
trunk/ejb3/src/test/org/jboss/ejb3/test/servicedependency/AccountBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumber.java
trunk/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueId.java
trunk/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOne.java
trunk/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOneDeploymentDescriptor.java
trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Bean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatefulClusteredBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatelessClusteredBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/OverrideStatefulClusteredBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatefulClusteredBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatelessClusteredBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/Depends.java
trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2Bean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1Bean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/security/SecuredBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneManagement.java
trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoManagement.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ClusteredStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/EntityFacadeBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ServiceBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulClusteredTimeoutBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulRemoteProxyFactory.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTimeoutBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTxBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/TreeCacheStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleContainedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleDeepNestedContainedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleDeepNestedStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleLocalContainedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleLocalNestedStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleParentStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleRemoteNestedStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleShoppingCartBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateless/CheckedStatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateless/DefaultPoolStatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateless/RunAsStatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateless/StrictMaxPoolStatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/statelesscreation/DestroyStatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/statelesscreation/ThreadLocalPoolStatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledMDB.java
trunk/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledSessionBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/strictpool/StrictlyPooledMDB.java
trunk/ejb3/src/test/org/jboss/ejb3/test/strictpool/StrictlyPooledMDB2.java
trunk/ejb3/src/test/org/jboss/ejb3/test/strictpool/StrictlyPooledSessionBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/StatefulTestBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/StatelessSessionBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterBean21.java
trunk/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterService.java
trunk/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimer.java
trunk/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/KeeperBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/LowEndBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/MasterBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/XPCAltBean.java
trunk/embedded/src/test/java/org/jboss/embedded/test/ejb/SecuredBean.java
trunk/embedded/src/test/java/org/jboss/embedded/test/mdb/ExampleMDB.java
trunk/testsuite/src/main/org/jboss/test/classloader/leak/ejb3/Ejb3StatefulSessionBean.java
trunk/testsuite/src/main/org/jboss/test/classloader/leak/ejb3/Ejb3StatelessSessionBean.java
trunk/testsuite/src/main/org/jboss/test/classloader/leak/ejb3/ThreadLocalPoolEjb3StatelessSessionBean.java
trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/EJB3Client.java
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/SecurityHandlerEJB3.java
Log:
[EJBTHREE-1134] Removed External API Implementation classes from JBossAS/EJB3, now available as thirdparty lib in projects/ejb3. Refactored All EJB3 annotations into package "org.jboss.ejb3.annotation" for consistency.
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/build/build-distr.xml 2007-11-29 21:13:26 UTC (rev 67628)
@@ -166,6 +166,8 @@
excludes="*-sources.jar, *-javadoc.jar"/>
<fileset dir="${jboss.jboss.ejb3.ext.api.lib}" includes="*.jar"
excludes="*-sources.jar, *-javadoc.jar"/>
+ <fileset dir="${jboss.jboss.ejb3.impl.lib}" includes="*.jar"
+ excludes="*-sources.jar, *-javadoc.jar"/>
<fileset dir="${hibernate.commons.annotations.lib}" includes="*.jar"/>
<fileset dir="${hibernate.entitymanager.lib}" includes="*.jar"/>
<fileset dir="${hibernate.annotations.lib}" includes="*.jar"/>
@@ -190,6 +192,7 @@
<include name="jboss-aop-jdk50-client.jar"/>
</fileset>
<fileset dir="${jboss.jboss.ejb3.ext.api.lib}" includes="*.jar" excludes="*sources.jar"/>
+ <fileset dir="${jboss.jboss.ejb3.impl.lib}" includes="*.jar" excludes="*sources.jar"/>
</copy>
</target>
Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/build/build-thirdparty.xml 2007-11-29 21:13:26 UTC (rev 67628)
@@ -94,6 +94,7 @@
<componentref name="jboss/jaxr" version="1.2.0.GA"/>
<componentref name="jboss/jboss-ejb3-cache" version="0.11.1"/>
<componentref name="jboss/jboss-ejb3-ext-api" version="0.1.1-SNAPSHOT"/>
+ <componentref name="jboss/jboss-ejb3-impl" version="0.1.1-SNAPSHOT"/>
<componentref name="jboss/jboss-jaspi-api" version="1.0-BETA1"/>
<componentref name="jboss/jboss-javaee" version="5.0.0.Beta3"/>
<componentref name="jboss/jboss-security-spi" version="2.0.1.GA"/>
Modified: trunk/ejb3/.classpath
===================================================================
--- trunk/ejb3/.classpath 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/.classpath 2007-11-29 21:13:26 UTC (rev 67628)
@@ -68,5 +68,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-ext-api/lib/jboss-ejb3-ext-api.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-ext-api/lib/jboss-ejb3-ext-api-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/ha/lib/jboss-ha-client.jar" sourcepath="/thirdparty/jboss/ha/lib/jboss-ha-client-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-cache/lib/jboss-ejb3-cache.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-cache/lib/jboss-ejb3-cache-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-impl/lib/jboss-ejb3-impl.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/ejb3/build-test.xml
===================================================================
--- trunk/ejb3/build-test.xml 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/build-test.xml 2007-11-29 21:13:26 UTC (rev 67628)
@@ -161,6 +161,7 @@
<path refid="jboss.integration.classpath"/>
<path refid="jboss.jboss.ejb3.cache.classpath"/>
<path refid="jboss.jboss.ejb3.ext.api.classpath"/>
+ <path refid="jboss.jboss.ejb3.impl.classpath"/>
<path refid="jboss.metadata.classpath"/>
<path refid="jboss.ha.classpath"/>
<path refid="sun.jaxb.classpath"/>
@@ -3861,6 +3862,7 @@
<path refid="jboss.common.logging.spi.classpath"/>
<path refid="jboss.common.logging.log4j.classpath"/>
<path refid="jboss.common.logging.jdk.classpath"/>
+ <path refid="jboss.jboss.ejb3.impl.classpath"/>
<path refid="jboss.aop.classpath"/>
<path refid="jboss.aspects.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
Modified: trunk/ejb3/build.xml
===================================================================
--- trunk/ejb3/build.xml 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/build.xml 2007-11-29 21:13:26 UTC (rev 67628)
@@ -113,6 +113,7 @@
<path refid="jboss.integration.classpath"/>
<path refid="jboss.jboss.ejb3.cache.classpath"/>
<path refid="jboss.jboss.ejb3.ext.api.classpath" />
+ <path refid="jboss.jboss.ejb3.impl.classpath" />
</path>
<!-- ======= -->
Deleted: trunk/ejb3/src/main/org/jboss/annotation/IgnoreDependencyImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/IgnoreDependencyImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/IgnoreDependencyImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation;
-
-import java.lang.annotation.Annotation;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class IgnoreDependencyImpl implements IgnoreDependency
-{
- public IgnoreDependencyImpl()
- {
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return IgnoreDependency.class;
- }
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/AspectDomainImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/AspectDomainImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/AspectDomainImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public class AspectDomainImpl implements AspectDomain
-{
- String value = "";
-
- public AspectDomainImpl(String value)
- {
- this.value = value;
- }
-
- public String value()
- {
- return value;
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return AspectDomain.class;
- }
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/ClusteredImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/ClusteredImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/ClusteredImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,85 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class ClusteredImpl implements Clustered
-{
- private Class loadBalancePolicy = LoadBalancePolicy.class;
- private Class homeLoadBalancePolicy = LoadBalancePolicy.class;
- private String partition = "${jboss.partition.name:DefaultPartition}";
-
-
- public Class loadBalancePolicy()
- {
- return loadBalancePolicy;
- }
-
- public void setLoadBalancePolicy(Class loadBalancePolicy)
- {
- this.loadBalancePolicy = loadBalancePolicy;
- }
-
- public String partition()
- {
- return partition;
- }
-
- public void setPartition(String partition)
- {
- this.partition = partition;
- }
-
- public Class homeLoadBalancePolicy()
- {
- return homeLoadBalancePolicy;
- }
-
- public void setHomeLoadBalancePolicy(Class homeLoadBalancePolicy)
- {
- this.homeLoadBalancePolicy = homeLoadBalancePolicy;
- }
-
- public Class annotationType()
- {
- return Clustered.class;
- }
-
- public String toString()
- {
- StringBuffer sb = new StringBuffer(100);
- sb.append("[");
- sb.append("loadBalancePolicy=").append(loadBalancePolicy);
- sb.append("homeLoadBalancePolicy=").append(homeLoadBalancePolicy);
- sb.append("partition=").append(partition);
- sb.append("]");
- return sb.toString();
- }
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/ConsumerImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/ConsumerImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/ConsumerImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,87 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import javax.ejb.ActivationConfigProperty;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class ConsumerImpl implements Consumer
-{
- private String name = "";
- private HashMap<String, ActivationConfigProperty> activationConfig = new HashMap<String, ActivationConfigProperty>();
-
- public ConsumerImpl(Consumer consumer)
- {
- if (consumer != null)
- {
- name = consumer.name();
- if (consumer.activationConfig() != null)
- {
- for (ActivationConfigProperty prop : consumer.activationConfig())
- {
- activationConfig.put(prop.propertyName(), prop);
- }
- }
- }
- }
-
- public String name()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- public ActivationConfigProperty[] activationConfig()
- {
- ActivationConfigProperty[] result = new ActivationConfigProperty[activationConfig.size()];
- int i = 0;
- for (Iterator<ActivationConfigProperty> it = activationConfig.values().iterator() ; it.hasNext() ; )
- {
- result[i++] = it.next();
- }
- return result;
- }
-
- public void addActivationConfig(ActivationConfigProperty config)
- {
- activationConfig.put(config.propertyName(), config);
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return Consumer.class;
- }
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessageImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessageImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/CurrentMessageImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class CurrentMessageImpl implements CurrentMessage
-{
-
- public CurrentMessageImpl()
- {
-
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return CurrentMessage.class;
- }
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/DefaultActivationSpecsImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/DefaultActivationSpecsImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/DefaultActivationSpecsImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,70 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class DefaultActivationSpecsImpl implements DefaultActivationSpecs
-{
- private HashMap activationConfigProperties = new HashMap();
-
- public DefaultActivationSpecsImpl()
- {
- }
-
- public ActivationConfigProperty[] value()
- {
- ActivationConfigProperty[] value = new ActivationConfigProperty[activationConfigProperties.size()];
- activationConfigProperties.values().toArray(value);
- return value;
- }
-
- public void addActivationConfigProperty(ActivationConfigProperty property)
- {
- activationConfigProperties.put(property.propertyName(), property);
- }
-
- public void merge(DefaultActivationSpecs annotation)
- {
- for (ActivationConfigProperty property : annotation.value())
- {
- if (!activationConfigProperties.containsKey(property.propertyName()))
- {
- activationConfigProperties.put(property.propertyName(), property);
- }
- }
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return DefaultActivationSpecs.class;
- }
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/DependsImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/DependsImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/DependsImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class DependsImpl implements Depends
-{
- private ArrayList<String> dependencies = new ArrayList();
-
- public DependsImpl()
- {
- }
-
- public String[] value()
- {
- String[] value = new String[dependencies.size()];
- dependencies.toArray(value);
- return value;
- }
-
- public void addDependency(String dependency)
- {
- dependencies.add(dependency);
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return Depends.class;
- }
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/ExcludeClassInterceptorsImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/ExcludeClassInterceptorsImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/ExcludeClassInterceptorsImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-
-import javax.interceptor.ExcludeClassInterceptors;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class ExcludeClassInterceptorsImpl implements ExcludeClassInterceptors
-{
-
- public Class<? extends Annotation> annotationType()
- {
- return ExcludeClassInterceptors.class;
- }
-
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/ExcludeDefaultInterceptorsImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/ExcludeDefaultInterceptorsImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/ExcludeDefaultInterceptorsImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-
-import javax.interceptor.ExcludeDefaultInterceptors;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision$
- */
-public class ExcludeDefaultInterceptorsImpl implements ExcludeDefaultInterceptors
-{
-
- public Class<? extends Annotation> annotationType()
- {
- return ExcludeDefaultInterceptors.class;
- }
-
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/JndiBindingPolicyImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/JndiBindingPolicyImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/JndiBindingPolicyImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-
-import org.jboss.ejb3.jndipolicy.DefaultJndiBindingPolicy;
-
-/**
- * Implementation of JndiBindingPolicy annotation
- *
- * @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
- * @version $Revision: $
- */
-public class JndiBindingPolicyImpl implements JndiBindingPolicy
-{
-
- // Instance Members
- private Class<? extends DefaultJndiBindingPolicy> policy;
-
- // Contracts
-
- public Class<? extends DefaultJndiBindingPolicy> policy(){
- return policy;
- }
-
- public void setPolicy(Class<? extends DefaultJndiBindingPolicy> policy)
- {
- this.policy = policy;
- }
-
- // Required Implementations
-
- public Class<? extends Annotation> annotationType()
- {
- return JndiBindingPolicy.class;
- }
-
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/LocalBindingImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/LocalBindingImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/LocalBindingImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-import org.jboss.annotation.ejb.LocalBinding;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class LocalBindingImpl implements LocalBinding
-{
- private String jndi;
-
- public LocalBindingImpl(String jndi)
- {
- this.jndi = jndi;
- }
-
- public String jndiBinding()
- {
- return jndi;
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return LocalBinding.class;
- }
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/LocalHomeBindingImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/LocalHomeBindingImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/LocalHomeBindingImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class LocalHomeBindingImpl implements LocalHomeBinding
-{
- private String jndi;
-
- public LocalHomeBindingImpl(String jndi)
- {
- this.jndi = jndi;
- }
-
- public String jndiBinding()
- {
- return jndi;
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return LocalHomeBinding.class;
- }
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/LocalHomeImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/LocalHomeImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/LocalHomeImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import javax.ejb.LocalHome;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class LocalHomeImpl implements LocalHome
-{
- private Class<?> value;
-
- public LocalHomeImpl(Class<?> value)
- {
- this.value = value;
- }
-
- public Class<?> value()
- {
- return value;
- }
-
- public Class<LocalHome> annotationType()
- {
- return LocalHome.class;
- }
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/LocalImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/LocalImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/LocalImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-import org.jboss.annotation.ejb.LocalBinding;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version $Revision$
- */
-public class LocalImpl implements Local
-{
-
- public LocalImpl()
- {
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return Local.class;
- }
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/ManagementImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/ManagementImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/ManagementImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class ManagementImpl implements Management
-{
- private Class value;
-
- public ManagementImpl(Class value)
- {
- this.value = value;
- }
-
- public void setObjectName(Class value)
- {
- this.value = value;
- }
-
- public Class value()
- {
- return value;
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return Management.class;
- }
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/MessagePropertiesImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/MessagePropertiesImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/MessagePropertiesImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,101 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-import java.io.Serializable;
-import org.jboss.annotation.ejb.DeliveryMode;
-import org.jboss.annotation.ejb.MessageProperties;
-
-/**
- * comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- */
-public class MessagePropertiesImpl implements MessageProperties, Serializable
-{
- private static final long serialVersionUID = 4630480271844522009L;
-
- private DeliveryMode deliveryMode = DeliveryMode.PERSISTENT;
- private int ttl = 0;
- private int priority = 4;
- private Class interfac;
-
- public MessagePropertiesImpl(DeliveryMode deliveryMode, int ttl, int priority)
- {
- this.deliveryMode = deliveryMode;
- this.ttl = ttl;
- this.priority = priority;
- }
-
- public MessagePropertiesImpl(MessageProperties props)
- {
- deliveryMode = props.delivery();
- ttl = props.timeToLive();
- priority = props.priority();
- }
-
- public void setDelivery(DeliveryMode mode)
- {
- this.deliveryMode = mode;
- }
-
- public void setPriority(int priority)
- {
- this.priority = priority;
- }
-
- public MessagePropertiesImpl()
- {
-
- }
-
- public DeliveryMode delivery()
- {
- return deliveryMode;
- }
-
- public int timeToLive()
- {
- return ttl;
- }
-
- public int priority()
- {
- return priority;
- }
-
- public Class getInterface()
- {
- return interfac;
- }
-
- public void setInterface(Class interfac)
- {
- this.interfac = interfac;
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return MessageProperties.class;
- }
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/PoolImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/PoolImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/PoolImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,85 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class PoolImpl implements Pool
-{
- public String value;
- public int maxSize = 30;
- public long timeout = Long.MAX_VALUE;
-
- public PoolImpl()
- {
- }
-
- public String value()
- {
- return value;
- }
-
- public void setValue(String value)
- {
- this.value = value;
- }
-
- public int maxSize()
- {
- return maxSize;
- }
-
- public void setMaxSize(int maxSize)
- {
- this.maxSize = maxSize;
- }
-
- public long timeout()
- {
- return timeout;
- }
-
- public void setTimeout(long timeout)
- {
- this.timeout = timeout;
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return Pool.class;
- }
-
- public String toString()
- {
- StringBuffer sb = new StringBuffer(100);
- sb.append("[PoolFactory name:");
- sb.append("value=").append(value);
- sb.append(", maxSize=").append(maxSize);
- sb.append(", timeout=").append(timeout);
- sb.append("]");
- return sb.toString();
- }
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/RemoteBindingImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/RemoteBindingImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/RemoteBindingImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,137 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-
-import org.jboss.ejb3.defaults.RemoteBindingDefaults;
-import org.jboss.ejb3.util.Debugger;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class RemoteBindingImpl implements RemoteBinding
-{
- private String jndi;
- private String stack;
- private String bindUrl;
- private String proxyFactory;
-
- private StackTraceElement constructionPoint;
-
- public RemoteBindingImpl()
- {
- jndi = "";
- stack = "";
- bindUrl = "";
- proxyFactory = RemoteBindingDefaults.PROXY_FACTORY_DEFAULT;
-
- this.constructionPoint = Debugger.constructionPoint();
- }
-
- public RemoteBindingImpl(String jndi, String stack, String bindUrl, String proxyFactory)
- {
- this.jndi = jndi;
- this.stack = stack;
- this.bindUrl = bindUrl;
- this.proxyFactory = proxyFactory;
-
- this.constructionPoint = Debugger.constructionPoint();
- }
-
- public void setStack(String stack)
- {
- this.stack = stack;
- }
-
- public void setFactory(String factory)
- {
- this.proxyFactory = factory;
- }
-
- public void setJndiBinding(String jndi)
- {
- this.jndi = jndi;
- }
-
- public void setBindUrl(String bindUrl)
- {
- this.bindUrl = bindUrl;
- }
-
- public String jndiBinding()
- {
- return jndi;
- }
-
- public String interceptorStack()
- {
- return stack;
- }
-
- public String clientBindUrl()
- {
- return bindUrl;
- }
-
- public String factory()
- {
- return proxyFactory;
- }
-
- public void merge(RemoteBinding annotation)
- {
- if (jndi.length() == 0)
- jndi = annotation.jndiBinding();
-
- if (stack.length() == 0)
- stack = annotation.interceptorStack();
-
- if (bindUrl.length() == 0)
- bindUrl = annotation.clientBindUrl();
-
- if (proxyFactory.equals(RemoteBindingDefaults.PROXY_FACTORY_DEFAULT))
- proxyFactory = annotation.factory();
-
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return RemoteBinding.class;
- }
-
- public String toString()
- {
- StringBuffer sb = new StringBuffer(100);
- sb.append("[RemoteBindingImpl:");
- sb.append(", jndi=" + jndi);
- sb.append(", stack=" + stack);
- sb.append(", bindUrl=" + bindUrl);
- sb.append(", proxyFactory=" + proxyFactory);
- sb.append(", constructionPoint=" + constructionPoint);
- sb.append(']');
- return sb.toString();
- }
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/RemoteBindingsImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/RemoteBindingsImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/RemoteBindingsImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-import java.util.List;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindings;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class RemoteBindingsImpl implements RemoteBindings
-{
- private RemoteBinding[] bindings;
-
- public RemoteBindingsImpl(RemoteBinding[] bindings)
- {
- this.bindings = bindings;
- }
-
- public RemoteBindingsImpl(List bindings)
- {
- this.bindings = (RemoteBinding[])bindings.toArray(new RemoteBinding[bindings.size()]);
- }
-
- public RemoteBinding[] value()
- {
- return bindings;
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return RemoteBindings.class;
- }
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/RemoteHomeBindingImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/RemoteHomeBindingImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/RemoteHomeBindingImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,74 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class RemoteHomeBindingImpl implements RemoteHomeBinding
-{
- private String jndi;
-
- public RemoteHomeBindingImpl()
- {
- jndi = "";
- }
-
- public RemoteHomeBindingImpl(String jndi)
- {
- this.jndi = jndi;
- }
-
- public void setJndiBinding(String jndi)
- {
- this.jndi = jndi;
- }
-
- public String jndiBinding()
- {
- return jndi;
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return RemoteHomeBinding.class;
- }
-
- public String toString()
- {
- StringBuffer sb = new StringBuffer(100);
- sb.append("[RemoteHomeBindingImpl:");
- sb.append(", jndi=" + jndi);
- sb.append(']');
- return sb.toString();
- }
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/RemoteHomeImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/RemoteHomeImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/RemoteHomeImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import javax.ejb.RemoteHome;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class RemoteHomeImpl implements RemoteHome
-{
- private Class<?> value;
-
- public RemoteHomeImpl(Class<?> value)
- {
- this.value = value;
- }
-
- public Class<?> value()
- {
- return value;
- }
-
- public Class<RemoteHome> annotationType()
- {
- return RemoteHome.class;
- }
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapterImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapterImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/ResourceAdapterImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class ResourceAdapterImpl implements ResourceAdapter
-{
- private String adapter;
-
- public ResourceAdapterImpl(String adapter)
- {
- this.adapter = adapter;
- }
-
- public String value() { return adapter; }
-
- public Class<? extends Annotation> annotationType()
- {
- return ResourceAdapter.class;
- }
-
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccessImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccessImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/SerializedConcurrentAccessImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class SerializedConcurrentAccessImpl implements SerializedConcurrentAccess
-{
- public SerializedConcurrentAccessImpl()
- {
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return SerializedConcurrentAccess.class;
- }
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/ServiceImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/ServiceImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/ServiceImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,85 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class ServiceImpl implements Service
-{
- private String objectName = "";
- private String name = "";
- private String xmbean = "";
-
- public ServiceImpl(Service service)
- {
- if (service != null)
- {
- objectName = service.objectName();
- name = service.name();
- }
- }
-
- public ServiceImpl(String objectName)
- {
- this.objectName = objectName;
- }
-
- public void setObjectName(String objectName)
- {
- this.objectName = objectName;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- public String objectName()
- {
- return objectName;
- }
-
- public String name()
- {
- return name;
- }
-
- public void setXMBean(String xmbean)
- {
- this.xmbean = xmbean;
- }
-
- public String xmbean()
- {
- return xmbean;
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return Service.class;
- }
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeoutImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeoutImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/TransactionTimeoutImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,61 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class TransactionTimeoutImpl implements TransactionTimeout
-{
- private int value = 0;
-
- public TransactionTimeoutImpl()
- {
-
- }
-
- public TransactionTimeoutImpl(int value)
- {
- this.value = value;
- }
-
- public void setValue(int value)
- {
- this.value = value;
- }
-
- public int value()
- {
- return value;
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return TransactionTimeout.class;
- }
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheConfigImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheConfigImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheConfigImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,133 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb.cache;
-
-import java.lang.annotation.Annotation;
-
-/**
- * Implementation of CacheConfig Annotation
- *
- * @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
- * @version $Revision: $
- */
-public class CacheConfigImpl implements CacheConfig
-{
-
- // Instance Members
-
- private String name;
-
- private int maxSize = CacheConfig.DEFAULT_NONCLUSTERED_MAX_SIZE;
-
- private long idleTimeoutSeconds = CacheConfig.DEFAULT_IDLE_TIMEOUT_SECONDS;
-
- private long removalTimeoutSeconds = CacheConfig.DEFAULT_REMOVAL_TIMEOUT_SECONDS;
-
- private boolean replicationIsPassivation = CacheConfig.DEFAULT_REPL_IS_PASV;
-
- // Constructor
-
- public CacheConfigImpl()
- {
- }
-
- // Accessors / Mutators
-
- public String name()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- public int maxSize()
- {
- return maxSize;
- }
-
- public void setMaxSize(int maxSize)
- {
- this.maxSize = maxSize;
- }
-
- public long idleTimeoutSeconds()
- {
- return idleTimeoutSeconds;
- }
-
- public void setIdleTimeoutSeconds(long idleTimeoutSeconds)
- {
- this.idleTimeoutSeconds = idleTimeoutSeconds;
- }
-
- public long removalTimeoutSeconds()
- {
- return removalTimeoutSeconds;
- }
-
- public void setRemovalTimeoutSeconds(long removalTimeoutSeconds)
- {
- this.removalTimeoutSeconds = removalTimeoutSeconds;
- }
-
- public boolean replicationIsPassivation()
- {
- return replicationIsPassivation;
- }
-
- public void setReplicationIsPassivation(boolean replicationIsPassivation)
- {
- this.replicationIsPassivation = replicationIsPassivation;
- }
-
- public void merge(CacheConfig annotation)
- {
- if (maxSize == CacheConfig.DEFAULT_NONCLUSTERED_MAX_SIZE)
- {
- maxSize = annotation.maxSize();
- }
-
- if (idleTimeoutSeconds == CacheConfig.DEFAULT_IDLE_TIMEOUT_SECONDS)
- {
- idleTimeoutSeconds = annotation.idleTimeoutSeconds();
- }
-
- if (removalTimeoutSeconds == CacheConfig.DEFAULT_REMOVAL_TIMEOUT_SECONDS)
- {
- removalTimeoutSeconds = annotation.removalTimeoutSeconds();
- }
-
- if (replicationIsPassivation == CacheConfig.DEFAULT_REPL_IS_PASV)
- {
- replicationIsPassivation = annotation.replicationIsPassivation();
- }
-
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return CacheConfig.class;
- }
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.annotation.ejb.cache;
-
-import java.lang.annotation.Annotation;
-
-import org.jboss.ejb3.cache.Ejb3CacheFactory;
-
-/**
- * Implementation of @Cache annotation
- *
- * @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
- * @version $Revision$
- */
-public class CacheImpl implements Cache
-{
- private String value;
-
- public CacheImpl(String value)
- {
- this.value = value;
- }
-
- public String value()
- {
- return value;
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return Cache.class;
- }
-}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/EJB3Util.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/EJB3Util.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/EJB3Util.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -58,19 +58,19 @@
public static boolean isService(AnnotationsAttribute group)
{
- return group.getAnnotation(org.jboss.annotation.ejb.Service.class.getName()) != null;
+ return group.getAnnotation(org.jboss.ejb3.annotation.Service.class.getName()) != null;
}
public static boolean isConsumer(AnnotationsAttribute group)
{
- return group.getAnnotation(org.jboss.annotation.ejb.Consumer.class.getName()) != null;
+ return group.getAnnotation(org.jboss.ejb3.annotation.Consumer.class.getName()) != null;
}
public static String getAspectDomain(AnnotationsAttribute visible, String defaultContainerName)
{
if (visible != null )
{
- Annotation dinfo = visible.getAnnotation(org.jboss.annotation.ejb.AspectDomain.class
+ Annotation dinfo = visible.getAnnotation(org.jboss.ejb3.annotation.AspectDomain.class
.getName());
if (dinfo != null)
{
Modified: trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -55,8 +55,6 @@
import javax.naming.Reference;
import javax.naming.StringRefAddr;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.aop.AspectManager;
import org.jboss.aop.ClassContainer;
import org.jboss.aop.MethodInfo;
@@ -64,6 +62,8 @@
import org.jboss.aop.annotation.AnnotationElement;
import org.jboss.aop.joinpoint.ConstructorInvocation;
import org.jboss.aop.util.MethodHashing;
+import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.ejb3.deployers.Ejb3Deployer;
import org.jboss.ejb3.deployers.JBoss5DependencyPolicy;
import org.jboss.ejb3.entity.PersistenceUnitDeployment;
@@ -803,7 +803,7 @@
protected void initializePool() throws Exception
{
- org.jboss.annotation.ejb.Pool poolAnnotation = getAnnotation(org.jboss.annotation.ejb.Pool.class);
+ org.jboss.ejb3.annotation.Pool poolAnnotation = getAnnotation(org.jboss.ejb3.annotation.Pool.class);
if (poolAnnotation == null)
throw new IllegalStateException("No pool annotation");
String registeredPoolName = poolAnnotation.value();
Modified: trunk/ejb3/src/main/org/jboss/ejb3/EJBContextImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/EJBContextImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/EJBContextImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -40,17 +40,14 @@
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.aop.Advisor;
-import org.jboss.ejb3.metamodel.EnterpriseBean;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.ejb3.tx.TxUtil;
import org.jboss.ejb3.tx.UserTransactionImpl;
import org.jboss.logging.Logger;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.javaee.spec.SecurityRoleRefMetaData;
import org.jboss.security.RealmMapping;
-import org.jboss.security.RunAsIdentity;
-import org.jboss.security.SecurityAssociation;
import org.jboss.security.SecurityContext;
import org.jboss.security.SimplePrincipal;
import org.jboss.security.integration.ejb.EJBAuthorizationHelper;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/EJBMetaDataLoader.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/EJBMetaDataLoader.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/EJBMetaDataLoader.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -27,8 +27,8 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.annotation.security.SecurityDomainImpl;
+import org.jboss.ejb3.annotation.SecurityDomain;
+import org.jboss.ejb3.annotation.impl.SecurityDomainImpl;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.plugins.loader.BasicMetaDataLoader;
import org.jboss.metadata.spi.retrieval.AnnotationItem;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/Ejb3AnnotationHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/Ejb3AnnotationHandler.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/Ejb3AnnotationHandler.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,27 +21,28 @@
*/
package org.jboss.ejb3;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
+
import javassist.bytecode.AnnotationsAttribute;
import javassist.bytecode.ClassFile;
import javassist.bytecode.annotation.Annotation;
import javassist.bytecode.annotation.StringMemberValue;
+
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+
import org.jboss.aop.AspectManager;
import org.jboss.aop.DomainDefinition;
-import org.jboss.ejb3.metamodel.EnterpriseBean;
import org.jboss.ejb3.mdb.ConsumerContainer;
import org.jboss.ejb3.mdb.MDB;
+import org.jboss.ejb3.metamodel.EnterpriseBean;
import org.jboss.ejb3.service.ServiceContainer;
import org.jboss.ejb3.stateful.StatefulContainer;
import org.jboss.ejb3.stateless.StatelessContainer;
import org.jboss.logging.Logger;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
* @author <a href="mailto:bill at jboss.com">Bill Burke</a>
@@ -321,14 +322,14 @@
}
else
{
- annotation = visible.getAnnotation(org.jboss.annotation.ejb.Service.class.getName());
+ annotation = visible.getAnnotation(org.jboss.ejb3.annotation.Service.class.getName());
if (annotation != null)
{
ejbType = EJB_TYPE.SERVICE;
}
else
{
- annotation = visible.getAnnotation(org.jboss.annotation.ejb.Consumer.class.getName());
+ annotation = visible.getAnnotation(org.jboss.ejb3.annotation.Consumer.class.getName());
if (annotation != null)
{
ejbType = EJB_TYPE.CONSUMER;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -45,6 +45,7 @@
import org.hibernate.ejb.packaging.PersistenceMetadata;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.ejb3.cache.CacheFactoryRegistry;
+import org.jboss.ejb3.cache.persistence.PersistenceManagerFactoryRegistry;
import org.jboss.ejb3.deployers.Ejb3Deployer;
import org.jboss.ejb3.enc.EjbModuleEjbResolver;
import org.jboss.ejb3.enc.EjbModulePersistenceUnitResolver;
@@ -199,6 +200,11 @@
return this.getDeployer().getRemoteProxyFactoryRegistry();
}
+ public PersistenceManagerFactoryRegistry getPersistenceManagerFactoryRegistry()
+ {
+ return this.getDeployer().getPersistenceManagerFactoryRegistry();
+ }
+
/**
* Returns a partial MBean attribute name of the form
* ",ear=foo.ear,jar=foo.jar"
Deleted: trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DeploymentSummary.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DeploymentSummary.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DeploymentSummary.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,136 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3;
-
-import java.io.Serializable;
-
-/**
- * Summary of an EJB3 deployment in flat properties; used in
- * determining default JNDI Bindings by a JNDI Binding Policy
- *
- * @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
- * @version $Revision: $
- */
-public class Ejb3DeploymentSummary implements Serializable
-{
- // Instance Members
-
- private String deploymentName;
-
- private String deploymentScopeBaseName;
-
- private String ejbName;
-
- private Class<?> beanClass;
-
- private boolean isLocal;
-
- private boolean isStateful;
-
- private boolean isHome;
-
- private boolean isService;
-
- // Accessors / Mutators
-
- public String getDeploymentName()
- {
- return deploymentName;
- }
-
- public void setDeploymentName(String deploymentName)
- {
- this.deploymentName = deploymentName;
- }
-
- public String getEjbName()
- {
- return ejbName;
- }
-
- public void setEjbName(String ejbName)
- {
- this.ejbName = ejbName;
- }
-
- public boolean isLocal()
- {
- return isLocal;
- }
-
- public void setLocal(boolean isLocal)
- {
- this.isLocal = isLocal;
- }
-
- public boolean isStateful()
- {
- return isStateful;
- }
-
- public void setStateful(boolean isStateful)
- {
- this.isStateful = isStateful;
- }
-
- public boolean isHome()
- {
- return isHome;
- }
-
- public void setHome(boolean isHome)
- {
- this.isHome = isHome;
- }
-
- public boolean isService()
- {
- return isService;
- }
-
- public void setService(boolean isService)
- {
- this.isService = isService;
- }
-
- public String getDeploymentScopeBaseName()
- {
- return deploymentScopeBaseName;
- }
-
- public void setDeploymentScopeBaseName(String deploymentScopeBaseName)
- {
- this.deploymentScopeBaseName = deploymentScopeBaseName;
- }
-
- public Class<?> getBeanClass()
- {
- return beanClass;
- }
-
- public void setBeanClass(Class<?> beanClass)
- {
- this.beanClass = beanClass;
- }
-
-
-}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -58,57 +58,6 @@
import javax.interceptor.ExcludeDefaultInterceptors;
import javax.interceptor.Interceptors;
-import org.jboss.annotation.IgnoreDependency;
-import org.jboss.annotation.IgnoreDependencyImpl;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.ClusteredImpl;
-import org.jboss.annotation.ejb.Consumer;
-import org.jboss.annotation.ejb.ConsumerImpl;
-import org.jboss.annotation.ejb.CurrentMessage;
-import org.jboss.annotation.ejb.CurrentMessageImpl;
-import org.jboss.annotation.ejb.DefaultActivationSpecs;
-import org.jboss.annotation.ejb.DefaultActivationSpecsImpl;
-import org.jboss.annotation.ejb.DeliveryMode;
-import org.jboss.annotation.ejb.Depends;
-import org.jboss.annotation.ejb.DependsImpl;
-import org.jboss.annotation.ejb.ExcludeClassInterceptorsImpl;
-import org.jboss.annotation.ejb.ExcludeDefaultInterceptorsImpl;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.LocalBindingImpl;
-import org.jboss.annotation.ejb.LocalHomeBinding;
-import org.jboss.annotation.ejb.LocalHomeBindingImpl;
-import org.jboss.annotation.ejb.LocalHomeImpl;
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.ManagementImpl;
-import org.jboss.annotation.ejb.MessageProperties;
-import org.jboss.annotation.ejb.MessagePropertiesImpl;
-import org.jboss.annotation.ejb.Pool;
-import org.jboss.annotation.ejb.PoolImpl;
-import org.jboss.annotation.ejb.Producers;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindingImpl;
-import org.jboss.annotation.ejb.RemoteBindings;
-import org.jboss.annotation.ejb.RemoteBindingsImpl;
-import org.jboss.annotation.ejb.RemoteHomeBinding;
-import org.jboss.annotation.ejb.RemoteHomeBindingImpl;
-import org.jboss.annotation.ejb.RemoteHomeImpl;
-import org.jboss.annotation.ejb.ResourceAdapter;
-import org.jboss.annotation.ejb.ResourceAdapterImpl;
-import org.jboss.annotation.ejb.SerializedConcurrentAccess;
-import org.jboss.annotation.ejb.SerializedConcurrentAccessImpl;
-import org.jboss.annotation.ejb.Service;
-import org.jboss.annotation.ejb.ServiceImpl;
-import org.jboss.annotation.ejb.TransactionTimeout;
-import org.jboss.annotation.ejb.TransactionTimeoutImpl;
-import org.jboss.annotation.ejb.cache.Cache;
-import org.jboss.annotation.ejb.cache.CacheImpl;
-import org.jboss.annotation.ejb.cache.simple.PersistenceManager;
-import org.jboss.annotation.ejb.cache.simple.PersistenceManagerImpl;
-import org.jboss.annotation.internal.DefaultInterceptorMarker;
-import org.jboss.annotation.internal.DefaultInterceptorMarkerImpl;
-import org.jboss.annotation.security.RunAsPrincipalImpl;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.annotation.security.SecurityDomainImpl;
import org.jboss.aop.annotation.AnnotationRepository;
import org.jboss.ejb.ActivationConfigPropertyImpl;
import org.jboss.ejb.AroundInvokeImpl;
@@ -131,13 +80,65 @@
import org.jboss.ejb.StatelessImpl;
import org.jboss.ejb.TransactionAttributeImpl;
import org.jboss.ejb.TransactionManagementImpl;
+import org.jboss.ejb3.annotation.Cache;
+import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.ejb3.annotation.Consumer;
+import org.jboss.ejb3.annotation.CurrentMessage;
+import org.jboss.ejb3.annotation.DefaultActivationSpecs;
+import org.jboss.ejb3.annotation.DefaultInterceptorMarker;
+import org.jboss.ejb3.annotation.DeliveryMode;
+import org.jboss.ejb3.annotation.Depends;
+import org.jboss.ejb3.annotation.IgnoreDependency;
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.LocalHomeBinding;
+import org.jboss.ejb3.annotation.Management;
+import org.jboss.ejb3.annotation.MessageProperties;
+import org.jboss.ejb3.annotation.PersistenceManager;
+import org.jboss.ejb3.annotation.Pool;
+import org.jboss.ejb3.annotation.Producers;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBindings;
+import org.jboss.ejb3.annotation.RemoteHomeBinding;
+import org.jboss.ejb3.annotation.ResourceAdapter;
+import org.jboss.ejb3.annotation.SecurityDomain;
+import org.jboss.ejb3.annotation.SerializedConcurrentAccess;
+import org.jboss.ejb3.annotation.Service;
+import org.jboss.ejb3.annotation.TransactionTimeout;
+import org.jboss.ejb3.annotation.impl.CacheImpl;
+import org.jboss.ejb3.annotation.impl.ClusteredImpl;
+import org.jboss.ejb3.annotation.impl.ConsumerImpl;
+import org.jboss.ejb3.annotation.impl.CurrentMessageImpl;
+import org.jboss.ejb3.annotation.impl.DefaultActivationSpecsImpl;
+import org.jboss.ejb3.annotation.impl.DefaultInterceptorMarkerImpl;
+import org.jboss.ejb3.annotation.impl.DependsImpl;
+import org.jboss.ejb3.annotation.impl.ExcludeClassInterceptorsImpl;
+import org.jboss.ejb3.annotation.impl.ExcludeDefaultInterceptorsImpl;
+import org.jboss.ejb3.annotation.impl.IgnoreDependencyImpl;
+import org.jboss.ejb3.annotation.impl.LocalBindingImpl;
+import org.jboss.ejb3.annotation.impl.LocalHomeBindingImpl;
+import org.jboss.ejb3.annotation.impl.LocalHomeImpl;
+import org.jboss.ejb3.annotation.impl.ManagementImpl;
+import org.jboss.ejb3.annotation.impl.MessagePropertiesImpl;
+import org.jboss.ejb3.annotation.impl.PersistenceManagerImpl;
+import org.jboss.ejb3.annotation.impl.PoolImpl;
+import org.jboss.ejb3.annotation.impl.ProducerImpl;
+import org.jboss.ejb3.annotation.impl.ProducersImpl;
+import org.jboss.ejb3.annotation.impl.RemoteBindingImpl;
+import org.jboss.ejb3.annotation.impl.RemoteBindingsImpl;
+import org.jboss.ejb3.annotation.impl.RemoteHomeBindingImpl;
+import org.jboss.ejb3.annotation.impl.RemoteHomeImpl;
+import org.jboss.ejb3.annotation.impl.ResourceAdapterImpl;
+import org.jboss.ejb3.annotation.impl.RunAsPrincipalImpl;
+import org.jboss.ejb3.annotation.impl.SecurityDomainImpl;
+import org.jboss.ejb3.annotation.impl.SerializedConcurrentAccessImpl;
+import org.jboss.ejb3.annotation.impl.ServiceImpl;
+import org.jboss.ejb3.annotation.impl.TransactionTimeoutImpl;
import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
import org.jboss.ejb3.mdb.ConsumerContainer;
import org.jboss.ejb3.mdb.MDB;
-import org.jboss.ejb3.mdb.ProducerImpl;
-import org.jboss.ejb3.mdb.ProducersImpl;
import org.jboss.ejb3.service.ServiceContainer;
import org.jboss.ejb3.stateful.StatefulContainer;
+import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
import org.jboss.logging.Logger;
import org.jboss.metadata.ejb.jboss.CacheConfigMetaData;
import org.jboss.metadata.ejb.jboss.ClusterConfigMetaData;
@@ -1446,13 +1447,15 @@
// FIXME: Wolf: what the hell is this?
// FIXME: ALR: This shouldn't be hardcoded; configuration needs reworking
- if (cacheValue == "SimpleStatefulCache")
+ if (cacheValue.equals("SimpleStatefulCache"))
{
if (!ejbClass.isAnnotationPresent(PersistenceManager.class))
{
PersistenceManagerImpl persistenceAnnotation = new PersistenceManagerImpl();
if (config.getPersistenceManager() != null)
- persistenceAnnotation.setValue(di.getClassLoader().loadClass(config.getPersistenceManager()));
+ {
+ persistenceAnnotation.setValue(config.getPersistenceManager());
+ }
addClassAnnotation(container, PersistenceManager.class, persistenceAnnotation);
}
}
@@ -1460,7 +1463,7 @@
if (config.getName() != null)
{
- org.jboss.annotation.ejb.cache.CacheConfigImpl configAnnotation = new org.jboss.annotation.ejb.cache.CacheConfigImpl();
+ org.jboss.ejb3.annotation.impl.CacheConfigImpl configAnnotation = new org.jboss.ejb3.annotation.impl.CacheConfigImpl();
configAnnotation.setName(config.getName());
@@ -1476,15 +1479,15 @@
if (config.getRemoveTimeoutSeconds() != null)
configAnnotation.setRemovalTimeoutSeconds(config.getRemoveTimeoutSeconds());
- org.jboss.annotation.ejb.cache.CacheConfig existingConfig = ejbClass.getAnnotation(org.jboss.annotation.ejb.cache.CacheConfig.class);
+ org.jboss.ejb3.annotation.CacheConfig existingConfig = ejbClass.getAnnotation(org.jboss.ejb3.annotation.CacheConfig.class);
if (existingConfig != null)
configAnnotation.merge(existingConfig);
- addClassAnnotation(container, org.jboss.annotation.ejb.cache.CacheConfig.class, configAnnotation);
+ addClassAnnotation(container, org.jboss.ejb3.annotation.CacheConfig.class, configAnnotation);
}
else
{
- org.jboss.annotation.ejb.cache.CacheConfigImpl configAnnotation = new org.jboss.annotation.ejb.cache.CacheConfigImpl();
+ org.jboss.ejb3.annotation.impl.CacheConfigImpl configAnnotation = new org.jboss.ejb3.annotation.impl.CacheConfigImpl();
if (config.getMaxSize() != null)
configAnnotation.setMaxSize(config.getMaxSize());
@@ -1495,11 +1498,11 @@
if (config.getRemoveTimeoutSeconds() != null)
configAnnotation.setRemovalTimeoutSeconds(config.getRemoveTimeoutSeconds());
- org.jboss.annotation.ejb.cache.CacheConfig existingConfig = ejbClass.getAnnotation(org.jboss.annotation.ejb.cache.CacheConfig.class);
+ org.jboss.ejb3.annotation.CacheConfig existingConfig = ejbClass.getAnnotation(org.jboss.ejb3.annotation.CacheConfig.class);
if (existingConfig != null)
configAnnotation.merge(existingConfig);
- addClassAnnotation(container, org.jboss.annotation.ejb.cache.CacheConfig.class, configAnnotation);
+ addClassAnnotation(container, org.jboss.ejb3.annotation.CacheConfig.class, configAnnotation);
}
}
@@ -1524,13 +1527,15 @@
if (config.getBeanLoadBalancePolicy() != null)
{
- Class<?> policy = di.getClassLoader().loadClass(config.getBeanLoadBalancePolicy());
+ Class<? extends LoadBalancePolicy> policy = (Class<? extends LoadBalancePolicy>) di.getClassLoader()
+ .loadClass(config.getBeanLoadBalancePolicy());
clusteredAnnotation.setLoadBalancePolicy(policy);
}
if (config.getHomeLoadBalancePolicy() != null)
{
- Class<?> policy = di.getClassLoader().loadClass(config.getHomeLoadBalancePolicy());
+ Class<? extends LoadBalancePolicy> policy = (Class<? extends LoadBalancePolicy>) di.getClassLoader()
+ .loadClass(config.getHomeLoadBalancePolicy());
clusteredAnnotation.setHomeLoadBalancePolicy(policy);
}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/ProxyFactoryHelper.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/ProxyFactoryHelper.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/ProxyFactoryHelper.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -35,17 +35,18 @@
import javax.jws.WebService;
import javax.management.ObjectName;
-import org.jboss.annotation.ejb.JndiBindingPolicy;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.LocalHomeBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindings;
-import org.jboss.annotation.ejb.RemoteHomeBinding;
import org.jboss.aop.Advisor;
import org.jboss.ejb.LocalImpl;
import org.jboss.ejb.RemoteImpl;
+import org.jboss.ejb3.annotation.JndiBindingPolicy;
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.LocalHomeBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBindings;
+import org.jboss.ejb3.annotation.RemoteHomeBinding;
import org.jboss.ejb3.jndipolicy.DefaultJndiBindingPolicy;
-import org.jboss.ejb3.jndipolicy.PackagingBasedJndiBindingPolicy;
+import org.jboss.ejb3.jndipolicy.Ejb3DeploymentSummary;
+import org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy;
import org.jboss.ejb3.remoting.RemoteProxyFactory;
import org.jboss.ejb3.service.ServiceContainer;
import org.jboss.ejb3.session.SessionContainer;
Copied: trunk/ejb3/src/main/org/jboss/ejb3/annotation/impl/ClusteredImpl.java (from rev 67580, trunk/ejb3/src/main/org/jboss/annotation/ejb/ClusteredImpl.java)
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/annotation/impl/ClusteredImpl.java (rev 0)
+++ trunk/ejb3/src/main/org/jboss/ejb3/annotation/impl/ClusteredImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.annotation.impl;
+
+import java.lang.annotation.Annotation;
+
+import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class ClusteredImpl implements Clustered
+{
+ private Class<? extends LoadBalancePolicy> loadBalancePolicy = LoadBalancePolicy.class;
+ private Class<? extends LoadBalancePolicy> homeLoadBalancePolicy = LoadBalancePolicy.class;
+ private String partition = "${jboss.partition.name:DefaultPartition}";
+
+
+ public Class<? extends LoadBalancePolicy> loadBalancePolicy()
+ {
+ return loadBalancePolicy;
+ }
+
+ public void setLoadBalancePolicy(Class<? extends LoadBalancePolicy> loadBalancePolicy)
+ {
+ this.loadBalancePolicy = loadBalancePolicy;
+ }
+
+ public String partition()
+ {
+ return partition;
+ }
+
+ public void setPartition(String partition)
+ {
+ this.partition = partition;
+ }
+
+ public Class<? extends LoadBalancePolicy> homeLoadBalancePolicy()
+ {
+ return homeLoadBalancePolicy;
+ }
+
+ public void setHomeLoadBalancePolicy(Class<? extends LoadBalancePolicy> homeLoadBalancePolicy)
+ {
+ this.homeLoadBalancePolicy = homeLoadBalancePolicy;
+ }
+
+ public Class<? extends Annotation> annotationType()
+ {
+ return Clustered.class;
+ }
+
+ public String toString()
+ {
+ StringBuffer sb = new StringBuffer(100);
+ sb.append("[");
+ sb.append("loadBalancePolicy=").append(loadBalancePolicy);
+ sb.append("homeLoadBalancePolicy=").append(homeLoadBalancePolicy);
+ sb.append("partition=").append(partition);
+ sb.append("]");
+ return sb.toString();
+ }
+}
Property changes on: trunk/ejb3/src/main/org/jboss/ejb3/annotation/impl/ClusteredImpl.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -29,12 +29,13 @@
import javax.ejb.EJBException;
import javax.ejb.NoSuchEJBException;
-import org.jboss.annotation.ejb.cache.CacheConfig;
-import org.jboss.annotation.ejb.cache.simple.PersistenceManager;
import org.jboss.aop.Advisor;
import org.jboss.ejb3.Container;
import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.PersistenceManager;
import org.jboss.ejb3.cache.StatefulCache;
+import org.jboss.ejb3.deployers.Ejb3Deployer;
import org.jboss.ejb3.pool.Pool;
import org.jboss.ejb3.stateful.StatefulBeanContext;
import org.jboss.logging.Logger;
@@ -245,7 +246,9 @@
this.pool = container.getPool();
cacheMap = new CacheMap();
PersistenceManager pmConfig = (PersistenceManager) advisor.resolveAnnotation(PersistenceManager.class);
- this.pm = (StatefulSessionPersistenceManager) pmConfig.value().newInstance();
+ EJBContainer ejbContainer = (EJBContainer)container;
+ this.pm = ejbContainer.getDeployment().getPersistenceManagerFactoryRegistry().getPersistenceManagerFactory(
+ pmConfig.value()).createPersistenceManager();
pm.initialize(container);
CacheConfig config = (CacheConfig) advisor.resolveAnnotation(CacheConfig.class);
maxSize = config.maxSize();
Added: trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/StatefulSessionFilePersistenceManagerFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/StatefulSessionFilePersistenceManagerFactory.java (rev 0)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/StatefulSessionFilePersistenceManagerFactory.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.cache.simple;
+
+import org.jboss.ejb3.cache.persistence.PersistenceManagerFactory;
+
+/**
+ * Factory for obtaining StatefulSessionFilePersistenceManager instances
+ *
+ * @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
+ * @version $Revision: $
+ */
+public class StatefulSessionFilePersistenceManagerFactory implements PersistenceManagerFactory
+{
+ public StatefulSessionPersistenceManager createPersistenceManager()
+ {
+ return new StatefulSessionFilePersistenceManager();
+ }
+
+}
Property changes on: trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/StatefulSessionFilePersistenceManagerFactory.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -32,7 +32,6 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.aop.Advisor;
import org.jboss.cache.Cache;
import org.jboss.cache.CacheException;
@@ -52,6 +51,7 @@
import org.jboss.cache.notifications.event.NodePassivatedEvent;
import org.jboss.ejb3.Container;
import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.annotation.CacheConfig;
import org.jboss.ejb3.cache.ClusteredStatefulCache;
import org.jboss.ejb3.pool.Pool;
import org.jboss.ejb3.stateful.NestedStatefulBeanContext;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -33,6 +33,7 @@
import org.jboss.ejb3.DeploymentScope;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.ejb3.cache.CacheFactoryRegistry;
+import org.jboss.ejb3.cache.persistence.PersistenceManagerFactoryRegistry;
import org.jboss.ejb3.metadata.jpa.spec.PersistenceUnitsMetaData;
import org.jboss.ejb3.pool.PoolFactoryRegistry;
import org.jboss.ejb3.remoting.RemoteProxyFactoryRegistry;
@@ -68,6 +69,8 @@
private RemoteProxyFactoryRegistry remoteProxyFactoryRegistry;
+ private PersistenceManagerFactoryRegistry persistenceManagerFactoryRegistry;
+
public Ejb3Deployer()
{
// TODO: when the annotation scanner deployer comes on, we will always have JBossMetaData
@@ -191,6 +194,16 @@
this.remoteProxyFactoryRegistry = remoteProxyFactoryRegistry;
}
+ public PersistenceManagerFactoryRegistry getPersistenceManagerFactoryRegistry()
+ {
+ return persistenceManagerFactoryRegistry;
+ }
+
+ public void setPersistenceManagerFactoryRegistry(PersistenceManagerFactoryRegistry persistenceManagerFactoryRegistry)
+ {
+ this.persistenceManagerFactoryRegistry = persistenceManagerFactoryRegistry;
+ }
+
private boolean hasAllowedSuffix(String name)
{
if(allowedSuffixes == null)
Modified: trunk/ejb3/src/main/org/jboss/ejb3/iiop/IORFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/iiop/IORFactory.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/iiop/IORFactory.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -29,18 +29,15 @@
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import javax.naming.Context;
-import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.rmi.PortableRemoteObject;
-import org.jboss.annotation.ejb.IIOP;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.aop.Advisor;
import org.jboss.classloading.spi.RealClassLoader;
-import org.jboss.ejb3.Container;
import org.jboss.ejb3.InitialContextFactory;
import org.jboss.ejb3.NonSerializableFactory;
import org.jboss.ejb3.ProxyFactoryHelper;
+import org.jboss.ejb3.annotation.IIOP;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.ejb3.remoting.RemoteProxyFactory;
import org.jboss.ejb3.session.SessionContainer;
import org.jboss.iiop.CorbaORBService;
@@ -54,7 +51,6 @@
import org.jboss.invocation.iiop.ServantRegistryKind;
import org.jboss.logging.Logger;
import org.jboss.metadata.IorSecurityConfigMetaData;
-import org.jboss.mx.loading.RepositoryClassLoader;
import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.proxy.ejb.handle.HandleDelegateImpl;
import org.jboss.system.Registry;
@@ -66,15 +62,11 @@
import org.omg.CORBA.ORB;
import org.omg.CORBA.Policy;
import org.omg.CORBA.Repository;
-import org.omg.CORBA.UserException;
import org.omg.CosNaming.NameComponent;
import org.omg.CosNaming.NamingContext;
import org.omg.CosNaming.NamingContextExt;
import org.omg.CosNaming.NamingContextExtHelper;
import org.omg.CosNaming.NamingContextHelper;
-import org.omg.CosNaming.NamingContextPackage.AlreadyBound;
-import org.omg.CosNaming.NamingContextPackage.CannotProceed;
-import org.omg.CosNaming.NamingContextPackage.InvalidName;
import org.omg.CosNaming.NamingContextPackage.NotFound;
import org.omg.PortableServer.Current;
import org.omg.PortableServer.CurrentHelper;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/interceptor/EJB3InterceptorsFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/interceptor/EJB3InterceptorsFactory.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/interceptor/EJB3InterceptorsFactory.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,26 +21,19 @@
*/
package org.jboss.ejb3.interceptor;
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Producer;
-import org.jboss.annotation.ejb.Producers;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
+import javax.jms.MessageListener;
+
import org.jboss.aop.Advisor;
import org.jboss.aop.InstanceAdvisor;
import org.jboss.aop.joinpoint.Joinpoint;
import org.jboss.aop.joinpoint.MethodJoinpoint;
import org.jboss.ejb3.EJBContainer;
-import org.jboss.ejb3.ProxyFactoryHelper;
-import org.jboss.ejb3.mdb.ConsumerContainer;
-import org.jboss.ejb3.mdb.MDB;
-import org.jboss.ejb3.service.ServiceContainer;
import org.jboss.logging.Logger;
import org.jboss.util.MethodHashing;
-import javax.jms.MessageListener;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-
/**
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
Modified: trunk/ejb3/src/main/org/jboss/ejb3/mdb/ConsumerContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/mdb/ConsumerContainer.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/mdb/ConsumerContainer.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,38 +21,37 @@
*/
package org.jboss.ejb3.mdb;
-import org.jboss.annotation.ejb.Consumer;
-import org.jboss.annotation.ejb.DefaultActivationSpecs;
-import org.jboss.annotation.ejb.Local;
-import org.jboss.annotation.ejb.MessageProperties;
-import org.jboss.annotation.ejb.MessagePropertiesImpl;
-import org.jboss.annotation.ejb.Producer;
-import org.jboss.annotation.ejb.Producers;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.Local;
+import javax.jms.Destination;
+import javax.jms.Message;
+import javax.jms.ObjectMessage;
+
import org.jboss.aop.AspectManager;
import org.jboss.aop.MethodInfo;
-import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.joinpoint.InvocationResponse;
import org.jboss.aop.joinpoint.MethodInvocation;
import org.jboss.aop.util.PayloadKey;
-import org.jboss.ejb3.Container;
import org.jboss.ejb3.EJBContainerInvocation;
import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.ejb3.annotation.Consumer;
+import org.jboss.ejb3.annotation.DefaultActivationSpecs;
+import org.jboss.ejb3.annotation.MessageProperties;
+import org.jboss.ejb3.annotation.Producer;
+import org.jboss.ejb3.annotation.Producers;
+import org.jboss.ejb3.annotation.impl.MessagePropertiesImpl;
import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
import org.jboss.logging.Logger;
import org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData;
-import javax.ejb.ActivationConfigProperty;
-import javax.jms.Destination;
-import javax.jms.Message;
-import javax.jms.ObjectMessage;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
/**
* Comment
*
Modified: trunk/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptorFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptorFactory.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/mdb/CurrentMessageInjectorInterceptorFactory.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,14 +24,13 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
-import org.jboss.aop.advice.AspectFactory;
+
import org.jboss.aop.Advisor;
import org.jboss.aop.InstanceAdvisor;
+import org.jboss.aop.advice.AspectFactory;
import org.jboss.aop.joinpoint.Joinpoint;
-import org.jboss.annotation.ejb.CurrentMessage;
+import org.jboss.ejb3.annotation.CurrentMessage;
-import org.jboss.ejb3.Container;
-
/**
* Comment
*
Modified: trunk/ejb3/src/main/org/jboss/ejb3/mdb/LocalProducerFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/mdb/LocalProducerFactory.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/mdb/LocalProducerFactory.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,13 +22,14 @@
package org.jboss.ejb3.mdb;
import java.util.Hashtable;
+
import javax.jms.Destination;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jboss.annotation.ejb.MessageProperties;
import org.jboss.aop.advice.Interceptor;
import org.jboss.ejb3.NonSerializableFactory;
+import org.jboss.ejb3.annotation.MessageProperties;
/**
* comment
Modified: trunk/ejb3/src/main/org/jboss/ejb3/mdb/MDB.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/mdb/MDB.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/mdb/MDB.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -34,12 +34,12 @@
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
-import org.jboss.annotation.ejb.DefaultActivationSpecs;
import org.jboss.aop.AspectManager;
import org.jboss.aop.MethodInfo;
import org.jboss.aop.util.MethodHashing;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.ejb3.ProxyFactoryHelper;
+import org.jboss.ejb3.annotation.DefaultActivationSpecs;
import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
/**
Modified: trunk/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,7 +21,6 @@
*/
package org.jboss.ejb3.mdb;
-import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Hashtable;
import java.util.Map;
@@ -38,7 +37,6 @@
import javax.naming.Context;
import javax.naming.NamingException;
-import org.jboss.annotation.ejb.ResourceAdapter;
import org.jboss.aop.AspectManager;
import org.jboss.aop.MethodInfo;
import org.jboss.deployment.DeploymentException;
@@ -48,6 +46,7 @@
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.ejb3.Ejb3Module;
import org.jboss.ejb3.ProxyFactoryHelper;
+import org.jboss.ejb3.annotation.ResourceAdapter;
import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
import org.jboss.ejb3.jms.JMSDestinationFactory;
import org.jboss.ejb3.mdb.inflow.JBossMessageEndpointFactory;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/mdb/ProducerFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/mdb/ProducerFactory.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/mdb/ProducerFactory.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,6 +24,7 @@
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Hashtable;
+
import javax.jms.Destination;
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -32,14 +33,16 @@
import javax.naming.RefAddr;
import javax.naming.Reference;
import javax.naming.StringRefAddr;
-import org.jboss.annotation.ejb.MessageProperties;
-import org.jboss.annotation.ejb.MessagePropertiesImpl;
-import org.jboss.annotation.ejb.Producer;
-import org.jboss.annotation.ejb.Producers;
+
import org.jboss.aop.util.MethodHashing;
import org.jboss.ejb3.Container;
import org.jboss.ejb3.JndiProxyFactory;
import org.jboss.ejb3.ProxyFactory;
+import org.jboss.ejb3.annotation.MessageProperties;
+import org.jboss.ejb3.annotation.Producer;
+import org.jboss.ejb3.annotation.Producers;
+import org.jboss.ejb3.annotation.impl.MessagePropertiesImpl;
+import org.jboss.ejb3.annotation.impl.ProducerImpl;
import org.jboss.logging.Logger;
import org.jboss.naming.Util;
Deleted: trunk/ejb3/src/main/org/jboss/ejb3/mdb/ProducerImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/mdb/ProducerImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/mdb/ProducerImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,90 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.mdb;
-
-import java.io.Serializable;
-import java.lang.annotation.Annotation;
-import org.jboss.annotation.ejb.Producer;
-
-/**
- * comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- */
-public class ProducerImpl implements Producer, Serializable
-{
- private static final long serialVersionUID = -5029440272889667348L;
-
- private String connectionFactory = "";
- private boolean transacted = false;
- private int acknowledgeMode = 1;
- private Class producer = null;
-
- public ProducerImpl(Class producer)
- {
- this.producer = producer;
- }
-
- public ProducerImpl(String connectionFactory, boolean transacted, int acknowledgeMode)
- {
- this.connectionFactory = connectionFactory;
- this.transacted = transacted;
- this.acknowledgeMode = acknowledgeMode;
- }
-
- public ProducerImpl(Producer producer)
- {
- connectionFactory = producer.connectionFactory();
- transacted = producer.transacted();
- acknowledgeMode = producer.acknowledgeMode();
- }
-
- public Class producer()
- {
- return producer;
- }
-
- public String connectionFactory()
- {
- return connectionFactory;
- }
-
- public void setConnectionFactory(String connectionFactory)
- {
- this.connectionFactory = connectionFactory;
- }
-
- public boolean transacted()
- {
- return transacted;
- }
-
- public int acknowledgeMode()
- {
- return acknowledgeMode;
- }
-
- public Class annotationType()
- {
- return Producer.class;
- }
-}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/mdb/ProducerManagerImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/mdb/ProducerManagerImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/mdb/ProducerManagerImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -28,6 +28,7 @@
import java.io.Serializable;
import java.util.HashMap;
import java.util.Hashtable;
+
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
@@ -37,13 +38,14 @@
import javax.jms.Session;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jboss.annotation.ejb.DeliveryMode;
-import org.jboss.annotation.ejb.MessageProperties;
-import org.jboss.annotation.ejb.Producer;
+
import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.joinpoint.MethodInvocation;
import org.jboss.ejb3.InitialContextFactory;
+import org.jboss.ejb3.annotation.DeliveryMode;
+import org.jboss.ejb3.annotation.MessageProperties;
+import org.jboss.ejb3.annotation.Producer;
import org.jboss.logging.Logger;
/**
Deleted: trunk/ejb3/src/main/org/jboss/ejb3/mdb/ProducersImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/mdb/ProducersImpl.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/mdb/ProducersImpl.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,62 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.mdb;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.lang.annotation.Annotation;
-import org.jboss.annotation.ejb.Producer;
-import org.jboss.annotation.ejb.Producers;
-
-/**
- * comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- */
-public class ProducersImpl implements Producers, Serializable
-{
- private static final long serialVersionUID = 6593673540842223866L;
-
- private List producers = new ArrayList();
-
- public ProducersImpl()
- {
- }
-
- public Producer[] value()
- {
- Producer[] result = new Producer[producers.size()];
- producers.toArray(result);
- return result;
- }
-
- public void addProducer(Producer producer)
- {
- producers.add(producer);
- }
-
- public Class annotationType()
- {
- return Producers.class;
- }
-}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/mdb/RemoteProducerFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/mdb/RemoteProducerFactory.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/mdb/RemoteProducerFactory.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,17 +22,18 @@
package org.jboss.ejb3.mdb;
import java.util.Hashtable;
+
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jboss.annotation.ejb.MessageProperties;
import org.jboss.aop.Dispatcher;
import org.jboss.aop.advice.Interceptor;
import org.jboss.aspects.remoting.Remoting;
import org.jboss.ejb3.Container;
import org.jboss.ejb3.ProxyFactory;
+import org.jboss.ejb3.annotation.MessageProperties;
import org.jboss.ejb3.remoting.RemoteProxyFactory;
import org.jboss.naming.Util;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptor.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptor.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptor.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -29,11 +29,11 @@
import javax.ejb.EJBAccessException;
import javax.security.auth.Subject;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aspects.security.AuthenticationInterceptor;
import org.jboss.ejb3.Container;
import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
import org.jboss.security.AuthenticationManager;
import org.jboss.security.RealmMapping;
@@ -41,7 +41,7 @@
import org.jboss.security.SecurityContext;
import org.jboss.security.SecurityRolesAssociation;
import org.jboss.security.SimplePrincipal;
-import org.jboss.security.plugins.SecurityContextAssociation;
+import org.jboss.security.plugins.SecurityContextAssociation;
/**
* Authentication Interceptor
Modified: trunk/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptorv2.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptorv2.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptorv2.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -27,12 +27,12 @@
import javax.ejb.EJBAccessException;
import javax.security.auth.Subject;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.joinpoint.MethodInvocation;
import org.jboss.ejb3.Container;
import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
import org.jboss.security.SecurityContext;
import org.jboss.security.SecurityIdentity;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/security/JaccHelper.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/security/JaccHelper.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/security/JaccHelper.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -41,12 +41,12 @@
import javax.security.jacc.PolicyConfigurationFactory;
import javax.security.jacc.PolicyContextException;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.aop.metadata.SimpleClassMetaDataBinding;
import org.jboss.aop.metadata.SimpleClassMetaDataLoader;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployment.DeploymentInfo;
import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
import org.jboss.security.RealmMapping;
import org.jboss.security.RunAsIdentity;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/security/RoleBasedAuthorizationInterceptorFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/security/RoleBasedAuthorizationInterceptorFactory.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/security/RoleBasedAuthorizationInterceptorFactory.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -26,11 +26,11 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.aop.Advisor;
import org.jboss.aop.advice.AspectFactory;
import org.jboss.ejb3.Container;
import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.security.AuthenticationManager;
import org.jboss.security.RealmMapping;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/security/RoleBasedAuthorizationInterceptorv2.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/security/RoleBasedAuthorizationInterceptorv2.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/security/RoleBasedAuthorizationInterceptorv2.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -32,13 +32,13 @@
import javax.annotation.security.RolesAllowed;
import javax.ejb.EJBAccessException;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.joinpoint.MethodInvocation;
import org.jboss.aspects.remoting.InvokeRemoteInterceptor;
import org.jboss.ejb3.Container;
import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
import org.jboss.metadata.ejb.jboss.JBossAssemblyDescriptorMetaData;
import org.jboss.remoting.InvokerLocator;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -28,11 +28,11 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.aop.Advisor;
import org.jboss.aop.advice.AspectFactory;
import org.jboss.aop.advice.Interceptor;
import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.ejb3.tx.NullInterceptor;
import org.jboss.logging.Logger;
import org.jboss.metadata.ejb.jboss.JBossAssemblyDescriptorMetaData;
@@ -84,7 +84,7 @@
try
{
InitialContext ctx = container.getInitialContext();
- SecurityDomain securityDomain = (SecurityDomain) advisor.resolveAnnotation(org.jboss.annotation.security.SecurityDomain.class);
+ SecurityDomain securityDomain = (SecurityDomain) advisor.resolveAnnotation(SecurityDomain.class);
if (securityDomain != null)
{
String domainName = securityDomain.value();
Modified: trunk/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorv2.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorv2.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorv2.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,16 +21,16 @@
*/
package org.jboss.ejb3.security;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.joinpoint.MethodInvocation;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.SecurityActions;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
import org.jboss.security.RunAsIdentity;
import org.jboss.security.SecurityContext;
-import org.jboss.security.plugins.SecurityContextAssociation;
+import org.jboss.security.plugins.SecurityContextAssociation;
/**
* An interceptor that enforces the run-as identity declared by a bean.
Modified: trunk/ejb3/src/main/org/jboss/ejb3/service/ServiceContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/service/ServiceContainer.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/service/ServiceContainer.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,13 +21,28 @@
*/
package org.jboss.ejb3.service;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.Service;
+import java.lang.reflect.Method;
+import java.util.Hashtable;
+import java.util.List;
+
+import javax.ejb.EJBException;
+import javax.ejb.Handle;
+import javax.ejb.Timer;
+import javax.ejb.TimerService;
+import javax.management.Attribute;
+import javax.management.AttributeList;
+import javax.management.AttributeNotFoundException;
+import javax.management.InstanceNotFoundException;
+import javax.management.InvalidAttributeValueException;
+import javax.management.MBeanException;
+import javax.management.MBeanInfo;
+import javax.management.MBeanRegistrationException;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.management.ReflectionException;
+
import org.jboss.aop.AspectManager;
import org.jboss.aop.MethodInfo;
-import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.joinpoint.InvocationResponse;
import org.jboss.aop.joinpoint.MethodInvocation;
@@ -37,10 +52,13 @@
import org.jboss.ejb.AllowedOperationsAssociation;
import org.jboss.ejb.AllowedOperationsFlags;
import org.jboss.ejb3.BeanContext;
-import org.jboss.ejb3.ContainerDelegateWrapper;
import org.jboss.ejb3.EJBContainerInvocation;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.ejb3.ProxyFactory;
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.Management;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.Service;
import org.jboss.ejb3.asynchronous.AsynchronousInterceptor;
import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
import org.jboss.ejb3.remoting.RemoteProxyFactory;
@@ -50,25 +68,6 @@
import org.jboss.injection.Injector;
import org.jboss.logging.Logger;
-import javax.ejb.EJBException;
-import javax.ejb.Handle;
-import javax.ejb.Timer;
-import javax.ejb.TimerService;
-import javax.management.Attribute;
-import javax.management.AttributeList;
-import javax.management.AttributeNotFoundException;
-import javax.management.InstanceNotFoundException;
-import javax.management.InvalidAttributeValueException;
-import javax.management.MBeanException;
-import javax.management.MBeanInfo;
-import javax.management.MBeanRegistrationException;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import javax.management.ReflectionException;
-import java.lang.reflect.Method;
-import java.util.Hashtable;
-import java.util.List;
-
/**
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
Modified: trunk/ejb3/src/main/org/jboss/ejb3/service/ServiceLocalProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/service/ServiceLocalProxyFactory.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/service/ServiceLocalProxyFactory.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -26,9 +26,9 @@
import java.util.HashSet;
import java.util.Set;
-import org.jboss.annotation.ejb.LocalBinding;
import org.jboss.ejb3.JBossProxy;
import org.jboss.ejb3.ProxyFactoryHelper;
+import org.jboss.ejb3.annotation.LocalBinding;
/**
Modified: trunk/ejb3/src/main/org/jboss/ejb3/service/ServiceRemoteProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/service/ServiceRemoteProxyFactory.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/service/ServiceRemoteProxyFactory.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -26,12 +26,12 @@
import java.util.HashSet;
import java.util.Set;
-import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.aop.Advisor;
import org.jboss.aop.AspectManager;
import org.jboss.aop.advice.AdviceStack;
import org.jboss.ejb3.JBossProxy;
import org.jboss.ejb3.ProxyFactoryHelper;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.ejb3.remoting.RemoteProxyFactory;
import org.jboss.remoting.InvokerLocator;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/session/BaseSessionProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/session/BaseSessionProxyFactory.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/session/BaseSessionProxyFactory.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,8 +21,6 @@
*/
package org.jboss.ejb3.session;
-import javax.ejb.EJBHome;
-import javax.ejb.EJBLocalHome;
import javax.ejb.EJBLocalObject;
import javax.ejb.EJBMetaData;
import javax.ejb.EJBObject;
@@ -31,14 +29,13 @@
import javax.ejb.Remote;
import javax.ejb.RemoteHome;
-import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.ProxyFactory;
import org.jboss.ejb3.ProxyFactoryHelper;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.ejb3.proxy.EJBMetaDataImpl;
import org.jboss.ejb3.proxy.handle.HomeHandleImpl;
import org.jboss.logging.Logger;
-import org.jboss.proxy.ejb.EjbObjectCorbaServant;
/**
* Comment
Modified: trunk/ejb3/src/main/org/jboss/ejb3/session/ProxyDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/session/ProxyDeployer.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/session/ProxyDeployer.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,15 +25,15 @@
import java.util.ArrayList;
import java.util.List;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.LocalBindingImpl;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindingImpl;
-import org.jboss.annotation.ejb.RemoteBindings;
-import org.jboss.annotation.ejb.RemoteBindingsImpl;
import org.jboss.ejb3.ProxyFactory;
import org.jboss.ejb3.ProxyFactoryHelper;
-import org.jboss.ejb3.defaults.RemoteBindingDefaults;
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBindings;
+import org.jboss.ejb3.annotation.defaults.RemoteBindingDefaults;
+import org.jboss.ejb3.annotation.impl.LocalBindingImpl;
+import org.jboss.ejb3.annotation.impl.RemoteBindingImpl;
+import org.jboss.ejb3.annotation.impl.RemoteBindingsImpl;
import org.jboss.ejb3.remoting.RemoteProxyFactory;
import org.jboss.logging.Logger;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/session/SessionContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/session/SessionContainer.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/session/SessionContainer.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -29,15 +29,11 @@
import java.util.List;
import java.util.Map;
-import javax.ejb.EJBLocalObject;
import javax.ejb.EJBObject;
import javax.ejb.Handle;
import javax.ejb.LocalHome;
import javax.ejb.RemoteHome;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindings;
import org.jboss.aop.AspectManager;
import org.jboss.aop.Dispatcher;
import org.jboss.aop.MethodInfo;
@@ -45,7 +41,6 @@
import org.jboss.aop.joinpoint.InvocationResponse;
import org.jboss.aop.util.MethodHashing;
import org.jboss.aspects.asynch.FutureHolder;
-import org.jboss.ejb3.BeanContext;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.EJBContainerInvocation;
import org.jboss.ejb3.Ejb3Deployment;
@@ -54,6 +49,9 @@
import org.jboss.ejb3.ProxyFactoryHelper;
import org.jboss.ejb3.ProxyUtils;
import org.jboss.ejb3.ThreadLocalStack;
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBindings;
import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
import org.jboss.ejb3.remoting.IsLocalInterceptor;
import org.jboss.ejb3.remoting.RemoteProxyFactory;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,14 +21,11 @@
*/
package org.jboss.ejb3.stateful;
-import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
import javax.naming.NamingException;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.aop.Advisor;
import org.jboss.aop.AspectManager;
import org.jboss.aop.Dispatcher;
@@ -38,8 +35,9 @@
import org.jboss.ejb3.JBossProxy;
import org.jboss.ejb3.ProxyFactory;
import org.jboss.ejb3.ProxyFactoryHelper;
+import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.ejb3.remoting.RemoteProxyFactory;
-import org.jboss.ejb3.session.SessionContainer;
import org.jboss.ha.client.loadbalance.FirstAvailable;
import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
import org.jboss.ha.framework.interfaces.ClusteringTargetsRepository;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -40,11 +40,6 @@
import javax.ejb.RemoteHome;
import javax.ejb.TimerService;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindings;
-import org.jboss.annotation.ejb.cache.Cache;
import org.jboss.aop.AspectManager;
import org.jboss.aop.MethodInfo;
import org.jboss.aop.joinpoint.Invocation;
@@ -57,6 +52,11 @@
import org.jboss.ejb3.ProxyFactory;
import org.jboss.ejb3.ProxyFactoryHelper;
import org.jboss.ejb3.ProxyUtils;
+import org.jboss.ejb3.annotation.Cache;
+import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBindings;
import org.jboss.ejb3.cache.CacheFactoryRegistry;
import org.jboss.ejb3.cache.Ejb3CacheFactory;
import org.jboss.ejb3.cache.StatefulCache;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulInstanceInterceptor.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulInstanceInterceptor.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulInstanceInterceptor.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -27,10 +27,10 @@
import javax.ejb.ConcurrentAccessException;
import javax.ejb.EJBException;
-import org.jboss.annotation.ejb.SerializedConcurrentAccess;
import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.annotation.SerializedConcurrentAccess;
import org.jboss.metadata.ejb.jboss.JBossAssemblyDescriptorMetaData;
import org.jboss.metadata.ejb.spec.ApplicationExceptionMetaData;
import org.jboss.metadata.ejb.spec.ApplicationExceptionsMetaData;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -28,11 +28,11 @@
import javax.ejb.LocalHome;
import javax.naming.NamingException;
-import org.jboss.annotation.ejb.LocalBinding;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.JBossProxy;
import org.jboss.ejb3.NonSerializableFactory;
import org.jboss.ejb3.ProxyFactoryHelper;
+import org.jboss.ejb3.annotation.LocalBinding;
import org.jboss.ejb3.session.SessionContainer;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxyFactory.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxyFactory.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -29,7 +29,6 @@
import javax.ejb.RemoteHome;
import javax.naming.NamingException;
-import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.aop.Advisor;
import org.jboss.aop.AspectManager;
import org.jboss.aop.Dispatcher;
@@ -40,6 +39,7 @@
import org.jboss.ejb3.JBossProxy;
import org.jboss.ejb3.ProxyFactory;
import org.jboss.ejb3.ProxyFactoryHelper;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.ejb3.remoting.IsLocalProxyFactoryInterceptor;
import org.jboss.ejb3.remoting.RemoteProxyFactory;
import org.jboss.ejb3.session.SessionContainer;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,14 +24,14 @@
import java.util.ArrayList;
import java.util.List;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.aop.Advisor;
import org.jboss.aop.AspectManager;
import org.jboss.aop.advice.AdviceStack;
import org.jboss.aspects.remoting.FamilyWrapper;
import org.jboss.ejb3.JBossProxy;
import org.jboss.ejb3.ProxyFactoryHelper;
+import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.ejb3.remoting.RemoteProxyFactory;
import org.jboss.ejb3.session.SessionContainer;
import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessContainer.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessContainer.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -32,10 +32,6 @@
import javax.ejb.TimerService;
import javax.naming.NamingException;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindings;
import org.jboss.aop.AspectManager;
import org.jboss.aop.MethodInfo;
import org.jboss.aop.joinpoint.Invocation;
@@ -51,6 +47,10 @@
import org.jboss.ejb3.ProxyFactory;
import org.jboss.ejb3.ProxyFactoryHelper;
import org.jboss.ejb3.ProxyUtils;
+import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBindings;
import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
import org.jboss.ejb3.remoting.RemoteProxyFactory;
import org.jboss.ejb3.session.SessionContainer;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxyFactory.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxyFactory.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -27,11 +27,11 @@
import javax.ejb.LocalHome;
-import org.jboss.annotation.ejb.LocalBinding;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.JBossProxy;
import org.jboss.ejb3.NonSerializableFactory;
import org.jboss.ejb3.ProxyFactoryHelper;
+import org.jboss.ejb3.annotation.LocalBinding;
import org.jboss.ejb3.session.SessionContainer;
import org.jboss.logging.Logger;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxyFactory.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxyFactory.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -28,13 +28,13 @@
import javax.ejb.RemoteHome;
import javax.naming.NamingException;
-import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.aop.Advisor;
import org.jboss.aop.AspectManager;
import org.jboss.aop.advice.AdviceStack;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.JBossProxy;
import org.jboss.ejb3.ProxyFactoryHelper;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.ejb3.remoting.RemoteProxyFactory;
import org.jboss.ejb3.session.SessionContainer;
import org.jboss.logging.Logger;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/tx/TxInterceptorFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/tx/TxInterceptorFactory.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/ejb3/tx/TxInterceptorFactory.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -27,10 +27,10 @@
import javax.ejb.TransactionAttributeType;
import javax.ejb.TransactionManagementType;
-import org.jboss.annotation.ejb.TransactionTimeout;
import org.jboss.aop.Advisor;
import org.jboss.aop.joinpoint.Joinpoint;
import org.jboss.aop.joinpoint.MethodJoinpoint;
+import org.jboss.ejb3.annotation.TransactionTimeout;
import org.jboss.ejb3.stateful.StatefulContainer;
import org.jboss.logging.Logger;
Modified: trunk/ejb3/src/main/org/jboss/injection/DependsHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/DependsHandler.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/injection/DependsHandler.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,14 +21,15 @@
*/
package org.jboss.injection;
+import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import java.lang.reflect.AccessibleObject;
import java.util.Map;
+
+import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
-import javax.management.MalformedObjectNameException;
-import org.jboss.annotation.ejb.Depends;
+import org.jboss.ejb3.annotation.Depends;
import org.jboss.logging.Logger;
import org.jboss.metadata.javaee.spec.RemoteEnvironment;
Modified: trunk/ejb3/src/main/org/jboss/injection/EJBRemoteHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/EJBRemoteHandler.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/injection/EJBRemoteHandler.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -31,8 +31,8 @@
import javax.ejb.EJBs;
import javax.naming.NameNotFoundException;
-import org.jboss.annotation.IgnoreDependency;
import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.annotation.IgnoreDependency;
import org.jboss.logging.Logger;
import org.jboss.metadata.javaee.spec.AbstractEJBReferenceMetaData;
import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
Modified: trunk/ejb3/src/main/org/jboss/injection/JndiInjectHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/JndiInjectHandler.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/injection/JndiInjectHandler.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -26,7 +26,7 @@
import java.lang.reflect.Method;
import java.util.Map;
-import org.jboss.annotation.JndiInject;
+import org.jboss.ejb3.annotation.JndiInject;
import org.jboss.logging.Logger;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.javaee.jboss.JndiRefMetaData;
Modified: trunk/ejb3/src/main/org/jboss/injection/PersistenceContextHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/PersistenceContextHandler.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/injection/PersistenceContextHandler.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,21 +21,22 @@
*/
package org.jboss.injection;
-import org.jboss.metadata.javaee.spec.Environment;
-import org.jboss.metadata.javaee.spec.PersistenceContextReferenceMetaData;
-import org.jboss.metadata.javaee.spec.RemoteEnvironment;
-import org.jboss.logging.Logger;
-import org.jboss.annotation.IgnoreDependency;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Map;
import javax.naming.NameNotFoundException;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContexts;
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Map;
+import org.jboss.ejb3.annotation.IgnoreDependency;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.javaee.spec.Environment;
+import org.jboss.metadata.javaee.spec.PersistenceContextReferenceMetaData;
+import org.jboss.metadata.javaee.spec.RemoteEnvironment;
+
/**
* Searches bean class for all
*
Modified: trunk/ejb3/src/main/org/jboss/injection/PersistenceUnitHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/PersistenceUnitHandler.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/main/org/jboss/injection/PersistenceUnitHandler.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -32,7 +32,7 @@
import javax.persistence.PersistenceUnits;
import org.hibernate.SessionFactory;
-import org.jboss.annotation.IgnoreDependency;
+import org.jboss.ejb3.annotation.IgnoreDependency;
import org.jboss.ejb3.entity.InjectedEntityManagerFactory;
import org.jboss.ejb3.entity.InjectedSessionFactory;
import org.jboss.ejb3.entity.ManagedEntityManagerFactory;
Modified: trunk/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml
===================================================================
--- trunk/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml 2007-11-29 21:13:26 UTC (rev 67628)
@@ -17,6 +17,7 @@
<property name="cacheFactoryRegistry"><inject bean="EJB3CacheFactoryRegistry" /></property>
<property name="poolFactoryRegistry"><inject bean="EJB3PoolFactoryRegistry" /></property>
<property name="remoteProxyFactoryRegistry"><inject bean="EJB3RemoteProxyFactoryRegistry" /></property>
+ <property name="persistenceManagerFactoryRegistry"><inject bean="EJB3PersistenceManagerFactoryRegistry" /></property>
<!--
@@ -232,6 +233,21 @@
</map>
</property>
</bean>
+
+ <!-- EJB3 Persistence Manager Factory Registry -->
+ <bean name="EJB3PersistenceManagerFactoryRegistry" class="org.jboss.ejb3.cache.persistence.PersistenceManagerFactoryRegistry">
+ <property name="factories">
+ <!-- Define each of the registered factories -->
+ <map class="java.util.HashMap" keyClass="java.lang.String"
+ valueClass="java.lang.Class">
+ <!-- StatefulSessionFilePersistenceManager -->
+ <entry>
+ <key>StatefulSessionFilePersistenceManager</key>
+ <value>org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManagerFactory</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
<bean name="JNDIKernelRegistryPlugin" class="org.jboss.ejb3.kernel.JNDIKernelRegistryPlugin"/>
Modified: trunk/ejb3/src/resources/ejb3-interceptors-aop.xml
===================================================================
--- trunk/ejb3/src/resources/ejb3-interceptors-aop.xml 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/resources/ejb3-interceptors-aop.xml 2007-11-29 21:13:26 UTC (rev 67628)
@@ -90,13 +90,13 @@
<interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
<interceptor-ref name="Basic Authorization"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
@@ -107,11 +107,11 @@
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.Pool)">
- @org.jboss.annotation.ejb.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
+ @org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.JndiBindingPolicy)">
- @org.jboss.annotation.ejb.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.PackagingBasedJndiBindingPolicy.class)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
+ @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
</annotation>
</domain>
@@ -121,13 +121,13 @@
<interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
<interceptor-ref name="JACC Authorization"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
@@ -138,11 +138,11 @@
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.Pool)">
- @org.jboss.annotation.ejb.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
+ @org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.JndiBindingPolicy)">
- @org.jboss.annotation.ejb.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.PackagingBasedJndiBindingPolicy.class)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
+ @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
</annotation>
</domain>
@@ -152,13 +152,13 @@
<interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
<interceptor-ref name="Basic Authorization"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
@@ -178,7 +178,7 @@
<interceptor-ref name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
<interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
</bind>
@@ -186,32 +186,32 @@
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.Pool)">
- @org.jboss.annotation.ejb.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
+ @org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.JndiBindingPolicy)">
- @org.jboss.annotation.ejb.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.PackagingBasedJndiBindingPolicy.class)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
+ @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
</annotation>
</domain>
<domain name="Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
<!-- NON Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache ("SimpleStatefulCache")
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Cache) AND !class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.Cache ("SimpleStatefulCache")
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.PersistenceManager) AND !class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.PersistenceManager ("StatefulSessionFilePersistenceManager")
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.CacheConfig) AND !class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
</annotation>
<!-- Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache ("StatefulTreeCache")
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Cache) AND class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.Cache ("StatefulTreeCache")
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.CacheConfig) AND class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
</annotation>
</domain>
@@ -221,13 +221,13 @@
<interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
<interceptor-ref name="JACC Authorization"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
@@ -248,43 +248,43 @@
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
<interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
</bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.Pool)">
- @org.jboss.annotation.ejb.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
+ @org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.JndiBindingPolicy)">
- @org.jboss.annotation.ejb.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.PackagingBasedJndiBindingPolicy.class)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
+ @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
</annotation>
<!-- NON Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache ("SimpleStatefulCache")
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Cache) AND !class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.Cache ("SimpleStatefulCache")
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.PersistenceManager) AND !class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.PersistenceManager ("StatefulSessionFilePersistenceManager")
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.CacheConfig) AND !class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
</annotation>
<!-- Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache ("StatefulTreeCache")
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Cache) AND class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.Cache ("StatefulTreeCache")
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.CacheConfig) AND class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
</annotation>
</domain>
<domain name="Embedded Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
<!-- NON Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache)">
- @org.jboss.annotation.ejb.cache.Cache ("NoPassivationCache")
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Cache)">
+ @org.jboss.ejb3.annotation.Cache ("NoPassivationCache")
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.JndiBindingPolicy)">
- @org.jboss.annotation.ejb.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.PackagingBasedJndiBindingPolicy.class)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
+ @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
</annotation>
</domain>
@@ -302,11 +302,11 @@
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.Pool)">
- @org.jboss.annotation.ejb.Pool (value="StrictMaxPool", maxSize=15, timeout=10000)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
+ @org.jboss.ejb3.annotation.Pool (value="StrictMaxPool", maxSize=15, timeout=10000)
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.JndiBindingPolicy)">
- @org.jboss.annotation.ejb.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.PackagingBasedJndiBindingPolicy.class)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
+ @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
</annotation>
</domain>
@@ -320,17 +320,17 @@
<interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
</bind>
- <bind pointcut="execution(public * *->*(..)) AND (has(* *->@org.jboss.annotation.ejb.CurrentMessage(..)) OR hasfield(* *->@org.jboss.annotation.ejb.CurrentMessage))">
+ <bind pointcut="execution(public * *->*(..)) AND (has(* *->@org.jboss.ejb3.annotation.CurrentMessage(..)) OR hasfield(* *->@org.jboss.ejb3.annotation.CurrentMessage))">
<interceptor-ref name="org.jboss.ejb3.mdb.CurrentMessageInjectorInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.Pool)">
- @org.jboss.annotation.ejb.Pool (value="StrictMaxPool", maxSize=15, timeout=10000)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
+ @org.jboss.ejb3.annotation.Pool (value="StrictMaxPool", maxSize=15, timeout=10000)
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.JndiBindingPolicy)">
- @org.jboss.annotation.ejb.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.PackagingBasedJndiBindingPolicy.class)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
+ @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
</annotation>
</domain>
@@ -342,7 +342,7 @@
<bind pointcut="!execution(* *->create()) AND !execution(* *->start()) AND !execution(*->new(..))">
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
<interceptor-ref name="Basic Authorization"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
@@ -357,8 +357,8 @@
<bind pointcut="execution(public * *->*(..)) AND !execution(* *->create()) AND !execution(* *->start())">
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.JndiBindingPolicy)">
- @org.jboss.annotation.ejb.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.PackagingBasedJndiBindingPolicy.class)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
+ @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
</annotation>
</domain>
@@ -370,7 +370,7 @@
<bind pointcut="!execution(* *->create()) AND !execution(* *->start()) AND !execution(*->new(..))">
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
<interceptor-ref name="Basic Authorization"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
@@ -385,8 +385,8 @@
<bind pointcut="execution(public * *->*(..)) AND !execution(* *->create()) AND !execution(* *->start())">
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.JndiBindingPolicy)">
- @org.jboss.annotation.ejb.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.PackagingBasedJndiBindingPolicy.class)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
+ @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
</annotation>
</domain>
Modified: trunk/ejb3/src/resources/test/circulardependency/META-INF/jboss.xml
===================================================================
--- trunk/ejb3/src/resources/test/circulardependency/META-INF/jboss.xml 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/resources/test/circulardependency/META-INF/jboss.xml 2007-11-29 21:13:26 UTC (rev 67628)
@@ -9,8 +9,8 @@
<session>
<ejb-name>StatelessBean2</ejb-name>
<annotation>
- <annotation-class>org.jboss.annotation.IgnoreDependency</annotation-class>
- <annotation-implementation-class>org.jboss.annotation.IgnoreDependencyImpl</annotation-implementation-class>
+ <annotation-class>org.jboss.ejb3.annotation.IgnoreDependency</annotation-class>
+ <annotation-implementation-class>org.jboss.ejb3.annotation.impl.IgnoreDependencyImpl</annotation-implementation-class>
<injection-target>
<injection-target-class>org.jboss.ejb3.test.circulardependecy.StatelessBean2</injection-target-class>
<injection-target-name>stateless</injection-target-name>
Modified: trunk/ejb3/src/resources/test/defaultremotebindings/default-ejb3-interceptors-aop.xml
===================================================================
--- trunk/ejb3/src/resources/test/defaultremotebindings/default-ejb3-interceptors-aop.xml 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/resources/test/defaultremotebindings/default-ejb3-interceptors-aop.xml 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,13 +22,13 @@
<interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
<interceptor-ref name="Basic Authorization"/>
</bind>
<bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
@@ -39,14 +39,14 @@
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.JndiBindingPolicy)">
- @org.jboss.annotation.ejb.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.PackagingBasedJndiBindingPolicy.class)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
+ @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.Pool)">
- @org.jboss.annotation.ejb.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
+ @org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.RemoteBinding)">
- @org.jboss.annotation.ejb.RemoteBinding (jndiBinding="DefaultedStateless", factory = "RemoteProxyFactory", interceptorStack="", clientBindUrl = "")
+ <annotation expr="!class(@org.jboss.ejb3.annotation.RemoteBinding)">
+ @org.jboss.ejb3.annotation.RemoteBinding (jndiBinding="DefaultedStateless", factory = "RemoteProxyFactory", interceptorStack="", clientBindUrl = "")
</annotation>
</domain>
</aop>
\ No newline at end of file
Modified: trunk/ejb3/src/resources/test/strictpool/META-INF/jboss.xml
===================================================================
--- trunk/ejb3/src/resources/test/strictpool/META-INF/jboss.xml 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/resources/test/strictpool/META-INF/jboss.xml 2007-11-29 21:13:26 UTC (rev 67628)
@@ -9,8 +9,8 @@
<session>
<ejb-name>OverrideStrictlyPooledSessionBean</ejb-name>
<annotation>
- <annotation-class>org.jboss.annotation.ejb.Pool</annotation-class>
- <annotation-implementation-class>org.jboss.annotation.ejb.PoolImpl</annotation-implementation-class>
+ <annotation-class>org.jboss.ejb3.annotation.Pool</annotation-class>
+ <annotation-implementation-class>org.jboss.ejb3.annotation.impl.PoolImpl</annotation-implementation-class>
<property>
<property-name>value</property-name>
<property-value>StrictMaxPool</property-value>
@@ -33,8 +33,8 @@
<message-driven>
<ejb-name>OverrideStrictlyPooledMDB</ejb-name>
<!--annotation>
- <annotation-class>org.jboss.annotation.ejb.Pool</annotation-class>
- <annotation-implementation-class>org.jboss.annotation.ejb.PoolImpl</annotation-implementation-class>
+ <annotation-class>org.jboss.ejb3.annotation.Pool</annotation-class>
+ <annotation-implementation-class>org.jboss.ejb3.annotation.impl.PoolImpl</annotation-implementation-class>
<property>
<property-name>value</property-name>
<property-value>StrictMaxPool</property-value>
Modified: trunk/ejb3/src/resources/test-configs/ejb3-jacc/deploy/ejb3-interceptors-aop.xml
===================================================================
--- trunk/ejb3/src/resources/test-configs/ejb3-jacc/deploy/ejb3-interceptors-aop.xml 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/resources/test-configs/ejb3-jacc/deploy/ejb3-interceptors-aop.xml 2007-11-29 21:13:26 UTC (rev 67628)
@@ -85,13 +85,13 @@
<interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
</bind>
- <bind pointcut="execution(* @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <bind pointcut="execution(* @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.JaccAuthorizationInterceptorFactory"/>
</bind>
<bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptor"/>
</bind>
- <bind pointcut="execution(* @org.jboss.annotation.ejb.Clustered->*(..))">
+ <bind pointcut="execution(* @org.jboss.ejb3.annotation.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(* *->*(..))">
@@ -103,8 +103,8 @@
<bind pointcut="execution(* $typedef{ejb3intercepted}->*(..))">
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.Pool)">
- @org.jboss.annotation.ejb.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
+ @org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
</annotation>
</domain>
@@ -113,13 +113,13 @@
<interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
</bind>
- <bind pointcut="execution(* @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <bind pointcut="execution(* @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.JaccAuthorizationInterceptorFactory"/>
</bind>
<bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptor"/>
</bind>
- <bind pointcut="execution(* @org.jboss.annotation.ejb.Clustered->*(..))">
+ <bind pointcut="execution(* @org.jboss.ejb3.annotation.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(* *->@javax.ejb.Remove(..))">
@@ -135,33 +135,33 @@
<interceptor-ref name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
</bind>
- <bind pointcut="execution(* @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(* *->@javax.ejb.Remove(..))">
+ <bind pointcut="execution(* @org.jboss.ejb3.annotation.Clustered->*(..)) AND !execution(* *->@javax.ejb.Remove(..))">
<interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
</bind>
<bind pointcut="execution(* $typedef{ejb3intercepted}->*(..))">
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.Pool)">
- @org.jboss.annotation.ejb.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
+ @org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
</annotation>
<!-- NON Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Cache) AND !class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.Cache ("SimpleStatefulCache")
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.PersistenceManager) AND !class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.PersistenceManager ("StatefulSessionFilePersistenceManager")
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.CacheConfig) AND !class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.CacheConfig (maxSize=100000, idleTimeoutSeconds=300)
</annotation>
<!-- Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Cache) AND class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.Cache ("StatefulTreeCache")
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.CacheConfig) AND class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300)
</annotation>
</domain>
@@ -177,8 +177,8 @@
<bind pointcut="execution(* $typedef{ejb3intercepted}->*(..))">
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.Pool)">
- @org.jboss.annotation.ejb.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
+ @org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
</annotation>
</domain>
@@ -187,7 +187,7 @@
<interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
</bind>
- <bind pointcut="execution(* @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <bind pointcut="execution(* @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.JaccAuthorizationInterceptorFactory"/>
</bind>
<bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))">
Modified: trunk/ejb3/src/resources/test-configs/removedislocal/deploy/ejb3-interceptors-aop.xml
===================================================================
--- trunk/ejb3/src/resources/test-configs/removedislocal/deploy/ejb3-interceptors-aop.xml 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/resources/test-configs/removedislocal/deploy/ejb3-interceptors-aop.xml 2007-11-29 21:13:26 UTC (rev 67628)
@@ -90,13 +90,13 @@
<interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
<interceptor-ref name="Basic Authorization"/>
</bind>
<bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
@@ -107,8 +107,8 @@
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.Pool)">
- @org.jboss.annotation.ejb.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
+ @org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
</annotation>
</domain>
@@ -118,13 +118,13 @@
<interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
<interceptor-ref name="JACC Authorization"/>
</bind>
<bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
@@ -135,8 +135,8 @@
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.Pool)">
- @org.jboss.annotation.ejb.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
+ @org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
</annotation>
</domain>
@@ -146,13 +146,13 @@
<interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
<interceptor-ref name="Basic Authorization"/>
</bind>
<bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
@@ -172,7 +172,7 @@
<interceptor-ref name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
<interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
</bind>
@@ -180,29 +180,29 @@
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.Pool)">
- @org.jboss.annotation.ejb.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
+ @org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
</annotation>
</domain>
<domain name="Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
<!-- NON Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Cache) AND !class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.Cache ("SimpleStatefulCache")
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.PersistenceManager) AND !class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.PersistenceManager ("StatefulSessionFilePersistenceManager")
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.CacheConfig) AND !class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
</annotation>
<!-- Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Cache) AND class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.Cache ("StatefulTreeCache")
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.CacheConfig) AND class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
</annotation>
</domain>
@@ -212,13 +212,13 @@
<interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
<interceptor-ref name="JACC Authorization"/>
</bind>
<bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
@@ -239,37 +239,37 @@
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
<interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
</bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.Pool)">
- @org.jboss.annotation.ejb.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
+ @org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
</annotation>
<!-- NON Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Cache) AND !class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.Cache ("SimpleStatefulCache")
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.PersistenceManager) AND !class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.PersistenceManager ("StatefulSessionFilePersistenceManager")
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.CacheConfig) AND !class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
</annotation>
<!-- Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Cache) AND class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.Cache ("StatefulTreeCache")
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.CacheConfig) AND class(@org.jboss.ejb3.annotation.Clustered)">
+ @org.jboss.ejb3.annotation.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
</annotation>
</domain>
<domain name="Embedded Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
<!-- NON Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache)">
- @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.NoPassivationCache.class)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Cache)">
+ @org.jboss.ejb3.annotation.Cache ("NoPassivationCache")
</annotation>
</domain>
@@ -285,8 +285,8 @@
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.Pool)">
- @org.jboss.annotation.ejb.Pool (value="StrictMaxPool", maxSize=15, timeout=10000)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
+ @org.jboss.ejb3.annotation.Pool (value="StrictMaxPool", maxSize=15, timeout=10000)
</annotation>
</domain>
@@ -300,14 +300,14 @@
<interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
</bind>
- <bind pointcut="execution(public * *->*(..)) AND (has(* *->@org.jboss.annotation.ejb.CurrentMessage(..)) OR hasfield(* *->@org.jboss.annotation.ejb.CurrentMessage))">
+ <bind pointcut="execution(public * *->*(..)) AND (has(* *->@org.jboss.ejb3.annotation.CurrentMessage(..)) OR hasfield(* *->@org.jboss.ejb3.annotation.CurrentMessage))">
<interceptor-ref name="org.jboss.ejb3.mdb.CurrentMessageInjectorInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
- <annotation expr="!class(@org.jboss.annotation.ejb.Pool)">
- @org.jboss.annotation.ejb.Pool (value="StrictMaxPool", maxSize=15, timeout=10000)
+ <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
+ @org.jboss.ejb3.annotation.Pool (value="StrictMaxPool", maxSize=15, timeout=10000)
</annotation>
</domain>
@@ -319,7 +319,7 @@
<bind pointcut="!execution(* *->create()) AND !execution(* *->start()) AND !execution(*->new(..))">
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
<interceptor-ref name="Basic Authorization"/>
</bind>
<bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
@@ -344,7 +344,7 @@
<bind pointcut="!execution(* *->create()) AND !execution(* *->start()) AND !execution(*->new(..))">
<interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+ <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
<interceptor-ref name="Basic Authorization"/>
</bind>
<bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
@@ -361,5 +361,4 @@
</bind>
</domain>
-
</aop>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/arjuna/StatefulTxBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/arjuna/StatefulTxBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/arjuna/StatefulTxBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -29,9 +29,8 @@
import javax.persistence.PersistenceContext;
import javax.transaction.TransactionManager;
-import org.jboss.annotation.JndiInject;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.ejb3.test.arjuna.Entity;
+import org.jboss.ejb3.annotation.JndiInject;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/DeploymentDescriptorStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/DeploymentDescriptorStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/DeploymentDescriptorStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,10 +24,10 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.Pool;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.cache.Cache;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.Cache;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Pool;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/StatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/StatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,11 +24,11 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.AspectDomain;
-import org.jboss.annotation.ejb.Pool;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.cache.Cache;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.AspectDomain;
+import org.jboss.ejb3.annotation.Cache;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Pool;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/SecuredStatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/SecuredStatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/SecuredStatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,16 +22,18 @@
package org.jboss.ejb3.test.asynchronous;
import java.lang.reflect.InvocationTargetException;
-import javax.ejb.EJB;
+
import javax.annotation.security.DenyAll;
import javax.annotation.security.PermitAll;
import javax.annotation.security.RolesAllowed;
+import javax.ejb.EJB;
import javax.ejb.EJBAccessException;
import javax.ejb.Local;
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import org.jboss.annotation.security.SecurityDomain;
+
import org.jboss.aspects.asynch.Future;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.ejb3.asynchronous.Asynch;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/ServiceBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/ServiceBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/ServiceBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,8 +23,9 @@
import javax.ejb.Local;
import javax.ejb.Remote;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Service;
+
/**
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/StatefulClusteredBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/StatefulClusteredBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/StatefulClusteredBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,10 +22,11 @@
package org.jboss.ejb3.test.asynchronous;
import java.io.Serializable;
+
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.Clustered;
+import org.jboss.ejb3.annotation.Clustered;
/**
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/StatelessClusteredBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/StatelessClusteredBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/StatelessClusteredBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,10 +21,10 @@
*/
package org.jboss.ejb3.test.asynchronous;
+import javax.ejb.Remote;
import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import org.jboss.annotation.ejb.Clustered;
+import org.jboss.ejb3.annotation.Clustered;
/**
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/bank/TellerRemoteProxyFactory.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/bank/TellerRemoteProxyFactory.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/bank/TellerRemoteProxyFactory.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,7 +21,7 @@
*/
package org.jboss.ejb3.test.bank;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.ejb3.session.SessionContainer;
import org.jboss.logging.Logger;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,14 +22,12 @@
package org.jboss.ejb3.test.bmt;
import javax.annotation.Resource;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
-import javax.transaction.Transaction;
-import org.jboss.annotation.JndiInject;
+import org.jboss.ejb3.annotation.JndiInject;
+
/**
* @version <tt>$Revision$</tt>
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorStatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,14 +21,12 @@
*/
package org.jboss.ejb3.test.bmt;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
import javax.annotation.Resource;
-import javax.transaction.UserTransaction;
import javax.transaction.TransactionManager;
-import org.jboss.annotation.JndiInject;
+import javax.transaction.UserTransaction;
+import org.jboss.ejb3.annotation.JndiInject;
+
/**
* @version <tt>$Revision$</tt>
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/DeploymentDescriptorTesterBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,11 +24,12 @@
import javax.ejb.EJB;
import javax.ejb.TransactionAttribute;
import javax.ejb.TransactionAttributeType;
+import javax.naming.InitialContext;
+import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import javax.transaction.Transaction;
-import javax.naming.InitialContext;
+
+import org.jboss.ejb3.annotation.JndiInject;
import org.jboss.logging.Logger;
-import org.jboss.annotation.JndiInject;
/**
* @version <tt>$Revision$</tt>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/StatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,11 +25,12 @@
import javax.ejb.Stateful;
import javax.ejb.TransactionManagement;
import javax.ejb.TransactionManagementType;
+import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
-import javax.transaction.Transaction;
-import org.jboss.annotation.JndiInject;
+import org.jboss.ejb3.annotation.JndiInject;
+
/**
* Comment
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/StatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,14 +21,15 @@
*/
package org.jboss.ejb3.test.bmt;
+import javax.annotation.Resource;
import javax.ejb.Stateless;
import javax.ejb.TransactionManagement;
import javax.ejb.TransactionManagementType;
-import javax.annotation.Resource;
+import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
-import javax.transaction.TransactionManager;
-import org.jboss.annotation.JndiInject;
+import org.jboss.ejb3.annotation.JndiInject;
+
/**
* Comment
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/bmt/TesterBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,14 +22,15 @@
package org.jboss.ejb3.test.bmt;
import javax.ejb.EJB;
+import javax.ejb.Stateless;
import javax.ejb.TransactionAttribute;
import javax.ejb.TransactionAttributeType;
-import javax.ejb.Stateless;
+import javax.naming.InitialContext;
+import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import javax.transaction.Transaction;
-import javax.naming.InitialContext;
+
+import org.jboss.ejb3.annotation.JndiInject;
import org.jboss.logging.Logger;
-import org.jboss.annotation.JndiInject;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/cache/SimpleStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/cache/SimpleStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/cache/SimpleStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -28,7 +28,7 @@
import javax.ejb.Stateful;
import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/cache/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/cache/StatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/cache/StatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -29,8 +29,8 @@
import javax.ejb.Stateful;
import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.cache.Cache;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.Cache;
+import org.jboss.ejb3.annotation.CacheConfig;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/cachepassivation/MockBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/cachepassivation/MockBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/cachepassivation/MockBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -27,10 +27,10 @@
import javax.ejb.PrePassivate;
import javax.ejb.SessionContext;
-import org.jboss.annotation.ejb.Pool;
-import org.jboss.annotation.ejb.cache.Cache;
-import org.jboss.annotation.ejb.cache.CacheConfig;
-import org.jboss.annotation.ejb.cache.simple.PersistenceManager;
+import org.jboss.ejb3.annotation.Cache;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.PersistenceManager;
+import org.jboss.ejb3.annotation.Pool;
/**
* Comment
@@ -39,7 +39,7 @@
* @version $Revision: $
*/
@Cache("SimpleStatefulCache")
- at PersistenceManager(MyStatefulSessionFilePersistenceManager.class)
+ at PersistenceManager("MyStatefulSessionFilePersistenceManager")
@CacheConfig(idleTimeoutSeconds=1)
@Pool("ThreadlocalPool")
public class MockBean implements Mock
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean1.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean1.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean1.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,11 +22,11 @@
package org.jboss.ejb3.test.circulardependency;
import javax.ejb.EJB;
+import javax.ejb.Remote;
import javax.ejb.Stateless;
-import javax.ejb.Remote;
import javax.naming.NamingException;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean2.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean2.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/circulardependency/StatelessBean2.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,11 +22,11 @@
package org.jboss.ejb3.test.circulardependency;
import javax.ejb.EJB;
+import javax.ejb.Remote;
import javax.ejb.Stateless;
-import javax.ejb.Remote;
import javax.naming.NamingException;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
/**
@@ -39,9 +39,10 @@
public class StatelessBean2 implements StatelessRemote
{
private static final Logger log = Logger.getLogger(StatelessBean2.class);
-
- @EJB(beanName="StatelessBean1") StatelessRemote stateless;
-
+
+ @EJB(beanName = "StatelessBean1")
+ StatelessRemote stateless;
+
public int method(int i) throws NamingException
{
return i;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30Bean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30Bean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/classloader/Session30Bean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,15 +22,14 @@
package org.jboss.ejb3.test.classloader;
import java.lang.reflect.Method;
+import java.net.URL;
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import java.net.URL;
-
import org.apache.log4j.Category;
import org.apache.log4j.PropertyConfigurator;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
/**
* @version <tt>$Revision$</tt>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/classloader/SharedBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/classloader/SharedBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/classloader/SharedBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,15 +22,14 @@
package org.jboss.ejb3.test.classloader;
import java.lang.reflect.Method;
+import java.net.URL;
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import java.net.URL;
-
import org.apache.log4j.Category;
import org.apache.log4j.PropertyConfigurator;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
/**
* @version <tt>$Revision$</tt>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/classloader/UnsharedBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/classloader/UnsharedBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/classloader/UnsharedBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,15 +22,14 @@
package org.jboss.ejb3.test.classloader;
import java.lang.reflect.Method;
+import java.net.URL;
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import java.net.URL;
-
import org.apache.log4j.Category;
import org.apache.log4j.PropertyConfigurator;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
/**
* @version <tt>$Revision$</tt>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clientinterceptor/StatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,11 +21,11 @@
*/
package org.jboss.ejb3.test.clientinterceptor;
+import javax.ejb.Stateless;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
-import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/QueueTestMDB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/QueueTestMDB.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/QueueTestMDB.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,21 +22,10 @@
package org.jboss.ejb3.test.clusteredjms;
import javax.ejb.ActivationConfigProperty;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
import javax.ejb.MessageDriven;
-import javax.ejb.MessageDrivenContext;
-import javax.ejb.EJB;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
import javax.jms.Message;
import javax.jms.MessageListener;
-import javax.naming.InitialContext;
-import javax.annotation.security.RunAs;
-
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -20,13 +20,13 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.ejb3.test.clusteredservice;
+import javax.ejb.Local;
import javax.ejb.Remote;
-import javax.ejb.Local;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.Depends;
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.ejb3.annotation.Depends;
+import org.jboss.ejb3.annotation.Management;
+import org.jboss.ejb3.annotation.Service;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -7,15 +7,16 @@
package org.jboss.ejb3.test.clusteredsession;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.ha.framework.interfaces.RoundRobin;
+import java.rmi.dgc.VMID;
+import javax.ejb.Remote;
import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import java.rmi.dgc.VMID;
+import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.ha.framework.interfaces.RoundRobin;
+
/**
- * Simple statless bean
+ * Simple stateless bean
*
* @author Ben Wang
*/
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/IgnoreReplicationStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/IgnoreReplicationStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/IgnoreReplicationStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,8 +24,8 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Clustered;
/**
* Stateful bean that configures clustering via annotations.
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OptimizedStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OptimizedStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OptimizedStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,8 +24,8 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Clustered;
import org.jboss.ejb3.cache.Optimized;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideAnnotationStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideAnnotationStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideAnnotationStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,7 +24,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.Clustered;
+import org.jboss.ejb3.annotation.Clustered;
/**
* SFSB whose clustering annotations are overridden in xml.
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,8 +24,8 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Clustered;
import org.jboss.logging.Logger;
import org.jboss.system.server.ServerConfig;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/SessionBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/SessionBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/SessionBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,10 +21,10 @@
*/
package org.jboss.ejb3.test.clusteredsession;
+import javax.ejb.Remote;
import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import org.jboss.annotation.ejb.Clustered;
+import org.jboss.ejb3.annotation.Clustered;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,8 +24,8 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Clustered;
/**
* Stateful bean that configures clustering via annotations.
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedContainedBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedContainedBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedContainedBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,8 +25,8 @@
import javax.ejb.Local;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Clustered;
import org.jboss.ejb3.test.stateful.nested.base.xpc.DeepNestedContained;
import org.jboss.ejb3.test.stateful.nested.base.xpc.DeepNestedContainedBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,8 +25,8 @@
import javax.ejb.Local;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Clustered;
import org.jboss.ejb3.test.stateful.nested.base.DeepNestedStateful;
import org.jboss.ejb3.test.stateful.nested.base.DeepNestedStatefulBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalContainedBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalContainedBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalContainedBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,8 +25,8 @@
import javax.ejb.Local;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Clustered;
import org.jboss.ejb3.test.stateful.nested.base.xpc.Contained;
import org.jboss.ejb3.test.stateful.nested.base.xpc.ContainedBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalNestedStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalNestedStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalNestedStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -10,8 +10,8 @@
import javax.ejb.Local;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Clustered;
import org.jboss.ejb3.test.stateful.nested.base.std.NestedStateful;
import org.jboss.ejb3.test.stateful.nested.base.std.NestedStatefulBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredParentStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredParentStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredParentStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -13,8 +13,8 @@
import javax.ejb.Stateful;
import javax.interceptor.Interceptors;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Clustered;
import org.jboss.ejb3.test.clusteredsession.ExplicitFailoverInterceptor;
import org.jboss.ejb3.test.stateful.nested.base.std.ParentStatefulBean;
import org.jboss.ejb3.test.stateful.nested.base.std.ParentStatefulRemote;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteContainedBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteContainedBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteContainedBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,8 +25,8 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Clustered;
import org.jboss.ejb3.test.stateful.nested.base.xpc.Contained;
import org.jboss.ejb3.test.stateful.nested.base.xpc.ContainedBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteNestedStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteNestedStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteNestedStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -10,8 +10,8 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Clustered;
import org.jboss.ejb3.test.stateful.nested.base.std.NestedStateful;
import org.jboss.ejb3.test.stateful.nested.base.std.OptimizedNestedStatefulBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredShoppingCartBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredShoppingCartBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredShoppingCartBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -28,8 +28,8 @@
import javax.ejb.Stateful;
import javax.interceptor.Interceptors;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Clustered;
import org.jboss.ejb3.test.clusteredsession.ExplicitFailoverInterceptor;
import org.jboss.ejb3.test.stateful.nested.base.xpc.ShoppingCart;
import org.jboss.ejb3.test.stateful.nested.base.xpc.ShoppingCartBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTest.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTest.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTest.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,9 +21,6 @@
*/
package org.jboss.ejb3.test.consumer;
-import org.jboss.annotation.ejb.MessageProperties;
-import org.jboss.annotation.ejb.DeliveryMode;
-
/**
* @version <tt>$Revision$</tt>
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestConsumer.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestConsumer.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestConsumer.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,10 +21,10 @@
*/
package org.jboss.ejb3.test.consumer;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
import javax.jms.Message;
import javax.naming.Context;
import javax.naming.InitialContext;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestLocal.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestLocal.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestLocal.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,8 +21,6 @@
*/
package org.jboss.ejb3.test.consumer;
-import org.jboss.annotation.ejb.Local;
-import org.jboss.annotation.ejb.Producer;
/**
* @version <tt>$Revision$</tt>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestRemote.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestRemote.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestRemote.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,9 +21,6 @@
*/
package org.jboss.ejb3.test.consumer;
-import org.jboss.annotation.ejb.DeliveryMode;
-import org.jboss.annotation.ejb.MessageProperties;
-import org.jboss.annotation.ejb.Producer;
/**
* @version <tt>$Revision$</tt>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestXA.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestXA.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/DeploymentDescriptorQueueTestXA.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,9 +21,6 @@
*/
package org.jboss.ejb3.test.consumer;
-import org.jboss.annotation.ejb.Producer;
-import org.jboss.annotation.ejb.MessageProperties;
-import org.jboss.annotation.ejb.DeliveryMode;
/**
* @version <tt>$Revision$</tt>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTest.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTest.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTest.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,8 +21,8 @@
*/
package org.jboss.ejb3.test.consumer;
-import org.jboss.annotation.ejb.MessageProperties;
-import org.jboss.annotation.ejb.DeliveryMode;
+import org.jboss.ejb3.annotation.DeliveryMode;
+import org.jboss.ejb3.annotation.MessageProperties;
/**
* comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTestConsumer.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTestConsumer.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTestConsumer.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,15 +21,16 @@
*/
package org.jboss.ejb3.test.consumer;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
import javax.ejb.ActivationConfigProperty;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
import javax.jms.Message;
-import org.jboss.annotation.ejb.Consumer;
-import org.jboss.annotation.ejb.CurrentMessage;
+import org.jboss.ejb3.annotation.Consumer;
+import org.jboss.ejb3.annotation.CurrentMessage;
+
/**
* Comment
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTestLocal.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTestLocal.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTestLocal.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,9 +21,10 @@
*/
package org.jboss.ejb3.test.consumer;
-import org.jboss.annotation.ejb.Local;
-import org.jboss.annotation.ejb.Producer;
+import javax.ejb.Local;
+import org.jboss.ejb3.annotation.Producer;
+
/**
* comment
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTestRemote.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTestRemote.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTestRemote.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,7 +21,7 @@
*/
package org.jboss.ejb3.test.consumer;
-import org.jboss.annotation.ejb.Producer;
+import org.jboss.ejb3.annotation.Producer;
/**
* comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTestXA.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTestXA.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/QueueTestXA.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,9 +21,9 @@
*/
package org.jboss.ejb3.test.consumer;
-import org.jboss.annotation.ejb.Producer;
-import org.jboss.annotation.ejb.MessageProperties;
-import org.jboss.annotation.ejb.DeliveryMode;
+import org.jboss.ejb3.annotation.DeliveryMode;
+import org.jboss.ejb3.annotation.MessageProperties;
+import org.jboss.ejb3.annotation.Producer;
/**
* comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/TestStatusBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/TestStatusBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/consumer/TestStatusBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,7 +23,8 @@
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import org.jboss.annotation.JndiInject;
+
+import org.jboss.ejb3.annotation.JndiInject;
import org.jboss.ejb3.mdb.ProducerManager;
import org.jboss.ejb3.mdb.ProducerObject;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatusBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatusBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/TestStatusBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,7 +25,7 @@
import javax.jms.Destination;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Service;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/dd/override/FooBean1.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/dd/override/FooBean1.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/dd/override/FooBean1.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -27,7 +27,8 @@
import javax.ejb.TransactionAttribute;
import javax.ejb.TransactionAttributeType;
import javax.transaction.TransactionManager;
-import org.jboss.annotation.JndiInject;
+
+import org.jboss.ejb3.annotation.JndiInject;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Session30Bean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Session30Bean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/dd/web/ejb/Session30Bean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,14 +22,12 @@
package org.jboss.ejb3.test.dd.web.ejb;
-import javax.naming.*;
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.ejb3.Container;
-import org.jboss.logging.Logger;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.ejb3.test.dd.web.interfaces.Session30;
+import org.jboss.logging.Logger;
/**
* @version <tt>$Revision$</tt>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/defaultremotebindings/StatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/defaultremotebindings/StatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/defaultremotebindings/StatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,10 +21,10 @@
*/
package org.jboss.ejb3.test.defaultremotebindings;
+import javax.ejb.Remote;
import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import org.jboss.annotation.ejb.AspectDomain;
+import org.jboss.ejb3.annotation.AspectDomain;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependencyBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependencyBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/dependency/HasMBeanDependencyBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,8 +22,9 @@
package org.jboss.ejb3.test.dependency;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.Depends;
+import org.jboss.ejb3.annotation.Depends;
+
/**
* Comment
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -33,9 +33,9 @@
import javax.ejb.Stateful;
import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindings;
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBindings;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulLocalOnlyBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulLocalOnlyBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatefulLocalOnlyBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -26,8 +26,7 @@
import javax.ejb.SessionContext;
import javax.ejb.Stateful;
-
-import org.jboss.annotation.ejb.LocalBinding;
+import org.jboss.ejb3.annotation.LocalBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbcontext/StatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -33,9 +33,9 @@
import javax.ejb.Stateless;
import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindings;
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBindings;
import org.jboss.logging.Logger;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1040/TestStatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1040/TestStatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1040/TestStatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -5,7 +5,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
@Stateless
@Remote(TestStateless1040Remote.class)
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1057/DelegateBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1057/DelegateBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1057/DelegateBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -11,7 +11,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
/**
* A DelegateBean.
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1057/TestBusinessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1057/TestBusinessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1057/TestBusinessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -14,8 +14,8 @@
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
@Stateless
@Local(TestBusinessLocal.class)
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1071/DelegateBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1071/DelegateBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1071/DelegateBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -10,7 +10,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
/**
* A StatefulRemoteBean.
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1071/StatefulLocalBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1071/StatefulLocalBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1071/StatefulLocalBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -9,7 +9,7 @@
import javax.ejb.Local;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.LocalBinding;
+import org.jboss.ejb3.annotation.LocalBinding;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1071/StatefulRemoteBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1071/StatefulRemoteBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1071/StatefulRemoteBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -9,7 +9,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1075/homeonly/RemoteHomeOnly21Bean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1075/homeonly/RemoteHomeOnly21Bean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1075/homeonly/RemoteHomeOnly21Bean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -10,7 +10,7 @@
import javax.ejb.RemoteHome;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
/**
* A RemoteHomeOnly21Bean.
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1075/remoteonly/RemoteInterfaceOnly21Bean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1075/remoteonly/RemoteInterfaceOnly21Bean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1075/remoteonly/RemoteInterfaceOnly21Bean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -8,7 +8,7 @@
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.ejb3.test.ejbthree1075.homeonly.RemoteHomeOnly21Business;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1082/ABean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1082/ABean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1082/ABean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -28,7 +28,7 @@
import javax.ejb.TransactionAttribute;
import javax.ejb.TransactionAttributeType;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1082/BBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1082/BBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1082/BBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -26,7 +26,7 @@
import javax.ejb.TransactionAttribute;
import javax.ejb.TransactionAttributeType;
-import org.jboss.annotation.ejb.LocalBinding;
+import org.jboss.ejb3.annotation.LocalBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1122/TestServiceBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1122/TestServiceBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1122/TestServiceBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,9 +23,9 @@
import javax.ejb.EJB;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.Service;
/**
* A Service/Singleton/Mbean Test EJB both directly implementing a remote business interface
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1122/TestStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1122/TestStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1122/TestStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,8 +25,8 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
/**
* A Stateful Test EJB both directly implementing a remote business interface
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1122/TestStatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1122/TestStatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1122/TestStatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,8 +24,8 @@
import javax.ejb.EJB;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
/**
* A Stateless Test EJB both directly implementing a remote business interface
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyManagedServiceBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyManagedServiceBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyManagedServiceBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,8 +23,8 @@
import javax.ejb.Remote;
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Management;
+import org.jboss.ejb3.annotation.Service;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyServiceBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyServiceBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree655/MyServiceBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,7 +23,7 @@
import javax.ejb.Remote;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Service;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree785/MyStatelessLocal.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree785/MyStatelessLocal.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree785/MyStatelessLocal.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,7 +23,7 @@
import javax.ejb.Local;
-import org.jboss.annotation.ejb.LocalBinding;
+import org.jboss.ejb3.annotation.LocalBinding;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree785/MyStatelessRemote.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree785/MyStatelessRemote.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree785/MyStatelessRemote.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,7 +23,7 @@
import javax.ejb.Remote;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree785/Tester.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree785/Tester.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree785/Tester.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -8,7 +8,7 @@
import javax.ejb.Remote;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
@Remote
@RemoteBinding(jndiBinding = Tester.JNDI_NAME_REMOTE)
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree786/DelegateBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree786/DelegateBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree786/DelegateBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -9,7 +9,7 @@
import javax.ejb.EJB;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
@Stateless
@RemoteBinding(jndiBinding = DelegateBean.JNDI_NAME_REMOTE)
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree786/Ejb21ViewBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree786/Ejb21ViewBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree786/Ejb21ViewBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -10,7 +10,7 @@
import javax.ejb.RemoteHome;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
@Stateful
@Remote(Ejb21View.class)
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree786/StatefulRemoveBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree786/StatefulRemoveBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree786/StatefulRemoveBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,8 +23,8 @@
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
/**
* Defines a custom "remove" method that is not associated w/ EJBOBject/EJBLocalObject.remove
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree786/StatelessRemoveBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree786/StatelessRemoveBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree786/StatelessRemoveBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,14 +23,14 @@
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
/**
* Defines a custom "remove" method that is not associated w/ EJBOBject/EJBLocalObject.remove
*
* @author <a href="mailto:arubinge at redhat.com">ALR</a>
- * @version $Revision: $
+ * @version $Revision$
*/
@Stateless
@LocalBinding(jndiBinding = StatelessRemoveBean.JNDI_NAME_LOCAL)
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree921/MyStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree921/MyStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree921/MyStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -31,7 +31,7 @@
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
-import org.jboss.annotation.ejb.Clustered;
+import org.jboss.ejb3.annotation.Clustered;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree963/MyStateful.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree963/MyStateful.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree963/MyStateful.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,7 +24,7 @@
import java.rmi.Remote;
import java.rmi.RemoteException;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
/**
* @author carlo
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree973/RunAsSpyBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree973/RunAsSpyBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree973/RunAsSpyBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -26,13 +26,13 @@
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.annotation.SecurityDomain;
/**
* Comment
*
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
+ * @version $Revision$
*/
@Stateless
@Remote(SpyMe.class)
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree973/SpyAllowedBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree973/SpyAllowedBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree973/SpyAllowedBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -26,13 +26,13 @@
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.annotation.SecurityDomain;
/**
* Only Spy is allowed to call me.
*
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
+ * @version $Revision$
*/
@Stateless
@Remote(SpyMe.class)
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree973/WhoAmIBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree973/WhoAmIBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree973/WhoAmIBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -26,13 +26,13 @@
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
-import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.annotation.SecurityDomain;
/**
* Report the caller principal.
*
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
+ * @version $Revision$
*/
@Stateless
@Remote(WhoAmI.class)
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree973/WhoAmIMDB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree973/WhoAmIMDB.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree973/WhoAmIMDB.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -37,13 +37,13 @@
import javax.jms.QueueSession;
import javax.jms.TextMessage;
-import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.annotation.SecurityDomain;
/**
* Report the caller principal.
*
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
+ * @version $Revision$
*/
@MessageDriven(activationConfig = {
@ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/entity/EntityTestBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/entity/EntityTestBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/entity/EntityTestBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,16 +21,11 @@
*/
package org.jboss.ejb3.test.entity;
-import org.hibernate.Session;
-import org.hibernate.jdbc.JDBCContext;
-import org.hibernate.event.EventSource;
-import org.hibernate.engine.SessionImplementor;
-import org.jboss.annotation.JndiInject;
-
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+
import javax.ejb.Remote;
import javax.ejb.Stateless;
import javax.ejb.TransactionAttribute;
@@ -38,12 +33,17 @@
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import javax.transaction.Transaction;
-import javax.transaction.SystemException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.hibernate.Session;
+import org.hibernate.engine.SessionImplementor;
+import org.hibernate.event.EventSource;
+import org.hibernate.jdbc.JDBCContext;
+import org.jboss.ejb3.annotation.JndiInject;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/enventry/ExtendedTestEnvEntryBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/enventry/ExtendedTestEnvEntryBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/enventry/ExtendedTestEnvEntryBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,11 +22,10 @@
package org.jboss.ejb3.test.enventry;
import javax.annotation.Resource;
-import javax.ejb.Stateless;
import javax.ejb.Remote;
+import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.RemoteBinding;
-
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/enventry/TestEnvEntryBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,14 +22,13 @@
package org.jboss.ejb3.test.enventry;
import javax.annotation.Resource;
-import javax.ejb.Stateless;
import javax.ejb.Remote;
import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jboss.annotation.ejb.RemoteBinding;
-
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/factory/MyServiceBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/factory/MyServiceBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/factory/MyServiceBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,10 +21,11 @@
*/
package org.jboss.ejb3.test.factory;
+import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Service;
+
/**
* Comment
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/factory/Session2Bean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/factory/Session2Bean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/factory/Session2Bean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,8 +21,6 @@
*/
package org.jboss.ejb3.test.factory;
-import org.jboss.annotation.IgnoreDependency;
-
import javax.ejb.EJB;
import javax.ejb.Remote;
import javax.ejb.Stateless;
@@ -33,6 +31,8 @@
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceUnit;
+import org.jboss.ejb3.annotation.IgnoreDependency;
+
/**
* Comment
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyServiceBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyServiceBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/factoryxml/MyServiceBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,10 +21,11 @@
*/
package org.jboss.ejb3.test.factoryxml;
+import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Service;
+
/**
* Comment
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/homeinterface/DuplicateStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/homeinterface/DuplicateStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/homeinterface/DuplicateStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -27,11 +27,10 @@
import javax.ejb.RemoteHome;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.LocalHomeBinding;
-import org.jboss.annotation.ejb.RemoteHomeBinding;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.LocalHomeBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteHomeBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/homeinterface/DuplicateStatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/homeinterface/DuplicateStatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/homeinterface/DuplicateStatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -27,11 +27,10 @@
import javax.ejb.RemoteHome;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.LocalHomeBinding;
-import org.jboss.annotation.ejb.RemoteHomeBinding;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.LocalHomeBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteHomeBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/homeinterface/ExplicitStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/homeinterface/ExplicitStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/homeinterface/ExplicitStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -27,11 +27,10 @@
import javax.ejb.RemoteHome;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.LocalHomeBinding;
-import org.jboss.annotation.ejb.RemoteHomeBinding;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.LocalHomeBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteHomeBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/homeinterface/ExplicitStatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/homeinterface/ExplicitStatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/homeinterface/ExplicitStatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -27,11 +27,10 @@
import javax.ejb.RemoteHome;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.LocalHomeBinding;
-import org.jboss.annotation.ejb.RemoteHomeBinding;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.LocalHomeBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteHomeBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/homeinterface/TestBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/homeinterface/TestBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/homeinterface/TestBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,15 +22,9 @@
package org.jboss.ejb3.test.homeinterface;
import javax.ejb.Remote;
-import javax.ejb.RemoteHome;
import javax.ejb.Stateless;
-import javax.ejb.EJB;
import javax.naming.InitialContext;
-import javax.ejb.EJBs;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.ejb3.Container;
-
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/HomedStatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/HomedStatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/HomedStatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -28,8 +28,8 @@
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.ejb3.defaults.RemoteBindingDefaults;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.defaults.RemoteBindingDefaults;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/MyServiceBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/MyServiceBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/MyServiceBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,9 +23,9 @@
import javax.ejb.Remote;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.Service;
-import org.jboss.ejb3.defaults.RemoteBindingDefaults;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.Service;
+import org.jboss.ejb3.annotation.defaults.RemoteBindingDefaults;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/MySessionBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/MySessionBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/MySessionBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -27,10 +27,10 @@
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.IIOP;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.ejb3.defaults.RemoteBindingDefaults;
+import org.jboss.ejb3.annotation.IIOP;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
+import org.jboss.ejb3.annotation.defaults.RemoteBindingDefaults;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/MyStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -32,8 +32,8 @@
import javax.ejb.RemoveException;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.ejb3.defaults.RemoteBindingDefaults;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.defaults.RemoteBindingDefaults;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTesterBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTesterBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/iiop/TxTesterBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -33,9 +33,9 @@
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import org.jboss.annotation.JndiInject;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.ejb3.defaults.RemoteBindingDefaults;
+import org.jboss.ejb3.annotation.JndiInject;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.defaults.RemoteBindingDefaults;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/initial/InterceptedSFTestBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/initial/InterceptedSFTestBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/initial/InterceptedSFTestBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -32,7 +32,7 @@
import javax.interceptor.Interceptors;
import javax.interceptor.InvocationContext;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/initial/SecuredTestBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/initial/SecuredTestBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/initial/SecuredTestBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -27,8 +27,9 @@
import javax.ejb.Local;
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.annotation.SecurityDomain;
+
/**
* Comment
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/initial/TestBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/initial/TestBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/initial/TestBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,15 +21,17 @@
*/
package org.jboss.ejb3.test.initial;
+import java.util.HashMap;
import java.util.Map;
-import java.util.HashMap;
+
import javax.ejb.Stateless;
import javax.ejb.TransactionAttribute;
import javax.ejb.TransactionAttributeType;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import org.jboss.annotation.JndiInject;
+import org.jboss.ejb3.annotation.JndiInject;
+
/**
* Comment
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyBaseInterceptor.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyBaseInterceptor.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyBaseInterceptor.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,8 +23,8 @@
import java.util.ArrayList;
+import javax.annotation.Resource;
import javax.ejb.EJB;
-import javax.annotation.Resource;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
import javax.persistence.EntityManager;
@@ -36,7 +36,7 @@
import org.hibernate.Session;
import org.hibernate.SessionFactory;
-import org.jboss.annotation.JndiInject;
+import org.jboss.ejb3.annotation.JndiInject;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyInterceptor.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyInterceptor.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors/MyInterceptor.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,20 +21,20 @@
*/
package org.jboss.ejb3.test.interceptors;
+import javax.annotation.Resource;
import javax.ejb.EJB;
-import javax.annotation.Resource;
-import javax.transaction.TransactionManager;
-import javax.sql.DataSource;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
import javax.persistence.PersistenceUnit;
-import javax.persistence.EntityManagerFactory;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
-import org.jboss.annotation.JndiInject;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
+import org.jboss.ejb3.annotation.JndiInject;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSB.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSB.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -32,7 +32,7 @@
import javax.interceptor.Interceptors;
import javax.interceptor.InvocationContext;
-import org.jboss.annotation.ejb.Pool;
+import org.jboss.ejb3.annotation.Pool;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyConsumer.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyConsumer.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyConsumer.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,7 +23,7 @@
import javax.ejb.ActivationConfigProperty;
-import org.jboss.annotation.ejb.Consumer;
+import org.jboss.ejb3.annotation.Consumer;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyProducer.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyProducer.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyProducer.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,7 +21,7 @@
*/
package org.jboss.ejb3.test.interceptors2;
-import org.jboss.annotation.ejb.Producer;
+import org.jboss.ejb3.annotation.Producer;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyService.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyService.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/DefaultOnlyService.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,8 +23,8 @@
import javax.ejb.Remote;
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Management;
+import org.jboss.ejb3.annotation.Service;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSB.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSB.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -32,7 +32,7 @@
import javax.interceptor.ExcludeDefaultInterceptors;
import javax.interceptor.InvocationContext;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSB.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSB.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -31,7 +31,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConsumer.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConsumer.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConsumer.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,7 +24,7 @@
import javax.ejb.ActivationConfigProperty;
import javax.interceptor.Interceptors;
-import org.jboss.annotation.ejb.Consumer;
+import org.jboss.ejb3.annotation.Consumer;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedProducer.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedProducer.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedProducer.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,7 +21,7 @@
*/
package org.jboss.ejb3.test.interceptors2;
-import org.jboss.annotation.ejb.Producer;
+import org.jboss.ejb3.annotation.Producer;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedServiceBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,8 +23,8 @@
import javax.interceptor.Interceptors;
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Management;
+import org.jboss.ejb3.annotation.Service;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/StatusBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,13 +23,13 @@
import java.util.ArrayList;
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.ejb.PostActivate;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
+import javax.ejb.PostActivate;
import javax.ejb.PrePassivate;
+import javax.interceptor.ExcludeDefaultInterceptors;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Service;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/invoker/StatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,11 +22,11 @@
package org.jboss.ejb3.test.invoker;
+import javax.ejb.Remote;
import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindings;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBindings;
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/jacc/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/jacc/StatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/jacc/StatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,12 +22,11 @@
package org.jboss.ejb3.test.jacc;
-import javax.annotation.security.RolesAllowed;
import javax.annotation.security.PermitAll;
+import javax.annotation.security.RolesAllowed;
import javax.ejb.Remote;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.annotation.ejb.AspectDomain;
+import org.jboss.ejb3.annotation.SecurityDomain;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/jacc/StatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/jacc/StatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/jacc/StatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,14 +22,13 @@
package org.jboss.ejb3.test.jacc;
-import javax.annotation.security.RolesAllowed;
import javax.annotation.security.PermitAll;
+import javax.annotation.security.RolesAllowed;
import javax.ejb.Remote;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.annotation.ejb.AspectDomain;
+import org.jboss.ejb3.annotation.SecurityDomain;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSMDBBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSMDBBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSMDBBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -26,8 +26,8 @@
import javax.jms.Message;
import javax.jms.MessageListener;
-import org.jboss.annotation.ejb.Pool;
-import org.jboss.annotation.ejb.ResourceAdapter;
+import org.jboss.ejb3.annotation.Pool;
+import org.jboss.ejb3.annotation.ResourceAdapter;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzMDBBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzMDBBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/QuartzMDBBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,20 +21,16 @@
*/
package org.jboss.ejb3.test.jca.inflowmdb;
-import org.jboss.ejb3.test.jca.inflow.TestMessageListener;
-import org.jboss.ejb3.test.jca.inflow.TestMessage;
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.interceptor.Interceptors;
+
+import org.jboss.ejb3.annotation.ResourceAdapter;
import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.ResourceAdapter;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
-import javax.ejb.MessageDriven;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.interceptor.Interceptors;
-
/**
*
* @version <tt>$Revision$</tt>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/TestMDBMessageListener.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/TestMDBMessageListener.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/TestMDBMessageListener.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -26,11 +26,10 @@
import javax.ejb.TransactionAttribute;
import javax.ejb.TransactionAttributeType;
-import org.jboss.ejb3.mdb.inflow.MessageInflowLocalProxy;
+import org.jboss.ejb3.annotation.ResourceAdapter;
import org.jboss.ejb3.test.jca.inflow.TestMessage;
import org.jboss.ejb3.test.jca.inflow.TestMessageListener;
import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.ResourceAdapter;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/jms/QueueStatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,7 +24,8 @@
import javax.annotation.Resource;
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.RemoteBinding;
+
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/localcall/ServiceBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,11 +22,11 @@
package org.jboss.ejb3.test.localcall;
+import javax.ejb.Local;
import javax.ejb.Remote;
-import javax.ejb.Local;
import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Service;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClusteredBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClusteredBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClusteredBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,7 +25,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.Clustered;
+import org.jboss.ejb3.annotation.Clustered;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClusteredBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClusteredBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClusteredBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,7 +25,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.Clustered;
+import org.jboss.ejb3.annotation.Clustered;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/longlived/ContainedBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/longlived/ContainedBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/longlived/ContainedBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -31,7 +31,7 @@
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/longlived/HibernateShoppingCartBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/longlived/HibernateShoppingCartBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/longlived/HibernateShoppingCartBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -29,8 +29,9 @@
import javax.ejb.TransactionAttributeType;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
+
import org.hibernate.Session;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
/**
* comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/longlived/ShoppingCartBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/longlived/ShoppingCartBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/longlived/ShoppingCartBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -34,7 +34,7 @@
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
/**
* comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMailBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMailBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/mail/StatelessMailBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,19 +22,17 @@
package org.jboss.ejb3.test.mail;
import javax.annotation.Resource;
-import javax.ejb.Stateless;
import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import javax.mail.Session;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.ejb3.Container;
-
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
-import javax.mail.Session;
-
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
* @version <tt>$Revision$</tt>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/BMTQueueTestMDB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/BMTQueueTestMDB.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/BMTQueueTestMDB.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,18 +21,15 @@
*/
package org.jboss.ejb3.test.mdb;
+import javax.annotation.Resource;
import javax.ejb.ActivationConfigProperty;
import javax.ejb.MessageDriven;
+import javax.ejb.MessageDrivenContext;
import javax.ejb.TransactionManagement;
import javax.ejb.TransactionManagementType;
-import javax.ejb.MessageDrivenContext;
import javax.jms.Message;
import javax.jms.MessageListener;
-import javax.annotation.security.RunAs;
-import javax.annotation.Resource;
-
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/CMTQueueTestMDB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/CMTQueueTestMDB.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/CMTQueueTestMDB.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,14 +22,12 @@
package org.jboss.ejb3.test.mdb;
import javax.annotation.Resource;
-import javax.annotation.security.RunAs;
import javax.ejb.ActivationConfigProperty;
import javax.ejb.MessageDriven;
import javax.ejb.MessageDrivenContext;
import javax.jms.Message;
import javax.jms.MessageListener;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/DefaultedQueueTestMDB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/DefaultedQueueTestMDB.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/DefaultedQueueTestMDB.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,17 +21,14 @@
*/
package org.jboss.ejb3.test.mdb;
+import javax.annotation.Resource;
import javax.ejb.ActivationConfigProperty;
import javax.ejb.MessageDriven;
import javax.ejb.MessageDrivenContext;
import javax.jms.Message;
import javax.jms.MessageListener;
-import javax.annotation.security.RunAs;
-import javax.annotation.Resource;
-
-import org.jboss.annotation.ejb.DefaultActivationSpecs;
-import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.annotation.DefaultActivationSpecs;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/ExpirationTestMDB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/ExpirationTestMDB.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/ExpirationTestMDB.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -26,7 +26,7 @@
import javax.jms.Message;
import javax.jms.MessageListener;
-import org.jboss.annotation.ejb.Pool;
+import org.jboss.ejb3.annotation.Pool;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/MismatchedQueueMDB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/MismatchedQueueMDB.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/MismatchedQueueMDB.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -27,7 +27,7 @@
import javax.jms.MessageListener;
import javax.jms.TextMessage;
-import org.jboss.annotation.ejb.Pool;
+import org.jboss.ejb3.annotation.Pool;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/NondurableQueueTestMDB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/NondurableQueueTestMDB.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/NondurableQueueTestMDB.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,17 +21,14 @@
*/
package org.jboss.ejb3.test.mdb;
+import javax.annotation.Resource;
import javax.ejb.ActivationConfigProperty;
import javax.ejb.MessageDriven;
import javax.ejb.MessageDrivenContext;
+import javax.jms.DeliveryMode;
import javax.jms.Message;
import javax.jms.MessageListener;
-import javax.jms.DeliveryMode;
-import javax.annotation.security.RunAs;
-import javax.annotation.Resource;
-
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideDefaultedQueueTestMDB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideDefaultedQueueTestMDB.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideDefaultedQueueTestMDB.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,17 +21,14 @@
*/
package org.jboss.ejb3.test.mdb;
+import javax.annotation.Resource;
import javax.ejb.ActivationConfigProperty;
import javax.ejb.MessageDriven;
import javax.ejb.MessageDrivenContext;
import javax.jms.Message;
import javax.jms.MessageListener;
-import javax.annotation.security.RunAs;
-import javax.annotation.Resource;
-
-import org.jboss.annotation.ejb.DefaultActivationSpecs;
-import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.annotation.DefaultActivationSpecs;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideTestMDB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideTestMDB.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/OverrideTestMDB.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,14 +21,14 @@
*/
package org.jboss.ejb3.test.mdb;
+import javax.annotation.Resource;
import javax.ejb.ActivationConfigProperty;
import javax.ejb.MessageDriven;
import javax.ejb.MessageDrivenContext;
import javax.jms.Message;
import javax.jms.MessageListener;
-import javax.annotation.Resource;
-import org.jboss.annotation.ejb.Pool;
+import org.jboss.ejb3.annotation.Pool;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/QueueTestMDB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/QueueTestMDB.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/QueueTestMDB.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,23 +21,22 @@
*/
package org.jboss.ejb3.test.mdb;
-import javax.ejb.ActivationConfigProperty;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-import javax.ejb.MessageDriven;
-import javax.ejb.MessageDrivenContext;
-import javax.ejb.EJB;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.annotation.Resource;
+import javax.annotation.security.RunAs;
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.EJB;
+import javax.ejb.MessageDriven;
+import javax.ejb.MessageDrivenContext;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
import javax.jms.Message;
import javax.jms.MessageListener;
import javax.naming.InitialContext;
-import javax.annotation.security.RunAs;
-
-import org.jboss.annotation.ejb.Pool;
-import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.annotation.Pool;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/RollbackCMTQueueTestMDB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/RollbackCMTQueueTestMDB.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/RollbackCMTQueueTestMDB.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,14 +22,12 @@
package org.jboss.ejb3.test.mdb;
import javax.annotation.Resource;
-import javax.annotation.security.RunAs;
import javax.ejb.ActivationConfigProperty;
import javax.ejb.MessageDriven;
import javax.ejb.MessageDrivenContext;
import javax.jms.Message;
import javax.jms.MessageListener;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/StatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/StatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/StatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,8 +25,8 @@
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/TransactionQueueTestMDB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/TransactionQueueTestMDB.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/TransactionQueueTestMDB.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,13 +23,11 @@
import javax.ejb.ActivationConfigProperty;
import javax.ejb.MessageDriven;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
import javax.jms.Message;
import javax.jms.MessageListener;
-import org.jboss.annotation.ejb.Pool;
-import org.jboss.annotation.ejb.TransactionTimeout;
+import org.jboss.ejb3.annotation.Pool;
+import org.jboss.ejb3.annotation.TransactionTimeout;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/StatelessFacadeBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/StatelessFacadeBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/StatelessFacadeBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -28,7 +28,7 @@
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful2Bean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful2Bean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/naming/Stateful2Bean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,7 +24,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,7 +24,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulOverrideBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulOverrideBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/naming/StatefulOverrideBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,7 +24,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/pool/ExampleTimerBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/pool/ExampleTimerBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/pool/ExampleTimerBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,16 +23,16 @@
import java.util.Date;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
import javax.annotation.Resource;
-import javax.annotation.PreDestroy;
-import javax.annotation.PostConstruct;
import javax.ejb.Remote;
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
import javax.ejb.Timeout;
import javax.ejb.Timer;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
@Stateless
@Remote(ExampleTimer.class)
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/reference21_30/GlobalSession30Bean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/reference21_30/GlobalSession30Bean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/reference21_30/GlobalSession30Bean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,11 +21,11 @@
*/
package org.jboss.ejb3.test.reference21_30;
-import javax.naming.*;
import javax.ejb.Remote;
import javax.ejb.Stateless;
+import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/reference21_30/HomedStatefulSession30Bean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/reference21_30/HomedStatefulSession30Bean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/reference21_30/HomedStatefulSession30Bean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,16 +21,17 @@
*/
package org.jboss.ejb3.test.reference21_30;
+import javax.annotation.PreDestroy;
import javax.ejb.Init;
import javax.ejb.Local;
import javax.ejb.LocalHome;
-import javax.annotation.PreDestroy;
import javax.ejb.Remote;
import javax.ejb.RemoteHome;
import javax.ejb.Stateful;
import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
+
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Bean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Bean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Session30Bean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,16 +21,16 @@
*/
package org.jboss.ejb3.test.reference21_30;
-import javax.naming.*;
import javax.ejb.EJB;
import javax.ejb.EJBs;
+import javax.ejb.Local;
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import javax.ejb.Local;
+import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.ejb3.Container;
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Bean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Bean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/reference21_30/StatefulSession30Bean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,14 +21,15 @@
*/
package org.jboss.ejb3.test.reference21_30;
+import javax.annotation.PreDestroy;
import javax.ejb.Init;
import javax.ejb.Local;
-import javax.annotation.PreDestroy;
import javax.ejb.Remote;
import javax.ejb.Stateful;
import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
+
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Bean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Bean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/reference21_30/Test3Bean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,16 +21,15 @@
*/
package org.jboss.ejb3.test.reference21_30;
+import javax.ejb.EJB;
+import javax.ejb.EJBs;
import javax.ejb.Remote;
import javax.ejb.RemoteHome;
import javax.ejb.Stateless;
-import javax.ejb.EJB;
import javax.naming.InitialContext;
-import javax.ejb.EJBs;
-import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.ejb3.Container;
-
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/regression/PassivationTestBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/regression/PassivationTestBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/regression/PassivationTestBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -33,8 +33,8 @@
import javax.persistence.PersistenceContext;
import javax.transaction.UserTransaction;
-import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.ejb3.Container;
+import org.jboss.ejb3.annotation.CacheConfig;
/**
* comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -29,7 +29,7 @@
import javax.ejb.SessionContext;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyServiceBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyServiceBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree249/MyServiceBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,9 +22,10 @@
package org.jboss.ejb3.test.regression.ejbthree249;
import javax.ejb.EJB;
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Management;
+import org.jboss.ejb3.annotation.Service;
+
/**
* Comment
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree315/ServiceBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,7 +21,7 @@
*/
package org.jboss.ejb3.test.regression.ejbthree315;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Service;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/NonExtendedStatefuBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/NonExtendedStatefuBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/NonExtendedStatefuBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -27,8 +27,8 @@
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.RemoteBinding;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -28,7 +28,7 @@
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulTransientBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulTransientBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulTransientBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -29,8 +29,8 @@
import javax.persistence.PersistenceContextType;
import javax.persistence.Transient;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.RemoteBinding;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree376/StatusBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,7 +21,7 @@
*/
package org.jboss.ejb3.test.regression.ejbthree376;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Service;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/InheritanceDemo.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/InheritanceDemo.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree440/session/InheritanceDemo.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,8 +1,7 @@
package org.jboss.ejb3.test.regression.ejbthree440.session;
-import java.util.Date;
-import org.jboss.serial.io.MarshalledObject;
import java.io.IOException;
+import java.util.Date;
import javax.ejb.Remote;
import javax.ejb.Stateless;
@@ -10,12 +9,12 @@
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
-import org.jboss.annotation.ejb.RemoteBinding;
-
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.ejb3.test.regression.ejbthree440.model.MyResource;
import org.jboss.ejb3.test.regression.ejbthree440.model.Resource;
import org.jboss.ejb3.test.regression.ejbthree440.model.User;
import org.jboss.ejb3.test.regression.ejbthree440.session.i.IInheritanceDemo;
+import org.jboss.serial.io.MarshalledObject;
@Stateless
@RemoteBinding(jndiBinding="InheritanceDemo/remote")
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree670/MyStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -26,8 +26,6 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.Cache;
-import org.jboss.ejb3.cache.simple.SimpleStatefulCache;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/CalleeBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/CalleeBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/CalleeBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,22 +22,19 @@
package org.jboss.ejb3.test.security;
import java.security.Principal;
-import javax.ejb.CreateException;
+
+import javax.annotation.Resource;
+import javax.annotation.security.RolesAllowed;
import javax.ejb.Local;
import javax.ejb.Remote;
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
-import javax.annotation.Resource;
-import javax.annotation.security.RunAs;
-
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import javax.annotation.security.RolesAllowed;
-
/** A simple session bean that is called by the CallerBean to test
run-as identity and role propagation.
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,6 +22,10 @@
package org.jboss.ejb3.test.security;
import java.security.Principal;
+
+import javax.annotation.Resource;
+import javax.annotation.security.RolesAllowed;
+import javax.annotation.security.RunAs;
import javax.ejb.EJBException;
import javax.ejb.Remote;
import javax.ejb.SessionContext;
@@ -29,15 +33,13 @@
import javax.naming.Context;
import javax.naming.InitialContext;
-import javax.annotation.Resource;
-import javax.annotation.security.RolesAllowed;
-import javax.annotation.security.RunAs;
-
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.ejb3.Container;
+
+
/**
* A simple session bean that calls the CalleeBean
* @author Scott.Stark at jboss.org
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean2.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean2.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean2.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,22 +22,22 @@
package org.jboss.ejb3.test.security;
import java.security.Principal;
+
+import javax.annotation.Resource;
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.EJB;
import javax.ejb.EJBException;
+import javax.ejb.EJBs;
import javax.ejb.Remote;
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
import javax.naming.Context;
import javax.naming.InitialContext;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.annotation.Resource;
-import javax.annotation.security.RolesAllowed;
-
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.ejb3.Container;
/**
* A simple session bean that calls the CalleeBean
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/CallerFacadeBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/CallerFacadeBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/CallerFacadeBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,19 +22,21 @@
package org.jboss.ejb3.test.security;
import java.security.Principal;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
+
import javax.annotation.Resource;
import javax.annotation.security.RolesAllowed;
+import javax.ejb.EJB;
import javax.ejb.EJBException;
+import javax.ejb.EJBs;
import javax.ejb.Remote;
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
import javax.naming.InitialContext;
+
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.ejb3.Container;
/**
* A simple session bean that calls the CalleeBean
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/FacadeTargetBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/FacadeTargetBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/FacadeTargetBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,19 +22,21 @@
package org.jboss.ejb3.test.security;
import java.security.Principal;
+
+import javax.annotation.Resource;
import javax.ejb.EJB;
+import javax.ejb.EJBException;
import javax.ejb.EJBs;
-import javax.annotation.Resource;
-import javax.ejb.EJBException;
import javax.ejb.Local;
import javax.ejb.Remote;
import javax.ejb.SessionContext;
import javax.ejb.Stateful;
import javax.naming.InitialContext;
+
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.ejb3.Container;
/**
* A simple session bean that calls the CalleeBean
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/JobDAOBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/JobDAOBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/JobDAOBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,14 +22,12 @@
package org.jboss.ejb3.test.security;
import javax.annotation.security.RolesAllowed;
-
import javax.ejb.Stateful;
-
-import org.jboss.annotation.security.SecurityDomain;
-
import javax.ejb.TransactionManagement;
import javax.ejb.TransactionManagementType;
+import org.jboss.ejb3.annotation.SecurityDomain;
+
@Stateful
@TransactionManagement(TransactionManagementType.BEAN)
@SecurityDomain("security-web")
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/Level1CallerBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/Level1CallerBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/Level1CallerBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,21 +22,23 @@
package org.jboss.ejb3.test.security;
import java.security.Principal;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
+
import javax.annotation.Resource;
import javax.annotation.security.RolesAllowed;
import javax.annotation.security.RunAs;
+import javax.ejb.EJB;
import javax.ejb.EJBException;
+import javax.ejb.EJBs;
import javax.ejb.Remote;
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
import javax.naming.Context;
import javax.naming.InitialContext;
+
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.ejb3.Container;
/**
* A simple session bean that calls the CalleeBean
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/PrivateSessionBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/PrivateSessionBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/PrivateSessionBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -29,8 +29,8 @@
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
/** An implmentation of the Session interface that should not
be accessible by external users.
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,17 +22,19 @@
package org.jboss.ejb3.test.security;
import java.security.Principal;
+
+import javax.annotation.Resource;
+import javax.annotation.security.RolesAllowed;
import javax.ejb.EJB;
import javax.ejb.EJBs;
-import javax.annotation.Resource;
-import javax.annotation.security.RolesAllowed;
import javax.ejb.Remote;
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
+
import org.jboss.ejb3.Container;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
/** An implmentation of the Session interface that delegates its
echo method call to the PrivateSession bean to test run-as.
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionFacade.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionFacade.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/PublicSessionFacade.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,18 +23,20 @@
import java.rmi.RemoteException;
import java.security.Principal;
+
+import javax.annotation.Resource;
+import javax.annotation.security.RolesAllowed;
import javax.ejb.EJB;
import javax.ejb.EJBs;
-import javax.annotation.Resource;
-import javax.annotation.security.RolesAllowed;
import javax.ejb.Remote;
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
+
import org.jboss.ejb3.Container;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
/**
* @author Scott.Stark at jboss.org
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,17 +23,19 @@
import java.util.Iterator;
import java.util.Set;
+
+import javax.annotation.Resource;
+import javax.annotation.security.RolesAllowed;
import javax.ejb.EJB;
import javax.ejb.EJBs;
-import javax.annotation.Resource;
-import javax.annotation.security.RolesAllowed;
import javax.ejb.Remote;
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
+
import org.jboss.ejb3.Container;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextTargetBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextTargetBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/SecurityContextTargetBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,20 +21,19 @@
*/
package org.jboss.ejb3.test.security;
-import java.rmi.RemoteException;
import java.util.Iterator;
import java.util.Set;
+
+import javax.annotation.Resource;
+import javax.annotation.security.PermitAll;
import javax.ejb.Remote;
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
import javax.naming.InitialContext;
-import javax.annotation.Resource;
-import javax.annotation.security.PermitAll;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.ejb3.Container;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,13 +25,12 @@
import javax.annotation.Resource;
import javax.annotation.security.RolesAllowed;
-
import javax.ejb.Remote;
import javax.ejb.SessionContext;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
@Stateful
@Remote(org.jboss.ejb3.test.security.StatefulSession.class)
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,18 +24,15 @@
import java.security.Principal;
import javax.annotation.Resource;
+import javax.annotation.security.RolesAllowed;
import javax.ejb.EJBException;
+import javax.ejb.Remote;
import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
import javax.naming.InitialContext;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import javax.annotation.security.RolesAllowed;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
/** A SessionBean that access the Entity bean to test Principal
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean2.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean2.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean2.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,18 +22,20 @@
package org.jboss.ejb3.test.security;
import java.security.Principal;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
+
import javax.annotation.Resource;
import javax.annotation.security.RolesAllowed;
+import javax.ejb.EJB;
import javax.ejb.EJBException;
+import javax.ejb.EJBs;
import javax.ejb.Remote;
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
+
import org.jboss.ejb3.Container;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
/** A SessionBean that access the Entity bean to test Principal
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean3.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean3.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean3.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,7 +21,6 @@
*/
package org.jboss.ejb3.test.security;
-import java.rmi.RemoteException;
import java.security.Principal;
import javax.annotation.Resource;
@@ -32,9 +31,8 @@
import javax.ejb.Stateless;
import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.ejb3.test.security.StatelessSession;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBeanInDomain.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBeanInDomain.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBeanInDomain.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,18 +24,16 @@
import java.security.Principal;
import javax.annotation.Resource;
+import javax.annotation.security.DenyAll;
+import javax.annotation.security.RolesAllowed;
import javax.ejb.EJBException;
+import javax.ejb.Remote;
import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
import javax.naming.InitialContext;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import javax.annotation.security.DenyAll;
-import javax.annotation.security.RolesAllowed;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
/** A SessionBean that access the Entity bean to test Principal
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean_test.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean_test.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/StatelessSessionBean_test.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,19 +24,17 @@
import java.security.Principal;
import javax.annotation.Resource;
+import javax.annotation.security.DenyAll;
+import javax.annotation.security.RolesAllowed;
import javax.ejb.EJBException;
+import javax.ejb.Remote;
import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
import javax.naming.InitialContext;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
-import javax.annotation.security.DenyAll;
-import javax.annotation.security.RolesAllowed;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-
/** A SessionBean that access the Entity bean to test Principal
identity propagation.
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/TimerTesterBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/TimerTesterBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/TimerTesterBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,24 +23,20 @@
import java.util.Date;
-import javax.naming.InitialContext;
-
import javax.annotation.Resource;
-import javax.annotation.security.RunAs;
import javax.ejb.Remote;
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
import javax.ejb.Timeout;
import javax.ejb.Timer;
import javax.ejb.TimerService;
+import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
+import org.jboss.logging.Logger;
import org.jboss.security.SecurityAssociation;
-import org.jboss.logging.Logger;
-
/**
* Comment
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,18 +24,16 @@
import java.security.Principal;
import javax.annotation.Resource;
-import javax.ejb.CreateException;
+import javax.annotation.security.PermitAll;
+import javax.annotation.security.RolesAllowed;
import javax.ejb.EJBException;
import javax.ejb.Remote;
-import javax.ejb.SessionBean;
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import javax.annotation.security.PermitAll;
-import javax.annotation.security.RolesAllowed;
/** A simple session bean for testing unchecked declarative security.
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanFirst.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanFirst.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanFirst.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,18 +24,16 @@
import java.security.Principal;
import javax.annotation.Resource;
-import javax.ejb.CreateException;
+import javax.annotation.security.PermitAll;
+import javax.annotation.security.RolesAllowed;
import javax.ejb.EJBException;
import javax.ejb.Remote;
-import javax.ejb.SessionBean;
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import javax.annotation.security.PermitAll;
-import javax.annotation.security.RolesAllowed;
/** A simple session bean for testing unchecked declarative security.
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanLast.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanLast.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedSessionBeanLast.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,18 +24,16 @@
import java.security.Principal;
import javax.annotation.Resource;
-import javax.ejb.CreateException;
+import javax.annotation.security.PermitAll;
+import javax.annotation.security.RolesAllowed;
import javax.ejb.EJBException;
import javax.ejb.Remote;
-import javax.ejb.SessionBean;
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-import javax.annotation.security.PermitAll;
-import javax.annotation.security.RolesAllowed;
/** A simple session bean for testing unchecked declarative security.
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/UncheckedStatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,14 +21,14 @@
*/
package org.jboss.ejb3.test.security;
+import javax.annotation.security.PermitAll;
+import javax.annotation.security.RunAs;
+import javax.ejb.Remote;
import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.annotation.security.PermitAll;
-import org.jboss.annotation.security.SecurityDomain;
+
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
-import javax.annotation.security.RunAs;
-
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
* @version $Revision$
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/security/UnsecuredStatelessSessionBean2.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/security/UnsecuredStatelessSessionBean2.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/security/UnsecuredStatelessSessionBean2.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,16 +22,18 @@
package org.jboss.ejb3.test.security;
import java.security.Principal;
+
+import javax.annotation.Resource;
import javax.ejb.EJB;
+import javax.ejb.EJBException;
import javax.ejb.EJBs;
-import javax.annotation.Resource;
-import javax.ejb.EJBException;
import javax.ejb.Remote;
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.RemoteBinding;
+
import org.jboss.ejb3.Container;
+import org.jboss.ejb3.annotation.RemoteBinding;
/** A SessionBean that access the Entity bean to test Principal
identity propagation.
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFive.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFive.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFive.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,10 +22,11 @@
package org.jboss.ejb3.test.service;
import javax.management.ObjectName;
-import org.jboss.annotation.ejb.Depends;
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Depends;
+import org.jboss.ejb3.annotation.Management;
+import org.jboss.ejb3.annotation.Service;
+
/**
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFour.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFour.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFour.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,9 +21,9 @@
*/
package org.jboss.ejb3.test.service;
-import org.jboss.annotation.ejb.Service;
-import org.jboss.annotation.ejb.Depends;
-import org.jboss.annotation.ejb.Management;
+import org.jboss.ejb3.annotation.Depends;
+import org.jboss.ejb3.annotation.Management;
+import org.jboss.ejb3.annotation.Service;
/**
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceOne.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceOne.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceOne.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,15 +22,14 @@
package org.jboss.ejb3.test.service;
import javax.ejb.EJB;
-import javax.ejb.Remote;
import javax.ejb.Local;
-
+import javax.ejb.Remote;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
-import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.annotation.Management;
+import org.jboss.ejb3.annotation.SecurityDomain;
+import org.jboss.ejb3.annotation.Service;
/**
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSeven.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSeven.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSeven.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,7 +21,7 @@
*/
package org.jboss.ejb3.test.service;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Service;
/**
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenManagement.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenManagement.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSevenManagement.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,7 +21,7 @@
*/
package org.jboss.ejb3.test.service;
-import org.jboss.annotation.ejb.Management;
+import org.jboss.ejb3.annotation.Management;
/**
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSix.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSix.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSix.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,14 +21,11 @@
*/
package org.jboss.ejb3.test.service;
-import javax.ejb.Remote;
-import javax.ejb.Local;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.sql.DataSource;
-import org.jboss.annotation.ejb.Service;
import org.jboss.ejb3.Container;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixManagement.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixManagement.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceSixManagement.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,8 +21,6 @@
*/
package org.jboss.ejb3.test.service;
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Management;
/**
* @version <tt>$Revision$</tt>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceThree.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceThree.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceThree.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,10 +24,11 @@
import javax.ejb.EJB;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
-import org.jboss.annotation.ejb.Depends;
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Depends;
+import org.jboss.ejb3.annotation.Management;
+import org.jboss.ejb3.annotation.Service;
+
/**
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceTwo.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceTwo.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceTwo.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,11 +23,12 @@
import javax.ejb.Local;
import javax.ejb.Remote;
-import org.jboss.annotation.ejb.Depends;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Depends;
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.Service;
+
/**
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/service/Session.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/service/Session.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/service/Session.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,8 +24,9 @@
import javax.ejb.Remote;
import javax.ejb.Stateless;
import javax.management.ObjectName;
-import org.jboss.annotation.ejb.Depends;
+import org.jboss.ejb3.annotation.Depends;
+
/**
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionService.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionService.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionService.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -4,9 +4,9 @@
import javax.jms.Topic;
import javax.jms.TopicConnectionFactory;
-import org.jboss.annotation.ejb.Depends;
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Depends;
+import org.jboss.ejb3.annotation.Management;
+import org.jboss.ejb3.annotation.Service;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionServiceIF.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionServiceIF.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionServiceIF.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -1,6 +1,6 @@
package org.jboss.ejb3.test.service;
-import org.jboss.annotation.ejb.Management;
+import org.jboss.ejb3.annotation.Management;
/**
* @version <tt>$Revision$</tt>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/servicedependency/AccountBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/servicedependency/AccountBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/servicedependency/AccountBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -3,8 +3,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.Depends;
-
+import org.jboss.ejb3.annotation.Depends;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumber.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumber.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/servicedependency/PinNumber.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -6,9 +6,9 @@
*/
package org.jboss.ejb3.test.servicedependency;
-import org.jboss.annotation.ejb.Depends;
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Depends;
+import org.jboss.ejb3.annotation.Management;
+import org.jboss.ejb3.annotation.Service;
/**
* A PinNumberMBean.
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueId.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueId.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/servicedependency/UniqueId.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -8,8 +8,8 @@
import java.util.UUID;
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Management;
+import org.jboss.ejb3.annotation.Service;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOne.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOne.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOne.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,7 +23,7 @@
import javax.ejb.Remote;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Service;
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOneDeploymentDescriptor.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOneDeploymentDescriptor.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/servicexmbean/ServiceOneDeploymentDescriptor.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,10 +21,7 @@
*/
package org.jboss.ejb3.test.servicexmbean;
-import javax.ejb.Remote;
-import org.jboss.annotation.ejb.Service;
-
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
*/
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Bean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Bean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Bean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,22 +21,19 @@
*/
package org.jboss.ejb3.test.servlet;
+import javax.annotation.security.RolesAllowed;
import javax.ejb.EJB;
import javax.ejb.Local;
-import javax.ejb.Remote;
import javax.ejb.LocalHome;
+import javax.ejb.Remote;
import javax.ejb.RemoteHome;
import javax.ejb.Stateless;
-import javax.annotation.security.RolesAllowed;
-
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
-import org.jboss.ejb3.test.servlet.Session30;
-
/**
* @version <tt>$Revision$</tt>
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,9 +25,9 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,9 +24,10 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindings;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBindings;
+
/**
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatefulClusteredBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatefulClusteredBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatefulClusteredBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,12 +24,12 @@
import java.io.Serializable;
+import javax.ejb.Remote;
import javax.ejb.Stateful;
-import javax.ejb.Remote;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindings;
+import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBindings;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,13 +22,11 @@
package org.jboss.ejb3.test.ssl;
-import javax.ejb.Stateless;
import javax.ejb.Remote;
+import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindings;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindings;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBindings;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatelessClusteredBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatelessClusteredBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatelessClusteredBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,13 +24,12 @@
import java.io.Serializable;
-import javax.ejb.Stateless;
import javax.ejb.Remote;
+import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindings;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBindings;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/OverrideStatefulClusteredBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/OverrideStatefulClusteredBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/OverrideStatefulClusteredBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,7 +25,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.Clustered;
+import org.jboss.ejb3.annotation.Clustered;
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,9 +24,10 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindings;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBindings;
+
/**
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatefulClusteredBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatefulClusteredBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatefulClusteredBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,12 +23,13 @@
package org.jboss.ejb3.test.ssladvanced;
import java.io.Serializable;
+
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindings;
+import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBindings;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,13 +22,11 @@
package org.jboss.ejb3.test.ssladvanced;
-import javax.ejb.Stateless;
import javax.ejb.Remote;
+import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindings;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindings;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBindings;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatelessClusteredBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatelessClusteredBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatelessClusteredBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,13 +24,12 @@
import java.io.Serializable;
-import javax.ejb.Stateless;
import javax.ejb.Remote;
+import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.RemoteBindings;
+import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBindings;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/Depends.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/Depends.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/Depends.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -6,8 +6,8 @@
*/
package org.jboss.ejb3.test.standalone;
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Management;
+import org.jboss.ejb3.annotation.Service;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/DependsBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,14 +23,12 @@
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.Depends;
-
/**
* @version <tt>$Revision$</tt>
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
*/
@Stateless
- at Depends ("jboss.test:service=depends")
+ at org.jboss.ejb3.annotation.Depends("jboss.test:service=depends")
public class DependsBean implements DependsRemote
{
public void test()
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2Bean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2Bean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Session2Bean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,8 +21,6 @@
*/
package org.jboss.ejb3.test.standalone.flushmodenever;
-import org.jboss.annotation.IgnoreDependency;
-
import javax.ejb.EJB;
import javax.ejb.Remote;
import javax.ejb.Stateless;
@@ -31,6 +29,8 @@
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceUnit;
+import org.jboss.ejb3.annotation.IgnoreDependency;
+
/**
* Comment
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1Bean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1Bean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/flushmodenever/Stateful1Bean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -29,10 +29,11 @@
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import javax.transaction.Transaction;
-import javax.transaction.SystemException;
-import org.jboss.annotation.JndiInject;
+
+import org.jboss.ejb3.annotation.JndiInject;
import org.jboss.ejb3.entity.ExtendedEntityManager;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/security/SecuredBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/security/SecuredBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/security/SecuredBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,13 +21,12 @@
*/
package org.jboss.ejb3.test.standalone.security;
-import org.jboss.annotation.security.SecurityDomain;
-
-import javax.ejb.Stateless;
import javax.annotation.security.RolesAllowed;
-
import javax.annotation.security.RunAs;
+import javax.ejb.Stateless;
+import org.jboss.ejb3.annotation.SecurityDomain;
+
/**
* Comment
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,7 +21,7 @@
*/
package org.jboss.ejb3.test.standalone.servicepojo;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Service;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneManagement.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneManagement.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneManagement.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,7 +21,7 @@
*/
package org.jboss.ejb3.test.standalone.servicepojo;
-import org.jboss.annotation.ejb.Management;
+import org.jboss.ejb3.annotation.Management;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,7 +21,7 @@
*/
package org.jboss.ejb3.test.standalone.servicepojo;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Service;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoManagement.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoManagement.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoManagement.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,7 +21,7 @@
*/
package org.jboss.ejb3.test.standalone.servicepojo;
-import org.jboss.annotation.ejb.Management;
+import org.jboss.ejb3.annotation.Management;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ClusteredStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ClusteredStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ClusteredStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -38,12 +38,12 @@
import javax.interceptor.Interceptors;
import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.cache.CacheConfig;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.ejb3.Container;
-import org.jboss.ejb3.defaults.RemoteBindingDefaults;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
+import org.jboss.ejb3.annotation.defaults.RemoteBindingDefaults;
import org.jboss.logging.Logger;
import org.jboss.serial.io.JBossObjectInputStream;
import org.jboss.serial.io.JBossObjectOutputStream;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,11 +24,10 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SerializedConcurrentAccess;
import org.jboss.logging.Logger;
-import org.jboss.annotation.ejb.SerializedConcurrentAccess;
-
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
* @version $Revision$
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/EntityFacadeBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/EntityFacadeBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/EntityFacadeBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -33,7 +33,7 @@
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
import org.jboss.logging.Logger;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ServiceBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ServiceBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ServiceBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,8 +24,8 @@
import javax.ejb.EJB;
import javax.ejb.Remote;
-import org.jboss.annotation.ejb.Service;
-import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.annotation.SecurityDomain;
+import org.jboss.ejb3.annotation.Service;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,7 +23,7 @@
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
/**
* Test small maxSize for cache
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -38,11 +38,11 @@
import javax.interceptor.Interceptors;
import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.cache.CacheConfig;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.ejb3.Container;
-import org.jboss.ejb3.defaults.RemoteBindingDefaults;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
+import org.jboss.ejb3.annotation.defaults.RemoteBindingDefaults;
import org.jboss.logging.Logger;
import org.jboss.serial.io.JBossObjectInputStream;
import org.jboss.serial.io.JBossObjectOutputStream;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulClusteredTimeoutBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulClusteredTimeoutBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulClusteredTimeoutBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,8 +25,8 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Clustered;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulRemoteProxyFactory.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulRemoteProxyFactory.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulRemoteProxyFactory.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,7 +21,7 @@
*/
package org.jboss.ejb3.test.stateful;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.ejb3.session.SessionContainer;
import org.jboss.logging.Logger;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTimeoutBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTimeoutBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTimeoutBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,7 +25,7 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTxBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTxBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTxBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -28,9 +28,9 @@
import javax.ejb.TransactionAttributeType;
import javax.transaction.TransactionManager;
-import org.jboss.annotation.JndiInject;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.annotation.JndiInject;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,10 +25,8 @@
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import javax.naming.InitialContext;
-
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/TreeCacheStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/TreeCacheStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/TreeCacheStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -39,12 +39,12 @@
import javax.interceptor.Interceptors;
import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.cache.Cache;
-import org.jboss.annotation.ejb.cache.CacheConfig;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.ejb3.Container;
-import org.jboss.ejb3.defaults.RemoteBindingDefaults;
+import org.jboss.ejb3.annotation.Cache;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
+import org.jboss.ejb3.annotation.defaults.RemoteBindingDefaults;
import org.jboss.logging.Logger;
import org.jboss.serial.io.JBossObjectInputStream;
import org.jboss.serial.io.JBossObjectOutputStream;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleContainedBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleContainedBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleContainedBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,7 +25,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
import org.jboss.ejb3.test.stateful.nested.base.xpc.Contained;
import org.jboss.ejb3.test.stateful.nested.base.xpc.ContainedBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleDeepNestedContainedBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleDeepNestedContainedBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleDeepNestedContainedBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,7 +25,7 @@
import javax.ejb.Local;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
import org.jboss.ejb3.test.stateful.nested.base.xpc.DeepNestedContained;
import org.jboss.ejb3.test.stateful.nested.base.xpc.DeepNestedContainedBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleDeepNestedStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleDeepNestedStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleDeepNestedStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,7 +25,7 @@
import javax.ejb.Local;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
import org.jboss.ejb3.test.stateful.nested.base.DeepNestedStateful;
import org.jboss.ejb3.test.stateful.nested.base.DeepNestedStatefulBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleLocalContainedBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleLocalContainedBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleLocalContainedBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,7 +25,7 @@
import javax.ejb.Local;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
import org.jboss.ejb3.test.stateful.nested.base.xpc.Contained;
import org.jboss.ejb3.test.stateful.nested.base.xpc.ContainedBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleLocalNestedStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleLocalNestedStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleLocalNestedStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -10,7 +10,7 @@
import javax.ejb.Local;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
import org.jboss.ejb3.test.stateful.nested.base.std.NestedStateful;
import org.jboss.ejb3.test.stateful.nested.base.std.NestedStatefulBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleParentStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleParentStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleParentStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -10,7 +10,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
import org.jboss.ejb3.test.stateful.nested.base.std.ParentStatefulBean;
import org.jboss.ejb3.test.stateful.nested.base.std.ParentStatefulRemote;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleRemoteNestedStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleRemoteNestedStatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleRemoteNestedStatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -10,7 +10,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
import org.jboss.ejb3.test.stateful.nested.base.std.NestedStateful;
import org.jboss.ejb3.test.stateful.nested.base.std.OptimizedNestedStatefulBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleShoppingCartBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleShoppingCartBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleShoppingCartBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,7 +25,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
import org.jboss.ejb3.test.stateful.nested.base.xpc.ShoppingCart;
import org.jboss.ejb3.test.stateful.nested.base.xpc.ShoppingCartBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateless/AnonymousStatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,11 +22,11 @@
package org.jboss.ejb3.test.stateless;
import javax.ejb.EJB;
+import javax.ejb.Remote;
import javax.ejb.Stateless;
-import javax.ejb.Remote;
import javax.naming.NamingException;
-import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateless/CheckedStatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateless/CheckedStatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateless/CheckedStatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,15 +23,14 @@
import javax.annotation.Resource;
import javax.annotation.security.RolesAllowed;
+import javax.ejb.Remote;
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
-import javax.ejb.Remote;
import javax.naming.NamingException;
-import javax.annotation.security.RolesAllowed;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
+
+import org.jboss.ejb3.annotation.RemoteBinding;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
-import org.jboss.annotation.security.SecurityDomain;
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateless/DefaultPoolStatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateless/DefaultPoolStatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateless/DefaultPoolStatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,11 +21,9 @@
*/
package org.jboss.ejb3.test.stateless;
-import javax.ejb.Stateless;
import javax.ejb.Remote;
+import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.Pool;
-import org.jboss.ejb3.pool.StrictMaxPool;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateless/RunAsStatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateless/RunAsStatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateless/RunAsStatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,15 +22,16 @@
package org.jboss.ejb3.test.stateless;
import javax.annotation.Resource;
+import javax.annotation.security.PermitAll;
import javax.annotation.security.RunAs;
+import javax.ejb.Local;
+import javax.ejb.Remote;
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
-import javax.annotation.security.PermitAll;
-import javax.ejb.Local;
-import javax.ejb.Remote;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jboss.annotation.security.SecurityDomain;
+
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateless/StrictMaxPoolStatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateless/StrictMaxPoolStatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateless/StrictMaxPoolStatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,11 +21,10 @@
*/
package org.jboss.ejb3.test.stateless;
-import javax.ejb.Stateless;
import javax.ejb.Remote;
+import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.Pool;
-import org.jboss.ejb3.pool.StrictMaxPool;
+import org.jboss.ejb3.annotation.Pool;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/statelesscreation/DestroyStatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/statelesscreation/DestroyStatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/statelesscreation/DestroyStatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -26,8 +26,8 @@
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.Pool;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.Pool;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/statelesscreation/ThreadLocalPoolStatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/statelesscreation/ThreadLocalPoolStatelessBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/statelesscreation/ThreadLocalPoolStatelessBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,8 +24,8 @@
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.Pool;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.Pool;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledMDB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledMDB.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledMDB.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -37,7 +37,7 @@
import javax.jms.TextMessage;
import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.Pool;
+import org.jboss.ejb3.annotation.Pool;
/**
* @version <tt>$Revision$</tt>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledSessionBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledSessionBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/strictpool/OverrideStrictlyPooledSessionBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -27,7 +27,7 @@
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.Pool;
+import org.jboss.ejb3.annotation.Pool;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/strictpool/StrictlyPooledMDB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/strictpool/StrictlyPooledMDB.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/strictpool/StrictlyPooledMDB.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -30,7 +30,6 @@
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageListener;
-import javax.jms.Queue;
import javax.jms.QueueConnection;
import javax.jms.QueueConnectionFactory;
import javax.jms.QueueSender;
@@ -38,7 +37,7 @@
import javax.jms.TextMessage;
import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.Pool;
+import org.jboss.ejb3.annotation.Pool;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/strictpool/StrictlyPooledMDB2.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/strictpool/StrictlyPooledMDB2.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/strictpool/StrictlyPooledMDB2.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -26,7 +26,7 @@
import javax.jms.Message;
import javax.jms.MessageListener;
-import org.jboss.annotation.ejb.Pool;
+import org.jboss.ejb3.annotation.Pool;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/strictpool/StrictlyPooledSessionBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/strictpool/StrictlyPooledSessionBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/strictpool/StrictlyPooledSessionBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -27,7 +27,7 @@
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.Pool;
+import org.jboss.ejb3.annotation.Pool;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/StatefulBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/StatefulBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,14 +23,10 @@
import javax.annotation.Resource;
import javax.annotation.security.RolesAllowed;
-
import javax.ejb.Remote;
-import javax.ejb.Remove;
import javax.ejb.SessionContext;
import javax.ejb.Stateful;
-import org.jboss.annotation.security.SecurityDomain;
-
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/StatefulTestBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/StatefulTestBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/StatefulTestBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -24,14 +24,11 @@
import javax.annotation.Resource;
import javax.annotation.security.RolesAllowed;
import javax.annotation.security.RunAs;
-
import javax.ejb.EJB;
import javax.ejb.Remote;
import javax.ejb.SessionContext;
import javax.ejb.Stateful;
-import org.jboss.annotation.security.SecurityDomain;
-
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/StatelessSessionBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/StatelessSessionBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/StatelessSessionBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -22,13 +22,11 @@
package org.jboss.ejb3.test.tck5sec;
import javax.annotation.Resource;
-import javax.ejb.SessionContext;
-
import javax.ejb.Remote;
+import javax.ejb.SessionContext;
import javax.ejb.Stateless;
-import org.jboss.annotation.security.SecurityDomain;
-
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterBean21.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterBean21.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterBean21.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -26,7 +26,7 @@
import javax.ejb.TimedObject;
import javax.ejb.Timer;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterService.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterService.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/timer/TimerTesterService.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -25,7 +25,7 @@
import javax.ejb.Timeout;
import javax.ejb.Timer;
-import org.jboss.annotation.ejb.Service;
+import org.jboss.ejb3.annotation.Service;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimer.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimer.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/timerdependency/InitTimer.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,9 +23,9 @@
import javax.ejb.EJB;
-import org.jboss.annotation.ejb.Management;
-import org.jboss.annotation.ejb.Service;
-import org.jboss.annotation.ejb.Depends;
+import org.jboss.ejb3.annotation.Depends;
+import org.jboss.ejb3.annotation.Management;
+import org.jboss.ejb3.annotation.Service;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,8 +21,6 @@
*/
package org.jboss.ejb3.test.webservices.jsr181;
-import org.jboss.annotation.ejb.RemoteBinding;
-
import javax.ejb.Remote;
import javax.ejb.RemoteHome;
import javax.ejb.Stateless;
@@ -30,6 +28,8 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
+
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
* @version $Revision$
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/KeeperBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/KeeperBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/KeeperBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -35,8 +35,8 @@
import javax.transaction.SystemException;
import javax.transaction.TransactionManager;
-import org.jboss.annotation.JndiInject;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.JndiInject;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/LowEndBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/LowEndBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/LowEndBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -32,7 +32,7 @@
import javax.ejb.TransactionAttribute;
import javax.persistence.EntityManager;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/MasterBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/MasterBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/MasterBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -35,8 +35,8 @@
import javax.transaction.SystemException;
import javax.transaction.TransactionManager;
-import org.jboss.annotation.JndiInject;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.JndiInject;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/XPCAltBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/XPCAltBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/XPCAltBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -42,8 +42,8 @@
import javax.transaction.SystemException;
import javax.transaction.TransactionManager;
-import org.jboss.annotation.JndiInject;
-import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.JndiInject;
import org.jboss.logging.Logger;
/**
Modified: trunk/embedded/src/test/java/org/jboss/embedded/test/ejb/SecuredBean.java
===================================================================
--- trunk/embedded/src/test/java/org/jboss/embedded/test/ejb/SecuredBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/embedded/src/test/java/org/jboss/embedded/test/ejb/SecuredBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,11 +21,11 @@
*/
package org.jboss.embedded.test.ejb;
-import org.jboss.annotation.security.SecurityDomain;
-
import javax.annotation.security.RolesAllowed;
import javax.ejb.Stateless;
+import org.jboss.ejb3.annotation.SecurityDomain;
+
/**
* comment
*
Modified: trunk/embedded/src/test/java/org/jboss/embedded/test/mdb/ExampleMDB.java
===================================================================
--- trunk/embedded/src/test/java/org/jboss/embedded/test/mdb/ExampleMDB.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/embedded/src/test/java/org/jboss/embedded/test/mdb/ExampleMDB.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -21,13 +21,13 @@
*/
package org.jboss.embedded.test.mdb;
-import org.jboss.annotation.ejb.Depends;
-
+import javax.ejb.ActivationConfigProperty;
import javax.ejb.MessageDriven;
-import javax.ejb.ActivationConfigProperty;
+import javax.jms.Message;
import javax.jms.MessageListener;
-import javax.jms.Message;
+import org.jboss.ejb3.annotation.Depends;
+
@MessageDriven(activationConfig =
{
@ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
Modified: trunk/testsuite/src/main/org/jboss/test/classloader/leak/ejb3/Ejb3StatefulSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/classloader/leak/ejb3/Ejb3StatefulSessionBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/testsuite/src/main/org/jboss/test/classloader/leak/ejb3/Ejb3StatefulSessionBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -27,7 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
/**
* @author Brian Stansberry
Modified: trunk/testsuite/src/main/org/jboss/test/classloader/leak/ejb3/Ejb3StatelessSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/classloader/leak/ejb3/Ejb3StatelessSessionBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/testsuite/src/main/org/jboss/test/classloader/leak/ejb3/Ejb3StatelessSessionBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -27,7 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
/**
* @author Brian Stansberry
Modified: trunk/testsuite/src/main/org/jboss/test/classloader/leak/ejb3/ThreadLocalPoolEjb3StatelessSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/classloader/leak/ejb3/ThreadLocalPoolEjb3StatelessSessionBean.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/testsuite/src/main/org/jboss/test/classloader/leak/ejb3/ThreadLocalPoolEjb3StatelessSessionBean.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -27,8 +27,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.annotation.ejb.Pool;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.Pool;
+import org.jboss.ejb3.annotation.RemoteBinding;
/**
* SLSB that uses ThreadLocalPool.
Modified: trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/EJB3Client.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/EJB3Client.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/EJB3Client.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -30,7 +30,7 @@
import javax.xml.ws.WebServiceRef;
import javax.xml.ws.WebServiceRefs;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.logging.Logger;
// standard EJB3 annotations
Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/SecurityHandlerEJB3.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/SecurityHandlerEJB3.java 2007-11-29 20:41:25 UTC (rev 67627)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/SecurityHandlerEJB3.java 2007-11-29 21:13:26 UTC (rev 67628)
@@ -23,16 +23,17 @@
//$Id: SecurityHandlerEJB3.java 4011 2007-07-27 02:45:35Z thomas.diesler at jboss.com $
+import java.util.Iterator;
+
+import javax.annotation.security.RolesAllowed;
+
import org.dom4j.Element;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.SecurityHandler;
-import javax.annotation.security.RolesAllowed;
-import java.util.Iterator;
-
/**
* Generate a service endpoint deployment for EJB endpoints
*
More information about the jboss-cvs-commits
mailing list