Merge branch 'master' into fb_tomee8

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

Branch: refs/heads/fb_tomee8
Commit: 37901b2e9b5d790702612be1f5462d75489aef7d
Parents: bab8961 715e7f2
Author: Mark Struberg <strub...@apache.org>
Authored: Sun Feb 18 22:25:49 2018 +0100
Committer: Mark Struberg <strub...@apache.org>
Committed: Sun Feb 18 22:25:49 2018 +0100

----------------------------------------------------------------------
 NOTICE                                          |    2 +-
 .../arquillian-tomee-jms-tests/pom.xml          |    9 +
 .../arquillian/tests/jms/BaseMdbBean.java       |   35 +
 .../openejb/arquillian/tests/jms/BlueBean.java  |   31 +
 .../openejb/arquillian/tests/jms/Color.java     |   40 +
 ...nectorWithApplicationResourcesInEarTest.java |  111 +
 ...nectorWithApplicationResourcesInWarTest.java |   71 +
 .../arquillian/tests/jms/EnvEntryTest.java      |  151 +
 .../arquillian/tests/jms/MessageBean.java       |   89 +
 .../tests/jms/NoColorSpecifiedBean.java         |   31 +
 .../openejb/arquillian/tests/jms/RedBean.java   |   32 +
 .../superbiz/application/MessagesReceived.java  |   35 +
 .../java/org/superbiz/application/Receiver.java |   40 +
 .../java/org/superbiz/application/Sender.java   |   69 +
 .../connector/adapter/SampleActivationSpec.java |   54 +
 .../adapter/SampleConnectionFactoryImpl.java    |   69 +
 .../connector/adapter/SampleConnectionImpl.java |   44 +
 .../adapter/SampleManagedConnection.java        |  134 +
 .../adapter/SampleManagedConnectionFactory.java |   99 +
 .../SampleManagedConnectionMetaData.java        |   56 +
 .../adapter/SampleResourceAdapter.java          |   89 +
 .../superbiz/connector/api/InboundListener.java |   24 +
 .../connector/api/SampleConnection.java         |   26 +
 .../connector/api/SampleConnectionFactory.java  |   28 +
 .../src/test/resources/arquillian.xml           |    1 +
 .../src/test/resources/connector/ra.xml         |   58 +
 .../src/test/resources/connector/resources.xml  |   30 +
 .../apache/openejb/assembler/DeployerEjb.java   |   37 +-
 .../openejb/assembler/classic/AppInfo.java      |    2 +-
 .../openejb/assembler/classic/Assembler.java    |   71 +-
 .../assembler/classic/ContainerInfo.java        |    3 +-
 .../ActivationConfigPropertyOverride.java       |  104 +-
 .../apache/openejb/config/AppInfoBuilder.java   |   29 +-
 .../org/apache/openejb/config/AutoConfig.java   |   47 +-
 .../openejb/config/ConfigurationFactory.java    |    2 +-
 .../apache/openejb/config/ContainerUtils.java   |   56 +
 .../apache/openejb/config/sys/StackHandler.java |    5 +
 .../openejb/core/ivm/naming/IvmContext.java     |    6 +-
 .../core/mdb/AbstractEndpointHandler.java       |  204 +
 .../openejb/core/mdb/BaseMdbContainer.java      |   64 +
 .../openejb/core/mdb/EndpointFactory.java       |   19 +-
 .../openejb/core/mdb/EndpointHandler.java       |  269 +-
 .../org/apache/openejb/core/mdb/Instance.java   |   12 +
 .../apache/openejb/core/mdb/MdbContainer.java   |    6 +-
 .../openejb/core/mdb/MdbContainerFactory.java   |  227 +
 .../org/apache/openejb/core/mdb/MdbContext.java |   15 +-
 .../openejb/core/mdb/MdbInstanceManager.java    |  692 +++
 .../openejb/core/mdb/MdbPoolContainer.java      |  547 ++
 .../openejb/core/mdb/PoolEndpointHandler.java   |  128 +
 .../java/org/apache/openejb/core/mdb/State.java |   49 +
 .../openejb/monitoring/StatsInterceptor.java    |   10 +
 .../resource/activemq/ActiveMQ5Factory.java     |   52 +
 .../openejb/resource/activemq/jms2/JMS2.java    |    2 +-
 .../org/apache/openejb/util/LogCategory.java    |    1 +
 .../META-INF/org.apache.openejb/service-jar.xml |   28 +-
 .../main/resources/openejb-version.properties   |    2 +-
 .../openejb/monitoring/Messages.properties      |   18 +
 .../apache/openejb/activemq/JMS2AMQTest.java    |   17 +-
 .../ActivationConfigPropertyOverrideTest.java   |   42 +-
 .../openejb/config/AppInfoBuilderTest.java      |   30 +
 .../openejb/config/ApplicationWideTest.java     |  116 +
 .../apache/openejb/config/AutoConfigTest.java   |    4 +-
 .../config/ConfigurationFactoryTest.java        |   36 +
 .../openejb/core/mdb/EndpointHandlerTest.java   |  158 +
 .../mdb/MaxSizePoolEndpointHandlerTest.java     |  159 +
 .../openejb/core/mdb/MdbContainerTest.java      |    2 +-
 .../openejb/core/mdb/MdbPoolContainerTest.java  |  149 +
 .../openejb/core/mdb/NoMessageDeliveryTest.java |  229 +
 .../core/mdb/PoolEndpointHandlerTest.java       |  141 +
 .../core/mdb/connector/api/InboundListener.java |   24 +
 .../mdb/connector/api/SampleConnection.java     |   26 +
 .../connector/api/SampleConnectionFactory.java  |   28 +
 .../connector/impl/SampleActivationSpec.java    |   54 +
 .../impl/SampleConnectionFactoryImpl.java       |   69 +
 .../connector/impl/SampleConnectionImpl.java    |   44 +
 .../connector/impl/SampleManagedConnection.java |  134 +
 .../impl/SampleManagedConnectionFactory.java    |   99 +
 .../impl/SampleManagedConnectionMetaData.java   |   56 +
 .../connector/impl/SampleResourceAdapter.java   |  117 +
 .../resource/PropertiesProviderFromXmlTest.java |   53 +
 .../resource/activemq/ActiveMQ5FactoryTest.java |   27 +-
 .../openejb/resource/jdbc/XAPoolTest.java       |    3 +-
 .../service-jar.xml                             |   29 +-
 .../connector-starter-api/pom.xml               |   50 +
 .../connector/starter/api/InboundListener.java  |   24 +
 .../connector/starter/api/SampleConnection.java |   26 +
 .../starter/api/SampleConnectionFactory.java    |   28 +
 .../src/main/resources/META-INF/LICENSE         |  202 +
 .../src/main/resources/META-INF/NOTICE          |    7 +
 .../connector-starter-impl/pom.xml              |   60 +
 .../starter/adapter/SampleActivationSpec.java   |   54 +
 .../adapter/SampleConnectionFactoryImpl.java    |   69 +
 .../starter/adapter/SampleConnectionImpl.java   |   44 +
 .../adapter/SampleManagedConnection.java        |  139 +
 .../adapter/SampleManagedConnectionFactory.java |  108 +
 .../SampleManagedConnectionMetaData.java        |   58 +
 .../starter/adapter/SampleResourceAdapter.java  |   92 +
 .../src/main/resources/META-INF/LICENSE         |  202 +
 .../src/main/resources/META-INF/NOTICE          |    7 +
 .../connector-starter-rar/pom.xml               |   43 +
 .../src/main/rar/META-INF/LICENSE               |  294 +
 .../src/main/rar/META-INF/NOTICE                |    5 +
 .../src/main/rar/META-INF/ra.xml                |   58 +
 .../connector-starter-sample-war/pom.xml        |  150 +
 .../src/main/java/org/superbiz/Receiver.java    |   35 +
 .../src/main/java/org/superbiz/Sender.java      |   52 +
 .../src/main/resources/META-INF/LICENSE         |  202 +
 .../src/main/resources/META-INF/NOTICE          |    7 +
 .../src/main/resources/META-INF/ejb-jar.xml     |   23 +
 .../org/tomitribe/connector/starter/Runner.java |  104 +
 .../src/test/resources/arquillian.xml           |   30 +
 .../connector-ear-sample/moviefun-ear/pom.xml   |   74 +
 examples/connector-ear-sample/pom.xml           |  205 +
 examples/connector-ear/.gitignore               |   30 +
 .../connector-ear/connector-sample-api/pom.xml  |   43 +
 .../superbiz/connector/api/InboundListener.java |   24 +
 .../connector/api/SampleConnection.java         |   26 +
 .../connector/api/SampleConnectionFactory.java  |   28 +
 .../src/main/resources/META-INF/LICENSE         |  202 +
 .../src/main/resources/META-INF/NOTICE          |    7 +
 .../connector-ear/connector-sample-ear/pom.xml  |   81 +
 .../connector-sample-functional-tests/pom.xml   |  145 +
 .../java/org/superbiz/moviefun/Basedir.java     |   34 +
 .../moviefun/DeployInWebAppsDirectoryTest.java  |  174 +
 .../java/org/superbiz/moviefun/EARTest.java     |  116 +
 .../src/test/resources/arquillian.xml           |   34 +
 .../connector-ear/connector-sample-impl/pom.xml |   54 +
 .../connector/adapter/SampleActivationSpec.java |   54 +
 .../adapter/SampleConnectionFactoryImpl.java    |   69 +
 .../connector/adapter/SampleConnectionImpl.java |   44 +
 .../adapter/SampleManagedConnection.java        |  139 +
 .../adapter/SampleManagedConnectionFactory.java |  108 +
 .../SampleManagedConnectionMetaData.java        |   58 +
 .../adapter/SampleResourceAdapter.java          |   92 +
 .../src/main/resources/META-INF/LICENSE         |  202 +
 .../src/main/resources/META-INF/NOTICE          |    7 +
 .../connector-ear/connector-sample-rar/pom.xml  |   43 +
 .../src/main/rar/META-INF/LICENSE               |  294 +
 .../src/main/rar/META-INF/NOTICE                |    5 +
 .../src/main/rar/META-INF/ra.xml                |   58 +
 .../connector-ear/connector-sample-war/pom.xml  |   70 +
 .../superbiz/application/MessagesReceived.java  |   35 +
 .../java/org/superbiz/application/Receiver.java |   40 +
 .../java/org/superbiz/application/Sender.java   |   76 +
 .../src/main/resources/META-INF/LICENSE         |  202 +
 .../src/main/resources/META-INF/NOTICE          |    7 +
 .../src/main/webapp/WEB-INF/resources.xml       |   30 +
 examples/connector-ear/pom.xml                  |   95 +
 examples/connector-war/README.md                |  340 ++
 examples/connector-war/pom.xml                  |  165 +
 .../connector/adapter/SampleActivationSpec.java |   54 +
 .../adapter/SampleConnectionFactoryImpl.java    |   69 +
 .../connector/adapter/SampleConnectionImpl.java |   44 +
 .../adapter/SampleManagedConnection.java        |  139 +
 .../adapter/SampleManagedConnectionFactory.java |  105 +
 .../SampleManagedConnectionMetaData.java        |   56 +
 .../adapter/SampleResourceAdapter.java          |   93 +
 .../superbiz/connector/api/InboundListener.java |   24 +
 .../connector/api/SampleConnection.java         |   26 +
 .../connector/api/SampleConnectionFactory.java  |   28 +
 .../connector/application/MessagesReceived.java |   35 +
 .../connector/application/Receiver.java         |   41 +
 .../superbiz/connector/application/Sender.java  |   76 +
 .../src/main/webapp/WEB-INF/resources.xml       |   30 +
 .../superbiz/moviefun/ConnectorInWarTest.java   |   59 +
 .../src/test/resources/arquillian.xml           |   34 +
 .../superbiz/injection/h3jpa/MoviesTest.java    |    2 +
 .../src/test/resources/arquillian.xml           |    1 +
 examples/polling-parent/polling-mdb/pom.xml     |  106 +
 .../src/main/java/org/superbiz/mdb/Api.java     |   25 +
 .../src/main/java/org/superbiz/mdb/ApiLog.java  |   64 +
 .../main/java/org/superbiz/mdb/CounterBean.java |   44 +
 .../src/main/java/org/superbiz/mdb/LogMdb.java  |   47 +
 .../src/main/resources/META-INF/beans.xml       |   20 +
 .../src/main/resources/META-INF/ejb-jar.xml     |   38 +
 .../polling-mdb/src/test/conf/tomee.xml         |   30 +
 .../test/java/org/superbiz/SimpleMdbTest.java   |  116 +
 .../src/test/resources/arquillian.xml           |   35 +
 examples/polling-parent/pom.xml                 |   13 +
 examples/pom.xml                                |    3 +
 .../simple-ear/moviefun-business-logic/pom.xml  |   85 +
 .../java/org/superbiz/logic/MoviesBean.java     |  120 +
 .../src/main/resources/META-INF/ejb-jar.xml     |    1 +
 .../java/org/superbiz/logic/MoviesTest.java     |   65 +
 .../simple-ear/moviefun-business-model/pom.xml  |   48 +
 .../src/main/java/org/superbiz/model/Movie.java |  104 +
 .../main/java/org/superbiz/model/Movies.java    |   27 +
 .../src/main/resources/META-INF/persistence.xml |   32 +
 examples/simple-ear/moviefun-ear/pom.xml        |   74 +
 .../moviefun-functional-tests/pom.xml           |  143 +
 .../moviefun/DeployInWebAppsDirectoryTest.java  |  130 +
 .../moviefun/MoviesArquillianHtmlUnitTest.java  |   75 +
 .../resources/META-INF/application-client.xml   |    1 +
 .../src/test/resources/arquillian.xml           |   32 +
 examples/simple-ear/moviefun-webapp/pom.xml     |   79 +
 .../org/superbiz/moviefun/ActionServlet.java    |  143 +
 .../src/main/webapp/WEB-INF/moviefun.jsp        |  124 +
 .../src/main/webapp/WEB-INF/web.xml             |   24 +
 .../webapp/assets/css/bootstrap-responsive.css  | 1285 ++++
 .../assets/css/bootstrap-responsive.min.css     | 1196 ++++
 .../src/main/webapp/assets/css/bootstrap.css    | 5774 ++++++++++++++++++
 .../main/webapp/assets/css/bootstrap.min.css    | 5215 ++++++++++++++++
 .../src/main/webapp/assets/css/movie.css        |   24 +
 .../assets/img/glyphicons-halflings-white.png   |  Bin 0 -> 8777 bytes
 .../webapp/assets/img/glyphicons-halflings.png  |  Bin 0 -> 12799 bytes
 .../src/main/webapp/assets/js/bootstrap.js      | 1885 ++++++
 .../src/main/webapp/assets/js/bootstrap.min.js  |  568 ++
 .../moviefun-webapp/src/main/webapp/default.css |  207 +
 .../moviefun-webapp/src/main/webapp/index.jsp   |   70 +
 .../moviefun-webapp/src/main/webapp/setup.jsp   |  111 +
 examples/simple-ear/pom.xml                     |  101 +
 server/openejb-multicast/pom.xml                |   12 +
 tomee/pom.xml                                   |   13 -
 .../tomee/catalina/TomcatWebAppBuilder.java     |   29 +
 tomee/tomee-webapp/src/main/webapp/app.js       |    2 +-
 215 files changed, 30552 insertions(+), 398 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/37901b2e/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tomee/blob/37901b2e/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tomee/blob/37901b2e/examples/polling-parent/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tomee/blob/37901b2e/examples/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tomee/blob/37901b2e/server/openejb-multicast/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tomee/blob/37901b2e/tomee/pom.xml
----------------------------------------------------------------------

Reply via email to