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/12/09 02:55:03 UTC
svn commit: r1848496 [7/16] - in /tomee/site/trunk/content: community/
latest/docs/ latest/docs/admin/cluster/ latest/docs/admin/configuration/
latest/docs/advanced/client/ latest/docs/advanced/jms/
latest/docs/advanced/setup/ latest/docs/advanced/shad...
Modified: tomee/site/trunk/content/latest/docs/tomee-maven-plugin.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/latest/docs/tomee-maven-plugin.html?rev=1848496&r1=1848495&r2=1848496&view=diff
==============================================================================
--- tomee/site/trunk/content/latest/docs/tomee-maven-plugin.html (original)
+++ tomee/site/trunk/content/latest/docs/tomee-maven-plugin.html Sun Dec 9 02:54:59 2018
@@ -95,7 +95,9 @@
<div class="row">
<div class="col-md-12">
- <div class="paragraph">
+ <div id="preamble">
+<div class="sectionbody">
+<div class="paragraph">
<p>Inspired by the Jetty Maven Plugin, the TomEE Maven Plugin is a
feature-rich plugin that allows for:</p>
</div>
@@ -116,9 +118,9 @@ feature-rich plugin that allows for:</p>
<p>Simply add the following to the , and optionally the ), section of your
<code>pom.xml</code></p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre><plugins>
+<pre class="highlight"><code class="language-xml" data-lang="xml"><plugins>
<plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
@@ -128,12 +130,14 @@ feature-rich plugin that allows for:</p>
<tomeeClassifier>plus</tomeeClassifier>
</configuration>
</plugin>
-</plugins></pre>
+</plugins></code></pre>
+</div>
</div>
</div>
-<div class="paragraph">
-<p>###Plugin Goals</p>
</div>
+<div class="sect1">
+<h2 id="_plugin_goals">Plugin Goals</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>Goal</p>
</div>
@@ -256,9 +260,9 @@ with the specified prefix</p>
you can use it in a pom project to setup a TomEE install, add libraries,
deploy apps then run the server.</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre> <plugin>
+<pre class="highlight"><code class="language-xml" data-lang="xml"> <plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
<version>1.7.1</version>
@@ -285,15 +289,15 @@ deploy apps then run the server.</p>
<lib>remove:openjpa-</lib>
</libs>
</configuration>
- </plugin></pre>
+ </plugin></code></pre>
</div>
</div>
<div class="paragraph">
<p>###Auto Reloading Example</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre><plugin>
+<pre class="highlight"><code class="language-xml" data-lang="xml"><plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
<version>1.7.1</version>
@@ -305,7 +309,7 @@ deploy apps then run the server.</p>
</synchronization>
<reloadOnUpdate>true</reloadOnUpdate>
</configuration>
-</plugin></pre>
+</plugin></code></pre>
</div>
</div>
<div class="paragraph">
@@ -340,6 +344,8 @@ deploy apps then run the server.</p>
<p>reloadOnUpdate means to reload the entire context (webapp). This means
undeploying/redeploying the application.</p>
</div>
+</div>
+</div>
</div>
</div>
Modified: tomee/site/trunk/content/latest/docs/tomee-mp-getting-started.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/latest/docs/tomee-mp-getting-started.html?rev=1848496&r1=1848495&r2=1848496&view=diff
==============================================================================
--- tomee/site/trunk/content/latest/docs/tomee-mp-getting-started.html (original)
+++ tomee/site/trunk/content/latest/docs/tomee-mp-getting-started.html Sun Dec 9 02:54:59 2018
@@ -95,9 +95,9 @@
<div class="row">
<div class="col-md-12">
- <div class="paragraph">
-<p>###Add The TomEE Maven Plugin To An Existing Project</p>
-</div>
+ <div class="sect1">
+<h2 id="_add_the_tomee_maven_plugin_to_an_existing_project">Add The TomEE Maven Plugin To An Existing Project</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>If you already have a maven project set up then just add the plugin as
described <a href="maven/index.html">here</a></p>
@@ -105,14 +105,14 @@ described <a href="maven/index.html">her
<div class="paragraph">
<p>You will likely need the full Java EE API added to your pom file:</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre><dependency>
+<pre class="highlight"><code class="language-xml" data-lang="xml"><dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
<version>6.0-6</version>
<scope>provided</scope>
-</dependency></pre>
+</dependency></code></pre>
</div>
</div>
<div class="paragraph">
@@ -120,9 +120,11 @@ described <a href="maven/index.html">her
you. Even if you have an existing project you can always use the
template as a reference.</p>
</div>
-<div class="paragraph">
-<p>###Generate a Basic TomEE-Project With Maven</p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_generate_a_basic_tomee_project_with_maven">Generate a Basic TomEE-Project With Maven</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>TomEE provides a maven-archetype for generating a template project. This
template project is preconfigured with <code>javaee-api</code> (scope provided) and
@@ -133,9 +135,9 @@ application with TomEE.</p>
<p>For example, if current version of the archetype is '1.7.1', then the
required command to generate an application would be:</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>mvn archetype:generate -DarchetypeGroupId=org.apache.openejb.maven -DarchetypeArtifactId=tomee-webapp-archetype -DarchetypeVersion=1.7.1</pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">mvn archetype:generate -DarchetypeGroupId=org.apache.openejb.maven -DarchetypeArtifactId=tomee-webapp-archetype -DarchetypeVersion=1.7.1</code></pre>
</div>
</div>
<div class="paragraph">
@@ -146,9 +148,9 @@ application. If you are using 'tomee' as
artifactId, '1.0' as version and 'myapp' as package, your console should
show something like:</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>Define value for property 'groupId': : tomee
+<pre class="highlight"><code class="language-properties" data-lang="properties">Define value for property 'groupId': : tomee
Define value for property 'artifactId': : tomee-demo
Define value for property 'version': 1.0-SNAPSHOT: : 1.0
Define value for property 'package': tomee: : myapp
@@ -159,7 +161,7 @@ version: 1.0
package: myapp
...
[INFO] BUILD SUCCESS
-...</pre>
+...</code></pre>
</div>
</div>
<div class="paragraph">
@@ -168,21 +170,23 @@ artifactId (in the previous example 'tom
application you have to change the current directory to the directory of
the generated application:</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>cd tomee-demo</pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">cd tomee-demo</code></pre>
+</div>
</div>
</div>
-<div class="paragraph">
-<p>###Starting a TomEE-Project with Maven</p>
</div>
+<div class="sect1">
+<h2 id="_starting_a_tomee_project_with_maven">Starting a TomEE-Project with Maven</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>With using the archetype everything you need is in place already. So you
just have to start TomEE with:</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>mvn package tomee:run</pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">mvn package tomee:run</code></pre>
</div>
</div>
<div class="paragraph">
@@ -191,9 +195,11 @@ has to download e.g. TomEE. Once those p
maven, deploying and starting the generated application takes less than
10s (depending on your computer).</p>
</div>
-<div class="paragraph">
-<p>###Accessing a running application</p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_accessing_a_running_application">Accessing a running application</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>The application gets deployed to <code>target/apache-tomee/webapps</code>. If
everything worked correctly, you should see a directory ('ROOT') as well
@@ -201,9 +207,11 @@ as a web-archive ('ROOT.war'). The conte
application is ROOT. In our example the generated application contains a
servlet mapped to '/index'. So you can access it via:</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>http://localhost:8080/index</pre>
+<pre class="highlight"><code class="language-properties" data-lang="properties">http://localhost:8080/index</code></pre>
+</div>
+</div>
</div>
</div>
</div>
Modified: tomee/site/trunk/content/latest/docs/tomee-webapp.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/latest/docs/tomee-webapp.html?rev=1848496&r1=1848495&r2=1848496&view=diff
==============================================================================
--- tomee/site/trunk/content/latest/docs/tomee-webapp.html (original)
+++ tomee/site/trunk/content/latest/docs/tomee-webapp.html Sun Dec 9 02:54:59 2018
@@ -165,9 +165,9 @@ libraries have been moved into <code><
EJBs over HTTP. However this can easily be added to a different webapp
like so:</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre><servlet>
+<pre class="highlight"><code class="language-xml" data-lang="xml"><servlet>
<servlet-name>ServerServlet</servlet-name>
<servlet-class>org.apache.openejb.server.httpd.ServerServlet</servlet-class>
</servlet>
@@ -175,16 +175,16 @@ like so:</p>
<servlet-mapping>
<servlet-name>ServerServlet</servlet-name>
<url-pattern>/myejbs/*</url-pattern>
-</servlet-mapping></pre>
+</servlet-mapping></code></pre>
</div>
</div>
<div class="paragraph">
<p>Then you can create an <code>InitialContext</code> that points to that webapp like
so:</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>Properties p = new Properties();
+<pre class="highlight"><code class="language-java" data-lang="java">Properties p = new Properties();
p.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
p.put("java.naming.provider.url", "http://127.0.0.1:8080/mywebapp/myejbs");
// user and pass optional
@@ -193,7 +193,7 @@ p.put("java.naming.security.credentials"
InitialContext ctx = new InitialContext(p);
-MyBean myBean = (MyBean) ctx.lookup("MyBeanRemote");</pre>
+MyBean myBean = (MyBean) ctx.lookup("MyBeanRemote");</code></pre>
</div>
</div>
</div>
Modified: tomee/site/trunk/content/latest/docs/topic-config.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/latest/docs/topic-config.html?rev=1848496&r1=1848495&r2=1848496&view=diff
==============================================================================
--- tomee/site/trunk/content/latest/docs/topic-config.html (original)
+++ tomee/site/trunk/content/latest/docs/topic-config.html Sun Dec 9 02:54:59 2018
@@ -100,11 +100,11 @@
file or in a <code>WEB-INF/resources.xml</code> file using a declaration like the
following. All properties in the element body are optional.</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre><Resource id="myTopic" type="javax.jms.Topic">
+<pre class="highlight"><code class="language-xml" data-lang="xml"><Resource id="myTopic" type="javax.jms.Topic">
destination =
-</Resource></pre>
+</Resource></code></pre>
</div>
</div>
<div class="paragraph">
@@ -113,10 +113,10 @@ following. All properties in the element
<code>-D</code> properties. The properties can also be used when embedding TomEE
via the <code>javax.ejb.embeddable.EJBContainer</code> API or <code>InitialContext</code></p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>myTopic = new://Resource?type=javax.jms.Topic
-myTopic.destination =</pre>
+<pre class="highlight"><code class="language-properties" data-lang="properties">myTopic = new://Resource?type=javax.jms.Topic
+myTopic.destination =</code></pre>
</div>
</div>
<div class="paragraph">
Modified: tomee/site/trunk/content/latest/docs/transaction-annotations.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/latest/docs/transaction-annotations.html?rev=1848496&r1=1848495&r2=1848496&view=diff
==============================================================================
--- tomee/site/trunk/content/latest/docs/transaction-annotations.html (original)
+++ tomee/site/trunk/content/latest/docs/transaction-annotations.html Sun Dec 9 02:54:59 2018
@@ -261,9 +261,9 @@ state.</p>
<div class="sect1">
<h2 id="_on_methods">On Methods</h2>
<div class="sectionbody">
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>@Stateless
+<pre class="highlight"><code class="language-java" data-lang="java">@Stateless
public static class MyBean implements MyBusinessInterface {
@TransactionAttribute(TransactionAttributeType.MANDATORY)
@@ -274,7 +274,7 @@ public static class MyBean implements My
public String codeBlue(String s) {
return s;
}
-}</pre>
+}</code></pre>
</div>
</div>
<div class="ulist">
@@ -292,9 +292,9 @@ public static class MyBean implements My
<div class="sect1">
<h2 id="_on_classes">On Classes</h2>
<div class="sectionbody">
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>@Stateless
+<pre class="highlight"><code class="language-java" data-lang="java">@Stateless
@TransactionAttribute(TransactionAttributeType.MANDATORY)
public static class MyBean implements MyBusinessInterface {
@@ -305,7 +305,7 @@ public static class MyBean implements My
public String codeBlue(String s) {
return s;
}
-}</pre>
+}</code></pre>
</div>
</div>
<div class="ulist">
@@ -321,9 +321,9 @@ public static class MyBean implements My
<div class="sect1">
<h2 id="_mixed_on_classes_and_methods">Mixed on classes and methods</h2>
<div class="sectionbody">
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>@Stateless
+<pre class="highlight"><code class="language-java" data-lang="java">@Stateless
@TransactionAttribute(TransactionAttributeType.SUPPORTS)
public static class MyBean implements MyBusinessInterface {
@@ -340,7 +340,7 @@ public static class MyBean implements My
public String codeGreen(String s) {
return s;
}
-}</pre>
+}</code></pre>
</div>
</div>
<div class="ulist">
@@ -366,9 +366,9 @@ methods and most callbacks.</p>
<div class="paragraph">
<p>The following usages of @TransactionAttribute have no effect.</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>@Stateful
+<pre class="highlight"><code class="language-java" data-lang="java">@Stateful
public class MyStatefulBean implements MyBusinessInterface {
@PostConstruct
@@ -400,7 +400,7 @@ public class MyStatefulBean implements
public void passivate(){
}
-}</pre>
+}</code></pre>
</div>
</div>
</div>
Modified: tomee/site/trunk/content/latest/docs/transactionmanager-config.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/latest/docs/transactionmanager-config.html?rev=1848496&r1=1848495&r2=1848496&view=diff
==============================================================================
--- tomee/site/trunk/content/latest/docs/transactionmanager-config.html (original)
+++ tomee/site/trunk/content/latest/docs/transactionmanager-config.html Sun Dec 9 02:54:59 2018
@@ -101,9 +101,9 @@
using a declaration like the following. All properties in the element
body are optional.</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre><TransactionManager id="myTransactionManager" type="TransactionManager">
+<pre class="highlight"><code class="language-xml" data-lang="xml"><TransactionManager id="myTransactionManager" type="TransactionManager">
adler32Checksum = true
bufferSizeKb = 32
checksumEnabled = true
@@ -118,7 +118,7 @@ body are optional.</p>
minBuffers = 4
threadsWaitingForceThreshold = -1
txRecovery = false
-</TransactionManager></pre>
+</TransactionManager></code></pre>
</div>
</div>
<div class="paragraph">
@@ -128,9 +128,9 @@ VirtualMachine <code>-D</code> propertie
embedding TomEE via the <code>javax.ejb.embeddable.EJBContainer</code> API or
<code>InitialContext</code></p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>myTransactionManager = new://TransactionManager?type=TransactionManager
+<pre class="highlight"><code class="language-properties" data-lang="properties">myTransactionManager = new://TransactionManager?type=TransactionManager
myTransactionManager.adler32Checksum = true
myTransactionManager.bufferSizeKb = 32
myTransactionManager.checksumEnabled = true
@@ -144,7 +144,7 @@ myTransactionManager.maxBuffers = 0
myTransactionManager.maxLogFiles = 2
myTransactionManager.minBuffers = 4
myTransactionManager.threadsWaitingForceThreshold = -1
-myTransactionManager.txRecovery = false</pre>
+myTransactionManager.txRecovery = false</code></pre>
</div>
</div>
<div class="paragraph">
Modified: tomee/site/trunk/content/latest/docs/understanding-callbacks.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/latest/docs/understanding-callbacks.html?rev=1848496&r1=1848495&r2=1848496&view=diff
==============================================================================
--- tomee/site/trunk/content/latest/docs/understanding-callbacks.html (original)
+++ tomee/site/trunk/content/latest/docs/understanding-callbacks.html Sun Dec 9 02:54:59 2018
@@ -110,9 +110,9 @@ have an AroundInvoke method and so on.</
<div class="paragraph">
<p>So the following is legal.</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>public class Plant {
+<pre class="highlight"><code class="language-java" data-lang="java">public class Plant {
@AroundInvoke
public Object a(InvocationContext ctx) throws Exception {
return ctx.proceed();
@@ -140,7 +140,7 @@ public class Apple extends Fruit impleme
public interface AppleLocal {
public String grow();
-}</pre>
+}</code></pre>
</div>
</div>
<div class="paragraph">
@@ -154,9 +154,9 @@ are ways to effectively shut off the cal
of a parent class by simply overriding the method. We can shut off the
"a" around invoke with a slightly different version of Apple as follows:</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>@Stateless
+<pre class="highlight"><code class="language-java" data-lang="java">@Stateless
public class Apple extends Fruit implements AppleLocal {
// This will now never be called.
@@ -172,7 +172,7 @@ public class Apple extends Fruit impleme
public String grow(){
return "ready to pick";
}
-}</pre>
+}</code></pre>
</div>
</div>
<div class="paragraph">
@@ -185,14 +185,14 @@ then "c" skipping "a" completely.</p>
they mean that they cannot be exposed to clients through a local or
remote interface. The following would be illegal.</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>public interface AppleLocal {
+<pre class="highlight"><code class="language-java" data-lang="java">public interface AppleLocal {
public String grow();
// This is an AroundInvoke method in the bean class, not a legal business method!
public Object c(InvocationContext ctx) throws Exception;
-}</pre>
+}</code></pre>
</div>
</div>
</div>
Modified: tomee/site/trunk/content/latest/docs/understanding-the-directory-layout.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/latest/docs/understanding-the-directory-layout.html?rev=1848496&r1=1848495&r2=1848496&view=diff
==============================================================================
--- tomee/site/trunk/content/latest/docs/understanding-the-directory-layout.html (original)
+++ tomee/site/trunk/content/latest/docs/understanding-the-directory-layout.html Sun Dec 9 02:54:59 2018
@@ -101,9 +101,9 @@
<p>Unpacking the standalone OpenEJB will result in the following directory
layout:</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>apache-openejb-[version]\apps
+<pre class="highlight"><code class="language-java" data-lang="java">apache-openejb-[version]\apps
apache-openejb-[version]\bin
apache-openejb-[version]\conf
apache-openejb-[version]\data
@@ -111,7 +111,7 @@ apache-openejb-[version]\lib
apache-openejb-[version]\logs
apache-openejb-[version]\LICENSE
apache-openejb-[version]\NOTICE
-apache-openejb-[version]\README.txt</pre>
+apache-openejb-[version]\README.txt</code></pre>
</div>
</div>
</div>
@@ -162,9 +162,9 @@ deploy all the EJB’s contained in
OpenEJB is unpacked. The first time OpenEJB is started however, these
files will be created:</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre> conf/
+<pre class="highlight"><code class="language-java" data-lang="java"> conf/
openejb.xml (main config file)
logging.properties (log levels and files)
login.config (jaas config file)
@@ -177,7 +177,7 @@ files will be created:</p>
ejbd.properties (network socket for ejb invocations)
hsql.properties (network socket for hsql client access)
httpejbd.properties (network socket for ejb invocations over http)
- telnet.properties (network socket for telnet "server")</pre>
+ telnet.properties (network socket for telnet "server")</code></pre>
</div>
</div>
<div class="paragraph">
Modified: tomee/site/trunk/content/latest/docs/unix-daemon.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/latest/docs/unix-daemon.html?rev=1848496&r1=1848495&r2=1848496&view=diff
==============================================================================
--- tomee/site/trunk/content/latest/docs/unix-daemon.html (original)
+++ tomee/site/trunk/content/latest/docs/unix-daemon.html Sun Dec 9 02:54:59 2018
@@ -116,11 +116,11 @@ used.</p>
<p>First, we’ll need to locate and unpack the
<code>commons-daemon-native.tar.gz</code></p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>cd $TOMEE_HOME/bin
+<pre class="highlight"><code class="language-bash" data-lang="bash">cd $TOMEE_HOME/bin
tar xzvf commons-daemon-native.tar.gz
-cd commons-daemon-1.0.7-native-src/unix/</pre>
+cd commons-daemon-1.0.7-native-src/unix/</code></pre>
</div>
</div>
<div class="paragraph">
@@ -149,18 +149,18 @@ system you will need:</p>
<code>--with-java=<dir></code> parameter or set the <code>JAVA_HOME</code> environment to
point to your SDK installation. For example:</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>./configure --with-java=/usr/java</pre>
+<pre class="highlight"><code class="language-properties" data-lang="properties">./configure --with-java=/usr/java</code></pre>
</div>
</div>
<div class="paragraph">
<p>or</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>export JAVA_HOME
-./configure</pre>
+<pre class="highlight"><code class="language-properties" data-lang="properties">export JAVA_HOME
+./configure</code></pre>
</div>
</div>
<div class="paragraph">
@@ -169,9 +169,9 @@ cleanly, otherwise it will report an err
of your OS/JDK, or a patch against the sources). To build the binaries
and libraries simply do:</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>make</pre>
+<pre class="highlight"><code class="language-java" data-lang="java">make</code></pre>
</div>
</div>
<div class="paragraph">
@@ -180,10 +180,10 @@ and libraries simply do:</p>
<div class="paragraph">
<p>Finally, we’ll want to set the execution bits and move the <code>jsvc</code> binary</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>chmod 755 jsvc
-mv jsvc $TOMEE_HOME/bin</pre>
+<pre class="highlight"><code class="language-properties" data-lang="properties">chmod 755 jsvc
+mv jsvc $TOMEE_HOME/bin</code></pre>
</div>
</div>
<div class="paragraph">
@@ -192,15 +192,15 @@ mv jsvc $TOMEE_HOME/bin</pre>
<div class="paragraph">
<p>As one script, the above might look like:</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>cd $TOMEE_HOME/bin
+<pre class="highlight"><code class="language-bash" data-lang="bash">cd $TOMEE_HOME/bin
tar xzvf commons-daemon-native.tar.gz
cd commons-daemon-1.0.7-native-src/unix/
./configure
make
chmod 755 jsvc
-mv jsvc ../..</pre>
+mv jsvc ../..</code></pre>
</div>
</div>
</div>
@@ -208,11 +208,11 @@ mv jsvc ../..</pre>
<div class="sect1">
<h2 id="_starting_unix">Starting (unix)</h2>
<div class="sectionbody">
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>sudo "$TOMEE_HOME/bin/jsvc" -cp "$TOMEE_HOME/bin/bootstrap.jar:$TOMEE_HOME/bin/tomcat-juli.jar" \
+<pre class="highlight"><code class="language-bash" data-lang="bash">sudo "$TOMEE_HOME/bin/jsvc" -cp "$TOMEE_HOME/bin/bootstrap.jar:$TOMEE_HOME/bin/tomcat-juli.jar" \
"-javaagent:$TOMEE_HOME/lib/openejb-javaagent.jar" -outfile "$TOMEE_HOME/logs/catalina.out" \
- -errfile "$TOMEE_HOME/logs/catalina.err" org.apache.catalina.startup.Bootstrap</pre>
+ -errfile "$TOMEE_HOME/logs/catalina.err" org.apache.catalina.startup.Bootstrap</code></pre>
</div>
</div>
</div>
@@ -223,21 +223,21 @@ mv jsvc ../..</pre>
<div class="paragraph">
<p>For a 64-bit JVM such as OSX Lion</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>sudo arch -arch x86_64 "$TOMEE_HOME/bin/jsvc" -jvm server -cp "$TOMEE_HOME/bin/bootstrap.jar:$TOMEE_HOME/bin/tomcat-juli.jar" \
+<pre class="highlight"><code class="language-bash" data-lang="bash">sudo arch -arch x86_64 "$TOMEE_HOME/bin/jsvc" -jvm server -cp "$TOMEE_HOME/bin/bootstrap.jar:$TOMEE_HOME/bin/tomcat-juli.jar" \
"-javaagent:$TOMEE_HOME/lib/openejb-javaagent.jar" -outfile "$TOMEE_HOME/logs/catalina.out" \
- -errfile "$TOMEE_HOME/logs/catalina.err" org.apache.catalina.startup.Bootstrap</pre>
+ -errfile "$TOMEE_HOME/logs/catalina.err" org.apache.catalina.startup.Bootstrap</code></pre>
</div>
</div>
<div class="paragraph">
<p>For a 32-bit JVM</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>sudo arch -arch i386 "$TOMEE_HOME/bin/jsvc" -jvm server -cp "$TOMEE_HOME/bin/bootstrap.jar:$TOMEE_HOME/bin/tomcat-juli.jar" \
+<pre class="highlight"><code class="language-bash" data-lang="bash">sudo arch -arch i386 "$TOMEE_HOME/bin/jsvc" -jvm server -cp "$TOMEE_HOME/bin/bootstrap.jar:$TOMEE_HOME/bin/tomcat-juli.jar" \
"-javaagent:$TOMEE_HOME/lib/openejb-javaagent.jar" -outfile "$TOMEE_HOME/logs/catalina.out" \
- -errfile "$TOMEE_HOME/logs/catalina.err" org.apache.catalina.startup.Bootstrap</pre>
+ -errfile "$TOMEE_HOME/logs/catalina.err" org.apache.catalina.startup.Bootstrap</code></pre>
</div>
</div>
<div class="sect2">
@@ -258,25 +258,25 @@ as long as the resulting command is one
<p>Ensure your <code>$TOME_HOME</code> and <code>$JAVA_HOME</code> variables are set correctly.
You should see similar output with the following two commands</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>mingus:~ 01:51:37
+<pre class="highlight"><code class="language-bash" data-lang="bash">mingus:~ 01:51:37
$ ls $TOMEE_HOME
LICENSE RELEASE-NOTES bin endorsed logs webapps
NOTICE RUNNING.txt conf lib temp work
mingus:~ 01:51:46
$ ls $JAVA_HOME
-bin bundle lib man</pre>
+bin bundle lib man</code></pre>
</div>
</div>
<div class="paragraph">
<p>The <code>jsvc -debug</code> option can also show useful information for
troubleshooting:</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>$TOMEE_HOME/bin/jsvc -debug</pre>
+<pre class="highlight"><code class="language-java" data-lang="java">$TOMEE_HOME/bin/jsvc -debug</code></pre>
</div>
</div>
<div class="paragraph">
Modified: tomee/site/trunk/content/latest/docs/validation-tool.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/latest/docs/validation-tool.html?rev=1848496&r1=1848495&r2=1848496&view=diff
==============================================================================
--- tomee/site/trunk/content/latest/docs/validation-tool.html (original)
+++ tomee/site/trunk/content/latest/docs/validation-tool.html Sun Dec 9 02:54:59 2018
@@ -232,13 +232,13 @@ classloader, perhaps because it is only
<div class="paragraph">
<p>Here is a more concrete example:</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>public interface Person extends EJBObject {
+<pre class="highlight"><code class="language-java" data-lang="java">public interface Person extends EJBObject {
}
public interface Employee extends Person {
-}</pre>
+}</code></pre>
</div>
</div>
<div class="paragraph">
Modified: tomee/site/trunk/content/master/docs/Configuring-in-tomee.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/master/docs/Configuring-in-tomee.html?rev=1848496&r1=1848495&r2=1848496&view=diff
==============================================================================
--- tomee/site/trunk/content/master/docs/Configuring-in-tomee.html (original)
+++ tomee/site/trunk/content/master/docs/Configuring-in-tomee.html Sun Dec 9 02:54:59 2018
@@ -95,7 +95,9 @@
<div class="row">
<div class="col-md-12">
- <div class="admonitionblock note">
+ <div id="preamble">
+<div class="sectionbody">
+<div class="admonitionblock note">
<table>
<tr>
<td class="icon">
@@ -118,9 +120,11 @@ License.
</tr>
</table>
</div>
-<div class="paragraph">
-<p>###Configuring Resources:</p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_configuring_resources">Configuring Resources:</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -140,23 +144,23 @@ License.
<div class="paragraph">
<p>For example,</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>@Resource DataSource moviesDatabase</pre>
+<pre class="highlight"><code class="language-java" data-lang="java">@Resource DataSource moviesDatabase</code></pre>
</div>
</div>
<div class="paragraph">
<p>is injected with the following resource:</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre><Resource id="moviesDatabase" type="DataSource">
+<pre class="highlight"><code class="language-xml" data-lang="xml"><Resource id="moviesDatabase" type="DataSource">
JdbcDriver org.hsqldb.jdbcDriver
JdbcUrl jdbc:mysql:localhost:3306/moviesdb
UserName sa
Password secret
JtaManaged true
-</Resource></pre>
+</Resource></code></pre>
</div>
</div>
<div class="paragraph">
@@ -164,6 +168,8 @@ JtaManaged true
<a href="/configuring-datasources.html">configuring-datasources</a>,
<a href="containers-and-resources.html">containers-and-resources</a> docs.</p>
</div>
+</div>
+</div>
</div>
</div>
Modified: tomee/site/trunk/content/master/docs/activemqresourceadapter-config.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/master/docs/activemqresourceadapter-config.html?rev=1848496&r1=1848495&r2=1848496&view=diff
==============================================================================
--- tomee/site/trunk/content/master/docs/activemqresourceadapter-config.html (original)
+++ tomee/site/trunk/content/master/docs/activemqresourceadapter-config.html Sun Dec 9 02:54:59 2018
@@ -103,14 +103,14 @@
using a declaration like the following. All properties in the element
body are optional.</p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre><Resource id="myActiveMQResourceAdapter" type="ActiveMQResourceAdapter">
+<pre class="highlight"><code class="language-xml" data-lang="xml"><Resource id="myActiveMQResourceAdapter" type="ActiveMQResourceAdapter">
brokerXmlConfig = broker:(tcp://localhost:61616)?useJmx=false
dataSource = Default Unmanaged JDBC Database
serverUrl = vm://localhost?waitForStart=20000&async=true
startupTimeout = 10 seconds
-</Resource></pre>
+</Resource></code></pre>
</div>
</div>
<div class="paragraph">
@@ -120,13 +120,13 @@ VirtualMachine <code>-D</code> propertie
embedding TomEE via the <code>javax.ejb.embeddable.EJBContainer</code> API or
<code>InitialContext</code></p>
</div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre>myActiveMQResourceAdapter = new://Resource?type=ActiveMQResourceAdapter
+<pre class="highlight"><code class="language-properties" data-lang="properties">myActiveMQResourceAdapter = new://Resource?type=ActiveMQResourceAdapter
myActiveMQResourceAdapter.brokerXmlConfig = broker:(tcp://localhost:61616)?useJmx=false
myActiveMQResourceAdapter.dataSource = Default Unmanaged JDBC Database
myActiveMQResourceAdapter.serverUrl = vm://localhost?waitForStart=20000&async=true
-myActiveMQResourceAdapter.startupTimeout = 10 seconds</pre>
+myActiveMQResourceAdapter.startupTimeout = 10 seconds</code></pre>
</div>
</div>
<div class="paragraph">
Modified: tomee/site/trunk/content/master/docs/admin/cluster/index.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/master/docs/admin/cluster/index.html?rev=1848496&r1=1848495&r2=1848496&view=diff
==============================================================================
--- tomee/site/trunk/content/master/docs/admin/cluster/index.html (original)
+++ tomee/site/trunk/content/master/docs/admin/cluster/index.html Sun Dec 9 02:54:59 2018
@@ -95,8 +95,9 @@
<div class="row">
<div class="col-md-12">
- <div class="sect2">
-<h3 id="_session_clustering">Session clustering</h3>
+ <div class="sect1">
+<h2 id="_session_clustering">Session clustering</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>TomEE fully relies on Tomcat clustering: <a href="https://tomcat.apache.org/tomcat-7.0-doc/cluster-howto.html">Tomcat Clustering</a>.</p>
</div>
@@ -105,8 +106,10 @@
through the session.</p>
</div>
</div>
-<div class="sect2">
-<h3 id="_hazelcast_as_session_provider">Hazelcast as session provider</h3>
+</div>
+<div class="sect1">
+<h2 id="_hazelcast_as_session_provider">Hazelcast as session provider</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>Hazelcast did a post on this topic on <a href="https://hazelcast.com/use-cases/web-session-clustering/session-clustering-tomee/">Session Clustering With TomEE</a>.</p>
</div>
@@ -114,8 +117,10 @@ through the session.</p>
<p>Tomitribe also demonstrated you can distributed <code>@Stateful</code> beans easily relying on hazelcast: <a href="https://github.com/tomitribe/hazelcast-tomee-poc">Hazelcast TomEE PoC</a>.</p>
</div>
</div>
-<div class="sect2">
-<h3 id="_load_balancing">Load balancing</h3>
+</div>
+<div class="sect1">
+<h2 id="_load_balancing">Load balancing</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>TomEE being a HTTP server all HTTP load balancer such as HTTPd (a.k.a. Apache2), ngnix, F5 etc…​ will work.</p>
</div>
@@ -123,28 +128,30 @@ through the session.</p>
<p>More documentation on HTTPd link can be found on <a href="https://tomcat.apache.org/connectors-doc/webserver_howto/apache.html">Tomcat</a> website.</p>
</div>
</div>
-<div class="sect2">
-<h3 id="_ejbd">EJBd</h3>
+</div>
+<div class="sect1">
+<h2 id="_ejbd">EJBd</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>If you use the EJBd protocol (<code>@Remote</code> EJB proprietary protocol of TomEE) you can get cluster features on the client
part.</p>
</div>
-<div class="sect3">
-<h4 id="_multicast">Multicast</h4>
+<div class="sect2">
+<h3 id="_multicast">Multicast</h3>
<div class="paragraph">
<p>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.</p>
</div>
<div class="paragraph">
<p>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.</p>
</div>
-<div class="sect4">
-<h5 id="_server_configuration">Server Configuration</h5>
+<div class="sect3">
+<h4 id="_server_configuration">Server Configuration</h4>
<div class="paragraph">
<p>When you boot the server there should be a conf/multicast.properties file containing:</p>
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">server = org.apache.openejb.server.discovery.MulticastDiscoveryAgent
+<pre class="highlight"><code class="language-properties" data-lang="properties">server = org.apache.openejb.server.discovery.MulticastDiscoveryAgent
bind = 239.255.2.3
port = 6142
disabled = true
@@ -232,7 +239,6 @@ for multicast to work you need to have e
<div class="paragraph">
<p>text</p>
</div>
-</div>
<div class="sect4">
<h5 id="_multicast_client">Multicast Client</h5>
<div class="paragraph">
@@ -285,7 +291,7 @@ When the client connects, the server wil
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">server = org.apache.openejb.server.discovery.MulticastPulseAgent
+<pre class="highlight"><code class="language-properties" data-lang="properties">server = org.apache.openejb.server.discovery.MulticastPulseAgent
bind = 239.255.2.3
port = 6142
disabled = true
@@ -306,7 +312,7 @@ group = default</code></pre>
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">server = org.apache.openejb.server.ejbd.EjbServer
+<pre class="highlight"><code class="language-properties" data-lang="properties">server = org.apache.openejb.server.ejbd.EjbServer
bind = 0.0.0.0
port = 4201
disabled = false
@@ -389,7 +395,7 @@ InitialContext remoteContext = new Initi
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">server = org.apache.openejb.server.discovery.MultipointDiscoveryAgent
+<pre class="highlight"><code class="language-properties" data-lang="properties">server = org.apache.openejb.server.discovery.MultipointDiscoveryAgent
bind = 127.0.0.1
port = 4212
disabled = false
@@ -462,6 +468,8 @@ InitialContext remoteContext = new Initi
</div>
</div>
</div>
+</div>
+</div>
</div>
</div>
Modified: tomee/site/trunk/content/master/docs/admin/configuration/application.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/master/docs/admin/configuration/application.html?rev=1848496&r1=1848495&r2=1848496&view=diff
==============================================================================
--- tomee/site/trunk/content/master/docs/admin/configuration/application.html (original)
+++ tomee/site/trunk/content/master/docs/admin/configuration/application.html Sun Dec 9 02:54:59 2018
@@ -101,13 +101,14 @@
<div class="row">
<div class="col-md-12">
- <div class="sect2">
-<h3 id="__code_application_properties_code"><code>application.properties</code></h3>
+ <div class="sect1">
+<h2 id="__code_application_properties_code"><code>application.properties</code></h2>
+<div class="sectionbody">
<div class="paragraph">
<p>This file is located in <code>WEB-INF</code> for a war and <code>META-INF</code> for an ear.</p>
</div>
-<div class="sect3">
-<h4 id="__code_asynchronous_code_configuration"><code>@Asynchronous</code> configuration</h4>
+<div class="sect2">
+<h3 id="__code_asynchronous_code_configuration"><code>@Asynchronous</code> configuration</h3>
<div class="paragraph">
<p>Default pool size for <code>@Asynchronous</code> 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 <code>application.properties</code>:</p>
@@ -174,8 +175,8 @@ asynchronism or reactive patterns. There
</tbody>
</table>
</div>
-<div class="sect3">
-<h4 id="_timerservice_and_code_scheduled_code">TimerService and <code>@Scheduled</code></h4>
+<div class="sect2">
+<h3 id="_timerservice_and_code_scheduled_code">TimerService and <code>@Scheduled</code></h3>
<div class="paragraph">
<p><code>timerStore.class</code> allows to switch from the in memory (<code>org.apache.openejb.core.timer.MemoryTimerStore</code>) timer storage
for quartz tasks to a custom implementation (using a database or anything for instance). Constructor can take a <code>TransactionManager</code>
@@ -185,8 +186,8 @@ or nothing.</p>
<p>All quartz properties prefixed with <code>org.apache.openejb.quartz.</code> (instead of <code>org.quartz.</code>) are passthrough to quartz.</p>
</div>
</div>
-<div class="sect3">
-<h4 id="_cdi">CDI</h4>
+<div class="sect2">
+<h3 id="_cdi">CDI</h3>
<div class="paragraph">
<p>The boolean <code>openejb.cdi.skip-resource-validation</code> allows to not validate resources ie <code>@EJB</code> and <code>@Resource</code> usages in CDI beans.</p>
</div>
@@ -194,8 +195,8 @@ or nothing.</p>
<p>All properties understood by OpenWebBeans will also be passthrough to OpenWebBeans from this location, see <a href="http://openwebbeans.apache.org/owbconfig.html">OWB config</a> for more details.</p>
</div>
</div>
-<div class="sect3">
-<h4 id="__code_webserviceref_code"><code>@WebServiceRef</code></h4>
+<div class="sect2">
+<h3 id="__code_webserviceref_code"><code>@WebServiceRef</code></h3>
<table class="tableblock frame-all grid-all spread table table-bordered">
<colgroup>
<col style="width: 50%;">
@@ -215,8 +216,8 @@ or nothing.</p>
</tbody>
</table>
</div>
-<div class="sect3">
-<h4 id="__code_stateless_code"><code>@Stateless</code></h4>
+<div class="sect2">
+<h3 id="__code_stateless_code"><code>@Stateless</code></h3>
<table class="tableblock frame-all grid-all spread table table-bordered">
<colgroup>
<col style="width: 50%;">
@@ -245,8 +246,10 @@ or nothing.</p>
</table>
</div>
</div>
-<div class="sect2">
-<h3 id="__code_resources_xml_code"><code>resources.xml</code></h3>
+</div>
+<div class="sect1">
+<h2 id="__code_resources_xml_code"><code>resources.xml</code></h2>
+<div class="sectionbody">
<div class="paragraph">
<p><code>resources.xml</code> is a tomee.xml using application classloader.</p>
</div>
@@ -276,8 +279,8 @@ to use a MySQL database on OpenShift you
<div class="paragraph">
<p><code>resources.xml</code> supports <code>Resource</code>, <code>Service</code> and <code>Container</code>.</p>
</div>
-<div class="sect3">
-<h4 id="__code_resources_xml_code_mecanism"><code>resources.xml</code> mecanism</h4>
+<div class="sect2">
+<h3 id="__code_resources_xml_code_mecanism"><code>resources.xml</code> mecanism</h3>
<div class="paragraph">
<p><code>resources.xml</code> resources are still available globally like any <code>tomee.xml</code> resource.</p>
</div>
@@ -294,6 +297,7 @@ as <code>myresource</code>, it will get
</div>
</div>
</div>
+</div>
</div>
</div>
Modified: tomee/site/trunk/content/master/docs/admin/configuration/containers.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/master/docs/admin/configuration/containers.html?rev=1848496&r1=1848495&r2=1848496&view=diff
==============================================================================
--- tomee/site/trunk/content/master/docs/admin/configuration/containers.html (original)
+++ tomee/site/trunk/content/master/docs/admin/configuration/containers.html Sun Dec 9 02:54:59 2018
@@ -112,8 +112,9 @@ if you don’t need to tune their co
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="__stateless">@Stateless</h3>
+<div class="sect1">
+<h2 id="__stateless">@Stateless</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>A <code>@Stateless</code> container.</p>
</div>
@@ -146,7 +147,7 @@ if you don’t need to tune their co
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">Foo = new://Container?type=STATELESS
+<pre class="highlight"><code class="language-properties" data-lang="properties">Foo = new://Container?type=STATELESS
Foo.AccessTimeout = 30 seconds
Foo.MaxSize = 10
Foo.MinSize = 0
@@ -164,10 +165,10 @@ Foo.UseOneSchedulerThreadByBean = false
Foo.EvictionThreads = 1</code></pre>
</div>
</div>
+<div class="sect2">
+<h3 id="_configuration">Configuration</h3>
<div class="sect3">
-<h4 id="_configuration">Configuration</h4>
-<div class="sect4">
-<h5 id="_accesstimeout">AccessTimeout</h5>
+<h4 id="_accesstimeout">AccessTimeout</h4>
<div class="paragraph">
<p>Specifies the time an invokation should wait for an instance
of the pool to become available.</p>
@@ -187,8 +188,8 @@ override this setting for the bean or me
annotation is used.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_maxsize">MaxSize</h5>
+<div class="sect3">
+<h4 id="_maxsize">MaxSize</h4>
<div class="paragraph">
<p>Specifies the size of the bean pools for this stateless
SessionBean container. If StrictPooling is not used, instances
@@ -197,8 +198,8 @@ they will not be returned to the pool an
immediately destroyed.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_minsize">MinSize</h5>
+<div class="sect3">
+<h4 id="_minsize">MinSize</h4>
<div class="paragraph">
<p>Specifies the minimum number of bean instances that should be in
the pool for each bean. Pools are prefilled to the minimum on
@@ -220,8 +221,8 @@ replaced. Replacement is done in a back
number of threads specified by <code>CallbackThreads</code>.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_strictpooling">StrictPooling</h5>
+<div class="sect3">
+<h4 id="_strictpooling">StrictPooling</h4>
<div class="paragraph">
<p>StrictPooling tells the container what to do when the pool
reaches it’s maximum size and there are incoming requests that
@@ -244,8 +245,8 @@ no pooling. Instead instances will be cr
for exactly one method call before being removed.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_maxage">MaxAge</h5>
+<div class="sect3">
+<h4 id="_maxage">MaxAge</h4>
<div class="paragraph">
<p>Specifies the maximum time that an instance should live before
it should be retired and removed from use. This will happen
@@ -259,8 +260,8 @@ seconds, minutes, hours, days. Or any c
<code>1 hour and 27 minutes and 10 seconds</code></p>
</div>
</div>
-<div class="sect4">
-<h5 id="_replaceaged">ReplaceAged</h5>
+<div class="sect3">
+<h4 id="_replaceaged">ReplaceAged</h4>
<div class="paragraph">
<p>When <code>ReplaceAged</code> is enabled, any instances in the pool that
expire due to reaching their <code>MaxAge</code> will be replaced immediately
@@ -279,8 +280,8 @@ when they reach their <code>MaxAge</code
treatment of non-minimum instances.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_replaceflushed">ReplaceFlushed</h5>
+<div class="sect3">
+<h4 id="_replaceflushed">ReplaceFlushed</h4>
<div class="paragraph">
<p>When <code>ReplaceFlushed</code> is enabled, any instances in the pool that
are flushed will be replaced immediately so that the pool will
@@ -323,8 +324,8 @@ public class MyBean {
</div>
</div>
</div>
-<div class="sect4">
-<h5 id="_maxageoffset">MaxAgeOffset</h5>
+<div class="sect3">
+<h4 id="_maxageoffset">MaxAgeOffset</h4>
<div class="paragraph">
<p>Applies to MaxAge usage and would rarely be changed, but is a
nice feature to understand.</p>
@@ -377,8 +378,8 @@ It is possible to set to decimal values
or 1.2.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_idletimeout">IdleTimeout</h5>
+<div class="sect3">
+<h4 id="_idletimeout">IdleTimeout</h4>
<div class="paragraph">
<p>Specifies the maximum time that an instance should be allowed to
sit idly in the pool without use before it should be retired and
@@ -390,8 +391,8 @@ seconds, minutes, hours, days. Or any c
"1 hour and 27 minutes and 10 seconds"</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_garbagecollection">GarbageCollection</h5>
+<div class="sect3">
+<h4 id="_garbagecollection">GarbageCollection</h4>
<div class="paragraph">
<p>Allows Garbage Collection to be used as a mechanism for shrinking
the pool. When set to true all instances in the pool, excluding
@@ -413,8 +414,8 @@ VM to garbage collect SoftReferences in
needed to avoid an <code>OutOfMemoryException</code>.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_sweepinterval">SweepInterval</h5>
+<div class="sect3">
+<h4 id="_sweepinterval">SweepInterval</h4>
<div class="paragraph">
<p>The frequency in which the container will sweep the pool and
evict expired instances. Eviction is how the <code>IdleTimeout</code>,
@@ -435,8 +436,8 @@ seconds, minutes, hours, days. Or any c
<code>1 hour and 27 minutes and 10 seconds</code></p>
</div>
</div>
-<div class="sect4">
-<h5 id="_callbackthreads">CallbackThreads</h5>
+<div class="sect3">
+<h4 id="_callbackthreads">CallbackThreads</h4>
<div class="paragraph">
<p>When sweeping the pool for expired instances a thread pool is
used to process calling <code>@PreDestroy</code> on expired instances as well
@@ -446,8 +447,8 @@ to the minimum after a Flush or <code>Ma
is shared by all beans deployed in the container.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_closetimeout">CloseTimeout</h5>
+<div class="sect3">
+<h4 id="_closetimeout">CloseTimeout</h4>
<div class="paragraph">
<p>PostConstruct methods are invoked on all instances in the pool
when the bean is undeployed and its pool is closed. The
@@ -460,23 +461,25 @@ seconds, minutes, hours, days. Or any c
<code>1 hour and 27 minutes and 10 seconds</code></p>
</div>
</div>
-<div class="sect4">
-<h5 id="_useoneschedulerthreadbybean">UseOneSchedulerThreadByBean</h5>
+<div class="sect3">
+<h4 id="_useoneschedulerthreadbybean">UseOneSchedulerThreadByBean</h4>
<div class="paragraph">
<p>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)</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_evictionthreads">EvictionThreads</h5>
+<div class="sect3">
+<h4 id="_evictionthreads">EvictionThreads</h4>
<div class="paragraph">
<p>number of threads to associate to eviction threads (1 is not bad for most applications)</p>
</div>
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="__stateful">@Stateful</h3>
+</div>
+<div class="sect1">
+<h2 id="__stateful">@Stateful</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>A <code>@Stateful</code> container.</p>
</div>
@@ -501,7 +504,7 @@ by bean (ie for 500 stateless beans you
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">Foo = new://Container?type=STATEFUL
+<pre class="highlight"><code class="language-properties" data-lang="properties">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
@@ -511,10 +514,10 @@ Foo.Capacity = 1000
Foo.BulkPassivate = 100</code></pre>
</div>
</div>
+<div class="sect2">
+<h3 id="_configuration_2">Configuration</h3>
<div class="sect3">
-<h4 id="_configuration_2">Configuration</h4>
-<div class="sect4">
-<h5 id="_accesstimeout_2">AccessTimeout</h5>
+<h4 id="_accesstimeout_2">AccessTimeout</h4>
<div class="paragraph">
<p>Specifies the maximum time an invocation could wait for the
<code>@Stateful</code> bean instance to become available before giving up.</p>
@@ -534,8 +537,8 @@ override this setting for the bean or me
annotation is used.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_cache">Cache</h5>
+<div class="sect3">
+<h4 id="_cache">Cache</h4>
<div class="paragraph">
<p>The cache is responsible for managing stateful bean
instances. The cache can page instances to disk as memory
@@ -544,8 +547,8 @@ cache implementation can be used by sett
to the fully qualified class name of the Cache implementation.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_passivator">Passivator</h5>
+<div class="sect3">
+<h4 id="_passivator">Passivator</h4>
<div class="paragraph">
<p>The passivator is responsible for writing beans to disk
at passivation time. Different passivators can be used
@@ -569,8 +572,8 @@ to disk.</p>
</ul>
</div>
</div>
-<div class="sect4">
-<h5 id="_timeout">TimeOut</h5>
+<div class="sect3">
+<h4 id="_timeout">TimeOut</h4>
<div class="paragraph">
<p>Specifies the time a bean can be idle before it is removed by the container.</p>
</div>
@@ -585,22 +588,22 @@ A value of 0 would mean a bean can be im
override this setting for the bean where the annotation is used.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_frequency">Frequency</h5>
+<div class="sect3">
+<h4 id="_frequency">Frequency</h4>
<div class="paragraph">
<p>Specifies the frequency (in seconds) at which the bean cache is checked for
idle beans.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_capacity">Capacity</h5>
+<div class="sect3">
+<h4 id="_capacity">Capacity</h4>
<div class="paragraph">
<p>Specifies the size of the bean pools for this
stateful SessionBean container.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_bulkpassivate">BulkPassivate</h5>
+<div class="sect3">
+<h4 id="_bulkpassivate">BulkPassivate</h4>
<div class="paragraph">
<p>Property name that specifies the number of instances
to passivate at one time when doing bulk passivation.</p>
@@ -608,8 +611,10 @@ to passivate at one time when doing bulk
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="__singleton">@Singleton</h3>
+</div>
+<div class="sect1">
+<h2 id="__singleton">@Singleton</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>A <code>@Singleton</code> container.</p>
</div>
@@ -628,14 +633,14 @@ to passivate at one time when doing bulk
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">Foo = new://Container?type=SINGLETON
+<pre class="highlight"><code class="language-properties" data-lang="properties">Foo = new://Container?type=SINGLETON
Foo.AccessTimeout = 30 seconds</code></pre>
</div>
</div>
+<div class="sect2">
+<h3 id="_configuration_3">Configuration</h3>
<div class="sect3">
-<h4 id="_configuration_3">Configuration</h4>
-<div class="sect4">
-<h5 id="_accesstimeout_3">AccessTimeout</h5>
+<h4 id="_accesstimeout_3">AccessTimeout</h4>
<div class="paragraph">
<p>Specifies the maximum time an invocation could wait for the
<code>@Singleton</code> bean instance to become available before giving up.</p>
@@ -657,8 +662,10 @@ annotation is used.</p>
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="__messagedriven">@MessageDriven</h3>
+</div>
+<div class="sect1">
+<h2 id="__messagedriven">@MessageDriven</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>A MDB container.</p>
</div>
@@ -681,7 +688,7 @@ annotation is used.</p>
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">Foo = new://Container?type=MESSAGE
+<pre class="highlight"><code class="language-properties" data-lang="properties">Foo = new://Container?type=MESSAGE
Foo.ResourceAdapter = Default JMS Resource Adapter
Foo.MessageListenerInterface = javax.jms.MessageListener
Foo.ActivationSpecClass = org.apache.activemq.ra.ActiveMQActivationSpec
@@ -689,43 +696,45 @@ Foo.InstanceLimit = 10
Foo.FailOnUnknowActivationSpec = true</code></pre>
</div>
</div>
+<div class="sect2">
+<h3 id="_configuration_4">Configuration</h3>
<div class="sect3">
-<h4 id="_configuration_4">Configuration</h4>
-<div class="sect4">
-<h5 id="_resourceadapter">ResourceAdapter</h5>
+<h4 id="_resourceadapter">ResourceAdapter</h4>
<div class="paragraph">
<p>The resource adapter delivers messages to the container</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_messagelistenerinterface">MessageListenerInterface</h5>
+<div class="sect3">
+<h4 id="_messagelistenerinterface">MessageListenerInterface</h4>
<div class="paragraph">
<p>Specifies the message listener interface handled by this container</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_activationspecclass">ActivationSpecClass</h5>
+<div class="sect3">
+<h4 id="_activationspecclass">ActivationSpecClass</h4>
<div class="paragraph">
<p>Specifies the activation spec class</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_instancelimit">InstanceLimit</h5>
+<div class="sect3">
+<h4 id="_instancelimit">InstanceLimit</h4>
<div class="paragraph">
<p>Specifies the maximum number of bean instances that are
allowed to exist for each MDB deployment.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_failonunknowactivationspec">FailOnUnknowActivationSpec</h5>
+<div class="sect3">
+<h4 id="_failonunknowactivationspec">FailOnUnknowActivationSpec</h4>
<div class="paragraph">
<p>Log a warning if true or throw an exception if false is an activation spec can’t be respected</p>
</div>
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="__managed">@Managed</h3>
+</div>
+<div class="sect1">
+<h2 id="__managed">@Managed</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>A managed bean container.</p>
</div>
@@ -742,12 +751,14 @@ allowed to exist for each MDB deployment
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">Foo = new://Container?type=MANAGED</code></pre>
+<pre class="highlight"><code class="language-properties" data-lang="properties">Foo = new://Container?type=MANAGED</code></pre>
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="_cmp_entity">CMP entity</h3>
+</div>
+<div class="sect1">
+<h2 id="_cmp_entity">CMP entity</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>A CMP bean container.</p>
</div>
@@ -766,22 +777,24 @@ allowed to exist for each MDB deployment
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">Foo = new://Container?type=CMP_ENTITY
+<pre class="highlight"><code class="language-properties" data-lang="properties">Foo = new://Container?type=CMP_ENTITY
Foo.CmpEngineFactory = org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory</code></pre>
</div>
</div>
+<div class="sect2">
+<h3 id="_configuration_5">Configuration</h3>
<div class="sect3">
-<h4 id="_configuration_5">Configuration</h4>
-<div class="sect4">
-<h5 id="_cmpenginefactory">CmpEngineFactory</h5>
+<h4 id="_cmpenginefactory">CmpEngineFactory</h4>
<div class="paragraph">
<p>The engine to use for this container. By default TomEE only provides the JPA implementation.</p>
</div>
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="_bmp_entity">BMP entity</h3>
+</div>
+<div class="sect1">
+<h2 id="_bmp_entity">BMP entity</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>A BMP entity container.</p>
</div>
@@ -800,20 +813,21 @@ Foo.CmpEngineFactory = org.apache.openej
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">Foo = new://Container?type=BMP_ENTITY
+<pre class="highlight"><code class="language-properties" data-lang="properties">Foo = new://Container?type=BMP_ENTITY
Foo.PoolSize = 10</code></pre>
</div>
</div>
+<div class="sect2">
+<h3 id="_configuration_6">Configuration</h3>
<div class="sect3">
-<h4 id="_configuration_6">Configuration</h4>
-<div class="sect4">
-<h5 id="_poolsize">PoolSize</h5>
+<h4 id="_poolsize">PoolSize</h4>
<div class="paragraph">
<p>Specifies the size of the bean pools for this
bmp entity container.</p>
</div>
</div>
</div>
+</div>
</div>
</div>
Modified: tomee/site/trunk/content/master/docs/admin/configuration/index.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/master/docs/admin/configuration/index.html?rev=1848496&r1=1848495&r2=1848496&view=diff
==============================================================================
--- tomee/site/trunk/content/master/docs/admin/configuration/index.html (original)
+++ tomee/site/trunk/content/master/docs/admin/configuration/index.html Sun Dec 9 02:54:59 2018
@@ -101,8 +101,9 @@
<div class="row">
<div class="col-md-12">
- <div class="sect2">
-<h3 id="_container">Container</h3>
+ <div class="sect1">
+<h2 id="_container">Container</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>TomEE specific configuration (ie not inherited one from Tomcat) is based on properties. Therefore
you can fully configure TomEE using properties in <code>conf/system.properties</code>.
@@ -122,8 +123,10 @@ However for convenience it also provides
</ul>
</div>
</div>
-<div class="sect2">
-<h3 id="_application">Application</h3>
+</div>
+<div class="sect1">
+<h2 id="_application">Application</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>Some settings can be specific to applications, these ones are also properties based and
are read in <code>WEB-INF/application.properties</code>. When you can’t use <code>tomee.xml</code> to configure
@@ -134,6 +137,7 @@ but binds the resources to the applicati
<p>More about <a href="application.html">Container Configuration</a>.</p>
</div>
</div>
+</div>
</div>
</div>
Modified: tomee/site/trunk/content/master/docs/admin/configuration/resources.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/master/docs/admin/configuration/resources.html?rev=1848496&r1=1848495&r2=1848496&view=diff
==============================================================================
--- tomee/site/trunk/content/master/docs/admin/configuration/resources.html (original)
+++ tomee/site/trunk/content/master/docs/admin/configuration/resources.html Sun Dec 9 02:54:59 2018
@@ -114,8 +114,9 @@ See <a href="server.html">Server Configu
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="_definition_a_resource_how_does_it_work">Definition a resource: how does it work?</h3>
+<div class="sect1">
+<h2 id="_definition_a_resource_how_does_it_work">Definition a resource: how does it work?</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>Before all let see how properties syntax is equivalent to XML one (system.properties and tomee.xml typically).</p>
</div>
@@ -129,7 +130,7 @@ Finally the id is an attribute in XML an
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">myDataSource = new://Resource?type=DataSource
+<pre class="highlight"><code class="language-properties" data-lang="properties">myDataSource = new://Resource?type=DataSource
myDataSource.JdbcUrl = jdbc:hsqldb:mem:site
myDataSource.UserName = sa</code></pre>
</div>
@@ -152,8 +153,10 @@ private DataSource dataSource;</code></p
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="_factory_syntax">Factory syntax</h3>
+</div>
+<div class="sect1">
+<h2 id="_factory_syntax">Factory syntax</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>Here are the attributes of a resource:</p>
</div>
@@ -254,18 +257,20 @@ will ignore implicit properties.</p>
fallback all unset properties (no matching property found) to a <code>Properties</code> 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.</p>
</div>
-<div class="sect4">
-<h5 id="_value_ciphering">Value ciphering</h5>
+<div class="sect2">
+<h3 id="_value_ciphering">Value ciphering</h3>
<div class="paragraph">
<p>The propertie values support ciphering using the syntax <code>cipher:{algorithm}:{cipheredValue}</code>, for instance <code>cipher:Static3DES:xMH5uM1V9vQzVUv5LG7YLA==</code> will
be read as <code>Passw0rd</code>. Ciphers can be computed using <code>tomee.sh</code> script: <code>${tomee.home}/bin/tomee.sh cipher Passw0rd</code>.</p>
</div>
</div>
</div>
+</div>
+<div class="sect1">
+<h2 id="_common_resources">Common Resources</h2>
+<div class="sectionbody">
<div class="sect2">
-<h3 id="_common_resources">Common Resources</h3>
-<div class="sect3">
-<h4 id="_datasources">DataSources</h4>
+<h3 id="_datasources">DataSources</h3>
<div class="paragraph">
<p>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:</p>
@@ -309,8 +314,8 @@ entries we try to keep in sync for both:
</tr>
</tbody>
</table>
-<div class="sect4">
-<h5 id="_password_and_ciphering">Password and ciphering</h5>
+<div class="sect3">
+<h4 id="_password_and_ciphering">Password and ciphering</h4>
<div class="paragraph">
<p>DataSource were the first resource to support password ciphering. Originally it was another property which is still supported.
It is called <code>PasswordCipher</code>. Its value is the ciphering algorithm and it affects the password value. However <code>cipher:xxx</code>
@@ -321,15 +326,15 @@ is still supported on <code>Password</co
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">ds = new://Resource?type=javax.sql.DataSource
+<pre class="highlight"><code class="language-properties" data-lang="properties">ds = new://Resource?type=javax.sql.DataSource
# our password is "Passw0rd"
ds.Password = xMH5uM1V9vQzVUv5LG7YLA==
ds.PasswordCipher = Static3DES</code></pre>
</div>
</div>
</div>
-<div class="sect4">
-<h5 id="_advanced_datasource_configuration">Advanced DataSource configuration</h5>
+<div class="sect3">
+<h4 id="_advanced_datasource_configuration">Advanced DataSource configuration</h4>
<div class="paragraph">
<p>TomEE also provides few utilities you can add in DataSource properties:</p>
</div>
@@ -376,8 +381,8 @@ ds.PasswordCipher = Static3DES</code></p
</tbody>
</table>
</div>
-<div class="sect4">
-<h5 id="_datasource_and_jta">DataSource and JTA</h5>
+<div class="sect3">
+<h4 id="_datasource_and_jta">DataSource and JTA</h4>
<div class="paragraph">
<p><code>JtaManaged</code> determines wether or not this data source should be JTA managed
or user managed. If set to 'true' it will automatically be enrolled
@@ -386,8 +391,8 @@ on the datasource or connection will not
these functions yourself, set <code>JtaManaged</code> to <code>false</code></p>
</div>
</div>
-<div class="sect4">
-<h5 id="_datasource_and_jpa">DataSource and JPA</h5>
+<div class="sect3">
+<h4 id="_datasource_and_jpa">DataSource and JPA</h4>
<div class="paragraph">
<p>In terms of JPA persistence.xml:</p>
</div>
@@ -404,8 +409,10 @@ these functions yourself, set <code>JtaM
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="_activemqresourceadapter">ActiveMQResourceAdapter</h3>
+</div>
+<div class="sect1">
+<h2 id="_activemqresourceadapter">ActiveMQResourceAdapter</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>Declarable in tomee.xml via</p>
</div>
@@ -424,45 +431,47 @@ these functions yourself, set <code>JtaM
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">Foo = new://Resource?type=ActiveMQResourceAdapter
+<pre class="highlight"><code class="language-properties" data-lang="properties">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</code></pre>
</div>
</div>
+<div class="sect2">
+<h3 id="_configuration">Configuration</h3>
<div class="sect3">
-<h4 id="_configuration">Configuration</h4>
-<div class="sect4">
-<h5 id="_brokerxmlconfig">BrokerXmlConfig</h5>
+<h4 id="_brokerxmlconfig">BrokerXmlConfig</h4>
<div class="paragraph">
<p>Broker configuration URI as defined by ActiveMQ
see <a href="http://activemq.apache.org/broker-configuration-uri.html" class="bare">http://activemq.apache.org/broker-configuration-uri.html</a>
BrokerXmlConfig xbean:file:conf/activemq.xml - Requires xbean-spring.jar and dependencies</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_serverurl">ServerUrl</h5>
+<div class="sect3">
+<h4 id="_serverurl">ServerUrl</h4>
<div class="paragraph">
<p>Broker address</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_datasource">DataSource</h5>
+<div class="sect3">
+<h4 id="_datasource">DataSource</h4>
<div class="paragraph">
<p>DataSource for persistence messages</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_startuptimeout">StartupTimeout</h5>
+<div class="sect3">
+<h4 id="_startuptimeout">StartupTimeout</h4>
<div class="paragraph">
<p>How long to wait for broker startup</p>
</div>
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="_javax_jms_connectionfactory">javax.jms.ConnectionFactory</h3>
+</div>
+<div class="sect1">
+<h2 id="_javax_jms_connectionfactory">javax.jms.ConnectionFactory</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>An ActiveMQ (JMS) connection factory.</p>
</div>
@@ -486,7 +495,7 @@ BrokerXmlConfig xbean:file:conf/activemq
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">Foo = new://Resource?type=javax.jms.ConnectionFactory
+<pre class="highlight"><code class="language-properties" data-lang="properties">Foo = new://Resource?type=javax.jms.ConnectionFactory
Foo.ResourceAdapter = Default JMS Resource Adapter
Foo.TransactionSupport = xa
Foo.PoolMaxSize = 10
@@ -495,49 +504,51 @@ Foo.ConnectionMaxWaitTime = 5 seconds
Foo.ConnectionMaxIdleTime = 15 Minutes</code></pre>
</div>
</div>
+<div class="sect2">
+<h3 id="_configuration_2">Configuration</h3>
<div class="sect3">
-<h4 id="_configuration_2">Configuration</h4>
-<div class="sect4">
-<h5 id="_resourceadapter">ResourceAdapter</h5>
+<h4 id="_resourceadapter">ResourceAdapter</h4>
<div class="paragraph">
<p>An ActiveMQ (JMS) resource adapter.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_transactionsupport">TransactionSupport</h5>
+<div class="sect3">
+<h4 id="_transactionsupport">TransactionSupport</h4>
<div class="paragraph">
<p>Specifies if the connection is enrolled in global transaction
allowed values: <code>xa</code>, <code>local</code> or <code>none</code>. Default to <code>xa</code>.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_poolmaxsize">PoolMaxSize</h5>
+<div class="sect3">
+<h4 id="_poolmaxsize">PoolMaxSize</h4>
<div class="paragraph">
<p>Maximum number of physical connection to the ActiveMQ broker.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_poolminsize">PoolMinSize</h5>
+<div class="sect3">
+<h4 id="_poolminsize">PoolMinSize</h4>
<div class="paragraph">
<p>Minimum number of physical connection to the ActiveMQ broker.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_connectionmaxwaittime">ConnectionMaxWaitTime</h5>
+<div class="sect3">
+<h4 id="_connectionmaxwaittime">ConnectionMaxWaitTime</h4>
<div class="paragraph">
<p>Maximum amount of time to wait for a connection.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_connectionmaxidletime">ConnectionMaxIdleTime</h5>
+<div class="sect3">
+<h4 id="_connectionmaxidletime">ConnectionMaxIdleTime</h4>
<div class="paragraph">
<p>Maximum amount of time a connection can be idle before being reclaimed.</p>
</div>
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="_javax_jms_queue">javax.jms.Queue</h3>
+</div>
+<div class="sect1">
+<h2 id="_javax_jms_queue">javax.jms.Queue</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>An ActiveMQ (JMS) queue.</p>
</div>
@@ -557,23 +568,25 @@ allowed values: <code>xa</code>, <code>l
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">Foo = new://Resource?type=javax.jms.Queue
+<pre class="highlight"><code class="language-properties" data-lang="properties">Foo = new://Resource?type=javax.jms.Queue
# not set means id
Foo.destination =</code></pre>
</div>
</div>
+<div class="sect2">
+<h3 id="_configuration_3">Configuration</h3>
<div class="sect3">
-<h4 id="_configuration_3">Configuration</h4>
-<div class="sect4">
-<h5 id="_destination">destination</h5>
+<h4 id="_destination">destination</h4>
<div class="paragraph">
<p>Specifies the name of the queue</p>
</div>
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="_javax_jms_topic">javax.jms.Topic</h3>
+</div>
+<div class="sect1">
+<h2 id="_javax_jms_topic">javax.jms.Topic</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>An ActiveMQ (JMS) topic.</p>
</div>
@@ -593,23 +606,25 @@ Foo.destination =</code></pre>
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">Foo = new://Resource?type=javax.jms.Topic
+<pre class="highlight"><code class="language-properties" data-lang="properties">Foo = new://Resource?type=javax.jms.Topic
# not set means id
Foo.destination =</code></pre>
</div>
</div>
+<div class="sect2">
+<h3 id="_configuration_4">Configuration</h3>
<div class="sect3">
-<h4 id="_configuration_4">Configuration</h4>
-<div class="sect4">
-<h5 id="_destination_2">destination</h5>
+<h4 id="_destination_2">destination</h4>
<div class="paragraph">
<p>Specifies the name of the topic</p>
</div>
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="_org_omg_corba_orb">org.omg.CORBA.ORB</h3>
+</div>
+<div class="sect1">
+<h2 id="_org_omg_corba_orb">org.omg.CORBA.ORB</h2>
+<div class="sectionbody">
<div class="admonitionblock note">
<table>
<tr>
@@ -635,12 +650,14 @@ to use it you need to add an implementat
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">Foo = new://Resource?type=org.omg.CORBA.ORB</code></pre>
+<pre class="highlight"><code class="language-properties" data-lang="properties">Foo = new://Resource?type=org.omg.CORBA.ORB</code></pre>
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="_javax_mail_session">javax.mail.Session</h3>
+</div>
+<div class="sect1">
+<h2 id="_javax_mail_session">javax.mail.Session</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>A mail session.</p>
</div>
@@ -665,7 +682,7 @@ to use it you need to add an implementat
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">mail/mysession = new://Resource?type=javax.mail.Session
+<pre class="highlight"><code class="language-properties" data-lang="properties">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
@@ -682,8 +699,10 @@ same configuration and return the same i
and use <code>aliases</code> option of the resource to define an alias if you need to share the same instance accross multiple names.</p>
</div>
</div>
-<div class="sect2">
-<h3 id="_managedexecutorservice">ManagedExecutorService</h3>
+</div>
+<div class="sect1">
+<h2 id="_managedexecutorservice">ManagedExecutorService</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>A concurrency utility for EE executor service.</p>
</div>
@@ -707,7 +726,7 @@ and use <code>aliases</code> option of t
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">Foo = new://Resource?type=ManagedExecutorService
+<pre class="highlight"><code class="language-properties" data-lang="properties">Foo = new://Resource?type=ManagedExecutorService
Foo.Core = 5
Foo.Max = 25
Foo.KeepAlive = 5 s
@@ -716,48 +735,50 @@ Foo.ThreadFactory = org.apache.openejb.t
Foo.Lazy = true</code></pre>
</div>
</div>
+<div class="sect2">
+<h3 id="_configuration_5">Configuration</h3>
<div class="sect3">
-<h4 id="_configuration_5">Configuration</h4>
-<div class="sect4">
-<h5 id="_core">Core</h5>
+<h4 id="_core">Core</h4>
<div class="paragraph">
<p>The pool core size.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_max">Max</h5>
+<div class="sect3">
+<h4 id="_max">Max</h4>
<div class="paragraph">
<p>The pool max size.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_keepalive">KeepAlive</h5>
+<div class="sect3">
+<h4 id="_keepalive">KeepAlive</h4>
<div class="paragraph">
<p>The thread keep alive time (in duration format)</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_queue">Queue</h5>
+<div class="sect3">
+<h4 id="_queue">Queue</h4>
<div class="paragraph">
<p>The queue type size.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_threadfactory">ThreadFactory</h5>
+<div class="sect3">
+<h4 id="_threadfactory">ThreadFactory</h4>
<div class="paragraph">
<p>The thread factory implementation class.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_lazy">Lazy</h5>
+<div class="sect3">
+<h4 id="_lazy">Lazy</h4>
<div class="paragraph">
<p>If set to true the pool is created when first accessed otherwise it is created at startup.</p>
</div>
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="_managedscheduledexecutorservice">ManagedScheduledExecutorService</h3>
+</div>
+<div class="sect1">
+<h2 id="_managedscheduledexecutorservice">ManagedScheduledExecutorService</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>Inherit from <code>ManagedExecutorService</code> and adds scheduling abilities.</p>
</div>
@@ -778,21 +799,23 @@ Foo.Lazy = true</code></pre>
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">Foo = new://Resource?type=ManagedScheduledExecutorService
+<pre class="highlight"><code class="language-properties" data-lang="properties">Foo = new://Resource?type=ManagedScheduledExecutorService
Foo.Core = 5
Foo.ThreadFactory = org.apache.openejb.threads.impl.ManagedThreadFactoryImpl
Foo.Lazy = true</code></pre>
</div>
</div>
-<div class="sect3">
-<h4 id="_configuration_6">Configuration</h4>
+<div class="sect2">
+<h3 id="_configuration_6">Configuration</h3>
<div class="paragraph">
<p>See <code>ManagedExecutorService</code>.</p>
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="_managedthreadfactory">ManagedThreadFactory</h3>
+</div>
+<div class="sect1">
+<h2 id="_managedthreadfactory">ManagedThreadFactory</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>A thread factory for a <code>ManagedExecutorService</code>.</p>
</div>
@@ -812,23 +835,25 @@ Foo.Lazy = true</code></pre>
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">Foo = new://Resource?type=ManagedThreadFactory
+<pre class="highlight"><code class="language-properties" data-lang="properties">Foo = new://Resource?type=ManagedThreadFactory
Foo.Prefix = openejb-managed-thread-
Foo.Lazy = true</code></pre>
</div>
</div>
+<div class="sect2">
+<h3 id="_configuration_7">Configuration</h3>
<div class="sect3">
-<h4 id="_configuration_7">Configuration</h4>
-<div class="sect4">
-<h5 id="_prefix">Prefix</h5>
+<h4 id="_prefix">Prefix</h4>
<div class="paragraph">
<p>The thread prefix (suffixed with thread id).</p>
</div>
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="_contextservice">ContextService</h3>
+</div>
+<div class="sect1">
+<h2 id="_contextservice">ContextService</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>A concurrency utilities for JavaEE context service. It allows to create
contextual proxies (inheriting from security, classloader…​contexts).</p>
@@ -846,12 +871,14 @@ contextual proxies (inheriting from secu
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">Foo = new://Resource?type=ContextService</code></pre>
+<pre class="highlight"><code class="language-properties" data-lang="properties">Foo = new://Resource?type=ContextService</code></pre>
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="_jndiprovider_inject_remote_clients">JndiProvider: inject remote clients</h3>
+</div>
+<div class="sect1">
+<h2 id="_jndiprovider_inject_remote_clients">JndiProvider: inject remote clients</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>A thread factory for a <code>ManagedExecutorService</code>.
Default implementation is <code>org.apache.openejb.threads.impl.ManagedThreadFactoryImpl</code>.</p>
@@ -872,23 +899,25 @@ Default implementation is <code>org.apac
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">Foo = new://Resource?type=ManagedThreadFactory
+<pre class="highlight"><code class="language-properties" data-lang="properties">Foo = new://Resource?type=ManagedThreadFactory
Foo.Prefix = openejb-managed-thread-
Foo.Lazy = true</code></pre>
</div>
</div>
+<div class="sect2">
+<h3 id="_configuration_8">Configuration</h3>
<div class="sect3">
-<h4 id="_configuration_8">Configuration</h4>
-<div class="sect4">
-<h5 id="_prefix_2">Prefix</h5>
+<h4 id="_prefix_2">Prefix</h4>
<div class="paragraph">
<p>The thread prefix (suffixed with thread id).</p>
</div>
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="_contextservice_2">ContextService</h3>
+</div>
+<div class="sect1">
+<h2 id="_contextservice_2">ContextService</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>A concurrency utilities for JavaEE context service. It allows to create
contextual proxies (inheriting from security, classloader…​contexts).</p>
@@ -906,7 +935,8 @@ contextual proxies (inheriting from secu
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">Foo = new://Resource?type=ContextService</code></pre>
+<pre class="highlight"><code class="language-properties" data-lang="properties">Foo = new://Resource?type=ContextService</code></pre>
+</div>
</div>
</div>
</div>
Modified: tomee/site/trunk/content/master/docs/admin/configuration/server.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/master/docs/admin/configuration/server.html?rev=1848496&r1=1848495&r2=1848496&view=diff
==============================================================================
--- tomee/site/trunk/content/master/docs/admin/configuration/server.html (original)
+++ tomee/site/trunk/content/master/docs/admin/configuration/server.html Sun Dec 9 02:54:59 2018
@@ -101,8 +101,9 @@
<div class="row">
<div class="col-md-12">
- <div class="sect2">
-<h3 id="_server">Server</h3>
+ <div class="sect1">
+<h2 id="_server">Server</h2>
+<div class="sectionbody">
<table class="tableblock frame-all grid-all spread table table-bordered">
<colgroup>
<col style="width: 33.3333%;">
@@ -415,8 +416,10 @@
</tbody>
</table>
</div>
-<div class="sect2">
-<h3 id="_client">Client</h3>
+</div>
+<div class="sect1">
+<h2 id="_client">Client</h2>
+<div class="sectionbody">
<table class="tableblock frame-all grid-all spread table table-bordered">
<colgroup>
<col style="width: 33.3333%;">
@@ -469,6 +472,7 @@
</tbody>
</table>
</div>
+</div>
</div>
</div>
Modified: tomee/site/trunk/content/master/docs/advanced/client/jndi.html
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/master/docs/advanced/client/jndi.html?rev=1848496&r1=1848495&r2=1848496&view=diff
==============================================================================
--- tomee/site/trunk/content/master/docs/advanced/client/jndi.html (original)
+++ tomee/site/trunk/content/master/docs/advanced/client/jndi.html Sun Dec 9 02:54:59 2018
@@ -220,7 +220,7 @@ ctx.lookup("java:....");</code></pre>
</div>
<div class="listingblock">
<div class="content">
-<pre class="highlight"><code>p.put("openejb.authentication.realmName", "my-realm"); // optional
+<pre class="highlight"><code class="language-properties" data-lang="properties">p.put("openejb.authentication.realmName", "my-realm"); // optional
p.put(Context.SECURITY_PRINCIPAL, "alfred");
p.put(Context.SECURITY_CREDENTIALS, "bat");</code></pre>
</div>
@@ -238,45 +238,6 @@ Thanks to TomEE/Tomcat integration login
<div class="paragraph">
<p>This can be done passing the token you need to set as <code>Authorization</code> header in the <code>PROVIDER_URL</code>:</p>
</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlight"><code>// tomee/openejb principal/credentials
-p.put(Context.PROVIDER_URL, "http://localhost:8080/tomee/ejb?authorization=Basic%20dG9tZWU6b3BlbmVqYg==");</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The token passed as <code>authorization</code> query parameter is the header value URL encoded. It can
-be any token like a basic one, a custom one, an OAuth2 one (in this case you need to renew it programmatically
-and change your client instance when renewing) etc…​</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-basic being very common there is a shortcut with two alternate query parameter replacing <code>authorization</code> one: <code>basic.password</code> and <code>basic.username</code>.
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Finally if you don’t use <code>Authorization</code> header you can change the used header setting <code>authorizationHeader</code> query parameter.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<code>authorization</code>, <code>authorizationHeader</code>, <code>basic.username</code>, and <code>basic.password</code> are removed
-from the URL before opening the connection and therefore not logged in the remote server access log since version 7.0.3.
-</td>
-</tr>
-</table>
-</div>
</div>
</div>
</div>