You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2018/12/21 14:46:49 UTC

[1/5] tomee git commit: Merge remote-tracking branch 'upstream/master'

Repository: tomee
Updated Branches:
  refs/heads/master 7732a4d0a -> 32463a387


Merge remote-tracking branch 'upstream/master'


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

Branch: refs/heads/master
Commit: 1b843f814fa0cbce86e7d929e6e5381dbabb97ad
Parents: a6b66e1 0cc96a6
Author: Michael P. Redlich <mi...@redlich.net>
Authored: Thu Dec 13 12:40:52 2018 -0500
Committer: Michael P. Redlich <mi...@redlich.net>
Committed: Thu Dec 13 12:40:52 2018 -0500

----------------------------------------------------------------------
 .../arquillian/tests/bmp/local/BigFinder.java   |  22 ++
 .../tests/bmp/local/BigFinderBean.java          |  57 ++++
 .../tests/bmp/local/BigFinderHome.java          |  25 ++
 .../arquillian/tests/bmp/local/BigFinderPK.java |  24 ++
 .../tests/bmp/local/BmpLocalEntityTest.java     |  62 ++++
 .../tests/bmp/local/FinderServlet.java          |  33 ++
 .../arquillian/tests/bmp/local/FinderTest.java  |  25 ++
 .../tests/bmp/local/FinderTestBean.java         |  86 ++++++
 .../tests/bmp/local/FinderTestHome.java         |  25 ++
 .../arquillian/tests/bmp/local/IntegerPK.java   |  99 ++++++
 .../tests/bmp/local/LittleFinder.java           |  22 ++
 .../tests/bmp/local/LittleFinderBean.java       |  55 ++++
 .../tests/bmp/local/LittleFinderHome.java       |  25 ++
 .../tests/bmp/local/LittleFinderPK.java         |  25 ++
 .../arquillian/tests/bmp/local/StringPK.java    |  71 +++++
 .../arquillian/tests/bmp/remote/BigFinder.java  |  22 ++
 .../tests/bmp/remote/BigFinderBean.java         |  57 ++++
 .../tests/bmp/remote/BigFinderHome.java         |  25 ++
 .../tests/bmp/remote/BigFinderPK.java           |  24 ++
 .../tests/bmp/remote/BmpRemoteEntityTest.java   |  62 ++++
 .../tests/bmp/remote/FinderServlet.java         |  33 ++
 .../arquillian/tests/bmp/remote/FinderTest.java |  24 ++
 .../tests/bmp/remote/FinderTestBean.java        |  82 +++++
 .../tests/bmp/remote/FinderTestHome.java        |  25 ++
 .../arquillian/tests/bmp/remote/IntegerPK.java  |  99 ++++++
 .../tests/bmp/remote/LittleFinder.java          |  22 ++
 .../tests/bmp/remote/LittleFinderBean.java      |  55 ++++
 .../tests/bmp/remote/LittleFinderHome.java      |  25 ++
 .../tests/bmp/remote/LittleFinderPK.java        |  25 ++
 .../arquillian/tests/bmp/remote/StringPK.java   |  71 +++++
 .../arquillian/tests/bmp/local/ejb-jar.xml      |  65 ++++
 .../openejb/arquillian/tests/bmp/local/web.xml  |  42 +++
 .../arquillian/tests/bmp/remote/ejb-jar.xml     |  65 ++++
 .../openejb/arquillian/tests/bmp/remote/web.xml |  42 +++
 .../assembler/classic/JndiEncBuilder.java       |   2 +-
 .../openejb/cdi/ManagedSecurityService.java     |  30 +-
 .../apache/openejb/config/CmpJpaConversion.java |   5 +-
 .../apache/openejb/core/cmp/cmp2/EjbSelect.java |   4 +-
 .../openejb/core/ivm/IntraVmArtifact.java       |   4 +-
 .../singleton/SingletonEjbObjectHandler.java    |   2 +-
 .../openejb/core/timer/EJBCronTrigger.java      |   4 +-
 .../stat/descriptive/DescriptiveStatistics.java |   4 +-
 .../java/org/apache/openejb/util/Index.java     |   6 +-
 .../apache/openejb/util/PojoSerialization.java  |  16 +-
 .../apache/openejb/config/InjectionTest.java    |   2 +-
 .../openejb/core/LegacyInterfaceTest.java       |   4 +-
 .../openejb/core/ivm/naming/IvmContextTest.java |   8 +-
 .../core/webservices/JPACMDIntegrationTest.java |   4 +-
 .../StatelessWithAroundInvokeOnlyTest.java      |   2 +-
 .../test/entity/cmp2/model/StorageBean.java     |   4 +-
 .../openejb/util/proxy/SampleLocalBean.java     |   2 +-
 .../org/apache/openejb/jee/BooleanAdapter.java  |   2 +-
 examples/mp-rest-jwt/README.md                  | 303 +++++++++++++++++++
 examples/mp-rest-jwt/pom.xml                    | 208 +++++++++++++
 .../main/java/org/superbiz/moviefun/Movie.java  |  70 +++++
 .../java/org/superbiz/moviefun/MoviesBean.java  |  61 ++++
 .../moviefun/rest/ApplicationConfig.java        |  28 ++
 .../rest/MoviesMPJWTConfigurationProvider.java  |  56 ++++
 .../org/superbiz/moviefun/rest/MoviesRest.java  |  77 +++++
 .../java/org/superbiz/moviefun/MoviesTest.java  | 133 ++++++++
 .../java/org/superbiz/moviefun/TokenUtils.java  | 257 ++++++++++++++++
 .../resources/META-INF/application-client.xml   |   1 +
 .../mp-rest-jwt/src/test/resources/Token1.json  |  17 ++
 .../mp-rest-jwt/src/test/resources/Token2.json  |  14 +
 .../src/test/resources/arquillian.xml           |  32 ++
 .../src/test/resources/privateKey.pem           |  28 ++
 .../src/test/resources/publicKey.pem            |   9 +
 examples/pom.xml                                |   2 +-
 examples/rest-mp-jwt/README.md                  |   4 -
 examples/rest-mp-jwt/pom.xml                    | 279 -----------------
 .../main/java/org/superbiz/moviefun/Movie.java  | 102 -------
 .../java/org/superbiz/moviefun/MoviesBean.java  |  91 ------
 .../moviefun/rest/ApplicationConfig.java        |  28 --
 .../org/superbiz/moviefun/rest/LoadRest.java    |  42 ---
 .../rest/MoviesMPJWTConfigurationProvider.java  |  63 ----
 .../org/superbiz/moviefun/rest/MoviesRest.java  | 113 -------
 .../java/org/superbiz/rest/GreetingService.java |  41 ---
 .../src/main/resources/META-INF/persistence.xml |  31 --
 examples/rest-mp-jwt/src/main/tomee/tomee.xml   |  27 --
 .../java/org/superbiz/moviefun/MoviesTest.java  |  88 ------
 .../java/org/superbiz/moviefun/TokenUtils.java  | 257 ----------------
 .../org/superbiz/rest/GreetingServiceTest.java  |  61 ----
 .../resources/META-INF/application-client.xml   |   1 -
 .../rest-mp-jwt/src/test/resources/Token1.json  |  20 --
 .../rest-mp-jwt/src/test/resources/Token2.json  |  12 -
 .../src/test/resources/arquillian.xml           |  32 --
 .../src/test/resources/privateKey.pem           |  28 --
 .../src/test/resources/publicKey.pem            |   9 -
 pom.xml                                         |   2 +
 tck/microprofile-tck/config/pom.xml             |  38 +++
 .../config/src/test/resources/arquillian.xml    |  34 ++-
 tck/microprofile-tck/fault-tolerance/pom.xml    |  38 +++
 .../src/test/resources/arquillian.xml           |  27 +-
 tck/microprofile-tck/health/pom.xml             |  38 +++
 .../health/src/test/resources/arquillian.xml    |  27 +-
 tck/microprofile-tck/jwt/pom.xml                |  41 ++-
 .../jwt/src/test/resources/arquillian.xml       |  61 +++-
 tck/microprofile-tck/metrics/pom.xml            |  38 +++
 .../metrics/src/test/resources/arquillian.xml   |  33 +-
 tck/microprofile-tck/openapi/pom.xml            |  39 ++-
 .../openapi/src/test/resources/arquillian.xml   |  35 ++-
 tck/microprofile-tck/opentracing/pom.xml        |  38 +++
 .../src/test/resources/arquillian.xml           |  27 +-
 tck/microprofile-tck/rest-client/pom.xml        |  38 +++
 .../src/test/resources/arquillian.xml           |  33 +-
 .../src/main/resources/META-INF/plume/NOTICE    |  23 ++
 .../src/main/resources/META-INF/plus/NOTICE     |  45 +++
 .../tomee-microprofile-webapp/pom.xml           |   6 +-
 tomee/tomee-plume-webapp/pom.xml                | 134 ++++++++
 .../src/main/resources/META-INF/NOTICE          |  75 ++++-
 tomee/tomee-plus-webapp/pom.xml                 | 134 ++++++++
 .../src/main/resources/META-INF/NOTICE          |  91 ++++++
 112 files changed, 3934 insertions(+), 1412 deletions(-)
----------------------------------------------------------------------


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


[5/5] tomee git commit: This closes #300. Thanks mpredli01.

Posted by jl...@apache.org.
This closes #300. Thanks mpredli01.


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

Branch: refs/heads/master
Commit: 32463a3874769e5175fc6614d5afd72f83d3dfbf
Parents: 7732a4d 6ff0b8c
Author: Jean-Louis Monteiro <je...@gmail.com>
Authored: Fri Dec 21 15:46:39 2018 +0100
Committer: Jean-Louis Monteiro <je...@gmail.com>
Committed: Fri Dec 21 15:46:39 2018 +0100

----------------------------------------------------------------------
 examples/mp-opentracing-traced/README.adoc | 64 +++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
----------------------------------------------------------------------



[3/5] tomee git commit: Merge remote-tracking branch 'upstream/master'

Posted by jl...@apache.org.
Merge remote-tracking branch 'upstream/master'


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

Branch: refs/heads/master
Commit: 403d4465d8d53869f7c37836e6b19880d1d224a5
Parents: 496a802 4763c81
Author: Michael P. Redlich <mi...@redlich.net>
Authored: Fri Dec 21 03:42:47 2018 -0500
Committer: Michael P. Redlich <mi...@redlich.net>
Committed: Fri Dec 21 03:42:47 2018 -0500

----------------------------------------------------------------------
 .../arquillian/tests/cmp/CmpServlet.java        |  16 +
 .../openejb/arquillian/tests/cmp/MyCmpBean.java |  16 +
 .../arquillian/tests/cmp/MyLocalHome.java       |  16 +
 .../arquillian/tests/cmp/MyLocalObject.java     |  16 +
 .../arquillian/tests/cmp/MyRemoteHome.java      |  16 +
 .../arquillian/tests/cmp/MyRemoteObject.java    |  16 +
 .../arquillian/tests/filter/AllFilterTest.java  |   1 -
 .../tests/realm/CdiLazyRealmTOMEE1490Test.java  |   4 +-
 arquillian/arquillian-tomee-tests/pom.xml       |  39 ++
 .../core/webservices/JPACMDIntegrationTest.java |  16 +
 .../resource/AutoConnectionTrackerTest.java     |  46 ++-
 docs/app-clients-and-jndi.adoc                  |   4 +-
 docs/application-composer/getting-started.adoc  |   2 +-
 ...application-discovery-via-the-classpath.adoc |   2 +-
 docs/application-resources.adoc                 |   4 +-
 docs/basics---getting-things.adoc               |   2 +-
 docs/basics---transactions.adoc                 |   2 +-
 docs/configuration.adoc                         |   2 +-
 docs/configuring-datasources.adoc               |   4 +-
 docs/constructor-injection.adoc                 |   2 +-
 docs/datasource-config.adoc                     |   2 +-
 docs/developer/json/index.adoc                  |   4 +-
 .../testing/applicationcomposer/index.adoc      |  26 +-
 docs/developer/testing/arquillian/index.adoc    |   2 +-
 docs/documentation.adoc                         |   2 +-
 docs/documentation.old.adoc                     |   2 +-
 docs/ejb-local-ref.adoc                         |   2 +-
 docs/ejb-ref.adoc                               |   2 +-
 docs/ejb-refs.adoc                              |   4 +-
 docs/embedded-and-remotable.adoc                |  12 +-
 docs/embedding.adoc                             |   2 +-
 docs/faq.adoc                                   |   2 +-
 docs/generating-ejb-3-annotations.adoc          |   4 +-
 docs/getting-started.adoc                       |   2 +-
 docs/hello-world.adoc                           |   2 +-
 docs/installation.adoc                          |   2 +-
 docs/jndi-names.adoc                            |   4 +-
 docs/jpa-concepts.adoc                          |   4 +-
 docs/local-client-injection.adoc                |  20 +-
 docs/local-server.adoc                          |   2 +-
 docs/lookup-of-other-ejbs-example.adoc          |   8 +-
 docs/manual-installation.adoc                   |   2 +-
 docs/new-in-openejb-3.0.adoc                    |   6 +-
 docs/persistence-context.adoc                   |   2 +-
 docs/persistence-unit-ref.adoc                  |   6 +-
 docs/property-overriding.adoc                   |   2 +-
 docs/quickstart.adoc                            |   2 +-
 docs/remote-server.adoc                         |   2 +-
 docs/resource-injection.adoc                    |   6 +-
 docs/resource-ref-for-datasource.adoc           |   2 +-
 docs/securing-a-web-service.adoc                |   2 +-
 docs/security-annotations.adoc                  |   8 +-
 docs/singleton-beans.adoc                       |  44 +-
 docs/spring-and-openejb-3.0.adoc                |   4 +-
 docs/spring-ejb-and-jpa.adoc                    |  10 +-
 docs/system-properties-files.adoc               |   2 +-
 docs/telnet-console.adoc                        |   2 +-
 docs/tomcat-object-factory.adoc                 |   2 +-
 docs/tomee-and-security.adoc                    |   2 +-
 docs/transaction-annotations.adoc               |   6 +-
 docs/validation-tool.adoc                       |   2 +-
 examples/moviefun-rest/README.md                | 404 +++++++++++++++++++
 examples/mp-rest-client/README.md               | 138 +++++++
 examples/mp-rest-client/pom.xml                 | 121 ++++++
 .../org/superbiz/rest/ApplicationConfig.java    |  26 ++
 .../src/main/java/org/superbiz/rest/Book.java   |  50 +++
 .../main/java/org/superbiz/rest/BookBean.java   |  60 +++
 .../java/org/superbiz/rest/BookResource.java    |  71 ++++
 .../org/superbiz/rest/BookResourceClient.java   |  57 +++
 .../org/superbiz/rest/BookResourceTest.java     |  77 ++++
 .../src/test/resources/META-INF/beans.xml       |   1 +
 .../META-INF/microprofile-config.properties     |   1 +
 .../src/test/resources/arquillian.xml           |  38 ++
 examples/pom.xml                                |   4 +-
 .../maven/plugin/AbstractAddressMojo.java       |  21 +
 .../maven/plugin/AbstractCommandMojo.java       |   9 +
 .../maven/plugin/AbstractDeployMojo.java        |   6 +
 .../maven/plugin/AbstractSynchronizable.java    |  63 +++
 .../openejb/maven/plugin/AbstractTomEEMojo.java | 281 +++++++++++++
 .../openejb/maven/plugin/BuildTomEEMojo.java    |  20 +
 .../maven/plugin/ConfigTestTomEEMojo.java       |   2 +
 .../openejb/maven/plugin/DebugTomEEMojo.java    |   1 +
 .../apache/openejb/maven/plugin/DeployMojo.java |  11 +
 .../apache/openejb/maven/plugin/ExecMojo.java   |  11 +
 .../openejb/maven/plugin/ListEjbMojo.java       |  13 +
 .../openejb/maven/plugin/RunTomEEMojo.java      |   2 +
 .../openejb/maven/plugin/StartTomEEMojo.java    |   1 +
 .../openejb/maven/plugin/StopTomEEMojo.java     |   1 +
 .../org/apache/openejb/maven/plugin/Synch.java  |  24 ++
 .../openejb/maven/plugin/Synchronization.java   |  43 ++
 .../openejb/maven/plugin/TomEEException.java    |  14 +
 .../openejb/maven/plugin/UnDeployMojo.java      |   1 +
 .../maven/plugin/UpdatableTomEEMojo.java        |  41 ++
 .../apache/openejb/maven/plugin/cli/Args.java   |   9 +
 .../maven/plugin/customizer/monkey/Monkey.java  |  12 +-
 .../monkey/classloader/ClassLoaderFactory.java  |  15 +
 .../monkey/file/PatchFolderFinder.java          |  10 +
 .../customizer/monkey/index/FileIndexer.java    |  30 ++
 .../plugin/customizer/monkey/index/Item.java    |  38 +-
 .../customizer/monkey/jar/JarPatcher.java       |  11 +
 .../openejb/maven/plugin/runner/ExecRunner.java |   9 +
 owasp-dc-suppression.xml                        |  80 ++++
 pom.xml                                         | 100 ++++-
 .../apache/openejb/server/rest/RESTService.java |   7 +-
 .../test/java/org/apache/tomee/TomEECliIT.java  |  57 ++-
 tomee/tomee-plume-webapp/pom.xml                |   3 +-
 tomee/tomee-plus-webapp/pom.xml                 |   3 +-
 107 files changed, 2292 insertions(+), 155 deletions(-)
----------------------------------------------------------------------



[4/5] tomee git commit: Add updated README.adoc to mp-opentracing-traced folder

Posted by jl...@apache.org.
Add updated README.adoc to mp-opentracing-traced folder


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

Branch: refs/heads/master
Commit: 6ff0b8c3c67d45bead4ffcfb6aabc2b67f8aa27f
Parents: 403d446
Author: Michael P. Redlich <mi...@redlich.net>
Authored: Fri Dec 21 05:00:12 2018 -0500
Committer: Michael P. Redlich <mi...@redlich.net>
Committed: Fri Dec 21 05:00:12 2018 -0500

----------------------------------------------------------------------
 examples/mp-opentracing-traced/README.adoc | 64 +++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/6ff0b8c3/examples/mp-opentracing-traced/README.adoc
----------------------------------------------------------------------
diff --git a/examples/mp-opentracing-traced/README.adoc b/examples/mp-opentracing-traced/README.adoc
new file mode 100644
index 0000000..7151c16
--- /dev/null
+++ b/examples/mp-opentracing-traced/README.adoc
@@ -0,0 +1,64 @@
+index-group=Traced
+type=page
+status=in progress
+~~~~~~
+
+== Microprofile OpenTracing @Traced
+
+This is an example on how to use the @Traced annotation in TomEE.
+
+NOTE: This example is a work in progress.
+
+===== Run the application:
+
+    mvn clean install tomee:run
+
+
+NOTE: Add text here for information about the endpoint.
+
+===== Request:
+
+    curl -X GET http://localhost:8080/mp-opentracing-traced/...
+
+NOTE: Complete the URL for the above `curl` command.
+
+===== Response:
+
+NOTE: Add the response from the example application
+
+==== @Traced Feature
+
+NOTE: Add text here to include how to implement and some source code.
+
+===== For the traced status:
+
+    GET http://localhost:8080/mp-opentracing-traced/...
+
+NOTE: Complete the URL for the above `curl` command.
+
+===== Reponse:
+
+
+===== Expected Prometheus format:
+
+===== Request:
+
+    curl -X GET http://localhost:8080/mp-opentracing-traced/...
+
+NOTE: Complete the URL for the above `curl` command.
+
+===== Response:
+
+==== Metric Metadata:
+
+===== Request:
+
+    curl -X OPTIONS http://localhost:8080/mp-opentracing/traced/...
+
+NOTE: Complete the URL for the above `curl` command.
+
+===== Response:
+
+===== Test the application:
+
+    mvn test


[2/5] tomee git commit: Merge remote-tracking branch 'upstream/master'

Posted by jl...@apache.org.
Merge remote-tracking branch 'upstream/master'


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

Branch: refs/heads/master
Commit: 496a80291178f973a695d8a5714e4b4e718884fe
Parents: 1b843f8 337176e
Author: Michael P. Redlich <mi...@redlich.net>
Authored: Mon Dec 17 07:50:19 2018 -0500
Committer: Michael P. Redlich <mi...@redlich.net>
Committed: Mon Dec 17 07:50:19 2018 -0500

----------------------------------------------------------------------
 .gitignore                                      |   1 +
 examples/access-timeout-meta/README.adoc        | 281 +++++++++++++++++++
 examples/access-timeout-meta/README.md          | 253 -----------------
 examples/access-timeout/README.adoc             | 216 ++++++++++++++
 examples/access-timeout/README.md               | 199 -------------
 examples/github-stylesheet.css                  |   4 +
 examples/mp-config-example/README.adoc          |  67 +++++
 examples/mp-config-example/README.md            |  46 ---
 examples/mp-faulttolerance-retry/README.md      |   4 +
 examples/mp-metrics-metered/pom.xml             |  70 +++++
 .../java/org/superbiz/rest/WeatherService.java  |  33 +++
 examples/mp-rest-jwt/README.md                  |   4 +
 .../java/org/superbiz/moviefun/MoviesTest.java  |   5 +-
 examples/pom.xml                                |   6 +-
 .../MPJWTSecurityAnnotationsInterceptor.java    |   9 +-
 .../server/cxf/rs/ApplicationFeatureTest.java   |  87 ++++++
 .../apache/openejb/server/rest/RESTService.java |   2 +
 17 files changed, 781 insertions(+), 506 deletions(-)
----------------------------------------------------------------------