tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlmonte...@apache.org
Subject [2/2] tomee git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tomee
Date Mon, 12 Nov 2018 11:03:13 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tomee


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/b880351b
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/b880351b
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/b880351b

Branch: refs/heads/master
Commit: b880351b44481a3abf0b3665771a6fd26fb0cdde
Parents: 14919e1 3e3f59d
Author: Jean-Louis Monteiro <jeanouii@gmail.com>
Authored: Mon Nov 12 12:02:58 2018 +0100
Committer: Jean-Louis Monteiro <jeanouii@gmail.com>
Committed: Mon Nov 12 12:02:58 2018 +0100

----------------------------------------------------------------------
 .../tests/ear/EarCommonsCodecTest.java          |   2 -
 .../java/org/apache/openejb/BeanContext.java    |   2 -
 .../openejb/assembler/classic/Assembler.java    |  84 ++-
 .../assembler/classic/ValidationInfo.java       |   7 +-
 .../assembler/classic/ValidatorBuilder.java     |  42 +-
 .../openejb/cdi/ThreadSingletonServiceImpl.java |   1 -
 .../apache/openejb/config/DeploymentLoader.java |   2 +-
 .../apache/openejb/config/ReadDescriptors.java  |   5 +-
 .../apache/openejb/config/sys/JaxbOpenejb.java  |  51 +-
 .../openejb/core/mdb/MdbInstanceManager.java    |  14 +
 .../monitoring/ConnectionFactoryMonitor.java    | 167 ++++++
 .../openejb/monitoring/MBeanPojoWrapper.java    | 162 ++++++
 .../openejb/resource/AutoConnectionTracker.java | 130 ++++-
 .../GeronimoConnectionManagerFactory.java       |  43 +-
 .../impl/ManagedExecutorServiceImpl.java        |  59 +-
 .../util/classloader/URLClassLoaderFirst.java   |  36 +-
 .../util/proxy/LocalBeanProxyFactory.java       |  37 +-
 .../classic/ConnectionFactoryJMXTest.java       | 133 +++++
 .../assembler/classic/ResourcesJMXTest.java     | 184 ++++++
 .../openejb/core/mdb/MdbPoolContainerTest.java  |  14 +-
 .../resource/AutoConnectionTrackerTest.java     | 567 +++++++++++++++++++
 .../openejb/jee/bval/ValidationConfigType.java  | 239 +++++---
 .../MBeanOpenEJBRuntimeServices.java            |  26 +
 .../MBeanOpenEJBRuntimeServicesMBean.java       |  22 +
 .../eclipselink/OpenEJBRuntimeServices.java     |  42 ++
 .../eclipselink/OpenEJBServerPlatform.java      |  13 +-
 examples/access-timeout-meta/pom.xml            |   4 +-
 examples/access-timeout/pom.xml                 |   4 +-
 examples/alternate-descriptors/pom.xml          |   4 +-
 examples/applet/pom.xml                         |   6 +-
 examples/application-composer/pom.xml           |   4 +-
 examples/applicationcomposer-jaxws-cdi/pom.xml  |   4 +-
 examples/applicationexception/pom.xml           |   4 +-
 examples/arquillian-jpa/pom.xml                 |   4 +-
 examples/async-methods/pom.xml                  |   4 +-
 examples/async-postconstruct/pom.xml            |   4 +-
 .../bean-validation-design-by-contract/pom.xml  |   4 +-
 .../WebApp1/pom.xml                             |   2 +-
 .../WebApp2/pom.xml                             |   2 +-
 examples/bval-evaluation-redeployment/pom.xml   |   6 +-
 .../bval-evaluation-redeployment/runner/pom.xml |   2 +-
 .../cdi-alternative-and-stereotypes/pom.xml     |   4 +-
 examples/cdi-application-scope/pom.xml          |   4 +-
 examples/cdi-basic/pom.xml                      |   4 +-
 examples/cdi-ejbcontext-jaas/pom.xml            |   4 +-
 examples/cdi-events/pom.xml                     |   4 +-
 examples/cdi-interceptors/pom.xml               |   4 +-
 examples/cdi-produces-disposes/pom.xml          |   4 +-
 examples/cdi-produces-field/pom.xml             |   4 +-
 examples/cdi-realm/pom.xml                      |   4 +-
 examples/cdi-request-scope/pom.xml              |   4 +-
 examples/cdi-session-scope/pom.xml              |   4 +-
 examples/change-jaxws-url/pom.xml               |   4 +-
 examples/client-resource-lookup-preview/pom.xml |   4 +-
 examples/component-interfaces/pom.xml           |   4 +-
 .../connector-starter-rar/pom.xml               |   2 +-
 .../connector-ear-sample/moviefun-ear/pom.xml   |   2 +-
 .../connector-ear/connector-sample-api/pom.xml  |   2 +-
 .../connector-ear/connector-sample-ear/pom.xml  |   2 +-
 .../connector-sample-functional-tests/pom.xml   |   8 +-
 .../moviefun/DeployInWebAppsDirectoryTest.java  |   2 +-
 .../connector-ear/connector-sample-impl/pom.xml |   2 +-
 .../connector-ear/connector-sample-rar/pom.xml  |   2 +-
 .../connector-ear/connector-sample-war/pom.xml  |   2 +-
 examples/connector-ear/pom.xml                  |  17 +-
 examples/connector-war/pom.xml                  |   2 +-
 examples/cucumber-jvm/pom.xml                   |   4 +-
 examples/custom-injection/pom.xml               |   4 +-
 examples/datasource-ciphered-password/pom.xml   |   4 +-
 examples/datasource-definition/pom.xml          |   4 +-
 examples/datasource-versioning/pom.xml          |   4 +-
 examples/decorators/pom.xml                     |   4 +-
 examples/deltaspike-configproperty/pom.xml      |   4 +-
 examples/deltaspike-exception-handling/pom.xml  |   4 +-
 examples/deltaspike-fullstack/pom.xml           |   4 +-
 examples/deltaspike-i18n/pom.xml                |   4 +-
 examples/dynamic-dao-implementation/pom.xml     |   4 +-
 examples/dynamic-datasource-routing/pom.xml     |   4 +-
 examples/dynamic-implementation/pom.xml         |   4 +-
 examples/dynamic-proxy-to-access-mbean/pom.xml  |   4 +-
 examples/ear-testing/business-logic/pom.xml     |   4 +-
 examples/ear-testing/business-model/pom.xml     |   2 +-
 examples/ear-testing/pom.xml                    |   4 +-
 examples/ejb-examples/pom.xml                   |   4 +-
 examples/ejb-webservice/pom.xml                 |   4 +-
 examples/groovy-cdi/pom.xml                     |   4 +-
 examples/groovy-jpa/pom.xml                     |   4 +-
 examples/groovy-spock/pom.xml                   |   4 +-
 examples/helloworld-weblogic/pom.xml            |   4 +-
 examples/injection-of-connectionfactory/pom.xml |   4 +-
 examples/injection-of-datasource/pom.xml        |   4 +-
 examples/injection-of-ejbs/pom.xml              |   4 +-
 examples/injection-of-entitymanager/pom.xml     |   4 +-
 examples/injection-of-env-entry/pom.xml         |   4 +-
 examples/interceptors/pom.xml                   |   4 +-
 examples/javamail/pom.xml                       |   4 +-
 examples/jpa-eclipselink/pom.xml                |   4 +-
 examples/jpa-enumerated/pom.xml                 |   4 +-
 examples/jpa-hibernate/pom.xml                  |   4 +-
 examples/jsf-cdi-and-ejb/pom.xml                |   4 +-
 examples/jsf-managedBean-and-ejb/pom.xml        |   4 +-
 examples/lookup-of-ejbs-with-descriptor/pom.xml |   4 +-
 examples/lookup-of-ejbs/pom.xml                 |   4 +-
 examples/mbean-auto-registration/pom.xml        |   4 +-
 examples/moviefun-rest/pom.xml                  |   4 +-
 examples/moviefun/pom.xml                       |   4 +-
 .../src/main/resources/META-INF/persistence.xml |   1 +
 examples/movies-complete-meta/pom.xml           |   4 +-
 examples/movies-complete/pom.xml                |   4 +-
 examples/mtom/pom.xml                           |   2 +-
 examples/multi-jpa-provider-testing/pom.xml     |   4 +-
 examples/multiple-arquillian-adapters/pom.xml   |   4 +-
 examples/multiple-tomee-arquillian/pom.xml      |   4 +-
 examples/myfaces-codi-demo/pom.xml              |   4 +-
 examples/persistence-fragment/pom.xml           |   4 +-
 examples/pojo-webservice/pom.xml                |   4 +-
 examples/polling-parent/polling-client/pom.xml  |   4 +-
 examples/polling-parent/polling-core/pom.xml    |   2 +-
 examples/polling-parent/polling-domain/pom.xml  |   2 +-
 examples/polling-parent/polling-mdb/pom.xml     |   2 +-
 examples/polling-parent/polling-web/pom.xml     |   2 +-
 .../arquillian/SubjectServiceTomEETest.java     |   7 +-
 examples/polling-parent/pom.xml                 |   4 +-
 examples/projectstage-demo/pom.xml              |   4 +-
 examples/quartz-app/pom.xml                     |   4 +-
 examples/quartz-app/quartz-beans/pom.xml        |   2 +-
 examples/quartz-app/quartz-ra/pom.xml           |   2 +-
 examples/realm-in-tomee/pom.xml                 |   4 +-
 .../reload-persistence-unit-properties/pom.xml  |   4 +-
 examples/resources-declared-in-webapp/pom.xml   |   4 +-
 examples/resources-jmx-example/pom.xml          |   4 +-
 .../resources-jmx-ear/pom.xml                   |   2 +-
 .../resources-jmx-ejb/pom.xml                   |   2 +-
 .../rest-applicationcomposer-mockito/pom.xml    |   4 +-
 examples/rest-applicationcomposer/pom.xml       |   4 +-
 examples/rest-cdi/pom.xml                       |   4 +-
 examples/rest-example-with-application/pom.xml  |   4 +-
 examples/rest-example/pom.xml                   |   4 +-
 examples/rest-jaas/pom.xml                      |   4 +-
 examples/rest-mp-jwt/pom.xml                    |   4 +-
 examples/rest-on-ejb/pom.xml                    |   4 +-
 examples/rest-xml-json/pom.xml                  |   4 +-
 examples/scala-basic/pom.xml                    |   4 +-
 examples/schedule-events/pom.xml                |   4 +-
 examples/schedule-expression/pom.xml            |   4 +-
 examples/schedule-methods-meta/pom.xml          |   4 +-
 examples/schedule-methods/pom.xml               |   4 +-
 examples/server-events/pom.xml                  |   4 +-
 examples/simple-cdi-interceptor/pom.xml         |   4 +-
 examples/simple-cmp2/pom.xml                    |   4 +-
 .../simple-ear/moviefun-business-logic/pom.xml  |   4 +-
 .../simple-ear/moviefun-business-model/pom.xml  |   2 +-
 examples/simple-ear/moviefun-ear/pom.xml        |   2 +-
 .../moviefun-functional-tests/pom.xml           |   2 +-
 .../moviefun/DeployInWebAppsDirectoryTest.java  |   2 +-
 examples/simple-ear/moviefun-webapp/pom.xml     |   2 +-
 examples/simple-ear/pom.xml                     |  11 +-
 examples/simple-mdb-and-cdi/pom.xml             |   4 +-
 examples/simple-mdb-with-descriptor/pom.xml     |   4 +-
 examples/simple-mdb/pom.xml                     |   4 +-
 examples/simple-remote-tomcatusers/pom.xml      |   4 +-
 examples/simple-rest/pom.xml                    |   4 +-
 examples/simple-singleton/pom.xml               |   4 +-
 examples/simple-stateful-callbacks/pom.xml      |   4 +-
 examples/simple-stateful/pom.xml                |   4 +-
 examples/simple-stateless-callbacks/pom.xml     |   4 +-
 .../simple-stateless-with-descriptor/pom.xml    |   4 +-
 examples/simple-stateless/pom.xml               |   4 +-
 .../simple-webservice-without-interface/pom.xml |   4 +-
 examples/simple-webservice/pom.xml              |   4 +-
 examples/spring-data-proxy-meta/pom.xml         |   4 +-
 examples/spring-data-proxy/pom.xml              |   4 +-
 examples/struts/pom.xml                         |   4 +-
 examples/telephone-stateful/pom.xml             |   4 +-
 examples/testcase-injection/pom.xml             |   4 +-
 examples/testing-security-2/pom.xml             |   4 +-
 examples/testing-security-3/pom.xml             |   4 +-
 examples/testing-security-4/pom.xml             |   4 +-
 examples/testing-security-meta/pom.xml          |   4 +-
 examples/testing-security/pom.xml               |   4 +-
 examples/testing-transactions-bmt/pom.xml       |   4 +-
 examples/testing-transactions/pom.xml           |   4 +-
 examples/tomee-jersey-eclipselink/pom.xml       |   4 +-
 examples/transaction-rollback/pom.xml           |   4 +-
 examples/troubleshooting/pom.xml                |   4 +-
 examples/webservice-attachments/pom.xml         |   4 +-
 examples/webservice-handlerchain/pom.xml        |   4 +-
 examples/webservice-holder/pom.xml              |   4 +-
 examples/webservice-inheritance/pom.xml         |   4 +-
 examples/webservice-security/pom.xml            |   4 +-
 examples/webservice-ws-security/pom.xml         |   4 +-
 .../webservice-ws-with-resources-config/pom.xml |   2 +-
 itests/legacy-server/pom.xml                    |   2 +-
 .../openejb/itest/legacy/LegacyServerTest.java  |   4 +-
 .../main/resources/archetype-resources/pom.xml  |   2 +-
 mp-jwt/pom.xml                                  |  22 +-
 .../tomee/microprofile/jwt/MPJWTFilter.java     |  18 +-
 pom.xml                                         |  75 ++-
 server/openejb-cxf-rs/pom.xml                   |   3 -
 .../openejb/server/cxf/rs/CxfRSService.java     |  13 +-
 .../server/cxf/rs/CxfRsHttpListener.java        |   6 +-
 .../TomEEJsonbPropertyVisibilityStrategy.java   |  88 +++
 .../cxf/rs/johnzon/TomEEJsonbProvider.java      |  33 ++
 .../cxf/rs/johnzon/JsonbJaxrsProviderTest.java  | 127 +++++
 server/openejb-cxf/pom.xml                      |  10 +-
 .../apache/openejb/server/rest/RESTService.java |   9 +-
 tck/bval-embedded/pom.xml                       |   7 +-
 tck/bval-embedded/src/test/resources/dev.xml    |   3 +-
 tck/bval-tomee/pom.xml                          |  10 +-
 .../src/test/resources/arquillian.xml           |  17 +-
 tck/bval-tomee/src/test/resources/dev.xml       |   3 +-
 tck/microprofile-tck/config/pom.xml             |  51 +-
 .../microprofile/config/ConfigurationBean.java  |  25 -
 .../MicroProfileConfigTCKArchiveProcessor.java  |  38 --
 .../config/MicroProfileConfigTCKExtension.java  |  11 -
 .../tck/config/ConfigurationBean.java           |  25 +
 .../MicroProfileConfigTCKArchiveProcessor.java  |  28 +
 .../config/MicroProfileConfigTCKExtension.java  |  11 +
 .../config/MicroProfileConfigurationTest.java   |  69 +++
 ....jboss.arquillian.core.spi.LoadableExtension |   2 +-
 tck/microprofile-tck/fault-tolerance/pom.xml    |  85 +++
 .../src/test/resources/arquillian.xml           |  37 ++
 tck/microprofile-tck/health/pom.xml             |  84 +++
 .../health/src/test/resources/arquillian.xml    |  37 ++
 tck/microprofile-tck/jwt/pom.xml                |  64 +--
 .../jwt/JWTAuthContextInfoProvider.java         |  63 ---
 .../tomee/microprofile/jwt/TCKTokenParser.java  |  40 --
 .../jwt/JWTAuthContextInfoProvider.java         |  63 +++
 .../tomee/microprofile/jwt/TCKTokenParser.java  |  40 ++
 .../jwt/src/test/resources/dev.xml              |  32 --
 tck/microprofile-tck/metrics/pom.xml            | 120 ++++
 ...icroProfileMetricsTCKDeploymentPackager.java |  89 +++
 .../MicroProfileMetricsTCKExtension.java        |  31 +
 .../metrics/MicroProfileMetricsTCKObserver.java |  32 ++
 .../metrics/MicroProfileMetricsTCKProtocol.java |  27 +
 ....jboss.arquillian.core.spi.LoadableExtension |   1 +
 .../metrics/src/test/resources/arquillian.xml   |  40 ++
 tck/microprofile-tck/openapi/pom.xml            | 105 ++++
 ...icroProfileOpenAPITCKDeploymentPackager.java |  56 ++
 .../MicroProfileOpenAPITCKExtension.java        |  31 +
 .../MicroProfileOpenAPITCKObserver.java         |  27 +
 .../MicroProfileOpenAPITCKProtocol.java         |  27 +
 ....jboss.arquillian.core.spi.LoadableExtension |   1 +
 .../openapi/src/test/resources/arquillian.xml   |  41 ++
 tck/microprofile-tck/opentracing/pom.xml        |  92 +++
 ...ProfileOpenTracingTCKDeploymentPackager.java |  58 ++
 .../MicroProfileOpenTracingTCKExtension.java    |  30 +
 .../MicroProfileOpenTracingTCKProtocol.java     |  27 +
 .../MicroProfileOpenTracingTCKTracer.java       |  28 +
 ...MicroProfileOpenTrackingContextResolver.java |  32 ++
 .../OpenTracingJacksonMapperTest.java           |  40 ++
 .../src/test/resources/META-INF/beans.xml       |  25 +
 .../META-INF/services/javax.ws.rs.ext.Providers |   1 +
 ....jboss.arquillian.core.spi.LoadableExtension |  17 +
 .../src/test/resources/arquillian.xml           |  36 ++
 tck/microprofile-tck/pom.xml                    |   6 +
 tck/microprofile-tck/rest-client/pom.xml        | 132 +++++
 ...croProfileRestClientTCKArchiveProcessor.java |  71 +++
 .../MicroProfileRestClientTCKExtension.java     |  27 +
 ....jboss.arquillian.core.spi.LoadableExtension |   1 +
 .../src/test/resources/arquillian.xml           |  40 ++
 tck/pom.xml                                     |   7 +-
 tck/tck-common/pom.xml                          |   2 +-
 .../main/resources/META-INF/microprofile/NOTICE | 171 ++++++
 .../src/main/resources/META-INF/plume/NOTICE    |   2 +-
 .../src/main/resources/META-INF/plus/NOTICE     |   2 +-
 .../apache-tomee/src/main/resources/service.bat |  26 +-
 .../tomee/catalina/TomcatWebAppBuilder.java     |  19 +-
 .../org/apache/tomee/installer/Installer.java   |   9 +
 .../embedded/ServletContextInjectionTest.java   | 238 ++++++++
 .../jul/handler/rotating/ArchivingTest.java     |   6 -
 tomee/tomee-microprofile-webapp/pom.xml         | 117 +++-
 .../src/main/resources/META-INF/NOTICE          |  87 ++-
 .../src/main/resources/META-INF/NOTICE          |   2 +-
 .../src/main/resources/META-INF/NOTICE          |   2 +-
 275 files changed, 5038 insertions(+), 920 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/b880351b/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
----------------------------------------------------------------------
diff --cc container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
index 68d1272,20e9ab9..053e4d4
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
@@@ -17,12 -17,15 +17,15 @@@
  
  package org.apache.openejb.util.proxy;
  
+ 
+ import org.apache.openejb.util.LogCategory;
+ import org.apache.openejb.util.Logger;
  import org.apache.openejb.util.Debug;
 -import org.apache.xbean.asm6.ClassWriter;
 -import org.apache.xbean.asm6.Label;
 -import org.apache.xbean.asm6.MethodVisitor;
 -import org.apache.xbean.asm6.Opcodes;
 -import org.apache.xbean.asm6.Type;
 +import org.apache.xbean.asm7.ClassWriter;
 +import org.apache.xbean.asm7.Label;
 +import org.apache.xbean.asm7.MethodVisitor;
 +import org.apache.xbean.asm7.Opcodes;
 +import org.apache.xbean.asm7.Type;
  
  import javax.ejb.EJBException;
  import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/tomee/blob/b880351b/examples/deltaspike-fullstack/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tomee/blob/b880351b/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 12b156b,7327038..f83bb56
--- a/pom.xml
+++ b/pom.xml
@@@ -166,8 -167,8 +167,8 @@@
      <commons-io.version>2.4</commons-io.version>
      <commons-net.version>3.3</commons-net.version>
  
 -    <bval.version>2.0.1-SNAPSHOT</bval.version>
 +    <bval.version>2.0.0</bval.version>
-     <org.apache.activemq.version>5.15.3</org.apache.activemq.version>
+     <org.apache.activemq.version>5.15.6</org.apache.activemq.version>
      <org.springframework.version>3.1.4.RELEASE</org.springframework.version>
      <junit.version>4.12</junit.version>
      <org.apache.axis2.version>1.4.1</org.apache.axis2.version>


Mime
View raw message