You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2015/08/06 21:28:26 UTC
[2/2] tomee git commit: Merge branch 'tomee-1.7.x' of
https://git-wip-us.apache.org/repos/asf/tomee into tomee-1.7.x
Merge branch 'tomee-1.7.x' of https://git-wip-us.apache.org/repos/asf/tomee into tomee-1.7.x
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/cab47144
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/cab47144
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/cab47144
Branch: refs/heads/tomee-1.7.x
Commit: cab47144aa73c30c9c43f9e8a25d268c44eddc76
Parents: 08ac610 476461a
Author: AndyGee <an...@gmx.de>
Authored: Thu Aug 6 21:27:46 2015 +0200
Committer: AndyGee <an...@gmx.de>
Committed: Thu Aug 6 21:27:46 2015 +0200
----------------------------------------------------------------------
.gitattributes | 2 +-
.../tests/cipher/CipherFromAppTest.java | 2 +-
.../openejb/assembler/classic/Assembler.java | 6 -
.../persistence/PersistenceUnitInfoImpl.java | 8 +-
.../jdbc/FlushableDataSourceHandler.java | 9 +-
.../resource/jdbc/SimpleDataSourceCreator.java | 8 +-
.../jdbc/dbcp/DbcpDataSourceCreator.java | 8 +-
.../managed/JTADataSourceWrapperFactory.java | 7 +-
.../jdbc/managed/local/ManagedConnection.java | 206 ++-
...gedConnectionsByTransactionByDatasource.java | 37 -
.../jdbc/managed/local/ManagedDataSource.java | 70 +-
.../managed/xa/CommonDataSourceAdapter.java | 9 +
.../jdbc/managed/xa/DataSourceXADataSource.java | 7 +-
.../jdbc/managed/xa/ManagedXAConnection.java | 23 +-
.../jdbc/managed/xa/ManagedXADataSource.java | 28 +-
.../jdbc/pool/PoolDataSourceCreator.java | 20 +-
.../resource/jdbc/ManagedDataSourceTest.java | 29 +-
.../MultiThreadedManagedDataSourceTest.java | 28 +-
.../resource/jdbc/UTManagedDataSourceTest.java | 29 +-
.../apache/openejb/loader/SystemInstance.java | 3 +-
examples/datasource-versioning/pom.xml | 12 +
.../maven/plugin/AbstractSynchronizable.java | 142 +-
.../test/resources/schema/ComplexAllElement.xsd | 42 +-
.../test/resources/schema/ComplexAllType.xsd | 42 +-
.../resources/schema/ComplexSequenceElement.xsd | 42 +-
.../resources/schema/ComplexSequenceType.xsd | 42 +-
.../test/resources/schema/JaxRpcSpecExample.xsd | 42 +-
.../src/test/resources/schema/SimpleElement.xsd | 42 +-
.../src/test/resources/schema/SimpleType.xsd | 42 +-
.../resources/schema/SoapArrayByAttribute.xsd | 42 +-
.../resources/schema/SoapArrayByRestriction.xsd | 42 +-
.../openejb/bonecp/BoneCPDataSourceCreator.java | 4 +-
.../BoneCPPooledDataSourceFromPoolTest.java | 32 +-
.../bonecp/BoneCPPooledDataSourceTest.java | 29 +-
.../org/apache/openejb/bonecp/XABoneCPTest.java | 4 +-
.../apache/openejb/client/ClientSecurity.java | 408 ++---
.../client/DirectConnectionStrategy.java | 66 +-
.../openejb/client/MulticastPulseClient.java | 1556 +++++++++---------
.../apache/openejb/client/ProtocolMetaData.java | 224 +--
.../openejb/server/cxf/rs/AutoJAXRSInvoker.java | 140 +-
.../server/cxf/rs/OpenEJBEJBInvoker.java | 230 +--
.../openejb/server/cxf/rs/PojoInvoker.java | 124 +-
.../rs/DynamicSubclassEjbDeploymentTest.java | 260 +--
.../cxf/rs/EJBAccessExceptionMapperTest.java | 220 +--
.../server/cxf/rs/EjbDeploymentTest.java | 246 +--
.../cxf/rs/PathParamAtClassLevelTest.java | 148 +-
.../server/cxf/WSSPassThroughInterceptor.java | 132 +-
.../server/cxf/ejb/EjbMessageContext.java | 124 +-
.../server/cxf/CxfJaxWsProviderTest.java | 274 +--
.../server/cxf/fault/AuthenticatorService.java | 60 +-
.../cxf/fault/AuthenticatorServiceBean.java | 84 +-
.../AuthenticatorServiceBeanNoHandler.java | 82 +-
.../server/cxf/fault/DummyInterceptor.java | 96 +-
.../cxf/fault/WrongPasswordException.java | 82 +-
.../fault/WrongPasswordRuntimeException.java | 84 +-
.../src/test/resources/META-INF/ejb-jar.xml | 36 +-
.../apache/openejb/server/cxf/fault/handler.xml | 52 +-
.../org/apache/openejb/daemon/NTService.java | 228 +--
.../openejb/server/ejbd/RequestHandler.java | 90 +-
.../server/discovery/MulticastPulseAgent.java | 1520 ++++++++---------
.../multipulse | 6 +-
.../discovery/MulticastPulseAgentTest.java | 1026 ++++++------
.../openejb/server/rest/EJBRestServiceInfo.java | 66 +-
.../server/rest/InternalApplication.java | 90 +-
.../main/resources/META-INF/openejb-server.xml | 72 +-
.../META-INF/org.apache.openejb.cli/stop.help | 28 +-
src/main/style/checkstyle.xml | 330 ++--
.../apache/openejb/tck/util/ServerLocal.java | 100 +-
.../apache-tomee/src/main/resources/service.bat | 452 ++---
.../main/resources/service.install.as.admin.bat | 64 +-
.../main/resources/service.remove.as.admin.bat | 64 +-
tomee/apache-tomee/src/main/resources/tomee.bat | 170 +-
.../org/apache/tomee/catalina/Contexts.java | 296 ++--
.../catalina/ProvisioningWebappLoader.java | 238 +--
.../tomee/catalina/TomcatDeploymentLoader.java | 86 +-
.../tomee/jdbc/TomEEDataSourceCreator.java | 17 +-
.../jdbc/TomcatDataSourceFromPoolTest.java | 29 +-
.../org/apache/tomee/jdbc/TomcatPoolTest.java | 29 +-
78 files changed, 5394 insertions(+), 5475 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/cab47144/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
----------------------------------------------------------------------