tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlmonte...@apache.org
Subject [12/12] tomee git commit: This closes #350. Thanks ivanjunckes.
Date Wed, 02 Jan 2019 21:18:23 GMT
This closes #350. Thanks ivanjunckes.


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

Branch: refs/heads/master
Commit: 2144c9692c005d99d6b4f4ed307b246514033f57
Parents: afd8f80 44d4053
Author: Jean-Louis Monteiro <jeanouii@gmail.com>
Authored: Wed Jan 2 22:17:56 2019 +0100
Committer: Jean-Louis Monteiro <jeanouii@gmail.com>
Committed: Wed Jan 2 22:17:56 2019 +0100

----------------------------------------------------------------------
 .../cdi-alternative-and-stereotypes/README.adoc |   1 -
 examples/cdi-session-scope/README.adoc          |   7 +-
 examples/connector-war/README.adoc              |   8 +-
 examples/decorators/README.adoc                 |   7 +-
 examples/injection-of-entitymanager/README.adoc | 229 +++++++++++++++
 examples/injection-of-entitymanager/README.md   | 221 --------------
 examples/jpa-eclipselink/README.adoc            | 215 ++++++++++++++
 examples/jpa-eclipselink/README.md              | 211 --------------
 examples/jpa-enumerated/README.adoc             | 259 +++++++++++++++++
 examples/jpa-enumerated/README.md               | 252 ----------------
 examples/jpa-hibernate/README.adoc              | 213 ++++++++++++++
 examples/jpa-hibernate/README.md                | 209 --------------
 examples/multi-jpa-provider-testing/README.adoc | 287 +++++++++++++++++++
 examples/multi-jpa-provider-testing/README.md   | 281 ------------------
 examples/persistence-fragment/README.adoc       | 131 +++++++++
 examples/persistence-fragment/README.md         | 130 ---------
 examples/schedule-events/README.adoc            | 170 +++++++++++
 examples/schedule-events/README.md              | 166 -----------
 examples/simple-mdb-and-cdi/README.adoc         | 195 +++++++++++++
 examples/simple-mdb-and-cdi/README.md           | 189 ------------
 examples/simple-mdb-with-descriptor/README.adoc | 249 ++++++++++++++++
 examples/simple-mdb-with-descriptor/README.md   | 245 ----------------
 examples/simple-mdb/README.adoc                 | 218 ++++++++++++++
 examples/simple-mdb/README.md                   | 215 --------------
 examples/simple-remote-tomcatusers/README.adoc  |  10 +
 25 files changed, 2185 insertions(+), 2133 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/2144c969/examples/simple-remote-tomcatusers/README.adoc
----------------------------------------------------------------------
diff --cc examples/simple-remote-tomcatusers/README.adoc
index 642a2a0,8242b2d..4530f68
--- a/examples/simple-remote-tomcatusers/README.adoc
+++ b/examples/simple-remote-tomcatusers/README.adoc
@@@ -1,12 -1,10 +1,22 @@@
++<<<<<<< HEAD
 +index-group=Unrevised
 +type=page
 +status=published
 +
 += Simple Remote Tomcatusers
 +
 +This is an example on how to use JNDI with security restrictions in TomEE.
 +
 +
++=======
+ = Simple Remote Tomcatusers
+ :index-group: Security
+ :jbake-type: page
+ :jbake-status: published
+ 
+ This is an example on how to use JNDI with security restrictions in TomEE.
+ 
++>>>>>>> origin/pr/350
  == Contract
  
  In our example Contract is an interface annotated with @Remote which indicates that all
methods of this interface can be accessed by client code.


Mime
View raw message