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 2019/05/28 16:44:15 UTC
[tomee] branch master updated (9f0a54e -> e4418b7)
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git.
from 9f0a54e Merge pull request #436 from danielsoro/fix-ignore
add 48f21ba Merge pull request #3 from apache/master
add 733e9f6 Update README.txt to include -alias flag
add 7261278 Add necessary web.xml for build
add 586d035 Resolve imports
add ccf1211 Refactor example services for test consistency
add 6bf39d4 Upgrade compiler source
add fa83e2b Update pom.xml with other examples
add c20cb01 Merge pull request #2 from apache/master
add ddd125b Merge branch 'TOMEE-2482-synchronize-examples' of https://github.com/ShermanMarshall/TomEE into TOMEE-2482-synchronize-examples
add 4d79ea4 Fix pom.xml typo
add 5118930 Merge branch 'TOMEE-2482-synchronize-examples' of https://github.com/ShermanMarshall/tomee into TOMEE-2482-synchronize-examples
add 3e7ab9f Remove changes to original test
add 5491c6d Update module pom.xml files with build/finalName
add 89f7f59 Fixing gitconfig, and repo with upstream
add d0e9814 Merge branch 'jaxrs-filter-example' of https://github.com/ShermanMarshall/tomee into jaxrs-filter-example
add 3f6abdf Adding Apache license
add 4515152 Merge branch 'jaxrs-filter-example' of https://github.com/ShermanMarshall/tomee into jaxrs-filter-example
add db76818 Changing documentation status to published for tomee-site-generation
new 81cf513 Merge branch 'jaxrs-filter-example' of github.com:ShermanMarshall/tomee into pr460
new be0dd01 Exclude applet
new e4418b7 Merge remote-tracking branch 'apache/master'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
examples/applet/README.txt | 2 +-
.../java/org/superbiz/applet/CalculatorApplet.java | 14 +++++--
.../bval-evaluation-redeployment/WebApp1/pom.xml | 1 +
.../bval-evaluation-redeployment/WebApp2/pom.xml | 1 +
examples/bval-evaluation-redeployment/pom.xml | 2 -
.../bval-evaluation-redeployment/runner/pom.xml | 5 ++-
.../runner/src/test/java/RedeploymentTest.java | 44 +++++++++++++++-------
.../src/main/webapp/WEB-INF/web.xml | 0
.../src/main/webapp/index.jsp | 0
examples/jaxrs-filter/README.adoc | 2 +-
.../org/superbiz/filterexample/ExampleServlet.java | 16 ++++++++
.../org/superbiz/filterexample/InboundFilter.java | 16 ++++++++
examples/pom.xml | 6 +++
13 files changed, 88 insertions(+), 21 deletions(-)
copy examples/{jaxrs-filter => java-modules}/src/main/webapp/WEB-INF/web.xml (100%)
copy examples/{jaxrs-filter => java-modules}/src/main/webapp/index.jsp (100%)
[tomee] 03/03: Merge remote-tracking branch 'apache/master'
Posted by jg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit e4418b721102940f0cc4d80080add44fcbbdba9b
Merge: be0dd01 9f0a54e
Author: Jonathan Gallimore <jg...@tomitribe.com>
AuthorDate: Tue May 28 17:43:59 2019 +0100
Merge remote-tracking branch 'apache/master'
.gitignore | 1 +
.../openejb/assembler/classic/Assembler.java | 2 ++
.../classic/DelegatePermissionCollection.java | 2 +-
.../openejb/core/entity/EntityContainer.java | 2 +-
.../openejb/core/entity/EntityEjbHomeHandler.java | 10 ++++----
.../org/apache/openejb/util/ArrayEnumeration.java | 28 ++++++++++-----------
.../openejb/web/LightweightWebAppBuilder.java | 1 +
.../core/security/SecurityServiceImplTest.java | 2 +-
.../openejb/server/httpd/HttpRequestImpl.java | 29 +++++++++-------------
9 files changed, 38 insertions(+), 39 deletions(-)
[tomee] 01/03: Merge branch 'jaxrs-filter-example' of
github.com:ShermanMarshall/tomee into pr460
Posted by jg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 81cf513e5237d7aed8080a7cb895237ba226a19b
Merge: 4a5956b db76818
Author: Jonathan Gallimore <jg...@tomitribe.com>
AuthorDate: Tue May 28 15:48:49 2019 +0100
Merge branch 'jaxrs-filter-example' of github.com:ShermanMarshall/tomee into pr460
examples/applet/README.txt | 2 +-
.../java/org/superbiz/applet/CalculatorApplet.java | 14 +++++--
.../bval-evaluation-redeployment/WebApp1/pom.xml | 1 +
.../bval-evaluation-redeployment/WebApp2/pom.xml | 1 +
examples/bval-evaluation-redeployment/pom.xml | 2 -
.../bval-evaluation-redeployment/runner/pom.xml | 5 ++-
.../runner/src/test/java/RedeploymentTest.java | 44 +++++++++++++++-------
.../java-modules/src/main/webapp/WEB-INF/web.xml | 7 ++++
examples/java-modules/src/main/webapp/index.jsp | 5 +++
examples/jaxrs-filter/README.adoc | 2 +-
.../org/superbiz/filterexample/ExampleServlet.java | 16 ++++++++
.../org/superbiz/filterexample/InboundFilter.java | 16 ++++++++
examples/pom.xml | 6 +++
13 files changed, 100 insertions(+), 21 deletions(-)
diff --cc examples/pom.xml
index 3a9998b,94db7b9..30aea46
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@@ -106,14 -110,14 +109,17 @@@
<module>mp-config-source-database</module>
<module>mp-faulttolerance-fallback</module>
<module>mp-faulttolerance-retry</module>
+ <module>mp-jwt-bean-validation</module>
+ <module>mp-jwt-bean-validation-strongly-typed</module>
<module>mp-metrics-counted</module>
<module>mp-metrics-histogram</module>
- <module>mp-metrics-metered</module>
<module>mp-metrics-timed</module>
+ <module>mp-metrics-gauge</module>
++ <module>mp-metrics-metered</module>
+ <module>mp-opentracing-traced</module>
<module>mp-rest-jwt</module>
<module>mp-rest-jwt-jwk</module>
+ <module>mp-rest-jwt-principal</module>
<module>mp-rest-jwt-public-key</module>
<module>mtom</module>
<module>multi-jpa-provider-testing</module>
[tomee] 02/03: Exclude applet
Posted by jg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit be0dd01ec059b4c45b426fa7cd0b3d82274fb6f0
Author: Jonathan Gallimore <jg...@tomitribe.com>
AuthorDate: Tue May 28 17:42:34 2019 +0100
Exclude applet
---
examples/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/pom.xml b/examples/pom.xml
index 30aea46..002974e 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -37,7 +37,7 @@
<module>access-timeout-meta</module>
<module>access-timeout</module>
<module>alternate-descriptors</module>
- <module>applet</module>
+ <!--<module>applet</module>-->
<module>application-composer</module>
<module>applicationcomposer-jaxws-cdi</module>
<module>applicationexception</module>