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/08 21:26:52 UTC
[2/2] tomee git commit: Guess source format. (via script,
feel free to adjust) Used this class to do the update
https://github.com/apache/tomee-site-generator/blob/686e6e5b7316e6fa7fd7fda8e917117def5afa24/src/main/java/org/apache/tomee/website/GuessAscii
Guess source format. (via script, feel free to adjust)
Used this class to do the update https://github.com/apache/tomee-site-generator/blob/686e6e5b7316e6fa7fd7fda8e917117def5afa24/src/main/java/org/apache/tomee/website/GuessAsciidocCodeblockLanguage.java
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0356a476
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0356a476
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0356a476
Branch: refs/heads/master
Commit: 0356a4764fe745a64163a9c3eea881989ee201fa
Parents: 66e0d66
Author: David Blevins <da...@gmail.com>
Authored: Sat Dec 8 13:25:46 2018 -0800
Committer: David Blevins <da...@gmail.com>
Committed: Sat Dec 8 13:25:46 2018 -0800
----------------------------------------------------------------------
docs/Configuring-in-tomee.adoc | 2 +-
docs/activemqresourceadapter-config.adoc | 4 +--
docs/admin/cluster/index.adoc | 8 +++---
docs/admin/configuration/containers.adoc | 14 +++++-----
docs/admin/configuration/resources.adoc | 28 ++++++++++----------
docs/advanced/client/jndi.adoc | 19 +------------
docs/advanced/shading/index.adoc | 4 +--
docs/advanced/tomee-embedded/index.adoc | 4 +--
docs/annotations,-xml-and-defaults.adoc | 4 +--
docs/application-composer/getting-started.adoc | 6 ++---
docs/application-deployment-solutions.adoc | 4 +--
...application-discovery-via-the-classpath.adoc | 6 ++---
docs/application-resources.adoc | 14 +++++-----
docs/arquillian-available-adapters.adoc | 10 +++----
docs/bmpentitycontainer-config.adoc | 4 +--
docs/bouncy-castle.adoc | 2 +-
docs/built-in-type-converters.adoc | 4 +--
docs/changing-jms-implementations.adoc | 6 ++---
docs/cmpentitycontainer-config.adoc | 4 +--
docs/common-datasource-configurations.adoc | 14 +++++-----
docs/common-persistenceprovider-properties.adoc | 6 ++---
docs/configuration.adoc | 4 +--
docs/configuring-datasources.adoc | 20 +++++++-------
docs/configuring-javamail.adoc | 4 +--
docs/configuring-logging-in-tests.adoc | 2 +-
docs/configuring-persistenceunits-in-tests.adoc | 2 +-
docs/containers-and-resources.adoc | 2 +-
docs/custom-injection.adoc | 2 +-
docs/datasource-config.adoc | 12 ++++-----
docs/datasource-password-encryption.adoc | 8 +++---
docs/deploy-tool.adoc | 2 +-
docs/deployment-id.adoc | 4 +--
docs/deployments.adoc | 12 ++++-----
docs/details-on-openejb-jar.adoc | 8 +++---
docs/developer/json/index.adoc | 2 +-
docs/developer/testing/arquillian/index.adoc | 2 +-
docs/developer/tools/gradle-plugins.adoc | 2 +-
.../tools/maven/applicationcomposer.adoc | 4 +--
docs/developer/tools/maven/tomee.adoc | 6 ++---
docs/dynamic-datasource.adoc | 4 +--
docs/ejb-local-ref.adoc | 2 +-
docs/ejb-over-ssl.adoc | 6 ++---
docs/ejb-ref.adoc | 2 +-
docs/ejb-refs.adoc | 8 +++---
docs/ejb-request-logging.adoc | 2 +-
docs/ejbd-transport.adoc | 14 +++++-----
docs/embedded-and-remotable.adoc | 2 +-
docs/embedded-configuration.adoc | 4 +--
docs/failover-logging.adoc | 10 +++----
docs/faq.adoc | 2 +-
docs/generating-ejb-3-annotations.adoc | 2 +-
docs/getting-started.adoc | 2 +-
docs/hello-world.adoc | 26 +++++++++---------
docs/hibernate.adoc | 2 +-
docs/initialcontext-config.adoc | 4 +--
docs/installation-drop-in-war.adoc | 2 +-
docs/javaagent-with-maven-surefire.adoc | 6 ++---
docs/javaagent.adoc | 4 +--
docs/javamailsession-config.adoc | 4 +--
docs/jms-resources-and-mdb-container.adoc | 10 +++----
docs/jmsconnectionfactory-config.adoc | 4 +--
docs/jndi-names.adoc | 20 +++++++-------
docs/jpa-concepts.adoc | 4 +--
docs/lookup-of-other-ejbs-example.adoc | 2 +-
docs/managedcontainer-config.adoc | 4 +--
docs/manual-installation.adoc | 4 +--
docs/maven.adoc | 4 +--
docs/maven/index.adoc | 6 ++---
docs/messagedrivencontainer-config.adoc | 4 +--
docs/multicast-discovery.adoc | 2 +-
docs/multiple-business-interface-hazzards.adoc | 2 +-
docs/multipoint-discovery.adoc | 2 +-
docs/multipulse-discovery.adoc | 4 +--
docs/new-in-openejb-3.0.adoc | 4 +--
docs/openejb-binaries.adoc | 2 +-
docs/openejb.xml.adoc | 6 ++---
docs/openjpa.adoc | 8 +++---
docs/orb-config.adoc | 4 +--
docs/persistence-context.adoc | 2 +-
docs/persistence-unit-ref.adoc | 4 +--
docs/properties-tool.adoc | 2 +-
docs/provisioning.adoc | 10 +++----
docs/proxyfactory-config.adoc | 4 +--
docs/queue-config.adoc | 4 +--
docs/resource-injection.adoc | 4 +--
docs/resource-ref-for-datasource.adoc | 2 +-
docs/securing-a-web-service.adoc | 8 +++---
docs/securityservice-config.adoc | 4 +--
docs/singleton-beans.adoc | 2 +-
docs/singletoncontainer-config.adoc | 4 +--
docs/spring-and-openejb-3.0.adoc | 8 +++---
docs/spring-ejb-and-jpa.adoc | 2 +-
docs/startup.adoc | 12 ++++-----
docs/statefulcontainer-config.adoc | 4 +--
docs/statelesscontainer-config.adoc | 4 +--
docs/system-properties.adoc | 4 +--
docs/telnet-console.adoc | 12 ++++-----
docs/tip-concurrency.adoc | 2 +-
docs/tip-jersey-client.adoc | 4 +--
docs/tomee-and-eclipse.adoc | 4 +--
docs/tomee-and-hibernate.adoc | 6 ++---
docs/tomee-jaas.adoc | 8 +++---
docs/tomee-logging-in-eclipse.adoc | 2 +-
docs/tomee-maven-plugin.adoc | 6 ++---
docs/tomee-mp-getting-started.adoc | 12 ++++-----
docs/tomee-webapp.adoc | 2 +-
docs/topic-config.adoc | 4 +--
docs/transactionmanager-config.adoc | 4 +--
docs/unix-daemon.adoc | 18 ++++++-------
109 files changed, 310 insertions(+), 327 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/Configuring-in-tomee.adoc
----------------------------------------------------------------------
diff --git a/docs/Configuring-in-tomee.adoc b/docs/Configuring-in-tomee.adoc
index 4e3ebb2..502e2e6 100644
--- a/docs/Configuring-in-tomee.adoc
+++ b/docs/Configuring-in-tomee.adoc
@@ -33,7 +33,7 @@ For example,
is injected with the following resource:
-[source,java]
+[source,xml]
----
<Resource id="moviesDatabase" type="DataSource">
JdbcDriver org.hsqldb.jdbcDriver
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/activemqresourceadapter-config.adoc
----------------------------------------------------------------------
diff --git a/docs/activemqresourceadapter-config.adoc b/docs/activemqresourceadapter-config.adoc
index aeb9b02..5bb6384 100644
--- a/docs/activemqresourceadapter-config.adoc
+++ b/docs/activemqresourceadapter-config.adoc
@@ -10,7 +10,7 @@ A ActiveMQResourceAdapter can be declared via xml in the
using a declaration like the following. All properties in the element
body are optional.
-[source,java]
+[source,xml]
----
<Resource id="myActiveMQResourceAdapter" type="ActiveMQResourceAdapter">
brokerXmlConfig = broker:(tcp://localhost:61616)?useJmx=false
@@ -26,7 +26,7 @@ VirtualMachine `-D` properties. The properties can also be used when
embedding TomEE via the `javax.ejb.embeddable.EJBContainer` API or
`InitialContext`
-[source,java]
+[source,properties]
----
myActiveMQResourceAdapter = new://Resource?type=ActiveMQResourceAdapter
myActiveMQResourceAdapter.brokerXmlConfig = broker:(tcp://localhost:61616)?useJmx=false
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/admin/cluster/index.adoc
----------------------------------------------------------------------
diff --git a/docs/admin/cluster/index.adoc b/docs/admin/cluster/index.adoc
index 7cf31aa..378d29d 100644
--- a/docs/admin/cluster/index.adoc
+++ b/docs/admin/cluster/index.adoc
@@ -37,7 +37,7 @@ In this way the issues with UDP being unordered and unreliable melt away as stat
When you boot the server there should be a conf/multicast.properties file containing:
-[source,bash]
+[source,properties]
----
server = org.apache.openejb.server.discovery.MulticastDiscoveryAgent
bind = 239.255.2.3
@@ -111,7 +111,7 @@ MultiPulse is only useful in network scenarios where both client and server can
After you boot the server for the first time the default configuration will create the file conf/conf.d/multipulse.properties containing:
-[source,bash]
+[source,properties]
----
server = org.apache.openejb.server.discovery.MulticastPulseAgent
bind = 239.255.2.3
@@ -128,7 +128,7 @@ The group setting can be changed to further group/cluster servers that may use t
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]
+[source,properties]
----
server = org.apache.openejb.server.ejbd.EjbServer
bind = 0.0.0.0
@@ -185,7 +185,7 @@ The entire process is essentially the art of using a statically maintained list
In the server this list can be specified via the conf/multipoint.properties file like so:
-[source,bash]
+[source,properties]
----
server = org.apache.openejb.server.discovery.MultipointDiscoveryAgent
bind = 127.0.0.1
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/admin/configuration/containers.adoc
----------------------------------------------------------------------
diff --git a/docs/admin/configuration/containers.adoc b/docs/admin/configuration/containers.adoc
index 3d86272..d42fd9d 100644
--- a/docs/admin/configuration/containers.adoc
+++ b/docs/admin/configuration/containers.adoc
@@ -38,7 +38,7 @@ Declarable in tomee.xml via
Declarable in properties via
-[source,bash]
+[source,properties]
----
Foo = new://Container?type=STATELESS
Foo.AccessTimeout = 30 seconds
@@ -335,7 +335,7 @@ Declarable in tomee.xml via
Declarable in properties via
-[source,bash]
+[source,properties]
----
Foo = new://Container?type=STATEFUL
Foo.AccessTimeout = 30 seconds
@@ -431,7 +431,7 @@ Declarable in tomee.xml via
Declarable in properties via
-[source,bash]
+[source,properties]
----
Foo = new://Container?type=SINGLETON
Foo.AccessTimeout = 30 seconds
@@ -475,7 +475,7 @@ Declarable in tomee.xml via
Declarable in properties via
-[source,bash]
+[source,properties]
----
Foo = new://Container?type=MESSAGE
Foo.ResourceAdapter = Default JMS Resource Adapter
@@ -522,7 +522,7 @@ Declarable in tomee.xml via
Declarable in properties via
-[source,bash]
+[source,properties]
----
Foo = new://Container?type=MANAGED
----
@@ -543,7 +543,7 @@ Declarable in tomee.xml via
Declarable in properties via
-[source,bash]
+[source,properties]
----
Foo = new://Container?type=CMP_ENTITY
Foo.CmpEngineFactory = org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
@@ -571,7 +571,7 @@ Declarable in tomee.xml via
Declarable in properties via
-[source,bash]
+[source,properties]
----
Foo = new://Container?type=BMP_ENTITY
Foo.PoolSize = 10
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/admin/configuration/resources.adoc
----------------------------------------------------------------------
diff --git a/docs/admin/configuration/resources.adoc b/docs/admin/configuration/resources.adoc
index 30398f5..3079974 100644
--- a/docs/admin/configuration/resources.adoc
+++ b/docs/admin/configuration/resources.adoc
@@ -22,7 +22,7 @@ Finally the id is an attribute in XML and the key of the resource definition in
Let see it with a sample, both delcarations are the same:
-[source,bash]
+[source,properties]
----
myDataSource = new://Resource?type=DataSource
myDataSource.JdbcUrl = jdbc:hsqldb:mem:site
@@ -117,7 +117,7 @@ is still supported on `Password` value. Default `PasswordCipher` being `PlainTex
Sample:
-[source,bash]
+[source,properties]
----
ds = new://Resource?type=javax.sql.DataSource
# our password is "Passw0rd"
@@ -172,7 +172,7 @@ Declarable in tomee.xml via
Declarable in properties via
-[source,bash]
+[source,properties]
----
Foo = new://Resource?type=ActiveMQResourceAdapter
Foo.BrokerXmlConfig = broker:(tcp://localhost:61616)?useJmx=false
@@ -222,7 +222,7 @@ Declarable in tomee.xml via
Declarable in properties via
-[source,bash]
+[source,properties]
----
Foo = new://Resource?type=javax.jms.ConnectionFactory
Foo.ResourceAdapter = Default JMS Resource Adapter
@@ -277,7 +277,7 @@ Declarable in tomee.xml via
Declarable in properties via
-[source,bash]
+[source,properties]
----
Foo = new://Resource?type=javax.jms.Queue
# not set means id
@@ -307,7 +307,7 @@ Declarable in tomee.xml via
Declarable in properties via
-[source,bash]
+[source,properties]
----
Foo = new://Resource?type=javax.jms.Topic
# not set means id
@@ -334,7 +334,7 @@ Declarable in tomee.xml via
Declarable in properties via
-[source,bash]
+[source,properties]
----
Foo = new://Resource?type=org.omg.CORBA.ORB
----
@@ -361,7 +361,7 @@ Declarable in tomee.xml via
Declarable in properties via
-[source,bash]
+[source,properties]
----
mail/mysession = new://Resource?type=javax.mail.Session
mail/mysession.mail.transport.protocol = smtp
@@ -399,7 +399,7 @@ Declarable in tomee.xml via
Declarable in properties via
-[source,bash]
+[source,properties]
----
Foo = new://Resource?type=ManagedExecutorService
Foo.Core = 5
@@ -454,7 +454,7 @@ Declarable in tomee.xml via
Declarable in properties via
-[source,bash]
+[source,properties]
----
Foo = new://Resource?type=ManagedScheduledExecutorService
Foo.Core = 5
@@ -483,7 +483,7 @@ Declarable in tomee.xml via
Declarable in properties via
-[source,bash]
+[source,properties]
----
Foo = new://Resource?type=ManagedThreadFactory
Foo.Prefix = openejb-managed-thread-
@@ -512,7 +512,7 @@ Declarable in tomee.xml via
Declarable in properties via
-[source,bash]
+[source,properties]
----
Foo = new://Resource?type=ContextService
----
@@ -535,7 +535,7 @@ Declarable in tomee.xml via
Declarable in properties via
-[source,bash]
+[source,properties]
----
Foo = new://Resource?type=ManagedThreadFactory
Foo.Prefix = openejb-managed-thread-
@@ -564,7 +564,7 @@ Declarable in tomee.xml via
Declarable in properties via
-[source,bash]
+[source,properties]
----
Foo = new://Resource?type=ContextService
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/advanced/client/jndi.adoc
----------------------------------------------------------------------
diff --git a/docs/advanced/client/jndi.adoc b/docs/advanced/client/jndi.adoc
index 09ea035..0d0e863 100644
--- a/docs/advanced/client/jndi.adoc
+++ b/docs/advanced/client/jndi.adoc
@@ -78,7 +78,7 @@ See link:../../admin/cluster/index.html[Cluster] page for more details on the op
The context configuration can take additional configuration to handle EJB security:
-[source]
+[source,properties]
----
p.put("openejb.authentication.realmName", "my-realm"); // optional
p.put(Context.SECURITY_PRINCIPAL, "alfred");
@@ -94,20 +94,3 @@ Often HTTP layer is secured and in this case you need to authenticate before the
Thanks to TomEE/Tomcat integration login there will propagate to the EJBd context.
This can be done passing the token you need to set as `Authorization` header in the `PROVIDER_URL`:
-
-[source]
-----
-// tomee/openejb principal/credentials
-p.put(Context.PROVIDER_URL, "http://localhost:8080/tomee/ejb?authorization=Basic%20dG9tZWU6b3BlbmVqYg==");
-----
-
-The token passed as `authorization` 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...
-
-TIP: basic being very common there is a shortcut with two alternate query parameter replacing `authorization` one: `basic.password` and `basic.username`.
-
-Finally if you don't use `Authorization` header you can change the used header setting `authorizationHeader` query parameter.
-
-NOTE: `authorization`, `authorizationHeader`, `basic.username`, and `basic.password` are removed
-from the URL before opening the connection and therefore not logged in the remote server access log since version 7.0.3.
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/advanced/shading/index.adoc
----------------------------------------------------------------------
diff --git a/docs/advanced/shading/index.adoc b/docs/advanced/shading/index.adoc
index fc4b18a..0e1f0f2 100644
--- a/docs/advanced/shading/index.adoc
+++ b/docs/advanced/shading/index.adoc
@@ -194,14 +194,14 @@ shadowJar {
Then run:
-[source]
+[source,properties]
----
gradle clean build shadowJar
----
and you'll get `build/libs/demo-gradle-tomee-embedded-shade-1.0-SNAPSHOT-bundle.jar` ready to run with:
-[source]
+[source,bash]
----
java -jar build/libs/demo-gradle-tomee-embedded-shade-1.0-SNAPSHOT-bundle.jar --as-war --simple-log=true
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/advanced/tomee-embedded/index.adoc
----------------------------------------------------------------------
diff --git a/docs/advanced/tomee-embedded/index.adoc b/docs/advanced/tomee-embedded/index.adoc
index 8664ade..874e691 100644
--- a/docs/advanced/tomee-embedded/index.adoc
+++ b/docs/advanced/tomee-embedded/index.adoc
@@ -156,7 +156,7 @@ Here are the recognized entries (they match the configuration, see org.apache.to
Here is a sample to add BASIC security on `/api/*`:
-[source]
+[source,properties]
----
# security configuration
securityConstraint =
@@ -176,7 +176,7 @@ properties.java.security.auth.login.config = configuration/login.jaas
And here a configuration to exclude jackson packages from scanning and use log4j2 as main logger (needs it as dependency):
-[source]
+[source,properties]
----
properties.openejb.log.factory = log4j2
properties.openejb.container.additional.include = com.fasterxml.jackson,org.apache.logging.log4j
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/annotations,-xml-and-defaults.adoc
----------------------------------------------------------------------
diff --git a/docs/annotations,-xml-and-defaults.adoc b/docs/annotations,-xml-and-defaults.adoc
index b0b2204..cb5801a 100644
--- a/docs/annotations,-xml-and-defaults.adoc
+++ b/docs/annotations,-xml-and-defaults.adoc
@@ -5,7 +5,7 @@
:jbake-status: published
-[source,java]
+[source,xml]
----
<p>The following is a list of all annotations and their attributes, the xml tags that correspond to them (for overriding), and what the default values are when left unspecified.</p>
----
@@ -16,7 +16,7 @@ xml element(s)
default value
-[source,java]
+[source,xml]
----
</div>
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/application-composer/getting-started.adoc
----------------------------------------------------------------------
diff --git a/docs/application-composer/getting-started.adoc b/docs/application-composer/getting-started.adoc
index 5f336e0..93c1cdb 100644
--- a/docs/application-composer/getting-started.adoc
+++ b/docs/application-composer/getting-started.adoc
@@ -10,7 +10,7 @@ To start using ApplicationComposer you need to add some dependencies.
The minimum required one is `openejb-core`:
-[source,java]
+[source,xml]
----
<dependency>
<groupId>org.apache.openejb</groupId>
@@ -22,7 +22,7 @@ The minimum required one is `openejb-core`:
If you need JAXRS services you'll add (or replace thanks to transitivity
of maven) `openejb-cxf-rs`:
-[source,java]
+[source,xml]
----
<dependency>
<groupId>org.apache.openejb</groupId>
@@ -34,7 +34,7 @@ of maven) `openejb-cxf-rs`:
If you need JAXWS services you'll add (or replace thanks to transitivity
of maven) `openejb-cxf`:
-[source,java]
+[source,xml]
----
<dependency>
<groupId>org.apache.openejb</groupId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/application-deployment-solutions.adoc
----------------------------------------------------------------------
diff --git a/docs/application-deployment-solutions.adoc b/docs/application-deployment-solutions.adoc
index ef36bd5..6cbc26a 100644
--- a/docs/application-deployment-solutions.adoc
+++ b/docs/application-deployment-solutions.adoc
@@ -51,14 +51,14 @@ pom you have access to the following configuration:
Then simply run
-[source,java]
+[source,bash]
----
mvn tomee:deploy <path>
----
or
-[source,java]
+[source,bash]
----
mvn tomee:undeploy <path>
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/application-discovery-via-the-classpath.adoc
----------------------------------------------------------------------
diff --git a/docs/application-discovery-via-the-classpath.adoc b/docs/application-discovery-via-the-classpath.adoc
index 9934d5b..3a6129c 100644
--- a/docs/application-discovery-via-the-classpath.adoc
+++ b/docs/application-discovery-via-the-classpath.adoc
@@ -13,7 +13,7 @@ like deployed while in an embedded mode.
Simplify the issue of searching for annotated applications by adding an
ejb-jar.xml like this to your app:
-[source,java]
+[source,xml]
----
<ejb-jar/>
----
@@ -68,7 +68,7 @@ _openejb.exclude-include.order_ properties if you wish to work in the
opposite direction or change the processing order. The default values
for the properties are as follows:
-[source,java]
+[source,properties]
----
openejb.exclude-include.order=include-exclude //Defines the processing order
openejb.deployments.classpath.include="" //Include nothing
@@ -100,7 +100,7 @@ for your ejb module is in the classpath, a little debug code like this
in your test setup will help you see what OpenEJB sees (which may be
nothing):
-[source,java]
+[source,properties]
----
Enumeration<URL> ejbJars =
this.getClass().getClassLoader().getResources("META-INF/ejb-jar.xml");
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/application-resources.adoc
----------------------------------------------------------------------
diff --git a/docs/application-resources.adoc b/docs/application-resources.adoc
index 37f5366..e80134e 100644
--- a/docs/application-resources.adoc
+++ b/docs/application-resources.adoc
@@ -18,7 +18,7 @@ available server-wide, whereas defining the resource within a
As a simple example, a JMS queue can be defined within `tomee.xml` with
the following configuration.
-[source,java]
+[source,xml]
----
<tomee>
<Resource id="MyQueue" type="javax.jms.Queue"/>
@@ -48,7 +48,7 @@ public class JmsClient {
As an alternative to defining a resource in XML, resources can also be
defined using system properties:
-[source,java]
+[source,properties]
----
MyQueue = new://Resource?type=javax.jms.Queue
----
@@ -69,7 +69,7 @@ and password to be able to connect to a database. That would be
configured with the following syntax. Notice the key/value pair syntax
for the properties within the `<Resource>` tag.
-[source,java]
+[source,xml]
----
<Resource id="DB" type="DataSource">
JdbcDriver com.mysql.jdbc.Driver
@@ -151,7 +151,7 @@ public class Configuration {
Can be defined in `tomee.xml` using the following configuration (note
the `class-name` attribute):
-[source,java]
+[source,xml]
----
<Resource id="config" class-name="org.superbiz.Configuration">
url http://localhost
@@ -193,7 +193,7 @@ public class Configuration {
Using the same resource definition:
-[source,java]
+[source,xml]
----
<Resource id="config" class-name="org.superbiz.Configuration">
url http://localhost
@@ -217,7 +217,7 @@ The format of `resources.xml` uses the same `<Resource>` tag as
`tomee.xml`. One key difference is the root element of the XML is
`<resources>` and not `<tomee>`.
-[source,java]
+[source,xml]
----
<resources>
<Resource id="config" class-name="org.superbiz.Configuration">
@@ -281,7 +281,7 @@ specified on the `Resource`, TomEE will instantiate the resource using
its no-arg constructor. If you wish to pass constructor arguments,
specify the arguments as a comma separated list:
-[source,java]
+[source,xml]
----
<Resource id="config" class-name="org.superbiz.Configuration" constructor="id, poolSize">
url http://localhost
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/arquillian-available-adapters.adoc
----------------------------------------------------------------------
diff --git a/docs/arquillian-available-adapters.adoc b/docs/arquillian-available-adapters.adoc
index 23ddf58..5a4c027 100644
--- a/docs/arquillian-available-adapters.adoc
+++ b/docs/arquillian-available-adapters.adoc
@@ -11,7 +11,7 @@ if you are not at all familiar with Arquillian.
All the Arquillian Adapters for TomEE support the following
configuration options in the *src/test/resources/arquillian.xml*:
-[source,java]
+[source,xml]
----
<container qualifier="tomee" default="true">
<configuration>
@@ -33,7 +33,7 @@ configuration options in the *src/test/resources/arquillian.xml*:
The above can also be set as system properties rather than via the
*src/test/resources/arquillian.xml* file.
-[source,java]
+[source,xml]
----
<build>
<plugins>
@@ -93,7 +93,7 @@ Adapter.
To use the TomEE Embedded Arquillian Adapter, simply add these Maven
dependencies to your Maven pom.xml:
-[source,java]
+[source,xml]
----
<dependency>
<groupId>org.apache.openejb</groupId>
@@ -157,7 +157,7 @@ The following shows a typical configuration for testing against TomEE
`<tomee.classifier>webprofile</tomee.classifier>` to
`<tomee.classifier>plus</tomee.classifier>`
-[source,java]
+[source,xml]
----
<properties>
<tomee.version>1.7.1</tomee.version>
@@ -225,7 +225,7 @@ Setting up both adapters is quite easy via Maven profiles. Here the
default adapter is the Embedded Adapter, the Remote Adapter will run
with `-Ptomee-webprofile-remote` specified as a `mvn` command argument.
-[source,java]
+[source,xml]
----
<profiles>
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/bmpentitycontainer-config.adoc
----------------------------------------------------------------------
diff --git a/docs/bmpentitycontainer-config.adoc b/docs/bmpentitycontainer-config.adoc
index 918e14d..0db9354 100644
--- a/docs/bmpentitycontainer-config.adoc
+++ b/docs/bmpentitycontainer-config.adoc
@@ -10,7 +10,7 @@ A BmpEntityContainer can be declared via xml in the
using a declaration like the following. All properties in the element
body are optional.
-[source,java]
+[source,xml]
----
<Container id="myBmpEntityContainer" type="BMP_ENTITY">
poolSize = 10
@@ -23,7 +23,7 @@ VirtualMachine `-D` properties. The properties can also be used when
embedding TomEE via the `javax.ejb.embeddable.EJBContainer` API or
`InitialContext`
-[source,java]
+[source,properties]
----
myBmpEntityContainer = new://Container?type=BMP_ENTITY
myBmpEntityContainer.poolSize = 10
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/bouncy-castle.adoc
----------------------------------------------------------------------
diff --git a/docs/bouncy-castle.adoc b/docs/bouncy-castle.adoc
index 631832e..0e8d66f 100644
--- a/docs/bouncy-castle.adoc
+++ b/docs/bouncy-castle.adoc
@@ -28,7 +28,7 @@ directory
The entry to `java.security` will look something like the following:
-[source,java]
+[source,properties]
----
security.provider.N=org.bouncycastle.jce.provider.BouncyCastleProvider
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/built-in-type-converters.adoc
----------------------------------------------------------------------
diff --git a/docs/built-in-type-converters.adoc b/docs/built-in-type-converters.adoc
index 0a2228d..2676479 100644
--- a/docs/built-in-type-converters.adoc
+++ b/docs/built-in-type-converters.adoc
@@ -76,7 +76,7 @@ public class MyBean {
Works with an ejb-jar.xml as follows:
-[source,java]
+[source,xml]
----
<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" version="3.0"
metadata-complete="false">
@@ -95,7 +95,7 @@ metadata-complete="false">
Or with an env-entries.properties file as follows:
-[source,java]
+[source,properties]
----
org.superbiz.foo.MyBean/myDate = 2008-04-19
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/changing-jms-implementations.adoc
----------------------------------------------------------------------
diff --git a/docs/changing-jms-implementations.adoc b/docs/changing-jms-implementations.adoc
index 220612a..68bb260 100644
--- a/docs/changing-jms-implementations.adoc
+++ b/docs/changing-jms-implementations.adoc
@@ -48,7 +48,7 @@ These values can be overridden in the `tomee.xml` or `openejb.xml`
Let's say that the following file lives in the jar at
`META-INF/org.superbiz/service-jar.xml`
-[source,java]
+[source,xml]
----
<?xml version="1.0" encoding="UTF-8"?>
<ServiceJar>
@@ -128,7 +128,7 @@ Once this file is packed in a jar and added to the `<tomee.home>/lib` or
"instances" of these things in your `tomee.xml` or `openejb.xml` config
file as follows:
-[source,java]
+[source,xml]
----
<Resource id="My Generic Adapter" type="GenericJMSRA" provider="org.superbiz:genericra">
AdapterProperty1 PropertyValue1
@@ -139,7 +139,7 @@ AdapterProperty2 PropertyValue2
Or in properties like so:
-[source,java]
+[source,properties]
----
myGenericAdapter = new://Resource?type=GenericJMSRA&provider=org.superbiz:genericra
myGenericAdapter.AdapterProperty1 = PropertyValue1
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/cmpentitycontainer-config.adoc
----------------------------------------------------------------------
diff --git a/docs/cmpentitycontainer-config.adoc b/docs/cmpentitycontainer-config.adoc
index cfdeddd..29f3f7d 100644
--- a/docs/cmpentitycontainer-config.adoc
+++ b/docs/cmpentitycontainer-config.adoc
@@ -10,7 +10,7 @@ A CmpEntityContainer can be declared via xml in the
using a declaration like the following. All properties in the element
body are optional.
-[source,java]
+[source,xml]
----
<Container id="myCmpEntityContainer" type="CMP_ENTITY">
cmpEngineFactory = org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
@@ -23,7 +23,7 @@ VirtualMachine `-D` properties. The properties can also be used when
embedding TomEE via the `javax.ejb.embeddable.EJBContainer` API or
`InitialContext`
-[source,java]
+[source,properties]
----
myCmpEntityContainer = new://Container?type=CMP_ENTITY
myCmpEntityContainer.cmpEngineFactory = org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/common-datasource-configurations.adoc
----------------------------------------------------------------------
diff --git a/docs/common-datasource-configurations.adoc b/docs/common-datasource-configurations.adoc
index f453e92..6d7bf5e 100644
--- a/docs/common-datasource-configurations.adoc
+++ b/docs/common-datasource-configurations.adoc
@@ -13,7 +13,7 @@ details on all configuration options for DataSources.
The drivers are included with OpenEJB 3.0 and HSQLDB is the default
database.
-[source,java]
+[source,xml]
----
<Resource id="HSQLDB Database" type="DataSource">
JdbcDriver org.hsqldb.jdbcDriver
@@ -25,7 +25,7 @@ database.
== Derby (Embedded)
-[source,java]
+[source,xml]
----
<Resource id="Derby Database" type="DataSource">
#Embedded Derby example
@@ -39,7 +39,7 @@ database.
== MySQL
-[source,java]
+[source,xml]
----
<Resource id="MySQL Database" type="DataSource">
# MySQL example
@@ -55,7 +55,7 @@ database.
== Oracle
-[source,java]
+[source,xml]
----
<Resource id="Oracle Database" type="DataSource">
# Oracle example
@@ -71,7 +71,7 @@ database.
== OracleXA
-[source,java]
+[source,xml]
----
<Resource id="OracleXA Database" type="DataSource">
# OracleXA example
@@ -87,7 +87,7 @@ database.
== PosgreSQL
-[source,java]
+[source,xml]
----
<Resource id="PostgreSQL Database" type="DataSource">
# PostgreSQL example
@@ -103,7 +103,7 @@ database.
== InstantDB
-[source,java]
+[source,xml]
----
<Resource id="InstantDB Database" type="DataSource">
# InstantDB example
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/common-persistenceprovider-properties.adoc
----------------------------------------------------------------------
diff --git a/docs/common-persistenceprovider-properties.adoc b/docs/common-persistenceprovider-properties.adoc
index cd4936c..45cdae6 100644
--- a/docs/common-persistenceprovider-properties.adoc
+++ b/docs/common-persistenceprovider-properties.adoc
@@ -10,7 +10,7 @@ various persistence providers out there.
# TopLink
-[source,java]
+[source,xml]
----
<properties>
@@ -24,7 +24,7 @@ various persistence providers out there.
# OpenJPA
-[source,java]
+[source,xml]
----
<properties>
<!--http://openjpa.apache.org/faq.html-->
@@ -41,7 +41,7 @@ various persistence providers out there.
# Hibernate
-[source,java]
+[source,xml]
----
<properties>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/configuration.adoc
----------------------------------------------------------------------
diff --git a/docs/configuration.adoc b/docs/configuration.adoc
index 371fa14..12eaff5 100644
--- a/docs/configuration.adoc
+++ b/docs/configuration.adoc
@@ -32,7 +32,7 @@ OpenEJB saves deployment descriptors - ejb-jar.xml and openejb-jar.xml
Show a config file with the elements hyperlinked.
-[source,java]
+[source,xml]
----
<?xml version="1.0"?>
<openejb>
@@ -99,7 +99,7 @@ openejb.home are added to the classpath.
A summary of the above in a different notation:
-[source,java]
+[source,properties]
----
openejb.home = user.dir (can be set explicitly)
openejb.base = openejb.home (can be set explicitly)
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/configuring-datasources.adoc
----------------------------------------------------------------------
diff --git a/docs/configuring-datasources.adoc b/docs/configuring-datasources.adoc
index 8d1ec8a..b911a46 100644
--- a/docs/configuring-datasources.adoc
+++ b/docs/configuring-datasources.adoc
@@ -21,7 +21,7 @@ For example, this annotation in your bean:
Would map to a Resource declared in your openejb.xml as follows:
-[source,java]
+[source,xml]
----
<Resource id="myDerbyDatasource" type="javax.sql.DataSource">
. . . .
@@ -31,7 +31,7 @@ Would map to a Resource declared in your openejb.xml as follows:
Note that in the xml element, the _type_ value of _javax.sql.DataSource_
can abbreviated to just _DataSource_ as follows:
-[source,java]
+[source,xml]
----
<Resource id="myDerbyDatasource" type="DataSource">
. . . .
@@ -41,7 +41,7 @@ can abbreviated to just _DataSource_ as follows:
It is also possible to specify the path to the driver jar file using a
classpath attribute like so:
-[source,java]
+[source,xml]
----
<Resource id="myDerbyDatasource" type="DataSource" classpath="/path/to/driver.jar">
. . . .
@@ -50,7 +50,7 @@ classpath attribute like so:
...Or in a http://maven.apache.org/[Maven] environment like so:
-[source,java]
+[source,xml]
----
<Resource id="myDerbyDatasource" type="DataSource" classpath="mvn:org.apache.derby:derby:10.10.1.1">
. . . .
@@ -80,7 +80,7 @@ link:dynamic-datasource.html[Dynamic Datasource] for more details.
=== Example 1
-[source,java]
+[source,xml]
----
<Resource id="Default JDBC Database" type="DataSource">
. . . . .
@@ -92,7 +92,7 @@ Database_
=== Example 2
-[source,java]
+[source,xml]
----
<Resource id="Derby Database" type="DataSource">
. . . . .
@@ -121,7 +121,7 @@ example of Derby.
With a Resource declaration in your openejb.xml like this:
-[source,java]
+[source,xml]
----
<Resource id="myDerbyDatabase" type="DataSource">
. . . . .
@@ -174,7 +174,7 @@ public class FooBean {
_OR_
-[source,java]
+[source,xml]
----
<resource-ref>
<res-ref-name>myDerbyDatabase</res-ref-name>
@@ -184,7 +184,7 @@ _OR_
_OR_
-[source,java]
+[source,xml]
----
<resource-ref>
<res-ref-name>jdbc/myDerbyDatabase</res-ref-name>
@@ -194,7 +194,7 @@ _OR_
_OR_
-[source,java]
+[source,xml]
----
<resource-ref>
<res-ref-name>someOtherName</res-ref-name>
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/configuring-javamail.adoc
----------------------------------------------------------------------
diff --git a/docs/configuring-javamail.adoc b/docs/configuring-javamail.adoc
index 21457f3..4fc8513 100644
--- a/docs/configuring-javamail.adoc
+++ b/docs/configuring-javamail.adoc
@@ -12,7 +12,7 @@ javax.mail.Session.getDefaultInstance(Properties props).
Here might be some example properties.
-[source,java]
+[source,xml]
----
<Resource id="SuperbizMail" type="javax.mail.Session">
mail.smtp.host=mail.superbiz.org
@@ -38,7 +38,7 @@ values before attempting to use them.
If you wanted to do a System property or InitialContext property
override of the above example mail session, you could do so like this:
-[source,java]
+[source,bash]
----
java ... -DSuperbizMail.mail.smtp.host=localhost
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/configuring-logging-in-tests.adoc
----------------------------------------------------------------------
diff --git a/docs/configuring-logging-in-tests.adoc b/docs/configuring-logging-in-tests.adoc
index cf8d660..017b649 100644
--- a/docs/configuring-logging-in-tests.adoc
+++ b/docs/configuring-logging-in-tests.adoc
@@ -92,7 +92,7 @@ source of logging information.
For your purposes, here are the contents of the default
embedded.logging.properties file contained in OpenEJB 3.1.1
-[source,java]
+[source,properties]
----
log4j.rootLogger = fatal,C
log4j.category.OpenEJB = warn
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/configuring-persistenceunits-in-tests.adoc
----------------------------------------------------------------------
diff --git a/docs/configuring-persistenceunits-in-tests.adoc b/docs/configuring-persistenceunits-in-tests.adoc
index 7291b3a..1878e4c 100644
--- a/docs/configuring-persistenceunits-in-tests.adoc
+++ b/docs/configuring-persistenceunits-in-tests.adoc
@@ -33,7 +33,7 @@ properties or the initial context properties. The format is:
So for example with the following persistence.xml:
-[source,java]
+[source,xml]
----
<persistence>
<persistence-unit name="movie-unit">
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/containers-and-resources.adoc
----------------------------------------------------------------------
diff --git a/docs/containers-and-resources.adoc b/docs/containers-and-resources.adoc
index 2384c6a..e15912e 100644
--- a/docs/containers-and-resources.adoc
+++ b/docs/containers-and-resources.adoc
@@ -5,7 +5,7 @@
:jbake-status: published
-[source,java]
+[source,xml]
----
<p><a name="ContainersandResources-containers"></a></p>
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/custom-injection.adoc
----------------------------------------------------------------------
diff --git a/docs/custom-injection.adoc b/docs/custom-injection.adoc
index 6cf8439..d2f2099 100644
--- a/docs/custom-injection.adoc
+++ b/docs/custom-injection.adoc
@@ -84,7 +84,7 @@ public class Stratocaster {
== The META-INF/env-entries.properties file
-[source,java]
+[source,properties]
----
guitarStringGuages=E1=0.052\nA=0.042\nD=0.030\nG=0.017\nB=0.013\nE=0.010
certificateOfAuthenticity=/tmp/strat-certificate.txt
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/datasource-config.adoc
----------------------------------------------------------------------
diff --git a/docs/datasource-config.adoc b/docs/datasource-config.adoc
index 672a169..d04a82d 100644
--- a/docs/datasource-config.adoc
+++ b/docs/datasource-config.adoc
@@ -10,7 +10,7 @@ A DataSource can be declared via xml in the
using a declaration like the following. All properties in the element
body are optional.
-[source,java]
+[source,xml]
----
<Resource id="myDataSource" type="javax.sql.DataSource">
accessToUnderlyingConnectionAllowed = false
@@ -49,7 +49,7 @@ Alternatively, a DataSource can be declared via properties in the
`-D` properties. The properties can also be used when embedding TomEE
via the `javax.ejb.embeddable.EJBContainer` API or `InitialContext`
-[source,java]
+[source,properties]
----
myDataSource = new://Resource?type=javax.sql.DataSource
myDataSource.accessToUnderlyingConnectionAllowed = false
@@ -473,7 +473,7 @@ XaDataSource can be defined as a standard resource using `class-name`.
First solution is to define as `JdbcDriver` an XADataSource:
-[source,java]
+[source,xml]
----
<Resource id="myXaDs" type="DataSource">
JdbcDriver = org.foo.MyXaDataSource
@@ -499,7 +499,7 @@ factory mecanism.
An alternative is to define a resource for the XaDataSource:
-[source,java]
+[source,xml]
----
<Resource id="myXa" class-name="org.foo.MyXaDataSource">
myXaProperty = value
@@ -508,7 +508,7 @@ An alternative is to define a resource for the XaDataSource:
And then wrap it in the pool:
-[source,java]
+[source,xml]
----
<Resource id="myXaDs" type="DataSource">
DataSourceCreator = [dbcp|dbcp-alternative]
@@ -523,7 +523,7 @@ because it is reusing direct dbcp JTA management.
For TomEE 1.7.0/1.7.1 you can need to add the property:
-[source,java]
+[source,properties]
----
openejb.datasource.pool = true
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/datasource-password-encryption.adoc
----------------------------------------------------------------------
diff --git a/docs/datasource-password-encryption.adoc b/docs/datasource-password-encryption.adoc
index 5980741..6219f0d 100644
--- a/docs/datasource-password-encryption.adoc
+++ b/docs/datasource-password-encryption.adoc
@@ -20,7 +20,7 @@ not activated so plain passwords are used.
Default Plain text password example:
-[source,java]
+[source,xml]
----
<Resource id="MySQL Database" type="DataSource">
# MySQL example
@@ -44,7 +44,7 @@ how relying on an HSM for example._ The easiest way to do it is to
implement the _org.apache.openejb.resource.jdbc.cipher.PasswordCipher_
interface.
-[source,java]
+[source,xml]
----
<Resource id="MySQL Database" type="DataSource">
# MySQL example
@@ -80,7 +80,7 @@ openejb cipher - OpenEJB Cypher Tool
==== SYNOPSIS
-[source,java]
+[source,properties]
----
openejb cipher [#options]
----
@@ -162,7 +162,7 @@ Encrypt a plain password using the default algorithm.
Output
-[source,java]
+[source,properties]
----
xMH5uM1V9vQzVUv5LG7YLA==
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/deploy-tool.adoc
----------------------------------------------------------------------
diff --git a/docs/deploy-tool.adoc b/docs/deploy-tool.adoc
index 5892134..a5bb436 100644
--- a/docs/deploy-tool.adoc
+++ b/docs/deploy-tool.adoc
@@ -147,7 +147,7 @@ _________________________
On running the deploy tool with a valid EJB jar the following output is
printed on the console
-[source,java]
+[source,properties]
----
Application deployed successfully at {0}
App(id=C:\samples\Calculator-new\hello-addservice.jar)
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/deployment-id.adoc
----------------------------------------------------------------------
diff --git a/docs/deployment-id.adoc b/docs/deployment-id.adoc
index 003b407..410429a 100644
--- a/docs/deployment-id.adoc
+++ b/docs/deployment-id.adoc
@@ -203,7 +203,7 @@ loaded. In addition, the system will log a warning like the following
one asking you to redeploy the jar and choose an different deployment ID
for the bean.
-[source,java]
+[source,properties]
----
WARN : Jar C:\openejb\beans\fooEjbs.jar cannot be loaded. The Deployment ID "/my/bean/foo" is already in use. Please redeploy this jar and assign a different deployment ID to the bean with the ejb-name "FooBean".
----
@@ -230,7 +230,7 @@ rest of the beans in the disneyEjbs.jar as they may need the
"DonaldDuckBean" bean to function properly. The disneyEjbs.jar is
skipped and the following warning is logged.
-[source,java]
+[source,properties]
----
WARN : Jar C:\openejb\beans\disneyEjbs.jar cannot be loaded. The Deployment ID "/my/favorite/duck" is already in use. Please redeploy this jar and assign a different deployment ID to the bean with the ejb-name "DonaldDuckBean".
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/deployments.adoc
----------------------------------------------------------------------
diff --git a/docs/deployments.adoc b/docs/deployments.adoc
index f182bdf..6017d7b 100644
--- a/docs/deployments.adoc
+++ b/docs/deployments.adoc
@@ -12,7 +12,7 @@
To include a single jar by name, just declare a 'Deployments' element
with a 'jar' attribute pointing to the jar file on the file system.
-[source,java]
+[source,xml]
----
<openejb>
...
@@ -34,7 +34,7 @@ To point to a directory that contains several jar files that OpenEJB
should load, simply declare a 'Deployments' element with a 'dir'
attribute pointing to the directory containing the jar files.
-[source,java]
+[source,xml]
----
<openejb>
...
@@ -82,7 +82,7 @@ For example, if you have a directory structure like this:
Then you would delcare a 'Deployments' element with the 'dir' attribute
set to 'C:' as shown below.
-[source,java]
+[source,xml]
----
<openejb>
...
@@ -105,7 +105,7 @@ is an incredible asset.
If your ejbs were loaded successfully you should see entries like the
following (1.x and higher only):
-[source,java]
+[source,properties]
----
INFO : Loaded EJBs from
/usr/local/openejb-1.0-beta1/beans/openejb-itests-beans.jar
@@ -116,7 +116,7 @@ INFO : Loaded EJBs from
If your ejbs failed to load, you will see an entry similar to the
following.
-[source,java]
+[source,properties]
----
WARN : Jar not loaded. /usr/local/openejb-1.0-beta1/beans/helloworld.jar.
Jar failed validation. Use the validation tool for more details
@@ -127,7 +127,7 @@ in the log file at startup. The Deployment ID listed is the JNDI name
used to lookup the ejb from a client of the Local or Remote Servers. The
beans listed below are from our test suite.
-[source,java]
+[source,properties]
----
DEBUG: Deployments : 19
DEBUG: Type Deployment ID
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/details-on-openejb-jar.adoc
----------------------------------------------------------------------
diff --git a/docs/details-on-openejb-jar.adoc b/docs/details-on-openejb-jar.adoc
index a3190d6..35a0bc3 100644
--- a/docs/details-on-openejb-jar.adoc
+++ b/docs/details-on-openejb-jar.adoc
@@ -44,7 +44,7 @@ This is the openejb-jar.xml that is created by the Deploy tool in the
Hello World example. As you can see, the file format is extremely
simple.
-[source,java]
+[source,xml]
----
<?xml version="1.0"?>
<openejb-jar xmlns="http://www.openejb.org/openejb-jar/1.1">
@@ -65,7 +65,7 @@ your jar.
Then you simply add a element to your element like this
-[source,java]
+[source,xml]
----
<?xml version="1.0"?>
<openejb-jar xmlns="http://www.openejb.org/openejb-jar/1.1">
@@ -92,7 +92,7 @@ and provide access to the desired resource.
You will need one element for every element in your ejb-jar.xml. So if
you had an ejb-jar.xml like the following
-[source,java]
+[source,xml]
----
<?xml version="1.0"?>
<ejb-jar>
@@ -131,7 +131,7 @@ you had an ejb-jar.xml like the following
Then you would need two elements for that bean in your openejb-jar.xml
file as such.
-[source,java]
+[source,xml]
----
<?xml version="1.0"?>
<openejb-jar xmlns="http://www.openejb.org/openejb-jar/1.1">
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/developer/json/index.adoc
----------------------------------------------------------------------
diff --git a/docs/developer/json/index.adoc b/docs/developer/json/index.adoc
index bbb05bd..a18fe18 100644
--- a/docs/developer/json/index.adoc
+++ b/docs/developer/json/index.adoc
@@ -33,7 +33,7 @@ public class MyModel {
will be mapped to:
-[source,java]
+[source,json]
----
{
"id": 1234,
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/developer/testing/arquillian/index.adoc
----------------------------------------------------------------------
diff --git a/docs/developer/testing/arquillian/index.adoc b/docs/developer/testing/arquillian/index.adoc
index 16f0538..4d44eb3 100644
--- a/docs/developer/testing/arquillian/index.adoc
+++ b/docs/developer/testing/arquillian/index.adoc
@@ -184,7 +184,7 @@ IMPORTANT: if a server is already started on host:port then it will be used inst
To use a custom instance with arquillian ensure to have ejbd and tomee webapp activated. A way is to have in `conf/system.properties` these entries:
-[source]
+[source,properties]
----
tomee.remote.support=true
openejb.system.apps=true
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/developer/tools/gradle-plugins.adoc
----------------------------------------------------------------------
diff --git a/docs/developer/tools/gradle-plugins.adoc b/docs/developer/tools/gradle-plugins.adoc
index fe43434..f83851d 100644
--- a/docs/developer/tools/gradle-plugins.adoc
+++ b/docs/developer/tools/gradle-plugins.adoc
@@ -25,7 +25,7 @@ apply plugin: 'org.apache.tomee.tomee-embedded'
Then just start tomee with:
-[source]
+[source,properties]
----
gradle tomee-embedded -i
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/developer/tools/maven/applicationcomposer.adoc
----------------------------------------------------------------------
diff --git a/docs/developer/tools/maven/applicationcomposer.adoc b/docs/developer/tools/maven/applicationcomposer.adoc
index 8694c37..05bb4b0 100644
--- a/docs/developer/tools/maven/applicationcomposer.adoc
+++ b/docs/developer/tools/maven/applicationcomposer.adoc
@@ -14,7 +14,7 @@ IMPORTANT: the dependencies are retrieved with `MavenProject.getArtifacts()` whi
=== Run goal configuration
-[source]
+[source,bash]
----
mvn process-classes applicationcomposer:run -DskipTests
----
@@ -30,7 +30,7 @@ mvn process-classes applicationcomposer:run -DskipTests
=== Zip goal configuration
-[source]
+[source,bash]
----
mvn process-classes applicationcomposer:zip -DskipTests
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/developer/tools/maven/tomee.adoc
----------------------------------------------------------------------
diff --git a/docs/developer/tools/maven/tomee.adoc b/docs/developer/tools/maven/tomee.adoc
index e4f5896..44ab4f4 100644
--- a/docs/developer/tools/maven/tomee.adoc
+++ b/docs/developer/tools/maven/tomee.adoc
@@ -113,21 +113,21 @@ The format can be:
- a maven dependency:
-[source]
+[source,properties]
----
groupId:artifactId:version
----
- a zip dependency and extracted in lib folder:
-[source]
+[source,properties]
----
unzip:groupId:artifactId:version
----
- a matching prefix to remove:
-[source]
+[source,properties]
----
remove:prefix
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/dynamic-datasource.adoc
----------------------------------------------------------------------
diff --git a/docs/dynamic-datasource.adoc b/docs/dynamic-datasource.adoc
index eee4ff7..c2d519a 100644
--- a/docs/dynamic-datasource.adoc
+++ b/docs/dynamic-datasource.adoc
@@ -173,7 +173,7 @@ META-INF/. For example META-INF/org.router.
This file will contain something like:
-[source,java]
+[source,xml]
----
<ServiceJar>
<ServiceProvider id="DeterminedRouter" service="Resource"
@@ -189,7 +189,7 @@ This file will contain something like:
In the openejb.xml file, you have to declare your dynamic database and
in our example it needs the proxied datasources too:
-[source,java]
+[source,xml]
----
<Resource id="router" type="<your implementation>" provider="<your provider>">
Param value
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/ejb-local-ref.adoc
----------------------------------------------------------------------
diff --git a/docs/ejb-local-ref.adoc b/docs/ejb-local-ref.adoc
index 0dabe90..648b433 100644
--- a/docs/ejb-local-ref.adoc
+++ b/docs/ejb-local-ref.adoc
@@ -38,7 +38,7 @@ public class MyEjbLocalRefBean implements MyBeanInterface {
The above @EJB annotation usage is 100% equivalent to the following xml.
-[source,java]
+[source,xml]
----
<ejb-local-ref>
<ejb-ref-name>myFooEjb</ejb-ref-name>
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/ejb-over-ssl.adoc
----------------------------------------------------------------------
diff --git a/docs/ejb-over-ssl.adoc b/docs/ejb-over-ssl.adoc
index d888c9b..431441a 100644
--- a/docs/ejb-over-ssl.adoc
+++ b/docs/ejb-over-ssl.adoc
@@ -56,7 +56,7 @@ and setup in OpenEJB Standalone by default.
Its configuration `conf/ejbds.properties` looks like this:
-[source,java]
+[source,properties]
----
server = org.apache.openejb.server.ejbd.EjbServer
bind = 127.0.0.1
@@ -109,7 +109,7 @@ You must now instruct the client and server to use that suite.
On the server:
-[source,java]
+[source,properties]
----
server = org.apache.openejb.server.ejbd.EjbServer
bind = 127.0.0.1
@@ -124,7 +124,7 @@ discovery = ejb:ejbds://{bind}:{port}
On the client, you must supply a property:
-[source,java]
+[source,properties]
----
-Dopenejb.client.enabledCipherSuites=TLS_RSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_128_CBC_SHA
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/ejb-ref.adoc
----------------------------------------------------------------------
diff --git a/docs/ejb-ref.adoc b/docs/ejb-ref.adoc
index d523822..f87de2f 100644
--- a/docs/ejb-ref.adoc
+++ b/docs/ejb-ref.adoc
@@ -37,7 +37,7 @@ public class MyEjbRemoteRefBean implements MyBeanInterface {
The above @EJB annotation usage is 100% equivalent to the following xml.
-[source,java]
+[source,xml]
----
<ejb-ref>
<ejb-ref-name>myFooEjb</ejb-ref-name>
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/ejb-refs.adoc
----------------------------------------------------------------------
diff --git a/docs/ejb-refs.adoc b/docs/ejb-refs.adoc
index 029347e..cfa5379 100644
--- a/docs/ejb-refs.adoc
+++ b/docs/ejb-refs.adoc
@@ -45,7 +45,7 @@ public class SquareBean implements SquareRemote {
To hook this reference up you need to override this ref and add more
info in the ejb-jar.xml of shapesApp.jar as follows:
-[source,java]
+[source,xml]
----
<ejb-jar>
<enterprise-beans>
@@ -99,7 +99,7 @@ Here's how you would hook this reference up, injection and all, with
just xml. The following would be added to the ejb-jar.xml of
shapesApp.jar:
-[source,java]
+[source,xml]
----
<ejb-jar>
<enterprise-beans>
@@ -135,7 +135,7 @@ to satisfy the lookup to the other server.
In this example we are calling our InitialContext `shoe` for fun.
-[source,java]
+[source,xml]
----
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<openejb>
@@ -177,7 +177,7 @@ supports.
If say, there are two servers that have the `OrangeBeanRemote` bean, you
could expand the `<JndiProvider>` delcaration like so:
-[source,java]
+[source,xml]
----
<JndiProvider id="shoe" type="javax.naming.InitialContext">
java.naming.provider.url = failover:ejbd://192.168.1.20:4201,ejbd://192.168.1.30:4201
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/ejb-request-logging.adoc
----------------------------------------------------------------------
diff --git a/docs/ejb-request-logging.adoc b/docs/ejb-request-logging.adoc
index c03474b..6f65625 100644
--- a/docs/ejb-request-logging.adoc
+++ b/docs/ejb-request-logging.adoc
@@ -85,7 +85,7 @@ security.
This information is available in JMX. A sample JMX ObjectName for a
`CounterBean` will look like this:
-[source,java]
+[source,properties]
----
openejb.management:J2EEServer=openejb,J2EEApplication=null,EJBModule=StatsModule,StatelessSessionBean=CounterBean,j2eeType=Invocations,name=CounterBean
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/ejbd-transport.adoc
----------------------------------------------------------------------
diff --git a/docs/ejbd-transport.adoc b/docs/ejbd-transport.adoc
index ec183a8..4d0cd79 100644
--- a/docs/ejbd-transport.adoc
+++ b/docs/ejbd-transport.adoc
@@ -18,7 +18,7 @@ you don't want them to be started.
In TomEE the transport is the Tomcat one. It uses a servlet brought by
TomEE webapp. Here is the servlet as defined in TomEE webapp:
-[source,java]
+[source,xml]
----
<servlet>
<servlet-name>ServerServlet</servlet-name>
@@ -104,7 +104,7 @@ default for `tomee.serialization.class.blacklist` is `*` since TomEE
If an EJB request fails because a class is not whitelisted you will find
this log entry:
-[source,java]
+[source,properties]
----
WARN - "null OEJP/4.7" FAIL "Security error - foo.Bar is not whitelisted as deserializable, prevented before loading it." - Debug for StackTrace
----
@@ -116,7 +116,7 @@ on server side as well as on client side.
If you only want to support serialization of the classes `foo.Bar` and
`foo.Baz` you can configure the properties like this:
-[source,java]
+[source,properties]
----
tomee.serialization.class.whitelist = foo.Bar,foo.Baz
tomee.serialization.class.blacklist = -
@@ -125,7 +125,7 @@ tomee.serialization.class.blacklist = -
If you trust all classes in the package `foo` define the properties like
this:
-[source,java]
+[source,properties]
----
tomee.serialization.class.whitelist = foo.
tomee.serialization.class.blacklist = -
@@ -137,7 +137,7 @@ classes in the package `foo2` otherwise.)
If you trust all classes in the package `foo` except the class `foo.Bar`
you have to configure the properties like this:
-[source,java]
+[source,properties]
----
tomee.serialization.class.whitelist = foo.
tomee.serialization.class.blacklist = foo.Bar
@@ -153,7 +153,7 @@ applications runs on TomEE 1.7.3 but does not on TomEE 1.7.4 showing the
aforementioned log message, you can define the configuration so that the
serialization will work in the same way as it did with TomEE 1.7.3:
-[source,java]
+[source,properties]
----
tomee.serialization.class.whitelist =
tomee.serialization.class.blacklist = org.codehaus.groovy.runtime.,org.apache.commons.collections.functors.,org.apache.xalan,java.lang.Process
@@ -184,7 +184,7 @@ TomEE 1.7.2 did not have any kind of blacklist when deserializing
objects over Ejbd. If you want to revert to this behavior you can simply
deactivate the blacklist with this configuration:
-[source,java]
+[source,properties]
----
tomee.serialization.class.whitelist =
tomee.serialization.class.blacklist = -
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/embedded-and-remotable.adoc
----------------------------------------------------------------------
diff --git a/docs/embedded-and-remotable.adoc b/docs/embedded-and-remotable.adoc
index 4c81d77..982a3fd 100644
--- a/docs/embedded-and-remotable.adoc
+++ b/docs/embedded-and-remotable.adoc
@@ -169,7 +169,7 @@ admin thread 127.0.0.1 4200 +
------- Ready! Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time
elapsed: 0.89 sec
-[source,java]
+[source,properties]
----
Results :
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/embedded-configuration.adoc
----------------------------------------------------------------------
diff --git a/docs/embedded-configuration.adoc b/docs/embedded-configuration.adoc
index db81801..a0ef648 100644
--- a/docs/embedded-configuration.adoc
+++ b/docs/embedded-configuration.adoc
@@ -101,7 +101,7 @@ Here's an example of the same properties being specified via a
classpath, not in a subdirectory of a path in the classpath such as
META-INF, but at the root of any of the paths in the classpath.
-[source]
+[source,properties]
----
# set the initial context factory
java.naming.factory.initial = org.apache.openejb.client.LocalInitialContextFactory
@@ -128,7 +128,7 @@ openejb.validation.output.level = verbose
Then OpenEJB can be booted via the `InitialContext` as normal.
Properties can still be used to override any of the above properties:
-[source]
+[source,java]
----
Properties p = new Properties();
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/failover-logging.adoc
----------------------------------------------------------------------
diff --git a/docs/failover-logging.adoc b/docs/failover-logging.adoc
index 1d00be8..8e1da19 100644
--- a/docs/failover-logging.adoc
+++ b/docs/failover-logging.adoc
@@ -6,14 +6,14 @@
Setting the following logging category to "debug" will open up some new
logging information.
-[source,java]
+[source,properties]
----
log4j.category.OpenEJB.server.discovery = debug
----
Or more specifically as:
-[source,java]
+[source,properties]
----
log4j.category.OpenEJB.server.discovery.multipoint = debug
log4j.category.OpenEJB.server.discovery.multicast = debug
@@ -22,7 +22,7 @@ log4j.category.OpenEJB.server.discovery.multicast = debug
The nature of the debug output is to display all configuration
information at startup:
-[source,java]
+[source,properties]
----
DEBUG - Using default 'heart_rate=500'
DEBUG - Using default 'max_missed_heartbeats=10'
@@ -35,7 +35,7 @@ INFO - Created Tracker{group='default', groupPrefix='default:', heartRate=500, m
Changing the configuration should reflect in the logging as follows:
-[source,java]
+[source,properties]
----
INFO - Using 'heart_rate=200'
INFO - Using 'max_missed_heartbeats=2'
@@ -48,7 +48,7 @@ INFO - Created Tracker{group='default', groupPrefix='default:', heartRate=200, m
As well as any events at runtime:
-[source,java]
+[source,properties]
----
DEBUG - Expired Service{uri=green://localhost:0, broadcastString='default:green://localhost:0'} Timeout{lastSeen=-5005, threshold=5000}
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/faq.adoc
----------------------------------------------------------------------
diff --git a/docs/faq.adoc b/docs/faq.adoc
index a901b14..a841956 100644
--- a/docs/faq.adoc
+++ b/docs/faq.adoc
@@ -76,7 +76,7 @@ your test case do this:
"org.apache.openejb.client.LocalInitialContextFactory");
-[source,java]
+[source,properties]
----
URL config =
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/generating-ejb-3-annotations.adoc
----------------------------------------------------------------------
diff --git a/docs/generating-ejb-3-annotations.adoc b/docs/generating-ejb-3-annotations.adoc
index 64b5a0c..d56e48c 100644
--- a/docs/generating-ejb-3-annotations.adoc
+++ b/docs/generating-ejb-3-annotations.adoc
@@ -16,7 +16,7 @@ of your project. If you are using Maven, you can add the following to
your POM (you will need to update your Eclipse project using mvn
eclipse:eclipse afterwards)
-[source,java]
+[source,xml]
----
<dependencies>
...
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/getting-started.adoc
----------------------------------------------------------------------
diff --git a/docs/getting-started.adoc b/docs/getting-started.adoc
index 0e17673..e67e0b0 100644
--- a/docs/getting-started.adoc
+++ b/docs/getting-started.adoc
@@ -161,7 +161,7 @@ public class Client {
Open Client.java in eclipse and run it as a java application. You should
see the following message in the console view:
-[source,java]
+[source,properties]
----
My First Remote Stateless Session Bean
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/hello-world.adoc
----------------------------------------------------------------------
diff --git a/docs/hello-world.adoc b/docs/hello-world.adoc
index d386a87..51df195 100644
--- a/docs/hello-world.adoc
+++ b/docs/hello-world.adoc
@@ -58,14 +58,14 @@ file under this directory - _logs_: Contains log files.
=== Create a working directory Assuming you are in your home directory,
create a directory named projects
-[source,java]
+[source,bash]
----
karan@poweredge:~$ mkdir projects
----
Go to the projects directory
-[source,java]
+[source,bash]
----
karan@poweredge:~$ cd projects
----
@@ -75,7 +75,7 @@ install Java (version 5 or higher). Also set it up so that you can run
the java and javac commands from any directory ### Set OPENEJB_HOME We
will setup this variable to refer to the openejb install location.
-[source,java]
+[source,bash]
----
karan@poweredge:~/projects$ export
----
@@ -117,7 +117,7 @@ our classpath to compile our source code. These annotations can be found
in the $OPENEJB_HOME/lib/javaee-5.0-1.jar. Lets compile our source (make
sure you are in the projects directory)
-[source,java]
+[source,bash]
----
karan@poweredge:~/projects$ javac -cp $OPENEJB_HOME/lib/javaee-5.0-1.jar -d
----
@@ -130,7 +130,7 @@ directory. All class files should be under org/acme directory. ###
Package the EJB To package the EJB into a JAR, run the following command
while you are in the projects directory
-[source,java]
+[source,bash]
----
karan@poweredge:~/projects$ jar cvf hello.jar org
----
@@ -139,7 +139,7 @@ The above command will package everything under the org directory
(including the org directory itself) into a jar file named hello.jar.
Below is the output from running the above command:
-[source,java]
+[source,bash]
----
karan@poweredge:~/projects$ jar cvf hello.jar org
added manifest
@@ -176,7 +176,7 @@ result = h.sayHello(); System.out.println(result); } }
=== Compile HelloClient.java Run the following command:
-[source,java]
+[source,bash]
----
karan@poweredge:~/projects$ javac -d . HelloClient.java
----
@@ -184,7 +184,7 @@ karan@poweredge:~/projects$ javac -d . HelloClient.java
== Start the Server Go to the OpenEJB install directory (i.e.
OPENEJB_HOME) and run the following command:
-[source,java]
+[source,bash]
----
karan@poweredge:~/install/openejb-3.0$ bin/openejb start
----
@@ -192,7 +192,7 @@ karan@poweredge:~/install/openejb-3.0$ bin/openejb start
Once the Server starts, you will see an output similar to the below in
your console:
-[source,java]
+[source,bash]
----
karan@poweredge:~/install/openejb-3.0$ bin/openejb start
Apache OpenEJB 3.0 build: 20070926-12:34
@@ -215,14 +215,14 @@ directories. ## Deploy the EJB We will now use the deploy command to
deploy the EJB in hello.jar. While you are in the projects directory,
run the following command:
-[source,java]
+[source,bash]
----
karan@poweredge:~/projects$ $OPENEJB_HOME/bin/openejb deploy hello.jar
----
The above command should give you the following output:
-[source,java]
+[source,bash]
----
karan@poweredge:~/projects$ $OPENEJB_HOME/bin/openejb deploy hello.jar
Application deployed successfully at "hello.jar"
@@ -238,7 +238,7 @@ the JNDI name we used in the client to lookup the EJB ## Run the Client
While you are in the projects directory, run the following command to
run the client:
-[source,java]
+[source,bash]
----
karan@poweredge:~/projects$ java -cp
----
@@ -248,7 +248,7 @@ org.acme.HelloClient
The above should give you the following output:
-[source,java]
+[source,properties]
----
Hello World!!!!
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/hibernate.adoc
----------------------------------------------------------------------
diff --git a/docs/hibernate.adoc b/docs/hibernate.adoc
index e2d653b..9217adf 100644
--- a/docs/hibernate.adoc
+++ b/docs/hibernate.adoc
@@ -10,7 +10,7 @@ For a unit called "movie-unit" using two datasources called
"movieDatabase" and "movieDatabaseUnmanaged" the following
persistence.xml would work.
-[source,java]
+[source,xml]
----
<persistence version="1.0"
xmlns="http://java.sun.com/xml/ns/persistence"
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/initialcontext-config.adoc
----------------------------------------------------------------------
diff --git a/docs/initialcontext-config.adoc b/docs/initialcontext-config.adoc
index 24ffed3..a487872 100644
--- a/docs/initialcontext-config.adoc
+++ b/docs/initialcontext-config.adoc
@@ -10,7 +10,7 @@ A InitialContext can be declared via xml in the
using a declaration like the following. All properties in the element
body are optional.
-[source,java]
+[source,xml]
----
<JndiProvider id="myInitialContext" type="javax.naming.InitialContext">
</JndiProvider>
@@ -21,7 +21,7 @@ Alternatively, a InitialContext can be declared via properties in the
`-D` properties. The properties can also be used when embedding TomEE
via the `javax.ejb.embeddable.EJBContainer` API or `InitialContext`
-[source,java]
+[source,properties]
----
myInitialContext = new://JndiProvider?type=javax.naming.InitialContext
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/installation-drop-in-war.adoc
----------------------------------------------------------------------
diff --git a/docs/installation-drop-in-war.adoc b/docs/installation-drop-in-war.adoc
index 844b16a..8d2cca2 100644
--- a/docs/installation-drop-in-war.adoc
+++ b/docs/installation-drop-in-war.adoc
@@ -32,7 +32,7 @@ http://tomcat.apache.org/download-70.cgi
* Update $CATALINA_HOME/conf/tomcat-users.xml to add a tomee user to
allow access to the installer page.
+
-[source,java]
+[source,xml]
----
<!-- Activate/create these lines to get access to TomEE GUI -->
<role rolename="tomee-admin" />
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/javaagent-with-maven-surefire.adoc
----------------------------------------------------------------------
diff --git a/docs/javaagent-with-maven-surefire.adoc b/docs/javaagent-with-maven-surefire.adoc
index 1816f2b..7f48bf1 100644
--- a/docs/javaagent-with-maven-surefire.adoc
+++ b/docs/javaagent-with-maven-surefire.adoc
@@ -9,7 +9,7 @@
In maven2 you can enable the javaagent for your tests by adding this to
your pom.xml file:
-[source,java]
+[source,xml]
----
<build>
<plugins>
@@ -21,7 +21,7 @@ pertest
-javaagent:latexmath:[${basedir}/target/openejb-javaagent-3.0.jar</argLine> <workingDirectory>$]\{basedir}/target
-[source,java]
+[source,xml]
----
<!-- this tells maven to copy the openejb-javaagent jar into your
----
@@ -31,7 +31,7 @@ copy process-resources copy org.apache.openejb openejb-javaagent 3.0
$\{project.build.directory}
-[source,java]
+[source,xml]
----
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/javaagent.adoc
----------------------------------------------------------------------
diff --git a/docs/javaagent.adoc b/docs/javaagent.adoc
index b784297..1543830 100644
--- a/docs/javaagent.adoc
+++ b/docs/javaagent.adoc
@@ -12,7 +12,7 @@ persistence provider or if using CMP.
Adding a java agent is done via a vm parameter as follows:
-[source,java]
+[source,bash]
----
java -javaagent:openejb-javaagent-4.6.0.jar _\[other params...](other-params....html)
----
@@ -22,7 +22,7 @@ java -javaagent:openejb-javaagent-4.6.0.jar _\[other params...](other-params....
In maven2 you can enable the javaagent for your tests by adding this to
your pom.xml file:
-[source,java]
+[source,xml]
----
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/javamailsession-config.adoc
----------------------------------------------------------------------
diff --git a/docs/javamailsession-config.adoc b/docs/javamailsession-config.adoc
index 78cccb1..55c8e0c 100644
--- a/docs/javamailsession-config.adoc
+++ b/docs/javamailsession-config.adoc
@@ -10,7 +10,7 @@ A JavaMailSession can be declared via xml in the
using a declaration like the following. All properties in the element
body are optional.
-[source,java]
+[source,xml]
----
<Resource id="myJavaMailSession" type="javax.mail.Session">
</Resource>
@@ -21,7 +21,7 @@ Alternatively, a JavaMailSession can be declared via properties in the
`-D` properties. The properties can also be used when embedding TomEE
via the `javax.ejb.embeddable.EJBContainer` API or `InitialContext`
-[source,java]
+[source,properties]
----
myJavaMailSession = new://Resource?type=javax.mail.Session
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/jms-resources-and-mdb-container.adoc
----------------------------------------------------------------------
diff --git a/docs/jms-resources-and-mdb-container.adoc b/docs/jms-resources-and-mdb-container.adoc
index 3a4f7c8..68fae8d 100644
--- a/docs/jms-resources-and-mdb-container.adoc
+++ b/docs/jms-resources-and-mdb-container.adoc
@@ -7,7 +7,7 @@
== External ActiveMQ Broker
-[source,java]
+[source,xml]
----
<tomee>
<Resource id="MyJmsResourceAdapter" type="ActiveMQResourceAdapter">
@@ -35,7 +35,7 @@ work, such as 'failover:'.
== Internal ActiveMQ Broker
-[source,java]
+[source,xml]
----
<tomee>
<Resource id="MyJmsResourceAdapter" type="ActiveMQResourceAdapter">
@@ -65,7 +65,7 @@ Adding the `DataSource` property to your `ActiveMQResourceAdapter`
config will automatically setup JDBC Persistence using the
`org.apache.activemq.store.jdbc.JDBCPersistenceAdapter`
-[source,java]
+[source,xml]
----
<tomee>
<Resource id="MyJmsResourceAdapter" type="ActiveMQResourceAdapter">
@@ -112,7 +112,7 @@ Create an link:activemq.xml[activemq.xml file] a in
Then use the `xbean:file:` url prefix in the `BrokerXmlConfig` as shown
belog.
-[source,java]
+[source,xml]
----
<tomee>
<Resource id="MyJmsResourceAdapter" type="ActiveMQResourceAdapter">
@@ -166,7 +166,7 @@ InitialContext context = new InitialContext(p);
From anywhere in the same VM as the EJB Container you could lookup the
above resources like so:
-[source,java]
+[source,properties]
----
javax.jms.ConnectionFactory cf = (ConnectionFactory)
context.lookup("openejb:Resource/MyJmsConnectionFactory");
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/jmsconnectionfactory-config.adoc
----------------------------------------------------------------------
diff --git a/docs/jmsconnectionfactory-config.adoc b/docs/jmsconnectionfactory-config.adoc
index af99dc0..1a821c7 100644
--- a/docs/jmsconnectionfactory-config.adoc
+++ b/docs/jmsconnectionfactory-config.adoc
@@ -10,7 +10,7 @@ A JmsConnectionFactory can be declared via xml in the
using a declaration like the following. All properties in the element
body are optional.
-[source,java]
+[source,xml]
----
<Resource id="myJmsConnectionFactory" type="javax.jms.ConnectionFactory">
connectionMaxIdleTime = 15 Minutes
@@ -28,7 +28,7 @@ VirtualMachine `-D` properties. The properties can also be used when
embedding TomEE via the `javax.ejb.embeddable.EJBContainer` API or
`InitialContext`
-[source,java]
+[source,properties]
----
myJmsConnectionFactory = new://Resource?type=javax.jms.ConnectionFactory
myJmsConnectionFactory.connectionMaxIdleTime = 15 Minutes
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/jndi-names.adoc
----------------------------------------------------------------------
diff --git a/docs/jndi-names.adoc b/docs/jndi-names.adoc
index 0155cff..b98d172 100644
--- a/docs/jndi-names.adoc
+++ b/docs/jndi-names.adoc
@@ -13,7 +13,7 @@ before you start reading:
== Default JNDI name The default JNDI name is in the following format:
-[source,java]
+[source,json]
----
{deploymentId}{interfaceType.annotationName}
----
@@ -152,7 +152,7 @@ InitialContext properties when embedded.
It's possible to set the openejb.jndiname.format for an ejb-jar jar in a
META-INF/openejb-jar.xml file as follows:
-[source,java]
+[source,xml]
----
<openejb-jar>
<properties>
@@ -167,7 +167,7 @@ META-INF/openejb-jar.xml file as follows:
The following sets the name specifically for the interface
org.superbiz.Foo.
-[source,java]
+[source,xml]
----
<openejb-jar>
<ejb-deployment ejb-name="FooBean">
@@ -178,7 +178,7 @@ org.superbiz.Foo.
Or more generally...
-[source,java]
+[source,xml]
----
<openejb-jar>
<ejb-deployment ejb-name="FooBean">
@@ -189,7 +189,7 @@ Or more generally...
Or more generally still...
-[source,java]
+[source,xml]
----
<openejb-jar>
<ejb-deployment ejb-name="FooBean">
@@ -200,7 +200,7 @@ Or more generally still...
The 'name' attribute can still use templates if it likes, such as:
-[source,java]
+[source,xml]
----
<openejb-jar>
<ejb-deployment ejb-name="FooBean">
@@ -226,7 +226,7 @@ intention with these examples is to show the various ways you can
isolate specific interfaces or types of interfaces to gain more specific
control on how they are named.
-[source,java]
+[source,xml]
----
<openejb-jar>
<ejb-deployment ejb-name="FooBean">
@@ -242,7 +242,7 @@ control on how they are named.
Or
-[source,java]
+[source,xml]
----
<openejb-jar>
<ejb-deployment ejb-name="FooBean">
@@ -263,7 +263,7 @@ Or
Or
-[source,java]
+[source,xml]
----
<openejb-jar>
<ejb-deployment ejb-name="FooBean">
@@ -279,7 +279,7 @@ Or
or
-[source,java]
+[source,xml]
----
<openejb-jar>
<ejb-deployment ejb-name="FooBean">
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/jpa-concepts.adoc
----------------------------------------------------------------------
diff --git a/docs/jpa-concepts.adoc b/docs/jpa-concepts.adoc
index 1d45025..76b7b83 100644
--- a/docs/jpa-concepts.adoc
+++ b/docs/jpa-concepts.adoc
@@ -132,7 +132,7 @@ Calling EntityManager.merge() will re-attach a Detached object.
Servlets and EJBs can use RESOURCE_LOCAL persistence units through the
EntityManagerFactory as follows:
-[source,java]
+[source,xml]
----
<?xml version="1.0" encoding="UTF-8" ?>
<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
@@ -183,7 +183,7 @@ public class MyEjbOrServlet ... {
EJBs can use JTA persistence units through the EntityManager as follows:
-[source,java]
+[source,xml]
----
<?xml version="1.0" encoding="UTF-8" ?>
<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/lookup-of-other-ejbs-example.adoc
----------------------------------------------------------------------
diff --git a/docs/lookup-of-other-ejbs-example.adoc b/docs/lookup-of-other-ejbs-example.adoc
index 35b6008..1b85b2d 100644
--- a/docs/lookup-of-other-ejbs-example.adoc
+++ b/docs/lookup-of-other-ejbs-example.adoc
@@ -140,7 +140,7 @@ container=Default Stateless Container) INFO - Deployed
Application(path=classpath.ear) Tests run: 2, Failures: 0, Errors: 0,
Skipped: 0, Time elapsed: 1.244 sec
-[source,java]
+[source,properties]
----
Results :
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/managedcontainer-config.adoc
----------------------------------------------------------------------
diff --git a/docs/managedcontainer-config.adoc b/docs/managedcontainer-config.adoc
index b52b00b..e58e4fd 100644
--- a/docs/managedcontainer-config.adoc
+++ b/docs/managedcontainer-config.adoc
@@ -10,7 +10,7 @@ A ManagedContainer can be declared via xml in the
using a declaration like the following. All properties in the element
body are optional.
-[source,java]
+[source,xml]
----
<Container id="myManagedContainer" type="MANAGED">
</Container>
@@ -21,7 +21,7 @@ Alternatively, a ManagedContainer can be declared via properties in the
`-D` properties. The properties can also be used when embedding TomEE
via the `javax.ejb.embeddable.EJBContainer` API or `InitialContext`
-[source,java]
+[source,properties]
----
myManagedContainer = new://Container?type=MANAGED
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/manual-installation.adoc
----------------------------------------------------------------------
diff --git a/docs/manual-installation.adoc b/docs/manual-installation.adoc
index 89bee40..f36233c 100644
--- a/docs/manual-installation.adoc
+++ b/docs/manual-installation.adoc
@@ -65,7 +65,7 @@ your conf/server.xml file to load the OpenEJB listener:
The snippet is shown below
-[source,java]
+[source,xml]
----
<!-- Note: A "Server" is not itself a "Container", so you may not
define subcomponents such as "Valves" at this
@@ -102,7 +102,7 @@ First, copy the OpenEJB JavaAgent jar into the lib directory.
Simply, add the snippet marked below in bin/catalina.bat (Windows) or
bin/catalina.sh (Unix) file to enable the OpenEJB javaagent:
-[source,java]
+[source,properties]
----
if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuli
set JAVA_OPTS=%JAVA_OPTS%
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/maven.adoc
----------------------------------------------------------------------
diff --git a/docs/maven.adoc b/docs/maven.adoc
index 3f4787c..36cd293 100644
--- a/docs/maven.adoc
+++ b/docs/maven.adoc
@@ -34,7 +34,7 @@ http://svn.apache.org/repos/asf/tomee/tomee/trunk
Use http://subversion.apache.org/[Subversion] to checkout the example
sources from a console like so:
-[source,java]
+[source,bash]
----
svn co http://svn.apache.org/repos/asf/tomee/tomee/trunk/examples/[example]
@@ -45,7 +45,7 @@ Or that you may of course also be using your own project pom.xml
If you want to use the latest snapshot locate the __ section in your
pom.xml and ensure the following repository exists:
-[source,java]
+[source,xml]
----
<repositories>
<repository>
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/maven/index.adoc
----------------------------------------------------------------------
diff --git a/docs/maven/index.adoc b/docs/maven/index.adoc
index b199b63..fafcbfa 100644
--- a/docs/maven/index.adoc
+++ b/docs/maven/index.adoc
@@ -15,7 +15,7 @@ feature-rich plugin that allows for:
Simply add the following to the , and optionally the ), section of your
`pom.xml`
-[source,java]
+[source,xml]
----
<plugins>
<plugin>
@@ -113,7 +113,7 @@ This plugin is also usable in projects which are not war. For instance
you can use it in a pom project to setup a TomEE install, add libraries,
deploy apps then run the server.
-[source,java]
+[source,xml]
----
<plugin>
<groupId>org.apache.openejb.maven</groupId>
@@ -147,7 +147,7 @@ deploy apps then run the server.
###Auto Reloading Example
-[source,java]
+[source,xml]
----
<plugin>
<groupId>org.apache.openejb.maven</groupId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/messagedrivencontainer-config.adoc
----------------------------------------------------------------------
diff --git a/docs/messagedrivencontainer-config.adoc b/docs/messagedrivencontainer-config.adoc
index 9a37df8..87adc93 100644
--- a/docs/messagedrivencontainer-config.adoc
+++ b/docs/messagedrivencontainer-config.adoc
@@ -10,7 +10,7 @@ A MessageDrivenContainer can be declared via xml in the
using a declaration like the following. All properties in the element
body are optional.
-[source,java]
+[source,xml]
----
<Container id="myMessageDrivenContainer" type="MESSAGE">
activationSpecClass = org.apache.activemq.ra.ActiveMQActivationSpec
@@ -26,7 +26,7 @@ VirtualMachine `-D` properties. The properties can also be used when
embedding TomEE via the `javax.ejb.embeddable.EJBContainer` API or
`InitialContext`
-[source,java]
+[source,properties]
----
myMessageDrivenContainer = new://Container?type=MESSAGE
myMessageDrivenContainer.activationSpecClass = org.apache.activemq.ra.ActiveMQActivationSpec
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/multicast-discovery.adoc
----------------------------------------------------------------------
diff --git a/docs/multicast-discovery.adoc b/docs/multicast-discovery.adoc
index d4b764d..0744c6d 100644
--- a/docs/multicast-discovery.adoc
+++ b/docs/multicast-discovery.adoc
@@ -26,7 +26,7 @@ going to do a better job at ensuring reliability and ordering.
When you boot the server there should be a `conf/multicast.properties`
file containing:
-[source,java]
+[source,properties]
----
server = org.apache.openejb.server.discovery.MulticastDiscoveryAgent
bind = 239.255.2.3
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/multiple-business-interface-hazzards.adoc
----------------------------------------------------------------------
diff --git a/docs/multiple-business-interface-hazzards.adoc b/docs/multiple-business-interface-hazzards.adoc
index d90a4c5..45b736e 100644
--- a/docs/multiple-business-interface-hazzards.adoc
+++ b/docs/multiple-business-interface-hazzards.adoc
@@ -188,7 +188,7 @@ throws Throwable \{ return args[0] ; } } }
Running this code will result in the following exception:
-[source,java]
+[source,properties]
----
java.lang.IllegalArgumentException: methods with same signature
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/multipoint-discovery.adoc
----------------------------------------------------------------------
diff --git a/docs/multipoint-discovery.adoc b/docs/multipoint-discovery.adoc
index 4106b58..77379fc 100644
--- a/docs/multipoint-discovery.adoc
+++ b/docs/multipoint-discovery.adoc
@@ -35,7 +35,7 @@ maintained list.
In the server this list can be specified via the
`conf/multipoint.properties` file like so:
-[source,java]
+[source,properties]
----
server = org.apache.openejb.server.discovery.MultipointDiscoveryAgent
bind = 127.0.0.1
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/multipulse-discovery.adoc
----------------------------------------------------------------------
diff --git a/docs/multipulse-discovery.adoc b/docs/multipulse-discovery.adoc
index 83be653..bee02c5 100644
--- a/docs/multipulse-discovery.adoc
+++ b/docs/multipulse-discovery.adoc
@@ -18,7 +18,7 @@ server can be configured to send multicast UDP packets.
After you boot the server for the first time the default configuration
will create the file `conf/conf.d/multipulse.properties` containing:
-[source,java]
+[source,properties]
----
server = org.apache.openejb.server.discovery.MulticastPulseAgent
bind = 239.255.2.3
@@ -46,7 +46,7 @@ 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,java]
+[source,properties]
----
server = org.apache.openejb.server.ejbd.EjbServer
bind = 0.0.0.0
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/new-in-openejb-3.0.adoc
----------------------------------------------------------------------
diff --git a/docs/new-in-openejb-3.0.adoc b/docs/new-in-openejb-3.0.adoc
index 037fc11..d1e7fef 100644
--- a/docs/new-in-openejb-3.0.adoc
+++ b/docs/new-in-openejb-3.0.adoc
@@ -88,7 +88,7 @@ things that need injection that are not container controlled resources
via a properties file and skip the need for an ejb-jar.xml and it's 5
lines per property madness.
-[source,java]
+[source,properties]
----
blog = http://acme.org/myblog
birthday = locale=en_US style=MEDIUM Mar 1, 1954
@@ -145,7 +145,7 @@ Embedding ## Tomcat 6 Support ## Business locals remotable
If you want to make business local interfaces remotable, you can set
this property:
-[source,java]
+[source,properties]
----
openejb.remotable.businessLocals=true
----
http://git-wip-us.apache.org/repos/asf/tomee/blob/0356a476/docs/openejb-binaries.adoc
----------------------------------------------------------------------
diff --git a/docs/openejb-binaries.adoc b/docs/openejb-binaries.adoc
index 84a3951..2a3d6f4 100644
--- a/docs/openejb-binaries.adoc
+++ b/docs/openejb-binaries.adoc
@@ -8,7 +8,7 @@ Add this to your _$HOME/.m2/settings.xml_ to enable publishing to
the Apache Nexus repo. This works for snapshots or staging final
binaries.
-[source,java]
+[source,xml]
----
<settings>
<servers>