Updated Branches: refs/heads/master 2f2d89167 -> d61e64667
[KARAF-2511] Add ejb page in the user guide Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d61e6466 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d61e6466 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d61e6466 Branch: refs/heads/master Commit: d61e64667e6c27f9b52cc64e2ba5b73b87526281 Parents: 2f2d891 Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Dec 19 21:29:11 2013 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Dec 19 21:29:11 2013 +0100 ---------------------------------------------------------------------- manual/src/main/webapp/_navigation.conf | 2 +- manual/src/main/webapp/manual.conf | 1 + manual/src/main/webapp/users-guide/ejb.conf | 10 ++++++++++ manual/src/main/webapp/users-guide/index.conf | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/d61e6466/manual/src/main/webapp/_navigation.conf ---------------------------------------------------------------------- diff --git a/manual/src/main/webapp/_navigation.conf b/manual/src/main/webapp/_navigation.conf index 02670d6..a7f5c98 100644 --- a/manual/src/main/webapp/_navigation.conf +++ b/manual/src/main/webapp/_navigation.conf @@ -27,7 +27,7 @@ h3. [Users Guide|/users-guide/index] -- [DataSource (JDBC)|/users-guide/jdbc] -- [MOM (JMS)|/users-guide/jms] -- [Persistence (JPA)|/users-guide/jpa] --- OpenEJB +-- [EJB|/users-guide/ejb] -- CDI -- [HA/failover and cluster|/users-guide/failover] - [Monitoring|/users-guide/monitoring] http://git-wip-us.apache.org/repos/asf/karaf/blob/d61e6466/manual/src/main/webapp/manual.conf ---------------------------------------------------------------------- diff --git a/manual/src/main/webapp/manual.conf b/manual/src/main/webapp/manual.conf index 3b76fc7..e3e4f4a 100644 --- a/manual/src/main/webapp/manual.conf +++ b/manual/src/main/webapp/manual.conf @@ -56,6 +56,7 @@ h1. Users Guide {include:users-guide/jdbc} {include:users-guide/jms} {include:users-guide/jpa} +{include:users-guide/ejb} {include:users-guide/failover} {include:users-guide/monitoring} {include:users-guide/webconsole} http://git-wip-us.apache.org/repos/asf/karaf/blob/d61e6466/manual/src/main/webapp/users-guide/ejb.conf ---------------------------------------------------------------------- diff --git a/manual/src/main/webapp/users-guide/ejb.conf b/manual/src/main/webapp/users-guide/ejb.conf new file mode 100644 index 0000000..710485b --- /dev/null +++ b/manual/src/main/webapp/users-guide/ejb.conf @@ -0,0 +1,10 @@ +h1. EJB + +Apache Karaf doesn't provide "native" support of EJB (Enterprise Java Beans). + +However, a project powered by Apache Karaf started at Apache OpenEJB: Apache KarafEE. + +It's the support of Apache OpenEJB in a custom distribution of Apache Karaf. + +The Apache KarafEE project is now "deprecated". It will be replaced by a ejb feature directly in the next +Apache Karaf release. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/karaf/blob/d61e6466/manual/src/main/webapp/users-guide/index.conf ---------------------------------------------------------------------- diff --git a/manual/src/main/webapp/users-guide/index.conf b/manual/src/main/webapp/users-guide/index.conf index 40635d8..ce17495 100644 --- a/manual/src/main/webapp/users-guide/index.conf +++ b/manual/src/main/webapp/users-guide/index.conf @@ -22,7 +22,7 @@ h1. Users Guide ** [DataSource (JDBC)|jdbc] ** [MOM (JMS)|jms] ** [Persistence (JPA)|jpa] -** OpenEJB +** [EJB|ejb] ** CDI ** [HA/failover and cluster|failover] * [Monitoring|monitoring]
