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%)
