You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/12/06 17:33:33 UTC
[11/24] tomee git commit: Merge remote-tracking branch
'apache/master' into cmp-jpa
Merge remote-tracking branch 'apache/master' into cmp-jpa
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d878bf09
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d878bf09
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d878bf09
Branch: refs/heads/master
Commit: d878bf09f0eea13e61e113a37d1d0e9ce6b83c7a
Parents: 86aec7f 7ff618f
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Tue Dec 4 09:53:00 2018 +0000
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Tue Dec 4 09:53:00 2018 +0000
----------------------------------------------------------------------
.../java/org/apache/openejb/AppContext.java | 8 +-
.../java/org/apache/openejb/BeanContext.java | 76 ++++++-------
.../org/apache/openejb/ClassLoaderUtil.java | 8 +-
.../org/apache/openejb/DeploymentContext.java | 2 +-
.../org/apache/openejb/InjectionProcessor.java | 4 +-
.../java/org/apache/openejb/MethodContext.java | 6 +-
.../org/apache/openejb/OpenEjbContainer.java | 4 +-
.../org/apache/openejb/UndeployException.java | 2 +-
.../openejb/assembler/classic/Assembler.java | 62 +++++------
.../assembler/classic/ClassListInfo.java | 2 +-
.../openejb/assembler/classic/ClientInfo.java | 10 +-
.../assembler/classic/CmpJarBuilder.java | 2 +-
.../assembler/classic/ConnectorInfo.java | 12 +--
.../assembler/classic/ContainerSystemInfo.java | 6 +-
.../classic/DelegatePermissionCollection.java | 4 +-
.../assembler/classic/DeployTimeEnhancer.java | 10 +-
.../assembler/classic/EjbJarBuilder.java | 2 +-
.../openejb/assembler/classic/EjbJarInfo.java | 24 ++---
.../openejb/assembler/classic/EjbResolver.java | 8 +-
.../classic/EnterpriseBeanBuilder.java | 10 +-
.../assembler/classic/EnterpriseBeanInfo.java | 28 ++---
.../assembler/classic/EntityBeanInfo.java | 6 +-
.../classic/EntityManagerFactoryCallable.java | 2 +-
.../assembler/classic/FacilitiesInfo.java | 10 +-
.../assembler/classic/HandlerChainInfo.java | 4 +-
.../openejb/assembler/classic/HandlerInfo.java | 4 +-
.../assembler/classic/InjectableInfo.java | 2 +-
.../assembler/classic/InjectionBuilder.java | 2 +-
.../classic/InterceptorBindingBuilder.java | 18 ++--
.../classic/InterceptorBindingInfo.java | 4 +-
.../assembler/classic/InterceptorInfo.java | 18 ++--
.../classic/JaccPermissionsBuilder.java | 4 +-
.../openejb/assembler/classic/JndiBuilder.java | 18 ++--
.../assembler/classic/JndiEncBuilder.java | 4 +-
.../openejb/assembler/classic/JndiEncInfo.java | 16 +--
.../assembler/classic/ManagedBeanInfo.java | 6 +-
.../classic/MessageDrivenBeanInfo.java | 2 +-
.../assembler/classic/MethodAttributeInfo.java | 2 +-
.../classic/MethodConcurrencyBuilder.java | 4 +-
.../assembler/classic/MethodInfoUtil.java | 31 +++---
.../assembler/classic/MethodPermissionInfo.java | 2 +-
.../assembler/classic/MethodScheduleInfo.java | 2 +-
.../classic/MethodTransactionBuilder.java | 2 +-
.../assembler/classic/PersistenceUnitInfo.java | 8 +-
.../assembler/classic/PolicyContext.java | 2 +-
.../openejb/assembler/classic/PortInfo.java | 2 +-
.../classic/ProxyInterfaceResolver.java | 8 +-
.../openejb/assembler/classic/ServiceInfo.java | 2 +-
.../assembler/classic/ServiceReferenceInfo.java | 4 +-
.../openejb/assembler/classic/ServletInfo.java | 4 +-
.../assembler/classic/StatefulBeanInfo.java | 14 +--
.../assembler/classic/ValidatorBuilder.java | 2 +-
.../openejb/assembler/classic/WsBuilder.java | 4 +-
.../assembler/classic/util/ServiceInfos.java | 2 +-
.../apache/openejb/async/AsynchronousPool.java | 2 +-
.../org/apache/openejb/bval/ValidatorUtil.java | 2 +-
.../org/apache/openejb/cdi/CdiBeanInfo.java | 50 ++++-----
.../java/org/apache/openejb/cdi/CdiEjbBean.java | 12 +--
.../java/org/apache/openejb/cdi/CdiPlugin.java | 16 +--
.../cdi/CdiResourceInjectionService.java | 2 +-
.../openejb/cdi/ConstructorInjectionBean.java | 2 +-
.../openejb/cdi/CurrentCreationalContext.java | 2 +-
.../apache/openejb/cdi/OpenEJBBeanBuilder.java | 2 +-
.../openejb/cdi/OptimizedLoaderService.java | 2 +-
.../CompositeClassLoaderConfigurer.java | 2 +-
.../ProvisioningClassLoaderConfigurer.java | 4 +-
.../java/org/apache/openejb/cli/MainImpl.java | 2 +-
.../openejb/component/ClassLoaderEnricher.java | 2 +-
.../openejb/config/AnnotationDeployer.java | 72 ++++++-------
.../config/AppContextConfigDeployer.java | 2 +-
.../apache/openejb/config/AppInfoBuilder.java | 10 +-
.../org/apache/openejb/config/AppModule.java | 34 +++---
.../org/apache/openejb/config/AppValidator.java | 2 +-
.../org/apache/openejb/config/AutoConfig.java | 44 ++++----
.../org/apache/openejb/config/AutoDeployer.java | 8 +-
.../openejb/config/BaseConvertDefinitions.java | 2 +-
.../apache/openejb/config/BeanProperties.java | 2 +-
.../apache/openejb/config/CleanEnvEntries.java | 2 +-
.../openejb/config/ClearEmptyMappedName.java | 2 +-
.../org/apache/openejb/config/ClientModule.java | 6 +-
.../apache/openejb/config/CmpJpaConversion.java | 18 ++--
.../config/ConfigurableClasspathArchive.java | 4 +-
.../openejb/config/ConfigurationFactory.java | 26 ++---
.../apache/openejb/config/ConnectorModule.java | 4 +-
.../apache/openejb/config/ContainerUtils.java | 2 +-
.../config/ConvertDataSourceDefinitions.java | 4 +-
.../openejb/config/DebuggableVmHackery.java | 4 +-
.../apache/openejb/config/DeploymentLoader.java | 68 ++++++------
.../apache/openejb/config/DeploymentModule.java | 2 +-
.../openejb/config/DeploymentsResolver.java | 4 +-
.../config/EnvEntriesPropertiesDeployer.java | 2 +-
.../apache/openejb/config/FinderFactory.java | 6 +-
.../openejb/config/GeneratedClientModules.java | 2 +-
.../openejb/config/InitEjbDeployments.java | 6 +-
.../openejb/config/JndiEncInfoBuilder.java | 6 +-
.../apache/openejb/config/LinkBuiltInTypes.java | 4 +-
.../apache/openejb/config/MBeanDeployer.java | 4 +-
.../java/org/apache/openejb/config/Module.java | 4 +-
.../apache/openejb/config/NewLoaderLogic.java | 12 +--
.../config/OpenEJBDeploymentManager.java | 12 +--
.../openejb/config/OpenEjb2Conversion.java | 10 +-
.../config/PersistenceContextAnnFactory.java | 8 +-
.../openejb/config/PersistenceModule.java | 2 +-
.../config/PersistenceUnitLinkResolver.java | 2 +-
.../openejb/config/QuickServerXmlParser.java | 2 +-
.../org/apache/openejb/config/RemoteServer.java | 6 +-
.../openejb/config/RemoveWebServices.java | 2 +-
.../org/apache/openejb/config/ScanUtil.java | 4 +-
.../org/apache/openejb/config/ServiceUtils.java | 2 +-
.../apache/openejb/config/SunConversion.java | 36 +++----
.../org/apache/openejb/config/TldScanner.java | 12 +--
.../openejb/config/ValidationContext.java | 6 +-
.../openejb/config/VmDeploymentManager.java | 10 +-
.../org/apache/openejb/config/WebModule.java | 20 ++--
.../openejb/config/WebappAggregatedArchive.java | 2 +-
.../org/apache/openejb/config/WsDeployer.java | 6 +-
.../config/provider/ProviderManager.java | 16 +--
.../config/provider/ServiceJarXmlLoader.java | 6 +-
.../config/rules/CheckAssemblyBindings.java | 6 +-
.../openejb/config/rules/CheckAsynchronous.java | 2 +-
.../openejb/config/rules/CheckCallbacks.java | 2 +-
.../openejb/config/rules/CheckClassLoading.java | 8 +-
.../openejb/config/rules/CheckDependsOn.java | 8 +-
.../config/rules/CheckDescriptorLocation.java | 4 +-
.../config/rules/CheckInjectionTargets.java | 2 +-
.../openejb/config/rules/CheckMethods.java | 8 +-
.../config/rules/CheckRestMethodArePublic.java | 4 +-
.../apache/openejb/config/sys/JaxbOpenejb.java | 2 +-
.../apache/openejb/config/sys/ListAdapter.java | 2 +-
.../org/apache/openejb/config/sys/Openejb.java | 2 +-
.../apache/openejb/config/sys/Resources.java | 10 +-
.../openejb/config/sys/SaxAppCtxConfig.java | 6 +-
.../apache/openejb/config/sys/SaxOpenejb.java | 2 +-
.../openejb/config/sys/ServiceProvider.java | 2 +-
.../apache/openejb/config/sys/ServicesJar.java | 2 +-
.../openejb/config/sys/WikiGenerator.java | 4 +-
.../openejb/config/typed/util/ObjectMap.java | 4 +-
.../config/typed/util/ProviderGenerator.java | 4 +-
.../apache/openejb/core/BaseSessionContext.java | 10 +-
.../openejb/core/CoreContainerSystem.java | 12 +--
...impleTransactionSynchronizationRegistry.java | 4 +-
.../org/apache/openejb/core/ThreadContext.java | 2 +-
.../org/apache/openejb/core/WebContext.java | 4 +-
.../apache/openejb/core/cmp/CmpContainer.java | 12 +--
.../openejb/core/cmp/ComplexKeyGenerator.java | 2 +-
.../openejb/core/cmp/cmp2/Cmp2Generator.java | 8 +-
.../apache/openejb/core/cmp/cmp2/CmrSet.java | 2 +-
.../openejb/core/cmp/cmp2/SetValuedCmr.java | 2 +-
.../openejb/core/cmp/jpa/JpaCmpEngine.java | 2 +-
.../openejb/core/entity/EntityContainer.java | 6 +-
.../openejb/core/entity/EntityContext.java | 4 +-
.../core/entity/EntityInstanceManager.java | 2 +-
.../openejb/core/entity/EntrancyTracker.java | 4 +-
.../core/interceptor/InterceptorData.java | 20 ++--
.../core/interceptor/InterceptorStack.java | 2 +-
.../ReflectionInvocationContext.java | 2 +-
.../openejb/core/ivm/BaseEjbProxyHandler.java | 10 +-
.../openejb/core/ivm/EjbHomeProxyHandler.java | 6 +-
.../openejb/core/ivm/EjbObjectProxyHandler.java | 2 +-
.../openejb/core/ivm/IntraVmArtifact.java | 2 +-
.../ivm/naming/AbstractThreadLocalProxy.java | 2 +-
.../ivm/naming/ContextualJndiReference.java | 4 +-
.../openejb/core/ivm/naming/IvmContext.java | 6 +-
.../core/ivm/naming/JaxWsServiceReference.java | 8 +-
.../apache/openejb/core/managed/Instance.java | 4 +-
.../openejb/core/managed/ManagedContainer.java | 18 ++--
.../openejb/core/managed/SimpleCache.java | 8 +-
.../openejb/core/mdb/EndpointFactory.java | 2 +-
.../apache/openejb/core/mdb/MdbContainer.java | 4 +-
.../openejb/core/mdb/MdbInstanceManager.java | 6 +-
.../openejb/core/mdb/MdbPoolContainer.java | 4 +-
.../core/security/AbstractSecurityService.java | 6 +-
.../core/security/jaas/SQLLoginModule.java | 6 +-
.../core/security/jaas/ScriptLoginModule.java | 4 +-
.../jaas/ServiceProviderLoginModule.java | 4 +-
.../core/security/jacc/BasicJaccProvider.java | 2 +-
.../security/jacc/BasicPolicyConfiguration.java | 2 +-
.../core/singleton/SingletonContainer.java | 10 +-
.../singleton/SingletonInstanceManager.java | 6 +-
.../apache/openejb/core/stateful/Instance.java | 4 +-
.../openejb/core/stateful/SimpleCache.java | 8 +-
.../core/stateful/StatefulContainer.java | 14 +--
.../core/stateless/StatelessContainer.java | 10 +-
.../stateless/StatelessInstanceManager.java | 4 +-
.../openejb/core/timer/EJBCronTrigger.java | 16 +--
.../openejb/core/timer/EjbTimerServiceImpl.java | 4 +-
.../openejb/core/timer/MemoryTimerStore.java | 18 ++--
.../core/transaction/JtaTransactionPolicy.java | 8 +-
.../core/webservices/HandlerChainData.java | 4 +-
.../openejb/core/webservices/HandlerData.java | 8 +-
.../core/webservices/HandlerResolverImpl.java | 16 +--
.../webservices/PortAddressRegistryImpl.java | 18 ++--
.../openejb/core/webservices/PortData.java | 4 +-
.../openejb/core/webservices/PortRefData.java | 2 +-
.../core/webservices/ProviderWrapper.java | 2 +-
.../core/webservices/ServiceRefData.java | 4 +-
.../apache/openejb/dyni/DynamicSubclass.java | 2 +-
.../org/apache/openejb/log/ColorFormatter.java | 2 +-
.../apache/openejb/log/logger/Log4jLogger.java | 2 +-
.../apache/openejb/log/logger/Slf4jLogger.java | 5 +-
.../stat/descriptive/DescriptiveStatistics.java | 2 +-
.../math/stat/descriptive/moment/Kurtosis.java | 2 +-
.../math/stat/descriptive/moment/Skewness.java | 2 +-
.../openejb/monitoring/DynamicMBeanWrapper.java | 12 +--
.../apache/openejb/monitoring/ManagedMBean.java | 14 +--
.../openejb/monitoring/ObjectNameBuilder.java | 2 +-
.../openejb/monitoring/StatsInterceptor.java | 2 +-
.../remote/RemoteResourceMonitor.java | 4 +-
.../openejb/persistence/JtaEntityManager.java | 2 +-
.../persistence/JtaEntityManagerRegistry.java | 2 +-
.../apache/openejb/persistence/JtaQuery.java | 2 +-
.../persistence/PersistenceBootstrap.java | 8 +-
.../persistence/PersistenceUnitInfoImpl.java | 6 +-
.../openejb/resource/AutoConnectionTracker.java | 10 +-
.../resource/activemq/ActiveMQ5Factory.java | 4 +-
.../resource/jdbc/DataSourceFactory.java | 2 +-
.../resource/jdbc/driver/AlternativeDriver.java | 2 +-
.../logging/LoggingPreparedSqlStatement.java | 2 +-
.../jdbc/pool/PoolDataSourceCreator.java | 2 +-
.../jdbc/pool/XADataSourceResource.java | 2 +-
.../resource/jdbc/router/FailOverRouter.java | 2 +-
.../resource/quartz/QuartzResourceAdapter.java | 8 +-
.../rest/AbstractRestThreadLocalProxy.java | 2 +-
...MultivaluedMapWithCaseInsensitiveKeySet.java | 2 +-
.../openejb/rest/ThreadLocalHttpHeaders.java | 2 +-
.../openejb/ri/sp/PseudoTransactionService.java | 14 +--
.../java/org/apache/openejb/table/Lines.java | 2 +-
.../openejb/testing/ApplicationComposers.java | 30 +++---
.../openejb/testng/PropertiesBuilder.java | 2 +-
.../impl/ManagedExecutorServiceImpl.java | 2 +-
.../ManagedScheduledExecutorServiceImpl.java | 12 +--
.../apache/openejb/util/AnnotationFinder.java | 10 +-
.../apache/openejb/util/AsynchronousRunner.java | 2 +-
.../java/org/apache/openejb/util/Classes.java | 4 +-
.../java/org/apache/openejb/util/Debug.java | 14 +--
.../apache/openejb/util/DirectoryMonitor.java | 4 +-
.../java/org/apache/openejb/util/Duration.java | 2 +-
.../apache/openejb/util/ExecutorBuilder.java | 8 +-
.../java/org/apache/openejb/util/Index.java | 20 ++--
.../openejb/util/IntrospectionSupport.java | 4 +-
.../main/java/org/apache/openejb/util/Join.java | 2 +-
.../org/apache/openejb/util/LinkResolver.java | 6 +-
.../apache/openejb/util/ListConfigurator.java | 2 +-
.../openejb/util/Log4jLogStreamFactory.java | 2 +-
.../java/org/apache/openejb/util/Logger.java | 2 +-
.../java/org/apache/openejb/util/Memoizer.java | 4 +-
.../java/org/apache/openejb/util/Messages.java | 2 +-
.../apache/openejb/util/ObjectRecipeHelper.java | 2 +-
.../apache/openejb/util/OpenEJBScripter.java | 2 +-
.../apache/openejb/util/PojoSerialization.java | 2 +-
.../main/java/org/apache/openejb/util/Pool.java | 2 +-
.../apache/openejb/util/PropertiesHelper.java | 2 +-
.../org/apache/openejb/util/References.java | 20 ++--
.../apache/openejb/util/SimpleJSonParser.java | 4 +-
.../apache/openejb/util/SuperProperties.java | 16 +--
.../org/apache/openejb/util/URISupport.java | 6 +-
.../java/org/apache/openejb/util/UrlCache.java | 10 +-
.../org/apache/openejb/util/UrlComparator.java | 2 +-
.../openejb/util/proxy/Jdk13ProxyFactory.java | 2 +-
.../util/proxy/LocalBeanProxyFactory.java | 4 +-
.../org/apache/openejb/util/proxy/ProxyEJB.java | 2 +-
.../apache/openejb/util/proxy/QueryProxy.java | 6 +-
.../openejb/web/LightweightWebAppBuilder.java | 22 ++--
.../openejb/DependenceValidationTest.java | 2 +-
.../org/apache/openejb/DependencyVisitor.java | 8 +-
.../apache/openejb/OpenEjbContainerTest.java | 4 +-
.../openejb/assembler/DeployerEjbTest.java | 2 +-
.../assembler/classic/AccessTimeoutTest.java | 4 +-
.../classic/AppNamingReadOnlyTest.java | 4 +-
.../classic/ConcurrentLockTypeTest.java | 4 +-
.../assembler/classic/ConcurrentMethodTest.java | 4 +-
.../classic/DataSourceDefinitionTest.java | 2 +-
.../DescriptorDataSourceDefinitionTest.java | 2 +-
.../InterceptorBindingInfoComparatorTest.java | 10 +-
.../assembler/classic/JdbcConfigTest.java | 4 +-
.../assembler/classic/LinkResolverTest.java | 2 +-
.../MethodTransactionInfoComparatorTest.java | 6 +-
.../OpenEjbConfigurationValidationTest.java | 2 +-
.../classic/ResourceInfoComparatorTest.java | 6 +-
.../apache/openejb/cdi/BasicObserverTest.java | 2 +-
.../apache/openejb/cdi/DependentScopedTest.java | 2 +-
.../openejb/config/AnnotationDeployerTest.java | 2 +-
.../config/ApplicationPropertiesTest.java | 14 +--
.../config/AutoConfigMdbContainerTest.java | 2 +-
.../config/AutoConfigResourceRefsTest.java | 4 +-
.../apache/openejb/config/AutoDeployerTest.java | 2 +-
.../openejb/config/BeanPropertiesTest.java | 12 +--
.../openejb/config/BusinessInterfacesTest.java | 8 +-
.../config/CheckDescriptorLocationTest.java | 6 +-
...escriptorLocationTestFileDeletionHelper.java | 2 +-
.../openejb/config/CleanEnvEntriesTest.java | 2 +-
.../openejb/config/DeploymentLoaderTest.java | 4 +-
.../openejb/config/DeploymentsElementTest.java | 16 +--
.../openejb/config/EarModuleNamesTest.java | 28 ++---
.../apache/openejb/config/EarUnpackTest.java | 4 +-
.../apache/openejb/config/EjbModuleIdTest.java | 14 +--
.../openejb/config/JMXDataSourceTest.java | 2 +-
.../config/JndiEncInfoBuilderInsertTest.java | 10 +-
.../openejb/config/MBeanDeployerTest.java | 2 +-
.../openejb/config/ModulePropertiesTest.java | 10 +-
.../PersistenceContextAnnFactoryTest.java | 2 +-
.../openejb/config/ProviderManagerTest.java | 4 +-
.../openejb/config/ServiceClasspathTest.java | 6 +-
.../openejb/config/SunCmpConversionTest.java | 2 +-
.../apache/openejb/config/XmlOverridesTest.java | 2 +-
...CheckInvalidAsynchronousAnnotationsTest.java | 4 +-
.../openejb/config/rules/InvokeMethod.java | 10 +-
.../config/rules/KeysAnnotationVisitor.java | 4 +-
.../config/rules/ValidationAssertions.java | 2 +-
.../config/rules/ValidationKeysAuditorTest.java | 18 ++--
.../openejb/core/InheritedAppExceptionTest.java | 2 +-
.../openejb/core/asynch/AsynchInRoleTest.java | 14 +--
.../apache/openejb/core/asynch/AsynchTest.java | 14 +--
.../apache/openejb/core/cmp/jpa/AuthorBean.java | 2 +-
.../apache/openejb/core/cmp/jpa/BookBean.java | 2 +-
.../openejb/core/ivm/naming/IvmContextTest.java | 4 +-
.../core/mdb/CustomMdbContainerTest.java | 2 +-
.../org/apache/openejb/core/mdb/JmsTest.java | 4 +-
.../org/apache/openejb/core/mdb/MdbInvoker.java | 4 +-
.../org/apache/openejb/core/mdb/MdbProxy.java | 2 +-
.../org/apache/openejb/core/mdb/MdbTest.java | 4 +-
.../openejb/core/mdb/NoMessageDeliveryTest.java | 2 +-
.../connector/impl/SampleManagedConnection.java | 2 +-
.../connector/impl/SampleResourceAdapter.java | 2 +-
.../core/singleton/AsyncPostContructTest.java | 6 +-
.../stateful/EntityManagerPropogationTest.java | 4 +-
.../stateful/StatefulConcurrentLookupTest.java | 2 +-
.../core/stateful/StatefulContainerTest.java | 2 +-
.../StatefulSecurityPermissionsTest.java | 2 +-
.../core/stateless/StatelessPoolStatsTest.java | 12 +--
.../interceptors/FullyInterceptedBean.java | 4 +-
.../interceptors/FullyInterceptedTest.java | 4 +-
.../MethodLevelInterceptorOnlySLSBean.java | 2 +-
.../MethodLevelInterceptorOnlyTest.java | 2 +-
.../SecondStatelessInterceptedBean.java | 2 +-
.../SecondStatelessInterceptedTest.java | 2 +-
.../openejb/interceptors/ThirdSLSBean.java | 4 +-
.../openejb/interceptors/ThirdSLSBeanTest.java | 4 +-
.../org/apache/openejb/interceptors/Utils.java | 2 +-
.../java/org/apache/openejb/meta/MetaTest.java | 4 +-
.../persistence/JtaEntityManagerTest.java | 2 +-
.../resource/AutoConnectionTrackerTest.java | 8 +-
.../resource/jdbc/DynamicDataSourceTest.java | 6 +-
.../MultiThreadedManagedDataSourceTest.java | 2 +-
.../cmr/onetomany/ExampleABean_ABean.java | 4 +-
.../entity/cmr/onetoone/ExampleABean_ABean.java | 2 +-
.../entity/cmr/onetoone/ExampleBBean_BBean.java | 2 +-
.../TransactionRollbackCauseTest.java | 2 +-
.../java/org/apache/openejb/util/Archives.java | 2 +-
.../apache/openejb/util/DynamicEJBImplTest.java | 4 +-
.../org/apache/openejb/util/OptionsTest.java | 2 +-
.../java/org/apache/openejb/util/PoolTest.java | 18 ++--
.../org/apache/openejb/util/PropertiesTest.java | 2 +-
.../org/apache/openejb/util/ReferencesTest.java | 24 ++---
.../openejb/util/SuperPropertiesTest.java | 2 +-
.../apache/openejb/util/UrlComparatorTest.java | 2 +-
.../org/apache/openejb/util/WebArchives.java | 2 +-
.../util/proxy/LocalBeanProxyFactoryTest.java | 6 +-
.../openejb/util/proxy/SampleLocalBean.java | 2 +-
.../openejb/jee/FacesConfigFlowDefinition.java | 2 +-
.../junit/context/OpenEjbTestContext.java | 8 +-
.../org/apache/openejb/junit/context/Util.java | 11 +-
docs/activemqresourceadapter-config.md | 2 +-
docs/common-datasource-configurations.md | 2 +-
docs/comparison.md | 2 +-
docs/datasource-config.md | 2 +-
docs/datasource-configuration-by-creator.md | 10 +-
docs/deploying-in-tomee.md | 2 +-
docs/ejbd-transport.md | 2 +-
...-testing-with-openejb,-jetty-and-selenium.md | 2 +-
docs/javamailsession-config.md | 2 +-
docs/jpa-concepts.md | 2 +-
docs/jpa-usage.md | 2 +-
docs/openjpa.md | 2 +-
docs/orb-config.md | 2 +-
docs/persistence-context.md | 2 +-
docs/persistence-unit-ref.md | 2 +-
docs/tomee-and-hibernate.md | 2 +-
docs/tomee-and-intellij.md | 2 +-
docs/tomee-directory-structure.md | 2 +-
docs/tomee-webapp.md | 2 +-
examples/arquillian-jpa/pom.xml | 4 +-
examples/java-modules/README.md | 7 ++
examples/java-modules/pom.xml | 108 +++++++++++++++++++
.../javamodules/rest/HelloResource.java | 29 +++++
.../javamodules/rest/HelloResourceTest.java | 45 ++++++++
.../src/test/resources/arquillian.xml | 33 ++++++
examples/mp-metrics-timed/README.md | 4 +-
examples/pom.xml | 16 +--
examples/quartz-app/README.md | 6 +-
examples/realm-in-tomee/README.md | 6 +-
.../README.md | 6 +-
.../openejb/test/SuperInterceptedBean.java | 6 +-
.../entity/bmp/BasicBmp2DataSourcesBean.java | 4 +-
.../openejb/test/entity/bmp/RmiIiopBmpBean.java | 1 -
.../test/interceptor/ClassInterceptor.java | 10 +-
.../openejb/test/interceptor/DDInterceptor.java | 10 +-
.../test/interceptor/MethodInterceptor.java | 4 +-
.../interceptor/SecondClassInterceptor.java | 10 +-
.../test/interceptor/SuperClassInterceptor.java | 10 +-
.../test/singleton/BeanTxSingletonBean.java | 1 -
.../test/stateless/BeanTxStatelessBean.java | 1 -
.../org/apache/openejb/test/RiTestServer.java | 1 -
.../apache/openejb/server/DiscoveryAgent.java | 4 +-
.../apache/tomee/RemoteTomEEEJBContainer.java | 6 +-
.../catalina/OpenEJBNamingContextListener.java | 4 +-
.../tomee/catalina/OpenEJBNamingResource.java | 4 +-
.../tomee/catalina/TomEEWebappLoader.java | 4 +-
.../org/apache/tomee/catalina/TomcatLoader.java | 22 ++--
.../jul/formatter/SimpleTomEEFormatter.java | 6 +-
.../jul/handler/rotating/LocalFileHandler.java | 9 +-
.../jul/formatter/SimpleTomEEFormatterTest.java | 6 +-
.../org/apache/tomee/loader/LoaderServlet.java | 4 +-
.../apache/tomee/loader/OpenEJBListener.java | 9 +-
414 files changed, 1561 insertions(+), 1344 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/d878bf09/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
----------------------------------------------------------------------