You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2018/11/30 22:27:17 UTC

[33/34] tomee-site-generator git commit: Merge old content. Move tech content to main build.

Merge old content.  Move tech content to main build.


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

Branch: refs/heads/master
Commit: b34e23c09636453da7d4cc22e37fe99e8e122787
Parents: a9b5030
Author: dblevins <da...@gmail.com>
Authored: Mon Nov 26 01:22:58 2018 -0800
Committer: dblevins <da...@gmail.com>
Committed: Mon Nov 26 01:22:59 2018 -0800

----------------------------------------------------------------------
 src/main/jbake/content/admin/cluster/index.adoc | 227 -----
 .../admin/configuration/application.adoc        | 100 ---
 .../content/admin/configuration/containers.adoc | 585 -------------
 .../content/admin/configuration/index.adoc      |  24 -
 .../content/admin/configuration/resources.adoc  | 572 ------------
 .../content/admin/configuration/server.adoc     |  86 --
 src/main/jbake/content/admin/file-layout.adoc   | 144 ----
 src/main/jbake/content/admin/index.adoc         |   7 -
 .../advanced/applicationcomposer/index.adoc     |  76 --
 .../jbake/content/advanced/client/jndi.adoc     | 116 ---
 src/main/jbake/content/advanced/index.adoc      |   7 -
 .../content/advanced/jms/jms-configuration.adoc |  67 --
 .../jbake/content/advanced/setup/index.adoc     | 142 ---
 .../jbake/content/advanced/shading/index.adoc   | 276 ------
 .../content/advanced/tomee-embedded/index.adoc  | 223 -----
 src/main/jbake/content/articles.mdtext          |  39 +
 src/main/jbake/content/azure.mdtext             |   5 +
 .../jbake/content/commercial-support.mdtext     |  24 +
 src/main/jbake/content/comparison.mdtext        | 219 +++++
 src/main/jbake/content/concepts.mdtext          |  75 ++
 src/main/jbake/content/contribute.mdtext        | 199 +++++
 src/main/jbake/content/dev/april2008.mdtext     |  31 +
 src/main/jbake/content/dev/april2009.mdtext     |  32 +
 .../arquillian-test-porting-initiative.mdtext   |  76 ++
 src/main/jbake/content/dev/asf.mdtext           |  24 +
 src/main/jbake/content/dev/august2007.mdtext    |  18 +
 .../content/dev/building-from-source.mdtext     |  44 +
 .../content/dev/cdi-tck-webappsdeployer.mdtext  | 266 ++++++
 .../dev/configuration-and-assembly.mdtext       | 185 ++++
 .../jbake/content/dev/contribution-tips.mdtext  | 201 +++++
 .../jbake/content/dev/creating-itests.mdtext    | 203 +++++
 .../dev/design-application-server.mdtext        |  33 +
 .../dev/design-application-serverlinks.mdtext   |   2 +
 .../jbake/content/dev/design-assembler.mdtext   |  33 +
 .../dev/design-bmp-entitybean-container.mdtext  |  23 +
 .../content/dev/design-classic-assembler.mdtext |  28 +
 .../dev/design-cmp-entitybean-container.mdtext  |  22 +
 .../dev/design-configuration-factory.mdtext     |  38 +
 .../jbake/content/dev/design-container.mdtext   |  36 +
 .../content/dev/design-local-server.mdtext      |  21 +
 .../content/dev/design-local-serverlinks.mdtext |   2 +
 .../design-nova-configuration-factory.mdtext    |  28 +
 .../dev/design-passivation-strategy.mdtext      |  26 +
 .../design-random-access-file-passivater.mdtext |  20 +
 .../content/dev/design-remote-server.mdtext     |  31 +
 .../dev/design-remote-serverlinks.mdtext        |   2 +
 .../content/dev/design-resource-manager.mdtext  |  29 +
 .../content/dev/design-security-service.mdtext  |  27 +
 .../content/dev/design-simple-passivater.mdtext |  18 +
 ...design-stateful-sessionbean-container.mdtext |  24 +
 ...esign-stateless-sessionbean-container.mdtext |  22 +
 .../dev/design-transaction-service.mdtext       |  28 +
 src/main/jbake/content/dev/design.mdtext        |  37 +
 src/main/jbake/content/dev/favicon.ico          | Bin 0 -> 3638 bytes
 src/main/jbake/content/dev/git.mdtext           |  85 ++
 src/main/jbake/content/dev/index.html           |   3 +
 .../jbake/content/dev/itests-overview.mdtext    | 151 ++++
 src/main/jbake/content/dev/january2008.mdtext   |  55 ++
 src/main/jbake/content/dev/january2010.mdtext   |  20 +
 src/main/jbake/content/dev/jira/index.html      |   3 +
 src/main/jbake/content/dev/jira/patches.swjira  |  32 +
 src/main/jbake/content/dev/jira/todo.swjira     |  30 +
 src/main/jbake/content/dev/july2007.mdtext      |  22 +
 src/main/jbake/content/dev/july2008.mdtext      |  19 +
 src/main/jbake/content/dev/july2009.mdtext      |  28 +
 src/main/jbake/content/dev/july2010.mdtext      |  18 +
 src/main/jbake/content/dev/june2007.mdtext      |  16 +
 src/main/jbake/content/dev/logging.mdtext       | 222 +++++
 .../dev/mastering-the-command-line.mdtext       |  97 +++
 src/main/jbake/content/dev/october2007.mdtext   |   8 +
 src/main/jbake/content/dev/october2008.mdtext   |  36 +
 src/main/jbake/content/dev/october2009.mdtext   |   4 +
 .../content/dev/openejb-release-process.mdtext  | 278 ++++++
 src/main/jbake/content/dev/proxies.mdtext       |  34 +
 src/main/jbake/content/dev/release-tomee.mdtext | 283 ++++++
 src/main/jbake/content/dev/roadmap.mdtext       |  23 +
 src/main/jbake/content/dev/rsync.mdtext         |  98 +++
 .../jbake/content/dev/rules-of-thumb.mdtext     |  24 +
 src/main/jbake/content/dev/source-code.mdtext   | 101 +++
 src/main/jbake/content/dev/take-my-code.mdtext  |  14 +
 src/main/jbake/content/dev/thread-dumps.mdtext  |  37 +
 .../content/dev/tips-and-suggestions.mdtext     | 384 +++++++++
 .../dev/validation-keys-audit-report.mdtext     | 282 ++++++
 src/main/jbake/content/dev/website-dev.mdtext   |  51 ++
 .../jbake/content/dev/writing-examples.mdtext   |  95 ++
 .../content/dev/writing-validation-tests.mdtext | 163 ++++
 src/main/jbake/content/dev/xbean-finder.mdtext  | 266 ++++++
 .../content/dev/xbean-usage-in-openejb.mdtext   | 149 ++++
 .../content/developer/classloading/index.adoc   |  59 --
 .../content/developer/configuration/cxf.adoc    |  93 --
 src/main/jbake/content/developer/ide/index.adoc |  25 -
 src/main/jbake/content/developer/index.adoc     |   7 -
 .../jbake/content/developer/json/index.adoc     | 206 -----
 .../developer/migration/tomee-1-to-7.adoc       |  33 -
 .../testing/applicationcomposer/index.adoc      | 335 --------
 .../developer/testing/arquillian/index.adoc     | 421 ---------
 .../jbake/content/developer/testing/index.adoc  |   9 -
 .../content/developer/testing/other/index.adoc  | 134 ---
 .../content/developer/tools/gradle-plugins.adoc |  50 --
 .../jbake/content/developer/tools/index.adoc    |   8 -
 .../content/developer/tools/maven-plugins.adoc  |  12 -
 .../tools/maven/applicationcomposer.adoc        |  47 -
 .../content/developer/tools/maven/embedded.adoc |  53 --
 .../content/developer/tools/maven/tomee.adoc    | 183 ----
 src/main/jbake/content/enterprise-tomcat.mdtext |   5 +
 src/main/jbake/content/evolution-of-ejb.mdtext  | 114 +++
 src/main/jbake/content/faq.mdtext               |  96 +++
 src/main/jbake/content/features.mdtext          |   1 +
 src/main/jbake/content/geronimo.mdtext          |   7 +
 src/main/jbake/content/lightening-demos.mdtext  |  83 ++
 src/main/jbake/content/mailing-lists.mdtext     |  74 ++
 .../jbake/content/management-and-voting.mdtext  |  86 ++
 src/main/jbake/content/powered-by.mdtext        |  20 +
 .../2010_ApacheCon_OpenEJB_InDepth.key          | Bin 0 -> 1310566 bytes
 .../2010_ApacheCon_OpenEJB_InDepth.pdf          | Bin 0 -> 1768517 bytes
 ...heCon_Apache_TomEE_Java_EE_6_Web_Profile.key | Bin 0 -> 1199415 bytes
 ...heCon_Apache_TomEE_Java_EE_6_Web_Profile.pdf | Bin 0 -> 1178889 bytes
 ...Autumn_TomEE_JavEE_Web_Profile_on_Tomcat.key | Bin 0 -> 255576 bytes
 ...Autumn_TomEE_JavEE_Web_Profile_on_Tomcat.pdf | Bin 0 -> 223080 bytes
 ...Autumn_TomEE_JavEE_Web_Profile_on_Tomcat.ppt | Bin 0 -> 174080 bytes
 .../2011_JAX_London_Fun_EJB31_and_OpenEJB.key   | Bin 0 -> 330634 bytes
 .../2011_JAX_London_Fun_EJB31_and_OpenEJB.pdf   | Bin 0 -> 207968 bytes
 ...vaOne_Apache_TomEE_Java_EE_6_Web_Profile.key | Bin 0 -> 1198882 bytes
 ...vaOne_Apache_TomEE_Java_EE_6_Web_Profile.pdf | Bin 0 -> 1164144 bytes
 .../2011_JavaOne_EJB_with_Meta_Annotations.key  | Bin 0 -> 1201626 bytes
 .../2011_JavaOne_EJB_with_Meta_Annotations.pdf  | Bin 0 -> 1080099 bytes
 ...011_JavaOne_Fun_with_EJB_3_1_and_OpenEJB.key | Bin 0 -> 1227795 bytes
 ...011_JavaOne_Fun_with_EJB_3_1_and_OpenEJB.pdf | Bin 0 -> 1386994 bytes
 .../presentations/2011_OSCONj-ApacheTomEE.key   | Bin 0 -> 25496277 bytes
 .../presentations/2011_OSCONj-ApacheTomEE.pdf   | Bin 0 -> 1169806 bytes
 ...2012_JAXConf_Tomcat_to_JavaEE_with_TomEE.key | Bin 0 -> 20876167 bytes
 ...2012_JAXConf_Tomcat_to_JavaEE_with_TomEE.pdf | Bin 0 -> 2841931 bytes
 .../Apache TomEE - Tomcat with a kick.odp       | Bin 0 -> 439454 bytes
 .../Apache TomEE - Tomcat with a kick.pdf       | Bin 0 -> 386594 bytes
 .../jbake/content/presentations/JAOO-2006.pdf   | Bin 0 -> 2344223 bytes
 .../jbake/content/presentations/favicon.ico     | Bin 0 -> 3638 bytes
 src/main/jbake/content/privacy-policy.mdtext    |  23 +
 src/main/jbake/content/robots.txt               |   4 +
 src/main/jbake/content/support.mdtext           |  36 +
 src/main/jbake/content/team.mdtext              | 106 +++
 src/main/jbake/content/time-saved.mdtext        | 245 ++++++
 src/main/jbake/content/tomcat-activemq.mdtext   |  53 ++
 src/main/jbake/content/tomcat-cdi.mdtext        |  54 ++
 .../content/tomcat-detailed-instructions.mdtext | 343 ++++++++
 src/main/jbake/content/tomcat-ejb-refs.mdtext   |  29 +
 src/main/jbake/content/tomcat-ejb.mdtext        |   5 +
 .../jbake/content/tomcat-installation.mdtext    | 168 ++++
 src/main/jbake/content/tomcat-java-ee.mdtext    |   5 +
 src/main/jbake/content/tomcat-javaee.mdtext     |   5 +
 src/main/jbake/content/tomcat-jaxrs.mdtext      |   5 +
 src/main/jbake/content/tomcat-jaxws.mdtext      |   5 +
 src/main/jbake/content/tomcat-jms.mdtext        |  53 ++
 src/main/jbake/content/tomcat-jpa.mdtext        |  59 ++
 src/main/jbake/content/tomcat-jsf.mdtext        |   5 +
 .../jbake/content/tomcat-object-factory.mdtext  |  12 +
 src/main/jbake/content/tomcat.mdtext            | 144 ++++
 .../jbake/content/tomee-1.0.0-beta-1.mdtext     |  53 ++
 .../content/tomee-1.5.0-release-notes.mdtext    | 290 +++++++
 src/main/jbake/content/tomee-1.5.0.mdtext       |  23 +
 .../content/tomee-1.5.1-release-notes.mdtext    | 430 +++++++++
 src/main/jbake/content/tomee-1.5.1.mdtext       |   7 +
 .../content/tomee-1.6.0.1-release-notes.mdtext  |  40 +
 src/main/jbake/content/tomee-1.6.0.1.mdtext     |  26 +
 .../content/tomee-1.6.0.2-release-notes.mdtext  |  34 +
 src/main/jbake/content/tomee-1.6.0.2.mdtext     |  17 +
 .../content/tomee-1.7.0-release-notes.mdtext    | 861 +++++++++++++++++++
 src/main/jbake/content/tomee-1.7.0.mdtext       |  58 ++
 .../content/tomee-1.7.1-release-notes.mdtext    |  67 ++
 src/main/jbake/content/tomee-1.7.1.mdtext       |  49 ++
 .../content/tomee-1.7.2-release-notes.mdtext    | 162 ++++
 src/main/jbake/content/tomee-1.7.2.mdtext       |  42 +
 .../content/tomee-1.7.3-release-notes.mdtext    |  82 ++
 src/main/jbake/content/tomee-1.7.3.mdtext       |  43 +
 .../content/tomee-1.7.4-release-notes.html      |  20 +
 src/main/jbake/content/tomee-1.7.4.mdtext       |  43 +
 .../content/tomee-7.0.0-M1-release-notes.mdtext | 529 ++++++++++++
 src/main/jbake/content/tomee-7.0.0-M1.mdtext    |  41 +
 .../content/tomee-7.0.0-M2-release-notes.mdtext | 138 +++
 src/main/jbake/content/tomee-7.0.0-M2.mdtext    |  41 +
 .../content/tomee-7.0.0-M3-release-notes.mdtext |  17 +
 src/main/jbake/content/tomee-7.0.0-M3.mdtext    |  41 +
 .../content/tomee-7.0.0-release-notes.mdtext    | 281 ++++++
 .../content/tomee-7.0.1-release-notes.mdtext    |  93 ++
 src/main/jbake/content/tomee-7.0.1.mdtext       |  40 +
 .../content/tomee-7.0.2-release-notes.mdtext    | 200 +++++
 src/main/jbake/content/webadmin.mdtext          | 169 ++++
 src/main/jbake/content/webobjects.mdtext        |   7 +
 187 files changed, 11091 insertions(+), 4327 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/b34e23c0/src/main/jbake/content/admin/cluster/index.adoc
----------------------------------------------------------------------
diff --git a/src/main/jbake/content/admin/cluster/index.adoc b/src/main/jbake/content/admin/cluster/index.adoc
deleted file mode 100755
index 82caad7..0000000
--- a/src/main/jbake/content/admin/cluster/index.adoc
+++ /dev/null
@@ -1,227 +0,0 @@
-== Clustering and High Availability (HA)
-
-:jbake-date: 2016-03-16
-:jbake-type: page
-:jbake-status: published
-:jbake-tomeepdf:
-
-
-=== Session clustering
-
-TomEE fully relies on Tomcat clustering: https://tomcat.apache.org/tomcat-7.0-doc/cluster-howto.html[Tomcat Clustering].
-
-The configuration is mainly in `conf/server.xml` and since TomEE 7 CDI `@SessionScoped` is transparently clustered
-through the session.
-
-=== Hazelcast as session provider
-
-Hazelcast did a post on this topic on https://hazelcast.com/use-cases/web-session-clustering/session-clustering-tomee/[Session Clustering With TomEE].
-
-Tomitribe also demonstrated you can distributed `@Stateful` beans easily relying on hazelcast: https://github.com/tomitribe/hazelcast-tomee-poc[Hazelcast TomEE PoC].
-
-=== Load balancing
-
-TomEE being a HTTP server all HTTP load balancer such as HTTPd (a.k.a. Apache2), ngnix, F5 etc... will work.
-
-More documentation on HTTPd link can be found on https://tomcat.apache.org/connectors-doc/webserver_howto/apache.html[Tomcat] website.
-
-=== EJBd
-
-If you use the EJBd protocol (`@Remote` EJB proprietary protocol of TomEE) you can get cluster features on the client
-part.
-
-==== Multicast
-
-Multicast is the preferred way to broadcast the heartbeat on the network. The simple technique of broadcasting a non-changing service URI on the network has specific advantages to multicast. The URI itself is essentially stateless and there is no "i'm alive" URI or an "i'm dead" URI.
-
-In this way the issues with UDP being unordered and unreliable melt away as state is no longer a concern and packet sizes are always small. Complicated libraries that ride atop UDP and attempt to offer reliability (retransmission) and ordering on UDP can be avoided. As well the advantages UDP has over TCP are retained as there are no java layers attempting to force UDP communication to be more TCP-like. The simple design means UDP/Multicast is only used for discovery and from there on out critical information is transmitted over TCP/IP which is obviously going to do a better job at ensuring reliability and ordering.
-
-===== Server Configuration
-
-When you boot the server there should be a conf/multicast.properties file containing:
-
-[source,bash]
-----
-server      = org.apache.openejb.server.discovery.MulticastDiscoveryAgent
-bind        = 239.255.2.3
-port        = 6142
-disabled    = true
-group       = default
-----
-
-Just need to enable that by setting disabled=false. All of the above settings except server can be changed. The port and bind must be valid for general multicast/udp network communication.
-
-The group setting can be changed to further group servers that may use the same multicast channel. As shown below the client also has a group setting which can be used to select an appropriate server from the multicast channel.
-
-IMPORTANT: for multicast to work you need to have ejbd activated as a normal service. This can be done setting in `conf/system.properties` the entry: `openejb.service.manager.class = org.apache.openejb.server.SimpleServiceManager`.
-
-===== Multicast Client
-
-The multicast functionality is not just for servers to find each other in a cluster, it can also be used for EJB clients to discover a server. A special multicast:// URL can be used in the InitialContext properties to signify that multicast should be used to seed the connection process. Such as:
-
-[source,java]
-----
-Properties p = new Properties();
-p.put(Context.INITIAL_CONTEXT_FACTORY,
-"org.apache.openejb.client.RemoteInitialContextFactory");
-p.put(Context.PROVIDER_URL, "multicast://239.255.2.3:6142?group=default");
-InitialContext remoteContext = new InitialContext(p);
-----
-
-The URL has optional query parameters such as schemes and group and timeout which allow you to zero in on a particular type of service of a particular cluster group as well as set how long you are willing to wait in the discovery process till finally giving up. The first matching service that it sees "flowing" around on the UDP stream is the one it picks and sticks to for that and subsequent requests, ensuring UDP is only used when there are no other servers to talk to.
-
-Note that EJB clients do not need to use multicast to find a server. If the client knows the URL of a server in the cluster, it may use it and connect directly to that server, at which point that server will share the full list of its peers.
-
-===== Multicast Servers with TCP Clients
-
-Note that clients do not need to use multicast to communicate with servers. Servers can use multicast to discover each other, but clients are still free to connect to servers in the network using the server's TCP address.
-
-[source,java]
-----
-Properties p = new Properties();
-p.put(Context.INITIAL_CONTEXT_FACTORY,  "org.apache.openejb.client.RemoteInitialContextFactory");
-p.put(Context.PROVIDER_URL, "ejbd://192.168.1.30:4201");
-InitialContext remoteContext = new InitialContext(p);
-When the client connects, the server will send the URLs of all the servers in the group and failover will take place normally.
-----
-
-==== Multipulse
-
-MultiPulse is an alternative multicast lookup that does not use a regular heartbeat. Instead, servers listen for a multicast request packet (a pulse) to which a response is then sent. Multicast network traffic is effectively reduced to an absolute minimum.
-
-MultiPulse is only useful in network scenarios where both client and server can be configured to send multicast UDP packets.
-
-===== Server Configuration
-
-After you boot the server for the first time the default configuration will create the file conf/conf.d/multipulse.properties containing:
-
-[source,bash]
-----
-server      = org.apache.openejb.server.discovery.MulticastPulseAgent
-bind        = 239.255.2.3
-port        = 6142
-disabled    = true
-group       = default
-----
-
-You just need to enable the agent by setting disabled = false. It is advisable to disable multicast in the multicast.properties file, or at least to use a different bind address or port should you wish to use both.
-
-All of the above settings except server can be modified as required. The port and bind must be valid for general multicast/udp network communication.
-
-The group setting can be changed to further group/cluster servers that may use the same multicast channel. As shown below the client also has an optional group setting which can be used to select an appropriate server cluster from the multicast channel (See MultiPulse Client).
-
-The next step is to ensure that the advertised services are configured for discovery. Edit the ejbd.properties file (and any other enabled services such as http, etc.) and ensure that the discovery option is set to a value that remote clients will be able to resolve.
-
-[source,bash]
-----
-server      = org.apache.openejb.server.ejbd.EjbServer
-bind        = 0.0.0.0
-port        = 4201
-disabled    = false
-threads     = 20
-discovery   = ejb:ejbd://{bind}:{port}
-----
-
-NOTE: If either 0.0.0.0 (IPv4) or [::] (IPv6) wildcard bind addresses are used then the server will actually broadcast all of it's known public hosts to clients. Clients will then cycle though and attempt to connect to the provided hosts until successful.
-
-If localhost is used then only clients on the same physical machine will actually 'see' the server response.
-
-===== MultiPulse Client
-
-The multipulse functionality is not just for servers to find each other in a cluster, it can also be used for EJB clients to discover a server. A special multipulse:// URL can be used in the InitialContext properties to signify that multipulse should be used to seed the connection process. Such as:
-
-[source,java]
-----
-Properties p = new Properties();
-p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
-p.put(Context.PROVIDER_URL, "multipulse://239.255.2.3:6142?group=default&timeout=250");
-InitialContext remoteContext = new InitialContext(p);
-----
-
-The URL has optional query parameters such as schemes and group and timeout which allow you to zero in on a particular type of service of a particular cluster group as well as set how long you are willing to wait in the discovery process till finally giving up. The first matching service that it sees "flowing" around on the UDP stream is the one it picks and sticks to for that and subsequent requests, ensuring UDP is only used when there are no other servers to talk to.
-
-Note that EJB clients do not need to use multipulse to find a server. If the client knows the URL of a server in the cluster, it may use it and connect directly to that server, at which point that server will share the full list of its peers.
-
-Multicast Servers with TCP Clients
-
-Note that clients do not need to use multipulse to communicate with servers. Servers can use multicast to discover each other, but clients are still free to connect to servers in the network using the server's TCP address.
-[source,java]
-----
-Properties p = new Properties();
-p.put(Context.INITIAL_CONTEXT_FACTORY,  "org.apache.openejb.client.RemoteInitialContextFactory");
-p.put(Context.PROVIDER_URL, "ejbd://192.168.1.30:4201");
-InitialContext remoteContext = new InitialContext(p);
-----
-
-When the client connects, the server will send the URLs of all the servers in the group and failover will take place normally.
-
-==== Multipoint
-
-As TCP has no real broadcast functionality to speak of, communication of who is in the network is achieved by each server having a physical connection to each other server in the network.
-
-To join the network, the server must be configured to know the address of at least one server in the network and connect to it. When it does both servers will exchange the full list of all the other servers each knows about. Each server will then connect to any new servers they've just learned about and repeat the processes with those new servers. The end result is that everyone has a direct connection to everyone 100% of the time, hence the made-up term "multipoint" to describe this situation of each server having multiple point-to-point connections which create a fully connected graph.
-
-On the client side things are similar. It needs to know the address of at least one server in the network and be able to connect to it. When it does it will get the full (and dynamically maintained) list of every server in the network. The client doesn't connect to each of those servers immediately, but rather consults the list in the event of a failover, using it to decide who to connect to next.
-
-The entire process is essentially the art of using a statically maintained list to bootstrap getting the more valuable dynamically maintained list.
-
-===== Server Configuration
-
-In the server this list can be specified via the conf/multipoint.properties file like so:
-
-[source,bash]
-----
-server      = org.apache.openejb.server.discovery.MultipointDiscoveryAgent
-bind        = 127.0.0.1
-port        = 4212
-disabled    = false
-initialServers = 192.168.1.20:4212, 192.168.1.30:4212, 192.168.1.40:4212
-----
-
-The above configuration shows the server has an port 4212 open for connections by other servers for multipoint communication. The initialServers list should be a comma separated list of other similar servers on the network. Only one of the servers listed is required to be running when this server starts up -- it is not required to list all servers in the network.
-
-===== Client Configuration
-
-Configuration in the client is similar, but note that EJB clients do not participate directly in multipoint communication and do not connect to the multipoint port. The server list is simply a list of the regular ejbd:// urls that a client normally uses to connect to a server.
-
-[source,java]
-----
-Properties p = new Properties();
-p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
-p.put(Context.PROVIDER_URL, "failover:ejbd://192.168.1.20:4201,ejbd://192.168.1.30:4201");
-InitialContext remoteContext = new InitialContext(p);
-----
-
-Failover can work entirely driven by the server, the client does not need to be configured to participate. A client can connect as usual to the server.
-
-[source,java]
-----
-Properties p = new Properties();
-p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
-p.put(Context.PROVIDER_URL, "ejbd://192.168.1.20:4201");
-InitialContext remoteContext = new InitialContext(p);
-----
-
-If the server at 192.168.1.20:4201 supports failover, so will the client.
-
-In this scenario the list of servers used for failover is supplied entirely by the server at 192.168.1.20:4201. The server could have aquired the list via multicast or multipoint (or both), but this detail is not visible to the client.
-
-===== Considerations
-
-====== Network size
-
-The general disadvantage of this topology is the number of connections required. The number of connections for the network of servers is equal to (n * n - n) / 2, where n is the number of servers. For example, with 5 servers you need 10 connections, with 10 servers you need 45 connections, and with 50 servers you need 1225 connections. This is of course the number of connections across the entire network, each individual server only needs n - 1 connections.
-
-The handling of these sockets is all asynchronous Java NIO code which allows the server to handle many connections (all of them) with one thread. From a pure threading perspective, the option is extremely efficient with just one thread to listen and broadcast to many peers.
-
-====== Double connect
-
-It is possible in this process that two servers learn of each other at the same time and each attempts to connect to the other simultaneously, resulting in two connections between the same two servers. When this happens both servers will detect the extra connection and one of the connections will be dropped and one will be kept. In practice this race condition rarely happens and can be avoided almost entirely by fanning out server startup by as little as 100 milliseconds.
-
-===== Recommandation
-
-As mentioned the initialServers is only used for bootstrapping the multipoint network. Once running, all servers will dynamically establish direct connections with each other and there is no single point of failure.
-
-However to ensure that the bootstrapping process can occur successfully, the initialServers property of the conf/multipoint.properties file must be set carefully and with a specific server start order in mind. Each server consults its initialServers list exactly once in the bootstrapping phase at startup, after that time connections are made dynamically.
-
-This means that at least one of the servers listed in initialServers must already be running when the server starts or the server might never become introduced and connected to all the other servers in the network.

http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/b34e23c0/src/main/jbake/content/admin/configuration/application.adoc
----------------------------------------------------------------------
diff --git a/src/main/jbake/content/admin/configuration/application.adoc b/src/main/jbake/content/admin/configuration/application.adoc
deleted file mode 100755
index be43cd2..0000000
--- a/src/main/jbake/content/admin/configuration/application.adoc
+++ /dev/null
@@ -1,100 +0,0 @@
-= Application Configuration
-:jbake-date: 2016-03-16
-:jbake-type: page
-:jbake-status: published
-:jbake-tomeepdf:
-
-=== `application.properties`
-
-This file is located in `WEB-INF` for a war and `META-INF` for an ear.
-
-==== `@Asynchronous` configuration
-
-Default pool size for `@Asynchronous` is 5. It can be very small for some applications highly relying on
-asynchronism or reactive patterns. Therefore it is possible to customize it adding these entries in `application.properties`:
-
-[.table.table-bordered,options="header"]
-|===
-| Name | Default| Description
-| AsynchronousPool.Size | 5 | Core size of the pool
-| AsynchronousPool.CorePoolSize | 5 | Core size of the pool (inherit its default from .Size alias)
-| AsynchronousPool.MaximumPoolSize | 5 | Maximum size of the pool
-| AsynchronousPool.QueueSize | 5 | Maximum size of the pool
-| AsynchronousPool.KeepAliveTime | 1 minute | Thread keep alive duration
-| AsynchronousPool.AllowCoreThreadTimeOut | true | Should thread timeout
-| AsynchronousPool.QueueType | LINKED (or SYNCHRONOUS if size == 0) | The type of queue of the pool in ARRAY, LINKED, PRIORITY or SYNCHRONOUS (same behavior as java implementations of the same name)
-| AsynchronousPool.ShutdownWaitDuration | 1 minute | How many time to wait for the pool to shutdown when undeploying the application
-| AsynchronousPool.RejectedExecutionHandlerClass | - | A fully qualified name of a `java.util.concurrent.RejectedExecutionHandler`
-|===
-
-==== TimerService and `@Scheduled`
-
-`timerStore.class` allows to switch from the in memory (`org.apache.openejb.core.timer.MemoryTimerStore`) timer storage
-for quartz tasks to a custom implementation (using a database or anything for instance). Constructor can take a `TransactionManager`
-or nothing.
-
-All quartz properties prefixed with `org.apache.openejb.quartz.` (instead of `org.quartz.`) are passthrough to quartz.
-
-==== CDI
-
-The boolean `openejb.cdi.skip-resource-validation` allows to not validate resources ie `@EJB` and `@Resource` usages in CDI beans.
-
-All properties understood by OpenWebBeans will also be passthrough to OpenWebBeans from this location, see http://openwebbeans.apache.org/owbconfig.html[OWB config] for more details.
-
-==== `@WebServiceRef`
-
-[.table.table-bordered,options="header"]
-|===
-| Name | Description
-| cxf.jaxws.client.wsFeatures | Allows to set WSFeature on the client injection. Values is a list (comma separated) of resource id in resources.xml or fully qualified names.
-|===
-
-==== `@Stateless`
-
-[.table.table-bordered,options="header"]
-|===
-| Name | Description
-| AccessTimeout or Timeout | container timeout
-| CloseTimeout | container timeout
-| BackgroundStartup | Don't create instances in parallel if minimum count is > 0, default to false
-|===
-
-=== `resources.xml`
-
-`resources.xml` is a tomee.xml using application classloader.
-
-As `tomee.xml` it supports filtering so you can use environment variables and system properties, for instance
-to use a MySQL database on OpenShift you can do:
-
-[source,xml]
-----
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-  <Resource id="MySQL" aliases="myAppDataSourceName" type="DataSource">
-    JdbcDriver = com.mysql.jdbc.Driver
-    JdbcUrl = jdbc:mysql://${OPENSHIFT_MYSQL_DB_HOST}:${OPENSHIFT_MYSQL_DB_PORT}/rmannibucau?tcpKeepAlive=true
-    UserName = ${OPENSHIFT_MYSQL_DB_USERNAME}
-    Password = ${OPENSHIFT_MYSQL_DB_PASSWORD}
-    ValidationQuery = SELECT 1
-    ValidationInterval = 30000
-    NumTestsPerEvictionRun = 5
-    TimeBetweenEvictionRuns = 30 seconds
-    TestWhileIdle = true
-    MaxActive = 200
-  </Resource>
-</resources>
-----
-
-`resources.xml` supports `Resource`, `Service` and `Container`.
-
-==== `resources.xml` mecanism
-
-`resources.xml` resources are still available globally like any `tomee.xml` resource.
-
-The actual resource is bound in an application subtree called with the application name and a resource facade is bound
-in the global naming tree to be able to route the requests depending the application.
-
-Typically if your application is named `myapp` and your resource id is `myresource` then instead of being registered
-as `myresource`, it will get registered as `myapp/myresource`.
-
-If you get any ambiguity in resource name matching try to fully qualified your resource prefixing it with the application name.

http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/b34e23c0/src/main/jbake/content/admin/configuration/containers.adoc
----------------------------------------------------------------------
diff --git a/src/main/jbake/content/admin/configuration/containers.adoc b/src/main/jbake/content/admin/configuration/containers.adoc
deleted file mode 100755
index 3d86272..0000000
--- a/src/main/jbake/content/admin/configuration/containers.adoc
+++ /dev/null
@@ -1,585 +0,0 @@
-= Resources
-:jbake-date: 2016-03-16
-:jbake-type: page
-:jbake-status: published
-:jbake-tomeepdf:
-
-All containers will be created automatically - which means you don't need to define them
-if you don't need to tune their configuration - when a bean of their type if found.
-
-To avoid that use `openejb.offline` property and set it to `true`. See link:server.html[Server Configuration] for more detail.
-
-=== @Stateless
-
-A `@Stateless` container.
-
-Declarable in tomee.xml via
-
-[source,xml]
-----
-<Container id="Foo" type="STATELESS">
-    AccessTimeout = 30 seconds
-    MaxSize = 10
-    MinSize = 0
-    StrictPooling = true
-    MaxAge = 0 hours
-    ReplaceAged = true
-    ReplaceFlushed = false
-    MaxAgeOffset = -1
-    IdleTimeout = 0 minutes
-    GarbageCollection = false
-    SweepInterval = 5 minutes
-    CallbackThreads = 5
-    CloseTimeout = 5 minutes
-    UseOneSchedulerThreadByBean = false
-    EvictionThreads = 1
-</Container>
-----
-
-Declarable in properties via
-
-[source,bash]
-----
-Foo = new://Container?type=STATELESS
-Foo.AccessTimeout = 30 seconds
-Foo.MaxSize = 10
-Foo.MinSize = 0
-Foo.StrictPooling = true
-Foo.MaxAge = 0 hours
-Foo.ReplaceAged = true
-Foo.ReplaceFlushed = false
-Foo.MaxAgeOffset = -1
-Foo.IdleTimeout = 0 minutes
-Foo.GarbageCollection = false
-Foo.SweepInterval = 5 minutes
-Foo.CallbackThreads = 5
-Foo.CloseTimeout = 5 minutes
-Foo.UseOneSchedulerThreadByBean = false
-Foo.EvictionThreads = 1
-----
-
-==== Configuration
-
-===== AccessTimeout
-
-Specifies the time an invokation should wait for an instance
-of the pool to become available.
-
-After the timeout is reached, if an instance in the pool cannot
-be obtained, the method invocation will fail.
-
-Usable time units: nanoseconds, microsecons, milliseconds,
-seconds, minutes, hours, days.  Or any combination such as
-"1 hour and 27 minutes and 10 seconds"
-
-Any usage of the `javax.ejb.AccessTimeout` annotation will
-override this setting for the bean or method where the
-annotation is used.
-
-===== MaxSize
-
-Specifies the size of the bean pools for this stateless
-SessionBean container.  If StrictPooling is not used, instances
-will still be created beyond this number if there is demand, but
-they will not be returned to the pool and instead will be
-immediately destroyed.
-
-===== MinSize
-
-Specifies the minimum number of bean instances that should be in
-the pool for each bean.  Pools are prefilled to the minimum on
-startup.  Note this will create start order dependencies between
-other beans that also eagerly start, such as other `@Stateless`
-beans with a minimum or `@Singleton` beans using `@Startup`.  The
-start order.
-
-The minimum pool size is rigidly maintained.  Instances in the
-minimum side of the pool are not eligible for `IdleTimeout` or
-`GarbageCollection`, but are subject to `MaxAge` and flushing.
-
-If the pool is flushed it is immediately refilled to the minimum
-size with `MaxAgeOffset` applied.  If an instance from the minimum
-side of the pool reaches its `MaxAge`, it is also immediately
-replaced.  Replacement is done in a background queue using the
-number of threads specified by `CallbackThreads`.
-
-===== StrictPooling
-
-StrictPooling tells the container what to do when the pool
-reaches it's maximum size and there are incoming requests that
-need instances.
-
-With strict pooling, requests will have to wait for instances to
-become available. The pool size will never grow beyond the the
-set `MaxSize` value.  The maximum amount of time a request should
-wait is specified via the `AccessTimeout` setting.
-
-Without strict pooling, the container will create temporary
-instances to meet demand. The instances will last for just one
-method invocation and then are removed.
-
-Setting `StrictPooling` to `false` and `MaxSize` to `0` will result in
-no pooling. Instead instances will be created on demand and live
-for exactly one method call before being removed.
-
-===== MaxAge
-
-Specifies the maximum time that an instance should live before
-it should be retired and removed from use.  This will happen
-gracefully.  Useful for situations where bean instances are
-designed to hold potentially expensive resources such as memory
-or file handles and need to be periodically cleared out.
-
-Usable time units: nanoseconds, microsecons, milliseconds,
-seconds, minutes, hours, days.  Or any combination such as
-`1 hour and 27 minutes and 10 seconds`
-
-===== ReplaceAged
-
-When `ReplaceAged` is enabled, any instances in the pool that
-expire due to reaching their `MaxAge` will be replaced immediately
-so that the pool will remain at its current size.  Replacement
-is done in a background queue so that incoming threads will not
-have to wait for instance creation.
-
-The aim of his option is to prevent user requests from paying
-the instance creation cost as `MaxAge` is enforced, potentially
-while under heavy load at peak hours.
-
-Instances from the minimum side of the pool are always replaced
-when they reach their `MaxAge`, this setting dictates the
-treatment of non-minimum instances.
-
-===== ReplaceFlushed
-
-When `ReplaceFlushed` is enabled, any instances in the pool that
-are flushed will be replaced immediately so that the pool will
-remain at its current size.  Replacement is done in a background
-queue so that incoming threads will not have to wait for
-instance creation.
-
-The aim of his option is to prevent user requests from paying
-the instance creation cost if a flush performed while under
-heavy load at peak hours.
-
-Instances from the minimum side of the pool are always replaced
-when they are flushed, this setting dictates the treatment of
-non-minimum instances.
-
-A bean may flush its pool by casting the `SessionContext` to
-`Flushable` and calling `flush()`.  See `SweepInterval` for details on
-how flush is performed.
-
-[source,java]
-----
-import javax.annotation.Resource;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-import java.io.Flushable;
-import java.io.IOException;
-
-public class MyBean {
-
-    private SessionContext sessionContext;
-
-    public void flush() throws IOException {
-
-        ((Flushable) sessionContext).flush();
-    }
-}
-----
-
-===== MaxAgeOffset
-
-Applies to MaxAge usage and would rarely be changed, but is a
-nice feature to understand.
-
-When the container first starts and the pool is filled to the
-minimum size, all those "minimum" instances will have the same
-creation time and therefore all expire at the same time dictated
-by the `MaxAge` setting.  To protect against this sudden drop
-scenario and provide a more gradual expiration from the start
-the container will spread out the age of the instances that fill
-the pool to the minimum using an offset.
-
-The `MaxAgeOffset` is not the final value of the offset, but
-rather it is used in creating the offset and allows the
-spreading to push the initial ages into the future or into the
-past.  The pool is filled at startup as follows:
-
-[source,java]
-----
-for (int i = 0; i < poolMin; i++) {
-    long ageOffset = (maxAge / poolMin * i * maxAgeOffset) % maxAge;
-    pool.add(new Bean(), ageOffset));
-}
-----
-
-The default `MaxAgeOffset` is -1 which causes the initial
-instances in the pool to live a bit longer before expiring.  As
-a concrete example, let's say the MinSize is 4 and the MaxAge is
-100 years.  The generated offsets for the four instances created
-at startup would be 0, -25, -50, -75.  So the first instance
-would be "born" at age 0, die at 100, living 100 years.  The
-second instance would be born at -25, die at 100, living a total
-of 125 years.  The third would live 150 years.  The fourth 175
-years.
-
-A `MaxAgeOffset` of 1 would cause instances to be "born" older
-and therefore die sooner.  Using the same example `MinSize` of 4
-and `MaxAge` of `100 years`, the life spans of these initial four
-instances would be 100, 75, 50, and 25 years respectively.
-
-A `MaxAgeOffset` of 0 will cause no "spreading" of the age of the
-first instances used to fill the pool to the minimum and these
-instances will of course reach their MaxAge at the same time.
-It is possible to set to decimal values such as -0.5, 0.5, -1.2,
-or 1.2.
-
-===== IdleTimeout
-
-Specifies the maximum time that an instance should be allowed to
-sit idly in the pool without use before it should be retired and
-removed.
-
-Usable time units: nanoseconds, microsecons, milliseconds,
-seconds, minutes, hours, days.  Or any combination such as
-"1 hour and 27 minutes and 10 seconds"
-
-===== GarbageCollection
-
-Allows Garbage Collection to be used as a mechanism for shrinking
-the pool.  When set to true all instances in the pool, excluding
-the minimum, are eligible for garbage collection by the virtual
-machine as per the rules of `java.lang.ref.SoftReference` and can be
-claimed by the JVM to free memory.  Instances garbage collected
-will have their `@PreDestroy` methods called during finalization.
-
-In the OpenJDK VM the `-XX:SoftRefLRUPolicyMSPerMB` flag can adjust
-how aggressively SoftReferences are collected.  The default
-OpenJDK setting is 1000, resulting in inactive pooled instances
-living one second of lifetime per free megabyte in the heap, which
-is very aggressive.  The setting should be increased to get the
-most out of the `GarbageCollection` feature of the pool.  Much
-higher settings are safe.  Even a setting as high as 3600000 (1
-hour per free MB in the heap) does not affect the ability for the
-VM to garbage collect SoftReferences in the event that memory is
-needed to avoid an `OutOfMemoryException`.
-
-===== SweepInterval
-
-The frequency in which the container will sweep the pool and
-evict expired instances.  Eviction is how the `IdleTimeout`,
-`MaxAge`, and pool "flush" functionality is enforced.  Higher
-intervals are better.
-
-Instances in use are excluded from sweeping.  Should an instance
-expire while in use it will be evicted immediately upon return
-to the pool.  Effectively `MaxAge` and flushes will be enforced as
-a part of normal activity or sweeping, while IdleTimeout is only
-enforcable via sweeping.  This makes aggressive sweeping less
-important for a pool under moderate load.
-
-Usable time units: nanoseconds, microsecons, milliseconds,
-seconds, minutes, hours, days.  Or any combination such as
-`1 hour and 27 minutes and 10 seconds`
-
-===== CallbackThreads
-
-When sweeping the pool for expired instances a thread pool is
-used to process calling `@PreDestroy` on expired instances as well
-as creating new instances as might be required to fill the pool
-to the minimum after a Flush or `MaxAge` expiration.  The
-`CallbackThreads` setting dictates the size of the thread pool and
-is shared by all beans deployed in the container.
-
-===== CloseTimeout
-
-PostConstruct methods are invoked on all instances in the pool
-when the bean is undeployed and its pool is closed.  The
-`CloseTimeout` specifies the maximum time to wait for the pool to
-close and `PostConstruct` methods to be invoked.
-
-Usable time units: nanoseconds, microsecons, milliseconds,
-seconds, minutes, hours, days.  Or any combination such as
-`1 hour and 27 minutes and 10 seconds`
-
-===== UseOneSchedulerThreadByBean
-
-back to previous behavior (TomEE 1.x) where 1 scheduler thread was used for stateless eviction
-by bean (ie for 500 stateless beans you get 500 eviction threads)
-
-===== EvictionThreads
-
-number of threads to associate to eviction threads (1 is not bad for most applications)
-
-
-=== @Stateful
-
-A `@Stateful` container.
-
-Declarable in tomee.xml via
-
-[source,xml]
-----
-<Container id="Foo" type="STATEFUL">
-    AccessTimeout = 30 seconds
-    Cache = org.apache.openejb.core.stateful.SimpleCache
-    Passivator = org.apache.openejb.core.stateful.SimplePassivater
-    TimeOut = 20
-    Frequency = 60
-    Capacity = 1000
-    BulkPassivate = 100
-</Container>
-----
-
-Declarable in properties via
-
-[source,bash]
-----
-Foo = new://Container?type=STATEFUL
-Foo.AccessTimeout = 30 seconds
-Foo.Cache = org.apache.openejb.core.stateful.SimpleCache
-Foo.Passivator = org.apache.openejb.core.stateful.SimplePassivater
-Foo.TimeOut = 20
-Foo.Frequency = 60
-Foo.Capacity = 1000
-Foo.BulkPassivate = 100
-----
-
-==== Configuration
-
-===== AccessTimeout
-
-Specifies the maximum time an invocation could wait for the
-`@Stateful` bean instance to become available before giving up.
-
-After the timeout is reached a `javax.ejb.ConcurrentAccessTimeoutException`
-will be thrown.
-
-Usable time units: nanoseconds, microsecons, milliseconds,
-seconds, minutes, hours, days.  Or any combination such as
-"1 hour and 27 minutes and 10 seconds"
-
-Any usage of the `javax.ejb.AccessTimeout` annotation will
-override this setting for the bean or method where the
-annotation is used.
-
-===== Cache
-
-The cache is responsible for managing stateful bean
-instances.  The cache can page instances to disk as memory
-is filled and can destroy abandoned instances.  A different
-cache implementation can be used by setting this property
-to the fully qualified class name of the Cache implementation.
-
-===== Passivator
-
-The passivator is responsible for writing beans to disk
-at passivation time. Different passivators can be used
-by setting this property to the fully qualified class name
-of the `PassivationStrategy` implementation. The passivator
-is not responsible for invoking any callbacks or other
-processing, its only responsibly is to write the bean state
-to disk.
-
-Known implementations:
-
-- org.apache.openejb.core.stateful.RAFPassivater
-- org.apache.openejb.core.stateful.SimplePassivater
-
-===== TimeOut
-
-Specifies the time a bean can be idle before it is removed by the container.
-
-This value is measured in minutes. A value of 5 would
-result in a time-out of 5 minutes between invocations.
-A value of -1 would mean no timeout.
-A value of 0 would mean a bean can be immediately removed by the container.
-
-Any usage of the `javax.ejb.StatefulTimeout` annotation will
-override this setting for the bean where the annotation is used.
-
-===== Frequency
-
-Specifies the frequency (in seconds) at which the bean cache is checked for
-idle beans.
-
-===== Capacity
-
-Specifies the size of the bean pools for this
-stateful SessionBean container.
-
-===== BulkPassivate
-
-Property name that specifies the number of instances
-to passivate at one time when doing bulk passivation.
-
-
-=== @Singleton
-
-A `@Singleton` container.
-
-Declarable in tomee.xml via
-
-[source,xml]
-----
-<Container id="Foo" type="SINGLETON">
-    AccessTimeout = 30 seconds
-</Container>
-----
-
-Declarable in properties via
-
-[source,bash]
-----
-Foo = new://Container?type=SINGLETON
-Foo.AccessTimeout = 30 seconds
-----
-
-==== Configuration
-
-===== AccessTimeout
-
-Specifies the maximum time an invocation could wait for the
-`@Singleton` bean instance to become available before giving up.
-
-After the timeout is reached a `javax.ejb.ConcurrentAccessTimeoutException`
-will be thrown.
-
-Usable time units: nanoseconds, microsecons, milliseconds,
-seconds, minutes, hours, days.  Or any combination such as
-`1 hour and 27 minutes and 10 seconds`
-
-Any usage of the `javax.ejb.AccessTimeout` annotation will
-override this setting for the bean or method where the
-annotation is used.
-
-
-=== @MessageDriven
-
-A MDB container.
-
-Declarable in tomee.xml via
-
-[source,xml]
-----
-<Container id="Foo" type="MESSAGE">
-    ResourceAdapter = Default JMS Resource Adapter
-    MessageListenerInterface = javax.jms.MessageListener
-    ActivationSpecClass = org.apache.activemq.ra.ActiveMQActivationSpec
-    InstanceLimit = 10
-    FailOnUnknowActivationSpec = true
-</Container>
-----
-
-Declarable in properties via
-
-[source,bash]
-----
-Foo = new://Container?type=MESSAGE
-Foo.ResourceAdapter = Default JMS Resource Adapter
-Foo.MessageListenerInterface = javax.jms.MessageListener
-Foo.ActivationSpecClass = org.apache.activemq.ra.ActiveMQActivationSpec
-Foo.InstanceLimit = 10
-Foo.FailOnUnknowActivationSpec = true
-----
-
-==== Configuration
-
-===== ResourceAdapter
-
-The resource adapter delivers messages to the container
-
-===== MessageListenerInterface
-
-Specifies the message listener interface handled by this container
-
-===== ActivationSpecClass
-
-Specifies the activation spec class
-
-===== InstanceLimit
-
-Specifies the maximum number of bean instances that are
-allowed to exist for each MDB deployment.
-
-===== FailOnUnknowActivationSpec
-
-Log a warning if true or throw an exception if false is an activation spec can't be respected
-
-
-=== @Managed
-
-A managed bean container.
-
-Declarable in tomee.xml via
-
-[source,xml]
-----
-<Container id="Foo" type="MANAGED" />
-----
-
-Declarable in properties via
-
-[source,bash]
-----
-Foo = new://Container?type=MANAGED
-----
-
-
-=== CMP entity
-
-A CMP bean container.
-
-Declarable in tomee.xml via
-
-[source,xml]
-----
-<Container id="Foo" type="CMP_ENTITY">
-    CmpEngineFactory = org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
-</Container>
-----
-
-Declarable in properties via
-
-[source,bash]
-----
-Foo = new://Container?type=CMP_ENTITY
-Foo.CmpEngineFactory = org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
-----
-
-==== Configuration
-
-===== CmpEngineFactory
-
-The engine to use for this container. By default TomEE only provides the JPA implementation.
-
-
-=== BMP entity
-
-A BMP entity container.
-
-Declarable in tomee.xml via
-
-[source,xml]
-----
-<Container id="Foo" type="BMP_ENTITY">
-    PoolSize = 10
-</Container>
-----
-
-Declarable in properties via
-
-[source,bash]
-----
-Foo = new://Container?type=BMP_ENTITY
-Foo.PoolSize = 10
-----
-
-==== Configuration
-
-===== PoolSize
-
-Specifies the size of the bean pools for this
-bmp entity container.

http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/b34e23c0/src/main/jbake/content/admin/configuration/index.adoc
----------------------------------------------------------------------
diff --git a/src/main/jbake/content/admin/configuration/index.adoc b/src/main/jbake/content/admin/configuration/index.adoc
deleted file mode 100755
index 115d1ba..0000000
--- a/src/main/jbake/content/admin/configuration/index.adoc
+++ /dev/null
@@ -1,24 +0,0 @@
-= Server Configuration
-:jbake-date: 2016-03-16
-:jbake-type: page
-:jbake-status: published
-:jbake-tomeepdf:
-
-=== Container
-
-TomEE specific configuration (ie not inherited one from Tomcat) is based on properties. Therefore
-you can fully configure TomEE using properties in `conf/system.properties`.
-However for convenience it also provides a hybrid XML alternative a.k.a. `conf/tomee.xml`.
-
-- link:server.html[Server Configuration: Properties].
-- link:resources.html[Resources]
-- link:containers.html[Containers]
-
-=== Application
-
-Some settings can be specific to applications, these ones are also properties based and
-are read in `WEB-INF/application.properties`. When you can't use `tomee.xml` to configure
-resources you can use `WEB-INF/resources.xml` which inherit from `tomee.xml` its syntax
-but binds the resources to the application and reuses the application classloader.
-
-More about link:application.html[Container Configuration].

http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/b34e23c0/src/main/jbake/content/admin/configuration/resources.adoc
----------------------------------------------------------------------
diff --git a/src/main/jbake/content/admin/configuration/resources.adoc b/src/main/jbake/content/admin/configuration/resources.adoc
deleted file mode 100755
index dc8d84a..0000000
--- a/src/main/jbake/content/admin/configuration/resources.adoc
+++ /dev/null
@@ -1,572 +0,0 @@
-= Resources
-:jbake-date: 2016-03-16
-:jbake-type: page
-:jbake-status: published
-:jbake-tomeepdf:
-
-In TomEE resources are mainly "singleton" (understood as defined once per server or application). Technically
-it can be anything but you will probably meet more Datasources than other type of resources.
-
-
-Most resources will be created automatically if there is no matching resources - by name and type -
-when an injection will be found. To avoid that use `openejb.offline` property and set it to `true`.
-See link:server.html[Server Configuration] for more detail.
-
-=== Definition a resource: how does it work?
-
-Before all let see how properties syntax is equivalent to XML one (system.properties and tomee.xml typically).
-
-Properties syntax uses dot notation to represent setters/properties which are plain properties in XML syntax
-and a URL syntax with query parameters to define the resource where it is directly the resource and tag attributes in XML.
-Finally the id is an attribute in XML and the key of the resource definition in properties.
-
-Let see it with a sample, both delcarations are the same:
-
-[source,bash]
-----
-myDataSource = new://Resource?type=DataSource
-myDataSource.JdbcUrl = jdbc:hsqldb:mem:site
-myDataSource.UserName = sa
-----
-
-[source,xml]
-----
-<Resource id="myDataSource" type="DataSource">
-  JdbcUrl = jdbc:hsqldb:mem:site
-  UserName = sa
-</Resource>
-----
-
-One started you can get injected any resource using `@Resource`:
-
-[source,java]
-----
-@Resource(name = "myDataSource")
-private DataSource dataSource;
-----
-
-=== Factory syntax
-
-Here are the attributes of a resource:
-
-[.table.table-bordered,options="header"]
-|===
-| Name | Optional |Description
-| id | false | name of the resource, will match `openejb:Resource/id` in JNDI tree.
-| provider | true | define a default resource definition using service-jar.xml
-| class-name | true |specify which class to instantiate
-| factory-name | true |specify which method to invoke on the class-name when specified to create the resource
-| properties-provider | true |a class responsible to provide to tomee the properties to use, it can have a property `serviceId` to know which resource it is.
-| classpath | true | a classpath to use to create the resource. Note: if not implementing an interface the resource will be isolated from the applications.
-| aliases | true | other names for the resource, allows for instance to share the same pool for a datasource used with multiple names in applications.
-| post-construct/pre-destroy | true | methods called when creating/destroying the resources.
-| Lazy | true | for resources set them to be created when first accessed and not when deployed
-|===
-
-TomEE supports some implicit properties for resources but sometimes you just want to fully control the
-resource and not use implicit properties which can be affected to a property which doesn't expect such a value (typically the case
-if you create a custom Oracle datasource). For such case you can set `SkipImplicitAttributes` property to `true` and your resource
-will ignore implicit properties.
-
-Implicit properties are:
-
-[.table.table-bordered,options="header"]
-|===
-| Name | Description
-| transactionManager | The JTA transaction manager
-| ServiceId | the "id" of the resource (its name)
-|===
-
-In the same spirit you can skip properties fallback using `SkipPropertiesFallback` and setting it to `true`. It typically avoids to
-fallback all unset properties (no matching property found) to a `Properties` instance and set it if one matching property is found.
-In Oracle case for instance it matches the connection properties which can have side effects.
-
-===== Value ciphering
-
-The propertie values support ciphering using the syntax `cipher:{algorithm}:{cipheredValue}`, for instance `cipher:Static3DES:xMH5uM1V9vQzVUv5LG7YLA==` will
-be read as `Passw0rd`. Ciphers can be computed using `tomee.sh` script: `${tomee.home}/bin/tomee.sh cipher Passw0rd`.
-
-=== Common Resources
-
-==== DataSources
-
-DataSources have defaults for all values and a default datasource can be provided automatically but if you want to
-configure it here are the common properties:
-
-You can set the boolean `JtaManaged` to false if you don't want your datasource to be using JTA - if you manage transactions yourself.
-
-Then other configurations are linked the pool the datasource is using. By default TomEE uses https://tomcat.apache.org/tomcat-7.0-doc/jdbc-pool.html[tomcat-jdbc] but we also provide
-https://commons.apache.org/proper/commons-dbcp/configuration.html[commons-dbcp] (2 for TomEE 7.x and 1 for TomEE 1.x).
-The properties are then the related configurations with these particular
-entries we try to keep in sync for both:
-
-[.table.table-bordered,options="header"]
-|===
-| Name|Description
-| JdbcDriver | the jdbc driver of the datasource
-| JdbcUrl | the jdbc url of the datasource
-| Username | the user to use
-| Password | the password of the user
-|===
-
-===== Password and ciphering
-
-DataSource were the first resource to support password ciphering. Originally it was another property which is still supported.
-It is called `PasswordCipher`. Its value is the ciphering algorithm and it affects the password value. However `cipher:xxx`
-is still supported on `Password` value. Default `PasswordCipher` being `PlainText` it behaves as no ciphering is in place by default.
-
-Sample:
-
-[source,bash]
-----
-ds = new://Resource?type=javax.sql.DataSource
-# our password is "Passw0rd"
-ds.Password = xMH5uM1V9vQzVUv5LG7YLA==
-ds.PasswordCipher = Static3DES
-----
-
-===== Advanced DataSource configuration
-
-TomEE also provides few utilities you can add in DataSource properties:
-
-[.table.table-bordered,options="header"]
-|===
-| Name | Description
-| LogSql | Should SQL be logged (using TomEE logger)
-| LogSqlPackages | if set the logging will show the matching packages (separated by comma) inline when logging the query, allows to know where a query comes from
-| Flushable| if true the datasource can be casted as a Flushable to recreate the pool
-| ResetOnError | if a `SQLException` happens the pool is automatically recreated. Configuration is either "true" to do it each time an exception occurs, `x` or `retry(x)` to do it and retry until maximum `x` times
-| ResetOnErrorMethods | which methods are handled by ResetOnError
-| TomEEProxyHandler | Custom `InvocationHandler` wrapping the datasource calls
-| DataSourceCreator | which pool to use, `dbcp`, `tomcat`, `dbcp-alternative` (DBCP and TomEE proxying instead of DBCP JTA integration), `simple` (no pooling)
-|===
-
-===== DataSource and JTA
-
-`JtaManaged` determines wether or not this data source should be JTA managed
-or user managed.  If set to 'true' it will automatically be enrolled
-in any ongoing transactions.  Calling begin/commit/rollback or setAutoCommit
-on the datasource or connection will not be allowed.  If you need to perform
-these functions yourself, set `JtaManaged` to `false`
-
-===== DataSource and JPA
-
-In terms of JPA persistence.xml:
-
-- `JtaManaged=true` can be used as a 'jta-data-source'
-- `JtaManaged=false` can be used as a 'non-jta-data-source'
-
-=== ActiveMQResourceAdapter
-
-Declarable in tomee.xml via
-
-[source,xml]
-----
-<Resource id="Foo" type="ActiveMQResourceAdapter">
-    BrokerXmlConfig = broker:(tcp://localhost:61616)?useJmx=false
-    ServerUrl = vm://localhost?waitForStart=20000&async=true
-    DataSource = Default Unmanaged JDBC Database
-    StartupTimeout = 10 seconds
-</Resource>
-----
-
-Declarable in properties via
-
-[source,bash]
-----
-Foo = new://Resource?type=ActiveMQResourceAdapter
-Foo.BrokerXmlConfig = broker:(tcp://localhost:61616)?useJmx=false
-Foo.ServerUrl = vm://localhost?waitForStart=20000&async=true
-Foo.DataSource = Default Unmanaged JDBC Database
-Foo.StartupTimeout = 10 seconds
-----
-
-==== Configuration
-
-===== BrokerXmlConfig
-
-Broker configuration URI as defined by ActiveMQ
-see http://activemq.apache.org/broker-configuration-uri.html
-BrokerXmlConfig xbean:file:conf/activemq.xml - Requires xbean-spring.jar and dependencies
-
-===== ServerUrl
-
-Broker address
-
-===== DataSource
-
-DataSource for persistence messages
-
-===== StartupTimeout
-
-How long to wait for broker startup
-
-
-=== javax.jms.ConnectionFactory
-
-An ActiveMQ (JMS) connection factory.
-
-Declarable in tomee.xml via
-
-[source,xml]
-----
-<Resource id="Foo" type="javax.jms.ConnectionFactory">
-    ResourceAdapter = Default JMS Resource Adapter
-    TransactionSupport = xa
-    PoolMaxSize = 10
-    PoolMinSize = 0
-    ConnectionMaxWaitTime = 5 seconds
-    ConnectionMaxIdleTime = 15 Minutes
-</Resource>
-----
-
-Declarable in properties via
-
-[source,bash]
-----
-Foo = new://Resource?type=javax.jms.ConnectionFactory
-Foo.ResourceAdapter = Default JMS Resource Adapter
-Foo.TransactionSupport = xa
-Foo.PoolMaxSize = 10
-Foo.PoolMinSize = 0
-Foo.ConnectionMaxWaitTime = 5 seconds
-Foo.ConnectionMaxIdleTime = 15 Minutes
-----
-
-==== Configuration
-
-===== ResourceAdapter
-
-An ActiveMQ (JMS) resource adapter.
-
-===== TransactionSupport
-
-Specifies if the connection is enrolled in global transaction
-allowed values: `xa`, `local` or `none`. Default to `xa`.
-
-===== PoolMaxSize
-
-Maximum number of physical connection to the ActiveMQ broker.
-
-===== PoolMinSize
-
-Minimum number of physical connection to the ActiveMQ broker.
-
-===== ConnectionMaxWaitTime
-
-Maximum amount of time to wait for a connection.
-
-===== ConnectionMaxIdleTime
-
-Maximum amount of time a connection can be idle before being reclaimed.
-
-
-=== javax.jms.Queue
-
-An ActiveMQ (JMS) queue.
-
-Declarable in tomee.xml via
-
-[source,xml]
-----
-<Resource id="Foo" type="javax.jms.Queue">
-    # not set means id
-    destination =
-</Resource>
-----
-
-Declarable in properties via
-
-[source,bash]
-----
-Foo = new://Resource?type=javax.jms.Queue
-# not set means id
-Foo.destination =
-----
-
-==== Configuration
-
-===== destination
-
-Specifies the name of the queue
-
-
-=== javax.jms.Topic
-
-An ActiveMQ (JMS) topic.
-
-Declarable in tomee.xml via
-
-[source,xml]
-----
-<Resource id="Foo" type="javax.jms.Topic">
-    # not set means id
-    destination =
-</Resource>
-----
-
-Declarable in properties via
-
-[source,bash]
-----
-Foo = new://Resource?type=javax.jms.Topic
-# not set means id
-Foo.destination =
-----
-
-==== Configuration
-
-===== destination
-
-Specifies the name of the topic
-
-
-=== org.omg.CORBA.ORB
-
-NOTE: to use it you need to add an implementation of corba.
-
-Declarable in tomee.xml via
-
-[source,xml]
-----
-<Resource id="Foo" type="org.omg.CORBA.ORB" />
-----
-
-Declarable in properties via
-
-[source,bash]
-----
-Foo = new://Resource?type=org.omg.CORBA.ORB
-----
-
-
-=== javax.mail.Session
-
-A mail session.
-
-Declarable in tomee.xml via
-
-[source,xml]
-----
-<Resource id="mail/mysession" type="javax.mail.Session">
-  mail.transport.protocol = smtp
-  mail.smtp.host = smtp.provider.com
-  mail.smtp.auth = true
-  mail.smtp.starttls.enable = true
-  mail.smtp.port = 587
-  mail.smtp.user = user@provider.com
-  password = abcdefghij
-</Resource>
-----
-
-Declarable in properties via
-
-[source,bash]
-----
-mail/mysession = new://Resource?type=javax.mail.Session
-mail/mysession.mail.transport.protocol = smtp
-mail/mysession.mail.smtp.host = smtp.provider.com
-mail/mysession.mail.smtp.auth = true
-mail/mysession.mail.smtp.starttls.enable = true
-mail/mysession.mail.smtp.port = 587
-mail/mysession.mail.smtp.user = user@provider.com
-mail/mysession.password = abcdefghij
-----
-
-The properties are `javax.mail.Session` ones with the addition of `useDefault` which specifies if `getDefaultInstance()`
-or `getInstance` is used to create the session. `getDefaultInstance()` will ensure that several calls are done with the
-same configuration and return the same instance. For tomee it is likely better to rely on `getInstance()`(ie keep `useDefault` to false)
-and use `aliases` option of the resource to define an alias if you need to share the same instance accross multiple names.
-
-
-=== ManagedExecutorService
-
-A concurrency utility for EE executor service.
-
-Declarable in tomee.xml via
-
-[source,xml]
-----
-<Resource id="Foo" type="ManagedExecutorService">
-    Core = 5
-    Max = 25
-    KeepAlive = 5 s
-    Queue = 15
-    ThreadFactory = org.apache.openejb.threads.impl.ManagedThreadFactoryImpl
-    Lazy = true
-</Resource>
-----
-
-Declarable in properties via
-
-[source,bash]
-----
-Foo = new://Resource?type=ManagedExecutorService
-Foo.Core = 5
-Foo.Max = 25
-Foo.KeepAlive = 5 s
-Foo.Queue = 15
-Foo.ThreadFactory = org.apache.openejb.threads.impl.ManagedThreadFactoryImpl
-Foo.Lazy = true
-----
-
-==== Configuration
-
-===== Core
-
-The pool core size.
-
-===== Max
-
-The pool max size.
-
-===== KeepAlive
-
-The thread keep alive time (in duration format)
-
-===== Queue
-
-The queue type size.
-
-===== ThreadFactory
-
-The thread factory implementation class.
-
-===== Lazy
-
-If set to true the pool is created when first accessed otherwise it is created at startup.
-
-
-=== ManagedScheduledExecutorService
-
-Inherit from `ManagedExecutorService` and adds scheduling abilities.
-
-Declarable in tomee.xml via
-
-[source,xml]
-----
-<Resource id="Foo" type="ManagedScheduledExecutorService">
-    Core = 5
-    ThreadFactory = org.apache.openejb.threads.impl.ManagedThreadFactoryImpl
-    Lazy = true
-</Resource>
-----
-
-Declarable in properties via
-
-[source,bash]
-----
-Foo = new://Resource?type=ManagedScheduledExecutorService
-Foo.Core = 5
-Foo.ThreadFactory = org.apache.openejb.threads.impl.ManagedThreadFactoryImpl
-Foo.Lazy = true
-----
-
-==== Configuration
-
-See `ManagedExecutorService`.
-
-
-=== ManagedThreadFactory
-
-A thread factory for a `ManagedExecutorService`.
-
-Declarable in tomee.xml via
-
-[source,xml]
-----
-<Resource id="Foo" type="ManagedThreadFactory">
-    Prefix = openejb-managed-thread-
-    Lazy = true
-</Resource>
-----
-
-Declarable in properties via
-
-[source,bash]
-----
-Foo = new://Resource?type=ManagedThreadFactory
-Foo.Prefix = openejb-managed-thread-
-Foo.Lazy = true
-----
-
-==== Configuration
-
-===== Prefix
-
-The thread prefix (suffixed with thread id).
-
-
-
-=== ContextService
-
-A concurrency utilities for JavaEE context service. It allows to create
-contextual proxies (inheriting from security, classloader...contexts).
-
-Declarable in tomee.xml via
-
-[source,xml]
-----
-<Resource id="Foo" type="ContextService" />
-----
-
-Declarable in properties via
-
-[source,bash]
-----
-Foo = new://Resource?type=ContextService
-----
-
-
-=== JndiProvider: inject remote clients
-
-A thread factory for a `ManagedExecutorService`.
-Default implementation is `org.apache.openejb.threads.impl.ManagedThreadFactoryImpl`.
-
-Declarable in tomee.xml via
-
-[source,xml]
-----
-<Resource id="Foo" type="ManagedThreadFactory">
-    Prefix = openejb-managed-thread-
-    Lazy = true
-</Resource>
-----
-
-Declarable in properties via
-
-[source,bash]
-----
-Foo = new://Resource?type=ManagedThreadFactory
-Foo.Prefix = openejb-managed-thread-
-Foo.Lazy = true
-----
-
-==== Configuration
-
-===== Prefix
-
-The thread prefix (suffixed with thread id).
-
-
-
-=== ContextService
-
-A concurrency utilities for JavaEE context service. It allows to create
-contextual proxies (inheriting from security, classloader...contexts).
-
-Declarable in tomee.xml via
-
-[source,xml]
-----
-<Resource id="Foo" type="ContextService" />
-----
-
-Declarable in properties via
-
-[source,bash]
-----
-Foo = new://Resource?type=ContextService
-----
-
-

http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/b34e23c0/src/main/jbake/content/admin/configuration/server.adoc
----------------------------------------------------------------------
diff --git a/src/main/jbake/content/admin/configuration/server.adoc b/src/main/jbake/content/admin/configuration/server.adoc
deleted file mode 100755
index db2ff19..0000000
--- a/src/main/jbake/content/admin/configuration/server.adoc
+++ /dev/null
@@ -1,86 +0,0 @@
-= Container Configuration
-:jbake-date: 2016-03-16
-:jbake-type: page
-:jbake-status: published
-:jbake-tomeepdf:
-
-=== Server
-
-[.table.table-bordered,options="header"]
-|===
-|Name	|Value|	Description
-|openejb.embedded.remotable|	bool|	activate or not the remote services when available
-|.bind, <service prefix>.port, <service prefix>.disabled, <service prefix>.threads	| host or IP, port, bool|override the host. Available for ejbd and httpejbd services (used by jaxws and jaxrs), number of thread to manage requests
-|openejb.embedded.initialcontext.close	|LOGOUT or DESTROY|	configure the hook called when closing the initial context. Useful when starting OpenEJB from a new InitialContext([properties]) instantiation. By default it simply logs out the logged user if it exists. DESTROY means clean the container.
-|javax.persistence.provider	|string|	override the JPA provider value
-|javax.persistence.transactionType	|string|	override the transaction type for persistence contexts
-|javax.persistence.jtaDataSource	|string|	override the JTA datasource value for persistence contexts
-|javax.persistence.nonJtaDataSource|	string	|override the non JTA datasource value for persistence contexts
-|openejb.descriptors.output	|bool|	dump memory deployment descriptors. Can be used to set complete metadata to true and avoid scanning when starting the container or to check the used configuration.
-|openejb.deployments.classpath.require.descriptor	|CLIENT or EJB|	can allow to filter what you want to scan (client modules or ejb modules)
-|openejb.descriptors.output.folder|	path|	where to dump deployement descriptors if activated.
-|openejb.strict.interface.declaration	|bool|	add some validations on session beans (spec validations in particular). false by default.
-|openejb.conf.file or openejb.configuration|	string|	OpenEJB configuration file path
-|openejb.debuggable-vm-hackery	|bool|	remove JMS informations from deployment
-|openejb.validation.skip	|bool	|skip the validations done when OpenEJB deploys beans
-|openejb.deployments.classpath.ear	|bool|	deploy the classpath as an ear
-|openejb.webservices.enabled|	bool	|activate or not webservices
-|openejb.validation.output.level|	TERSE or MEDIUM or VERBOSE|	level of the logs used to report validation errors
-|openejb.user.mbeans.list	* or a list of classes separated by ,|	list of mbeans to deploy automatically
-|openejb.deploymentId.format	composition (+string) of {ejbName} {ejbType} {ejbClass} and {ejbClass.simpleName}	default {ejbName}. The format to use to deploy ejbs.
-|openejb.deployments.classpath	|bool|	whether or not deploy from classpath
-|openejb.deployments.classpath.include and openejb.deployments.classpath.exclude	|regex|	regex to filter the scanned classpath (when you are in this case)
-|openejb.deployments.package.include and openejb.deployments.package.exclude|	regex|	regex to filter scanned packages
-|openejb.autocreate.jta-datasource-from-non-jta-one|	bool|	whether or not auto create the jta datasource if it doesn't exist but a non jta datasource exists. Useful when using hibernate to be able to get a real non jta datasource.
-|openejb.altdd.prefix	|string|	prefix use for altDD (example test to use a test.ejb-jar.xml).
-|org.apache.openejb.default.system.interceptors	|class names|list of interceptor (qualified names) separated by a comma or a space	add these interceptor on all beans
-|openejb.jndiname.strategy.class	|class name|	an implementation of org.apache.openejb.assembler.classic.JndiBuilder.JndiNameStrategy
-|openejb.jndiname.failoncollision|	bool|	if a NameAlreadyBoundException is thrown or not when 2 EJBs have the same name
-|openejb.jndiname.format |string|composition of these properties: ejbType, ejbClass, ejbClass.simpleName, ejbClass.packageName, ejbName, deploymentId, interfaceType, interfaceType.annotationName, interfaceType.annotationNameLC, interfaceType.xmlName, interfaceType.xmlNameCc, interfaceType.openejbLegacyName, interfaceClass, interfaceClass.simpleName, interfaceClass.packageName	default {deploymentId}{interfaceType.annotationName}. Change the name used for the ejb.
-|openejb.org.quartz.threadPool.class	|class| qualified name which implements org.quartz.spi.ThreadPool	the thread pool used by quartz (used to manage ejb timers)
-|openejb.localcopy	|bool|	default true. whether or not copy EJB arguments[/method/interface] for remote invocations.
-|openejb.cxf.jax-rs.providers	|string|the list of the qualified name of the JAX-RS providers separated by comma or space. Note: to specify a provider for a specific service suffix its class qualified name by ".providers", the value follow the same rules. Note 2: default is a shortcut for jaxb and json providers.
-|openejb.wsAddress.format	|string| composition of {ejbJarId}, ejbDeploymentId, ejbType, ejbClass, ejbClass.simpleName, ejbName, portComponentName, wsdlPort, wsdlService	default /{ejbDeploymentId}. The WS name format.
-|org.apache.openejb.server.webservices.saaj.provider|	axis2, sun or null	|specified the saaj configuration
-|[<uppercase service name>.]<service id>.<name> or [<uppercase service name>.]<service id>	|whatever is supported (generally string, int ...)|	set this value to the corresponding service. example: [EnterpriseBean.]<ejb-name>.activation.<property>, [PERSISTENCEUNIT.]<persistence unit name>.<property>, [RESOURCE.]<name>
-|log4j.category.OpenEJB.options|	DEBUG, INFO, ...	|active one OpenEJB log level. need log4j in the classpath
-|openejb.jmx.active|	bool|	activate (by default) or not the OpenEJB JMX MBeans
-|openejb.nobanner	|bool|	activate or not the OpenEJB banner (activated by default)
-|openejb.check.classloader	|bool|	if true print some information about duplicated classes
-|openejb.check.classloader.verbose|	bool|	if true print classes intersections
-|openejb.additional.exclude	|string separated by comma|	list of prefixes you want to exclude and are not in the default list of exclusion
-|openejb.additional.include	|string separated by comma|	list of prefixes you want to remove from thedefault list of exclusion
-|openejb.offline	|bool|	if true can create datasources and containers automatically
-|openejb.exclude-include.order|	include-exclude or exclude-include|	if the inclusion/exclusion should win on conflicts (intersection)
-|openejb.log.color	|bool|	activate or not the color in the console in embedded mode
-|openejb.log.color.<level in lowercase>	|color in uppercase	|set a color for a particular level. Color are BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE, DEFAULT.
-|tomee.serialization.class.blacklist|	string	|default list of packages/classnames excluded for EJBd deserialization (needs to be set on server and client sides). Please see the description of Ejbd Transport for details.
-|tomee.serialization.class.whitelist|	string|	default list of packages/classnames allowed for EJBd deserialization (blacklist wins over whitelist, needs to be set on server and client sides). Please see the description of Ejbd Transport for details.
-|tomee.remote.support	|boolean	|if true /tomee webapp is auto-deployed and EJBd is active (true by default for 1.x, false for 7.x excepted for tomee maven plugin and arquillian)
-|openejb.crosscontext	|bool|	set the cross context property on tomcat context (can be done in the traditionnal way if the deployment is don through the webapp discovery and not the OpenEJB Deployer EJB)
-|openejb.jsessionid-support	|bool|	remove URL from session tracking modes for this context (see javax.servlet.SessionTrackingMode)
-|openejb.myfaces.disable-default-values	|bool|	by default TomEE will initialize myfaces with some its default values to avoid useless logging
-|openejb.web.xml.major	|int|	major version of web.xml. Can be useful to force tomcat to scan servlet 3 annotatino when deploying with a servlet 2.x web.xml
-|tomee.jaxws.subcontext	|string|	sub context used to bind jaxws web services, default is webservices
-|openejb.servicemanager.enabled	|bool|	run all services detected or only known available services (WS and RS
-|tomee.jaxws.oldsubcontext	|bool|	wether or not activate old way to bind jaxws webservices directly on root context
-|openejb.modulename.useHash	|bool|	add a hash after the module name of the webmodule if it is generated from the webmodule location, it avoids conflicts between multiple deployment (through ear) of the same webapp. Note: it disactivated by default since names are less nice this way.
-|openejb.session.manager	|qualified name (string)|	configure a session managaer to use for all contexts
-|tomee.tomcat.resource.wrap	|bool|wrap tomcat resources (context.xml) as tomee resources if possible (true by default)
-|tomee.tomcat.datasource.wrap	|bool|same as tomee.tomcat.resource.wrap for datasource (false by default). Note that setting it to true will create tomee datasources but can have the side effect to create twice singleton resources
-|openejb.environment.default	|bool|should default JMS resources be created or not, default to false to ensure no port is bound or multiple resources are created and completely uncontrolled (doesn't apply to datasources etc for compatibility). For tests only!
-|===
-
-=== Client
-
-[.table.table-bordered,options="header"]
-|===
-|Name|	Value	|Description
-|openejb.client.identityResolver	|implementation of org.apache.openejb.client.IdentityResolver|	default org.apache.openejb.client.JaasIdentityResolver. The class to get the client identity.
-|openejb.client.connection.pool.timeout or openejb.client.connectionpool.timeout	|int (ms)|	the timeout of the client
-|openejb.client.connection.pool.size or openejb.client.connectionpool.size	|int|	size of the socket pool
-|openejb.client.keepalive	|int (ms)|	the keepalive duration
-|openejb.client.protocol.version	|string|	Optional legacy server protocol compatibility level. Allows 4.6.x clients to potentially communicate with older servers. OpenEJB 4.5.2 and older use version "3.1", and 4.6.x currently uses version "4.6" (Default). This does not allow old clients to communicate with new servers prior to 4.6.0
-|tomee.serialization.class.blacklist|	string	|default list of packages/classnames excluded for EJBd deserialization (needs to be set on server and client sides). Please see the description of Ejbd Transport for details.
-|tomee.serialization.class.whitelist|	string|	default list of packages/classnames allowed for EJBd deserialization (blacklist wins over whitelist, needs to be set on server and client sides). Please see the description of Ejbd Transport for details.
-|===

http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/b34e23c0/src/main/jbake/content/admin/file-layout.adoc
----------------------------------------------------------------------
diff --git a/src/main/jbake/content/admin/file-layout.adoc b/src/main/jbake/content/admin/file-layout.adoc
deleted file mode 100755
index 433fea3..0000000
--- a/src/main/jbake/content/admin/file-layout.adoc
+++ /dev/null
@@ -1,144 +0,0 @@
-= Directory Structure
-:jbake-date: 2016-03-16
-:jbake-type: page
-:jbake-status: published
-:jbake-tomeepdf:
-
-ifndef::backend-pdf[]
-
-[#filetree.col-md-4]
-[
-    {
-        label: 'apps',
-        description: 'A common but optional folder containing the applications (war, ear, jar). Note: this folder needs to be activated in tomee.xml for instance and is not there by default.',
-        children: [
-            {label:'module1.jar',description:'An ejbmodule'},
-            {label:'myapp',description:'An exploded war or ear'},
-            {label:'anotherapp.war',description:'A war'},
-            {label:'anotherapp',description:'By default TomEE will explode the war next to the .war file, this is customizable.'},
-            {label:'anotherapp2.ear',description:'An ear'},
-            {label:'anotherapp2',description:'By default TomEE will explode the ear next to the .ear file, this is customizable.'}
-        ]
-    },
-    {
-        label: 'bin',
-        description: 'The executable and boot related files',
-        children: [
-            {label:'bootstrap.jar',description:'The jar allowing Tomcat to start'},
-            {label:'catalina.bat',description:'The windows main Tomcat script'},
-            {label:'catalina.bat.original',description:'The original catalina.bat from Tomcat. TomEE customizes it.'},
-            {label:'catalina.sh',description:'The UNIx main Tomcat script'},
-            {label:'catalina.sh.original',description:'The original catalina.sh from Tomcat. TomEE customizes it.'},
-            {label:'catalina-tasks.xml',description:'Some Ant tasks Tomcat provides to work with JMX'},
-            {label:'commons-daemon.jar',description:'When setting up TomEE as a service you need this jar.'},
-            {label:'commons-daemon-native.tar.gz',description:'The native needed by commons-daemon'},
-            {label:'configtest.bat',description:'A windows script to validate the server.xml'},
-            {label:'configtest.sh',description:'A UNIx script to validate the server.xml'},
-            {label:'daemon.sh',description:'A script which can be used as init.d script'},
-            {label:'digest.bat',description:'A windows script to compute a digest'},
-            {label:'digest.sh',description:'A UNIx script to compute a digest'},
-            {label:'service.bat',description:'The windows service script'},
-            {label:'service.install.as.admin.bat',description:'Install TomEE as a service on windows'},
-            {label:'service.readme.txt',description:'The explanations on how to setup TomEE as a windows service'},
-            {label:'service.remove.as.admin.bat',description:'Uninstall TomEE service on windows'},
-            {label:'setclasspath.bat',description:'The script called by catalina.bat to initialize Tomcat classpath'},
-            {label:'setclasspath.sh',description:'The script called by catalina.bat to initialize TomEE classpath'},
-            {label:'setenv.sh',description:'A UNIx user script (optional) where you can specify some JVM options like CATALINA_OPTS environment variable'},
-            {label:'setenv.bat',description:'A windows user script (optional) where you can specify some JVM options like CATALINA_OPTS environment variable'},
-            {label:'shutdown.bat',description:'Stop the server on windows, it is commonly used with -force and a timeout as options'},
-            {label:'shutdown.sh',description:'Stop the server on UNIx, it is commonly used with -force and a timeout as options'},
-            {label:'startup.bat',description:'Start (and forget) TomEE on windows'},
-            {label:'startup.sh',description:'Start (and forget) TomEE on UNIx'},
-            {label:'tomcat-juli.jar',description:'The Tomcat Java Util Logging extensions which allow for instance to configure the logging per application'},
-            {label:'tomcat-native.tar.gz',description:'The Tomcat native used by some connectors'},
-            {label:'TomEE....exe',description:'TomEE windows executables when setup as a service for amd64 architectures'},
-            {label:'tomee.bat',description:'TomEE utility script for windows, allows to compute ciphers for instance'},
-            {label:'tomee.sh',description:'TomEE utility script for UNIx, allows to compute ciphers for instance'},
-            {label:'tool-wrapper.bat',description:'Windows script calling Tomcat Tool utility. It executes a command line with Tomcat classloader.'},
-            {label:'tool-wrapper.sh',description:'UNIx script calling Tomcat Tool utility. It executes a command line with Tomcat classloader.'},
-            {label:'version.bat',description:'Print Tomcat version (for windows)'},
-            {label:'version.sh',description:'Print Tomcat version (for UNIx)'}
-        ]
-    },
-    {
-        label: 'conf',
-        description: 'Folder containing the configuration of TomEE',
-        children: [
-            {label:'Catalina',description:'A folder where Tomcat can copy web application configuration (typically context.xml can be overriden from there)'},
-            {label:'catalina.policy',description:'The server security policy rules'},
-            {label:'catalina.properties',description:'The server boot configuration (classloader etc...)'},
-            {label:'conf.d',description:'A TomEE folder where services can pick configuration'},
-            {label:'context.xml',description:'The default context.xml configuration'},
-            {label:'logging.properties',description:'The logging configuration for the server and applications (overridable)'},
-            {label:'server.xml',description:'The server configuration (Host, Context, Valves, ...)'},
-            {label:'server.xml.original',description:'The original server.xml, TomEE updates it to add its lifecycle manager.'},
-            {label:'system.properties',description:'TomEE global configuration'},
-            {label:'tomcat-users.xml',description:'The default location where tomcat stores users.'},
-            {label:'tomcat-users.xml.original',description:'The Tomcat tomcat-users.xml (TomEE add comments)'},
-            {label:'tomcat-users.xsd',description:'The XSD for tomcat-users.xml'},
-            {label:'tomee.xml',description:'The TomEE configuration file, syntax is hybrid between XML and Properties and it is fully replaceable with system.properties but users generally prefer this file.'},
-            {label:'web.xml',description:'The default web.xml'}
-        ]
-    },
-    {
-        label: 'lib',
-        description: 'Folder containing TomEE binaries',
-        children: [
-            {label:'*.jar',description:'Tomcat + TomEE libraries'}
-        ]
-    },
-    {
-        label: 'logs',
-        description: 'Default location of log files',
-        children: [
-            {label:'catalina.$day.log',description:'By default container logs go there'},
-            {label:'xxx.2016-03-16.log',description:'By default application xxx logs go there (when using servlet API)'},
-            {label:'localhost.$day.log',description:'By default host related logs go there'},
-            {label:'localhost_access_log.$day.txt',description:'By default access logs (request the container processed) go there'}
-        ]
-    },
-    {
-        label: 'temp',
-        description: 'Java temporary directory is redirected by default to this folder',
-        children: [
-            {label:'OpenEJB-dejlzdbhjzbfrzeofrh',description:'A temporary file TomEE can create (suffix depends the startup) to check the instance'}
-        ]
-    },
-    {
-        label: 'webapps',
-        description: 'Folder containing the web applications',
-        children: [
-            {label:'myapp',description:'An exploded war'},
-            {label:'anotherapp.war',description:'A war'},
-            {label:'anotherapp',description:'By default TomEE will explode the war next to the .war file, this is customizable.'}
-        ]
-    },
-    {
-        label: 'work',
-        description: 'Folder where Tomcat and TomEE can work',
-        children: [
-            {
-                label:'Catalina',description:'By default Tomcat Engine is called Catalina. This folder matches engine name.',
-                children: [
-                    {
-                        label:'localhost',description:'A folder by host by engine to seggregate data of each ones',
-                        children: [
-                            {
-                                label:'myapp',description:'An application deployed on the previous level host',
-                                children: [
-                                    { label:'org.apache.jsp.index_jsp.java',description:'The generated JSP source (index.jsp there)' },
-                                    { label:'org.apache.jsp.index_jsp.class',description:'The compiled JSP binary' }
-                                ]
-                            }
-                        ]
-                    }
-                ]
-            }
-        ]
-    }
-]
-
-[#filetreedetail.col-md-8.bs-callout.bs-callout-primary]
-Click on a tree node or open a folder to see the detail there.
-
-endif::[]

http://git-wip-us.apache.org/repos/asf/tomee-site-generator/blob/b34e23c0/src/main/jbake/content/admin/index.adoc
----------------------------------------------------------------------
diff --git a/src/main/jbake/content/admin/index.adoc b/src/main/jbake/content/admin/index.adoc
deleted file mode 100755
index 9c10d63..0000000
--- a/src/main/jbake/content/admin/index.adoc
+++ /dev/null
@@ -1,7 +0,0 @@
-= Administrator
-:jbake-date: 2016-03-16
-:jbake-type: page
-:jbake-status: published
-:jbake-tomeepdf:
-
-Click link:../docs.html[here] to find the documentation for administrators.
\ No newline at end of file