This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch tomee-10.x in repository https://gitbox.apache.org/repos/asf/tomee.git
commit d1a0bb01ac8d23f3cf2d20beee62f5d15d41c1dc Author: Martin Wiesner <[email protected]> AuthorDate: Sun Feb 22 21:55:48 2026 +0100 Correct spelling errors in TomEE's adoc files (cherry picked from commit 3e5095034c848c9a2aabc2e2a931b2fe7536dfa4) --- docs/admin/cluster/index.adoc | 2 +- docs/admin/configuration/resources.adoc | 4 ++-- docs/admin/configuration/server.adoc | 2 +- docs/advanced/client/jndi.adoc | 4 ++-- docs/advanced/tomee-embedded/index.adoc | 4 ++-- docs/application-composer/advanced.adoc | 2 +- docs/application-composer/getting-started.adoc | 2 +- docs/basics---getting-things.adoc | 2 +- docs/basics---transactions.adoc | 5 ++--- docs/bouncy-castle.adoc | 2 +- docs/common-errors.adoc | 2 +- docs/datasource-config.adoc | 20 ++++++++++---------- docs/datasource-configuration-by-creator.adoc | 2 +- docs/deployment-id.adoc | 2 +- docs/deployments.adoc | 2 +- .../developer/testing/applicationcomposer/index.adoc | 4 ++-- docs/developer/testing/arquillian/index.adoc | 2 +- docs/developer/testing/index.adoc | 2 +- docs/developer/tools/maven/tomee.adoc | 4 ++-- docs/dynamic-datasource.adoc | 2 +- docs/ejb-over-ssl.adoc | 2 +- docs/ejb-refs.adoc | 4 ++-- docs/embedded-and-remotable.adoc | 2 +- docs/embedded-configuration.adoc | 2 +- docs/hello-world.adoc | 6 +++--- docs/java7.adoc | 4 ++-- docs/jms-resources-and-mdb-container.adoc | 2 +- docs/jpa-concepts.adoc | 2 +- docs/local-server.adoc | 6 +++--- docs/maven/index.adoc | 4 ++-- docs/microprofile/jwt.adoc | 8 ++++---- docs/multipoint-discovery.adoc | 2 +- docs/new-in-openejb-3.0.adoc | 4 ++-- docs/openejb.xml.adoc | 2 +- docs/properties-listing.adoc | 10 +++++----- docs/property-overriding.adoc | 2 +- docs/provisioning.adoc | 2 +- docs/security.adoc | 4 ++-- docs/singleton-beans.adoc | 19 ++++++++++--------- docs/singletoncontainer-config.adoc | 2 +- docs/spring.adoc | 2 +- docs/statefulcontainer-config.adoc | 2 +- docs/statelesscontainer-config.adoc | 16 ++++++++-------- docs/system-properties-files.adoc | 2 +- docs/tomee-and-hibernate.adoc | 4 ++-- docs/tomee-and-intellij.adoc | 2 +- docs/tomee-maven-plugin.adoc | 2 +- docs/tomee-version-policies.adoc | 6 +++--- docs/transaction-annotations.adoc | 4 ++-- docs/understanding-the-directory-layout.adoc | 4 ++-- docs/validation-tool.adoc | 6 +++--- 51 files changed, 105 insertions(+), 105 deletions(-) diff --git a/docs/admin/cluster/index.adoc b/docs/admin/cluster/index.adoc index 8e12cf9934..8ccfba2b72 100644 --- a/docs/admin/cluster/index.adoc +++ b/docs/admin/cluster/index.adoc @@ -223,7 +223,7 @@ The handling of these sockets is all asynchronous Java NIO code which allows the It is possible in this process that two servers learn of each other at the same time and each attempts to connect to the other simultaneously, resulting in two connections between the same two servers. When this happens both servers will detect the extra connection and one of the connections will be dropped and one will be kept. In practice this race condition rarely happens and can be avoided almost entirely by fanning out server startup by as little as 100 milliseconds. -===== Recommandation +===== Recommendation As mentioned the initialServers is only used for bootstrapping the multipoint network. Once running, all servers will dynamically establish direct connections with each other and there is no single point of failure. diff --git a/docs/admin/configuration/resources.adoc b/docs/admin/configuration/resources.adoc index 2c728f38b4..3acb68d31b 100644 --- a/docs/admin/configuration/resources.adoc +++ b/docs/admin/configuration/resources.adoc @@ -143,7 +143,7 @@ TomEE also provides few utilities you can add in DataSource properties: ==== DataSource and JTA -`JtaManaged` determines wether or not this data source should be JTA managed +`JtaManaged` determines whether or not this data source should be JTA managed or user managed. If set to 'true' it will automatically be enrolled in any ongoing transactions. Calling begin/commit/rollback or setAutoCommit on the datasource or connection will not be allowed. If you need to perform @@ -356,7 +356,7 @@ mail/mysession.password = abcdefghij The properties are `jakarta.mail.Session` ones with the addition of `useDefault` which specifies if `getDefaultInstance()` or `getInstance` is used to create the session. `getDefaultInstance()` will ensure that several calls are done with the same configuration and return the same instance. For tomee it is likely better to rely on `getInstance()`(ie keep `useDefault` to false) -and use `aliases` option of the resource to define an alias if you need to share the same instance accross multiple names. +and use `aliases` option of the resource to define an alias if you need to share the same instance across multiple names. == ManagedExecutorService diff --git a/docs/admin/configuration/server.adoc b/docs/admin/configuration/server.adoc index 8b1df3c817..e6ee292409 100644 --- a/docs/admin/configuration/server.adoc +++ b/docs/admin/configuration/server.adoc @@ -63,7 +63,7 @@ |openejb.web.xml.major |int| major version of web.xml. Can be useful to force tomcat to scan servlet 3 annotation when deploying with a servlet 2.x web.xml |tomee.jaxws.subcontext |string| sub context used to bind jaxws web services, default is webservices |openejb.servicemanager.enabled |bool| run all services detected or only known available services (WS and RS -|tomee.jaxws.oldsubcontext |bool| wether or not activate old way to bind jaxws webservices directly on root context +|tomee.jaxws.oldsubcontext |bool| whether or not activate old way to bind jaxws webservices directly on root context |openejb.modulename.useHash |bool| add a hash after the module name of the webmodule if it is generated from the webmodule location, it avoids conflicts between multiple deployment (through ear) of the same webapp. Note: it disactivated by default since names are less nice this way. |openejb.session.manager |qualified name (string)| configure a session manager to use for all contexts |tomee.tomcat.resource.wrap |bool|wrap tomcat resources (context.xml) as tomee resources if possible (true by default) diff --git a/docs/advanced/client/jndi.adoc b/docs/advanced/client/jndi.adoc index a72c7fff4f..baf9ac950e 100644 --- a/docs/advanced/client/jndi.adoc +++ b/docs/advanced/client/jndi.adoc @@ -20,7 +20,7 @@ ctx.lookup("java:...."); This is the legacy context factory used by OpenEJB. It is still useful to fallback on the "default" one in embedded mode where sometimes classloaders or libraries can mess -up the automatic conextual context. +up the automatic contextual context. Usage: @@ -70,7 +70,7 @@ final InitialContext remoteContext = new InitialContext(p); ctx.lookup("java:...."); ---- -Contrarly to local one, the remote factory supports `Context.SECURITY_*` options in a thread safe manner, and you can do lookups at runtime using them. +Contrarily to local one, the remote factory supports `Context.SECURITY_*` options in a thread safe manner, and you can do lookups at runtime using them. See link:../../admin/cluster/index.html[Cluster] page for more details on the options. diff --git a/docs/advanced/tomee-embedded/index.adoc b/docs/advanced/tomee-embedded/index.adoc index 1bcc997561..8f857da1f5 100644 --- a/docs/advanced/tomee-embedded/index.adoc +++ b/docs/advanced/tomee-embedded/index.adoc @@ -36,7 +36,7 @@ The default configuration allows to start tomee without issue but you can desire |properties|-|container properties |quickSession | true|use Random instead of SecureRandom (for dev) |skipHttp|false|don't use the http connector -|httpsPort | 8443|https potr +|httpsPort | 8443|https port |ssl|false| activate https |withEjbRemote|false|use EJBd |keystoreFile|-|https keystore location @@ -184,7 +184,7 @@ properties.openejb.container.additional.include = com.fasterxml.jackson,org.apac == Application Runner -SInce TomEE 7.0.2, TomEE provide a light ApplicationComposer integration for TomEE Embedded (all features are not yet supported but the main ones are): +Since TomEE 7.0.2, TomEE provide a light ApplicationComposer integration for TomEE Embedded (all features are not yet supported but the main ones are): `org.apache.tomee.embedded.TomEEEmbeddedApplicationRunner`. It relies on the definition of an `@Application`: [source,java] diff --git a/docs/application-composer/advanced.adoc b/docs/application-composer/advanced.adoc index 766b994141..38ab335ae2 100644 --- a/docs/application-composer/advanced.adoc +++ b/docs/application-composer/advanced.adoc @@ -4,7 +4,7 @@ :index-group: Testing link:getting-started.html[Getting Started] page gives you already a lot -of inputs but you caneven go further. +of inputs but you can even go further. == @Descriptors diff --git a/docs/application-composer/getting-started.adoc b/docs/application-composer/getting-started.adoc index 70e0ce3994..b2e99581e9 100644 --- a/docs/application-composer/getting-started.adoc +++ b/docs/application-composer/getting-started.adoc @@ -171,7 +171,7 @@ ApplicationComposerRule(this); } Tip: since TomEE 2.x ApplicationComposerRule is decomposed in 2 rules if you need: `ContainerRule` and `DeployApplication`. Using JUnit -`RuleChain` you can chain them to get the samebehavior as +`RuleChain` you can chain them to get the same behavior as `ApplicationComposerRule` or better deploy multiple ApplicationComposer models and controlling their deployment ordering (to mock a remote service for instance). diff --git a/docs/basics---getting-things.adoc b/docs/basics---getting-things.adoc index b452073885..273831b485 100644 --- a/docs/basics---getting-things.adoc +++ b/docs/basics---getting-things.adoc @@ -76,7 +76,7 @@ See rule 2 and the above. Just creating an EJB doesn't cause it to be added to java:comp/env. If a link:container-managed-component.html[Container-Managed Component] wants to look up the EJB they must [Declare a Reference|Declaring References] -to it via the `@EJB` annotionation or <ejb-local-ref> or <ejb-ref> in xml. +to it via the `@EJB` annotation or <ejb-local-ref> or <ejb-ref> in xml. In Java EE 6, however, EJBs will be automatically bound to "java:global[/<app-name>]/<module-name>/<bean-name>[!<fully-qualified-interface-name>]" and can be looked up without declaring a reference first. diff --git a/docs/basics---transactions.adoc b/docs/basics---transactions.adoc index 43f98c7fde..0dd859366c 100644 --- a/docs/basics---transactions.adoc +++ b/docs/basics---transactions.adoc @@ -58,10 +58,9 @@ set one type of transaction behaviour (as seen above) on the bean, and a different one on a specific method of that same bean, which overrides the one configured for the overall bean. For instance, maybe you want to make an audit entry in the database that you are about to attempt a -credit card payment. It really needs to be in it's own transaction so +credit card payment. It really needs to be in its own transaction so that it is IMMEDIATELY committed for audit purposes, if something goes wrong with the credit card payment. So, perhaps you use MANDATORY on the bean, and REQUIRES_NEW on the method for audit logging. As soon as the method that does the audit logging is complete, the transaction is -committed, and the credit card payment transaction continues on it's -way. +committed, and the credit card payment transaction continues on its way. diff --git a/docs/bouncy-castle.adoc b/docs/bouncy-castle.adoc index 3bf3a7ab2e..1207d00e65 100644 --- a/docs/bouncy-castle.adoc +++ b/docs/bouncy-castle.adoc @@ -35,6 +35,6 @@ security.provider.N=org.bouncycastle.jce.provider.BouncyCastleProvider Replace `N` with the order of precedence you would like to give Bouncy Castle in comparison to the other providers in the file. *Recommended* -would be the last entry in the list -- `N` being the higest number in +would be the last entry in the list -- `N` being the highest number in the list. *Warning* that configuring Bouncy Castle as the first provider, `security.provider.1`, may cause JVM errors. diff --git a/docs/common-errors.adoc b/docs/common-errors.adoc index 86d2c6cb38..4db3974199 100644 --- a/docs/common-errors.adoc +++ b/docs/common-errors.adoc @@ -27,5 +27,5 @@ FOO, which is not currently configured in the JNDI namespace. This message is displayed when the server is starting up. -This message is usally the result of a deployment descriptor that has +This message is usually the result of a deployment descriptor that has been created by hand. diff --git a/docs/datasource-config.adoc b/docs/datasource-config.adoc index 680e188d9a..ae3e9ad9f2 100644 --- a/docs/datasource-config.adoc +++ b/docs/datasource-config.adoc @@ -187,7 +187,7 @@ boolean true -Determines wether or not this data source should be JTA managed or user +Determines whether or not this data source should be JTA managed or user managed. maxActive @@ -236,7 +236,7 @@ time 30 minutes The minimum amount of time a connection may sit idle in the pool before -it is eligable for eviction by the idle connection evictor (if any). +it is eligible for eviction by the idle connection evictor (if any). minIdle @@ -253,7 +253,7 @@ int 3 -The number of connectionss to examine during each run of the idle +The number of connections to examine during each run of the idle connection evictor thread (if any). password @@ -289,7 +289,7 @@ true If true connections will be validated before being returned from the pool. If the validation fails, the connection is destroyed, and a new -conection will be retrieved from the pool (and validated). +connection will be retrieved from the pool (and validated). testOnReturn @@ -343,7 +343,7 @@ boolean false -Wether SQL queries should be logged or not +Whether SQL queries should be logged or not == accessToUnderlyingConnectionAllowed @@ -358,8 +358,8 @@ Connection rawConn = ((DelegatingConnection) conn).getInnermostDelegate(); conn.close() ---- -Default is false, because misbehaving programs can do harmfull things to -the raw connection shuch as closing the raw connection or continuing to +Default is `false`, because misbehaving programs can do harmful things to +the raw connection such as closing the raw connection or continuing to use the raw connection after it has been assigned to another logical connection. Be careful and only use when you need direct access to driver specific extensions. @@ -399,7 +399,7 @@ The initial size to initialize the pool of connections. == jtaManaged -Determines wether or not this data source should be JTA managed or user +Determines whether or not this data source should be JTA managed or user managed. If set to 'true' it will automatically be enrolled in any ongoing @@ -434,9 +434,9 @@ public PreparedStatement prepareStatement(String sql, int resultSetType, int res == testOnBorrow -If true connections will be validated before being returned from the +If `true` connections will be validated before being returned from the pool. If the validation fails, the connection is destroyed, and a new -conection will be retrieved from the pool (and validated). +connection will be retrieved from the pool (and validated). NOTE - for a true value to have any effect, the ValidationQuery parameter must be set. diff --git a/docs/datasource-configuration-by-creator.adoc b/docs/datasource-configuration-by-creator.adoc index 026f281e3a..7ea6ad838c 100644 --- a/docs/datasource-configuration-by-creator.adoc +++ b/docs/datasource-configuration-by-creator.adoc @@ -14,7 +14,7 @@ Depending which one you use the accept configuration are not 100% the same even if we try to align the most common entries to the historical configuration (ie DBCP). -Here are a more detailled list of accepted properties by creator. +Here are a more detailed list of accepted properties by creator. == DBCP2 (TomEE 7.x and 8.x) diff --git a/docs/deployment-id.adoc b/docs/deployment-id.adoc index e782eed3ae..03652022b4 100644 --- a/docs/deployment-id.adoc +++ b/docs/deployment-id.adoc @@ -76,7 +76,7 @@ for every bean deployed in OpenEJB. The Local (IntraVM) Server is an integral part of the container system and the two are, in many ways, inseparable. The Local Server takes care of all bean to bean and client to bean invocations made inside the -virtual machine. For this reason, it often refered to as the IntraVM +virtual machine. For this reason, it often referred to as the IntraVM Server. For bean to bean communications, the Local Server must create a JNDI diff --git a/docs/deployments.adoc b/docs/deployments.adoc index 97d15dfd46..a19b51ca7c 100644 --- a/docs/deployments.adoc +++ b/docs/deployments.adoc @@ -79,7 +79,7 @@ For example, if you have a directory structure like this: > C:\myapp\acmeEjbs\org\acme\BarHome.class ---- -Then you would delcare a 'Deployments' element with the 'dir' attribute +Then you would declare a 'Deployments' element with the 'dir' attribute set to 'C:' as shown below. [source,xml] diff --git a/docs/developer/testing/applicationcomposer/index.adoc b/docs/developer/testing/applicationcomposer/index.adoc index 84571f3a59..151ecbdded 100644 --- a/docs/developer/testing/applicationcomposer/index.adoc +++ b/docs/developer/testing/applicationcomposer/index.adoc @@ -227,7 +227,7 @@ using ApplicationComposer runner: using ApplicationComposerRule rule: public class MyTest { `@Rule` // or `@ClassRule` if you want the container/application lifecycle be bound to the class and not test methods public final ApplicationComposerRule rule = new ApplicationComposerRule(this); } -Tip: since TomEE 7.x ApplicationComposerRule is decomposed in 2 rules if you need: ContainerRule and DeployApplication. Using JUnit RuleChain you can chain them to get the samebehavior as ApplicationComposerRule or better deploy multiple ApplicationComposer models and controlling their deployment ordering (to mock a remote service for instance). +Tip: since TomEE 7.x ApplicationComposerRule is decomposed in 2 rules if you need: ContainerRule and DeployApplication. Using JUnit RuleChain you can chain them to get the same behavior as ApplicationComposerRule or better deploy multiple ApplicationComposer models and controlling their deployment ordering (to mock a remote service for instance). Finally just write `@Test` method using test class injections as if the test class was a managed bean! @@ -277,7 +277,7 @@ public class MyTest { When having a huge suite of test it can be long to start/deploy/undeploy/shutdown he container/application for each method. -That's why `SingleApplicationComposerRunner` allows to just reuse the same instance accross several test. +That's why `SingleApplicationComposerRunner` allows to just reuse the same instance across several test. The first test will start and deploy the application and then other tests will reuse this instance until the JVM is destroyed where the server/application will be undeployed/shutdown. diff --git a/docs/developer/testing/arquillian/index.adoc b/docs/developer/testing/arquillian/index.adoc index 06b4c3dbad..bd7c0219c5 100644 --- a/docs/developer/testing/arquillian/index.adoc +++ b/docs/developer/testing/arquillian/index.adoc @@ -9,7 +9,7 @@ TomEE has several arquillian adapter flavors: - openejb-embedded: a plain embedded OpenEJB supporting most of EE features - tomee-embedded: a full TomEE running in the same JVM - tomee-remote: a standard TomEE running in its own process as in production -- tomee-webapp (not recommanded): an adapter starting from a Tomcat and installing tomee-webapp +- tomee-webapp (not recommended): an adapter starting from a Tomcat and installing tomee-webapp == Embedded or Remote? diff --git a/docs/developer/testing/index.adoc b/docs/developer/testing/index.adoc index 8b277e65e1..7f9e075f23 100644 --- a/docs/developer/testing/index.adoc +++ b/docs/developer/testing/index.adoc @@ -6,4 +6,4 @@ - link:applicationcomposer/index.html[ApplicationComposer]: Lightweight tests - link:arquillian/index.html[Arquillian]: The standard for EE tests -- link:other/index.html[Going futher]: OpenEJB JUnit, TomEE Embedded... +- link:other/index.html[Going further]: OpenEJB JUnit, TomEE Embedded... diff --git a/docs/developer/tools/maven/tomee.adoc b/docs/developer/tools/maven/tomee.adoc index 6abe4c4764..06caee12d8 100644 --- a/docs/developer/tools/maven/tomee.adoc +++ b/docs/developer/tools/maven/tomee.adoc @@ -73,7 +73,7 @@ The most commonly used goal, it allows to start a tomee with applications. Here |endorsedLibs|-|dependencies to add in endorsed, see after this table for advanced usage |javaagents|-|javaagents to add on the JVM, supports maven coordinates |persistJavaagents|false|should javaagent be saved or just use for this plugin run -|webapps|-|additional applicatinos to deploy +|webapps|-|additional applications to deploy |warFile|${project.build.directory}/${project.build.finalName}.${project.packaging}|the war to deploy |workWarFile|${project.build.directory}/${project.build.finalName}"|the exploded war to deploy |removeDefaultWebapps|true| should default webapps (ROOT, docs, ...) be deleted @@ -87,7 +87,7 @@ The most commonly used goal, it allows to start a tomee with applications. Here |useOpenEJB|false|use openejb-standalone instead of tomee |inlinedServerXml|-|a server.xml content in pom.xml directly |inlinedTomEEXml|-|a tomee.xml content in pom.xml directly -|overrideOnUnzip|true|if when unzipping tomee a file is already there should it be overriden +|overrideOnUnzip|true|if when unzipping tomee a file is already there should it be overridden |skipRootFolderOnUnzip|true|ignore root folder of the zip |keystore|-|path to keystore for HTTPS connector |=== diff --git a/docs/dynamic-datasource.adoc b/docs/dynamic-datasource.adoc index ff35f73cfd..798c788673 100644 --- a/docs/dynamic-datasource.adoc +++ b/docs/dynamic-datasource.adoc @@ -12,7 +12,7 @@ The openejb dynamic datasource api aims to allow to use multiple data sources as one. It can be useful for technical reasons (load balancing for example) or -functionnal reasons (filtering, aggregation, enriching...). +functional reasons (filtering, aggregation, enriching...). == The API diff --git a/docs/ejb-over-ssl.adoc b/docs/ejb-over-ssl.adoc index d34d364fe8..d65542cf61 100644 --- a/docs/ejb-over-ssl.adoc +++ b/docs/ejb-over-ssl.adoc @@ -37,7 +37,7 @@ InitialContext ctx = new InitialContext(p); MyBean myBean = (MyBean) ctx.lookup("MyBeanRemote"); ---- -If you set up Tomcat (TomEE) to use the APR (Apache Portable Runitme) +If you set up Tomcat (TomEE) to use the APR (Apache Portable Runtime) implementation of SSL on the server side, and you have connection issues like connection reset, you'll have to set 'https.protocols' system property. 'https.protocols' property must be set according to the diff --git a/docs/ejb-refs.adoc b/docs/ejb-refs.adoc index 84dbc24cd2..844ebf24f2 100644 --- a/docs/ejb-refs.adoc +++ b/docs/ejb-refs.adoc @@ -175,7 +175,7 @@ Note the above also works with the various forms of failover that TomEE supports. If say, there are two servers that have the `OrangeBeanRemote` bean, you -could expand the `<JndiProvider>` delcaration like so: +could expand the `<JndiProvider>` declaration like so: [source,xml] ---- @@ -188,7 +188,7 @@ could expand the `<JndiProvider>` delcaration like so: In the event that the `ejbd://192.168.1.20:4201` server cannot be contacted, the second server will be tried. -This sort of arangement can also happen dynamicall against a list of +This sort of arrangement can also happen dynamically against a list of servers that continuously grows and shrinks. The server list is maintained behind the scenes using server discovery logic that can function on either UDP or TCP. See these docs for more details on diff --git a/docs/embedded-and-remotable.adoc b/docs/embedded-and-remotable.adoc index d16f0bee01..7dfa1e8bc8 100644 --- a/docs/embedded-and-remotable.adoc +++ b/docs/embedded-and-remotable.adoc @@ -12,7 +12,7 @@ in other vms_ access your ejbs. _Note, you do not need to go to this extreme to unit test ejbs with remote interfaces._ The basic recipe is the same for a standard embedded scenario but with -these added ingreditents: +these added ingredients: * _openejb.embedded.remotable_ property * _openejb-ejbd_ jar diff --git a/docs/embedded-configuration.adoc b/docs/embedded-configuration.adoc index d06db7197a..79b12108e4 100644 --- a/docs/embedded-configuration.adoc +++ b/docs/embedded-configuration.adoc @@ -35,7 +35,7 @@ lowest. It opens up some interesting possibilities in how you configure your environment. You could do 100% of your configuration in your test case -via InitialContext propertes, or you could do say 80% in a +via InitialContext properties, or you could do say 80% in a jndi.properties file or openejb.xml file and 20% in your test case via InitialContext properties. You can put 100% of your configuration in a `jndi.properties` or `openejb.xml` file and override them via diff --git a/docs/hello-world.adoc b/docs/hello-world.adoc index 51a48fc10c..0c42da0c6c 100644 --- a/docs/hello-world.adoc +++ b/docs/hello-world.adoc @@ -50,7 +50,7 @@ server will automatically deploy all the EJB's contained in this JAR. - _conf_: This directory contains all the configuration files. Although you may not see any file except for a README.txt file right now, but after you start the server, the required configuration files will be -automatically created. It is highly recommeded to read the README.txt +automatically created. It is highly recommended to read the README.txt file under this directory - _logs_: Contains log files. == Setup your development environment @@ -73,7 +73,7 @@ karan@poweredge:~$ cd projects We will do all our work in this directory. ### Install Java Download and 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. +will set up this variable to refer to the openejb install location. [source,bash] ---- @@ -253,7 +253,7 @@ The above should give you the following output: Hello World!!!! ---- -== Help! , it didn't work for me!!. No problem, we are here to help. +== Help! It didn't work for me!!. No problem, we are here to help. Just send us an email at [email protected]. If possible, send us the contents of logs/openejb.log file in the email. diff --git a/docs/java7.adoc b/docs/java7.adoc index 25371176fa..d61167e6fe 100644 --- a/docs/java7.adoc +++ b/docs/java7.adoc @@ -23,7 +23,7 @@ If you compile your applications on JDK7 you have to run Apache TomEE == Configuring TomEE to use JDK7 If you have multiple JDK installed on your system you should set -JAVA_HOME in your stratup scripts. For example if your `JAVA_HOME` is +JAVA_HOME in your startup scripts. For example if your `JAVA_HOME` is `/usr/local/java/current` edit `catalina.sh` and add a line `JAVA_HOME=/usr/local/java/current/bin` @@ -33,7 +33,7 @@ calling `<tomee-home>/bin/startup.sh` == Endorsed libraries directory -TomEE 1.0 package comes with and "endorsed" direcotry which contains +TomEE 1.0 package comes with and "endorsed" directory which contains updates for core JDK6 libraries. If you are running JDK7 you should remove al files in this directory. diff --git a/docs/jms-resources-and-mdb-container.adoc b/docs/jms-resources-and-mdb-container.adoc index 91dabdb349..877c313c62 100644 --- a/docs/jms-resources-and-mdb-container.adoc +++ b/docs/jms-resources-and-mdb-container.adoc @@ -221,7 +221,7 @@ The Activation Spec properties that can be configured are: |*maxMessagesPerSessions* |no |_10_ -|This is actually the prefetch size for the subscription. (Yes, badlynamed). +|This is actually the prefetch size for the subscription. (Yes, badly named). |*maxSessions* |no diff --git a/docs/jpa-concepts.adoc b/docs/jpa-concepts.adoc index eb2d718a60..667f55dafb 100644 --- a/docs/jpa-concepts.adoc +++ b/docs/jpa-concepts.adoc @@ -99,7 +99,7 @@ will become Detached if it somehow *lives longer* or is *used outside* the scope of the PersistenceContext/Cache. For a JTA unit, the PersistenceContext/Cache will live as long as the -transaction does. When a transaction completes (commits or rollsback) +transaction does. When a transaction completes (commits or rolls back) all objects that were in the PersistenceContext/Cache are Detached. You can still use them, but they are no longer associated with a PersistenceContext/Cache and modifications on them will *not* be diff --git a/docs/local-server.adoc b/docs/local-server.adoc index cc0aac5802..f29db8a9ed 100644 --- a/docs/local-server.adoc +++ b/docs/local-server.adoc @@ -9,7 +9,7 @@ align=right, hspace=15! # Accessing EJBs Locally When OpenEJB embedded in your app, server, IDE, or JUnit, you can use what we call the Local Server and avoid the network overhead and enjoy -an easy way to embedd OpenEJB. Instead of putting the app in the server, +an easy way to embed OpenEJB. Instead of putting the app in the server, put the server in the app! = Say what?! A local server? @@ -17,7 +17,7 @@ put the server in the app! Yes, you read correctly. OpenEJB can be embedded and treated as your very own personal EJB container. -If they can have Local and Remote EJB's, why not Local and Remote EJB +If they can have Local and Remote EJBs, why not Local and Remote EJB Servers too? Haven't you ever wanted EJBs without the heavy? I mean you need the @@ -45,7 +45,7 @@ intents purposes, your application an IntraVM Client. There are some interesting differences though. The IntraVM Server isn't a heavyweight server as one normally associates with EJB. It doesn't open connections, launch threads for processing requests, introduce -complex classloading heirarchies, or any of those "heavy" kind of +complex classloading hierarchies, or any of those "heavy" kind of things. All it does is dish out proxies to your app that can be used to shoot calls right into the EJB Container. Very light, very fast, very easy for testing, debugging, developing, etc. diff --git a/docs/maven/index.adoc b/docs/maven/index.adoc index 3ac3267329..fba7cece18 100644 --- a/docs/maven/index.adoc +++ b/docs/maven/index.adoc @@ -44,7 +44,7 @@ Simply add the following to the `<plugins>` and optionally the `<pluginManagemen | tomee:help | Display help information on the tomee-maven-plugin. Call mvn tomee:help -Ddetail=true -Dgoal=<goal-name> to display parameter details. | tomee:list | Largely inspired by the OpenEJB command helper, but with some -differences. List deployed EJB's in a running TomEE. +differences. List deployed EJBs in a running TomEE. | tomee:run |Start and wait for TomEE. | tomee:start | Start TomEE and continue. | tomee:stop | Stop a TomEE started with start command. @@ -72,7 +72,7 @@ supported. * remove:<some prefix of jar in lib folder>: remove all jar starting with the specified prefix * unzip:<some maven zip>: extract the zip in lib folder -* ?name=<new-name>: rename the libary once copied in lib folder +* ?name=<new-name>: rename the library once copied in lib folder Note: the name tweak can be used to rename applications too diff --git a/docs/microprofile/jwt.adoc b/docs/microprofile/jwt.adoc index 6b26c55a95..2a43a50807 100644 --- a/docs/microprofile/jwt.adoc +++ b/docs/microprofile/jwt.adoc @@ -47,7 +47,7 @@ Specifying the keys for verifying or decrypting JWTs is done via a `META-INF/mic | Description | `mp.jwt.verify.publickey` | String -| The contents of any valid public key file. Allows the public key to be inlined into the `microprofile-config.properties` withou the need for separate files. +| The contents of any valid public key file. Allows the public key to be inlined into the `microprofile-config.properties` without the need for separate files. | `mp.jwt.verify.publickey.location` | String | The location of any valid public key file. Can be specified as a relative path on disk, relative path on the classpath, or valid URL such a `file:`, `http:`, or `https:`. Custom URLs are supported as long as there is a corresponding `java.net.URLStreamHandler` installed in the JVM. @@ -62,7 +62,7 @@ Specifying the keys for verifying or decrypting JWTs is done via a `META-INF/mic | When `mp.jwt.token.header=Cookie` the value of `mp.jwt.token.cookie` specifies the exact cookie name holding the JWT. The default is `Bearer`. | `mp.jwt.verify.audiences` | String -| A comma-delimited list of allowable values for the JWT `aud` claim. When specified, a JWT with an `aud` that does not apper in the allowed list will result in an HTTP `401`. When not specified, all `aud` values are accepted including no `aud` at all. +| A comma-delimited list of allowable values for the JWT `aud` claim. When specified, a JWT with an `aud` that does not appear in the allowed list will result in an HTTP `401`. When not specified, all `aud` values are accepted including no `aud` at all. | `mp.jwt.verify.issuer` | String | The expected value of the `iss` JWT claim. When specified, a JWT with an `iss` that does not match the configured value will result in an HTTP `401`. When not specified, any `iss` values are accepted including no `iss` at all. @@ -93,7 +93,7 @@ In addition to the standard MicroProfile JWT configuration properties above, the | Should the first attempt to load keys fail, this setting specifies how long we should wait before trying again. An exponential backoff will occur and the delay will double on each subsequent retry. This allows retrying to be very aggressive in the event of a temporary issue, but prevents overloading the server supplying the keys. The default value is `2 seconds` | `tomee.jwt.verify.publickey.cache.maxRetryDelay` | link:../configuring-durations.html[Duration] -| Allows the retry attempts to eventually reach a fixed rate after a certain maximum delay is reached. This property disables the exponential backoff once the specified maximum delay is reached. All subsequent retries will happen at the interval specifed. To disable exponential backoff entirely, set `initialRetryDelay` and `maxRetryDelay` to the same value. The default value is `1 hour` +| Allows the retry attempts to eventually reach a fixed rate after a certain maximum delay is reached. This property disables the exponential backoff once the specified maximum delay is reached. All subsequent retries will happen at the interval specified. To disable exponential backoff entirely, set `initialRetryDelay` and `maxRetryDelay` to the same value. The default value is `1 hour` | `tomee.jwt.verify.publickey.cache.accessTimeout` | link:../configuring-durations.html[Duration] | Specifies the maximum time incoming HTTP Requests with JWTs will block and wait for keys when no keys are available. If specified time is reached, callers will receive an HTTP `401`. The default value is `30 seconds` @@ -108,7 +108,7 @@ In addition to the standard MicroProfile JWT configuration properties above, the | Should the first attempt to load keys fail, this setting specifies how long we should wait before trying again. An exponential backoff will occur and the delay will double on each subsequent retry. This allows retrying to be very aggressive in the event of a temporary issue, but prevents overloading the server supplying the keys. The default value is `2 seconds` | `tomee.jwt.decrypt.key.cache.maxRetryDelay` | link:../configuring-durations.html[Duration] -| Allows the retry attempts to eventually reach a fixed rate after a certain maximum delay is reached. This property disables the exponential backoff once the specified maximum delay is reached. All subsequent retries will happen at the interval specifed. To disable exponential backoff entirely, set `initialRetryDelay` and `maxRetryDelay` to the same value. The default value is `1 hour` +| Allows the retry attempts to eventually reach a fixed rate after a certain maximum delay is reached. This property disables the exponential backoff once the specified maximum delay is reached. All subsequent retries will happen at the interval specified. To disable exponential backoff entirely, set `initialRetryDelay` and `maxRetryDelay` to the same value. The default value is `1 hour` | `tomee.jwt.decrypt.key.cache.accessTimeout` | link:../configuring-durations.html[Duration] | Specifies the maximum time incoming HTTP Requests with JWTs will block and wait for keys when no keys are available. If specified time is reached, callers will receive an HTTP `401`. The default value is `30 seconds` diff --git a/docs/multipoint-discovery.adoc b/docs/multipoint-discovery.adoc index bfc20af492..3ca487ba5a 100644 --- a/docs/multipoint-discovery.adoc +++ b/docs/multipoint-discovery.adoc @@ -83,5 +83,5 @@ client. In this scenario the list of servers used for failover is supplied entirely by the server at `192.168.1.20:4201`. The server could have -aquired the list via multicast or multipoint (or both), but this detail +acquired the list via multicast or multipoint (or both), but this detail is not visible to the client. diff --git a/docs/new-in-openejb-3.0.adoc b/docs/new-in-openejb-3.0.adoc index bc444846a3..cb4687aa8b 100644 --- a/docs/new-in-openejb-3.0.adoc +++ b/docs/new-in-openejb-3.0.adoc @@ -13,7 +13,7 @@ OpenEJB 3.0 supports the EJB 3.0 specification as well as the prior EJB * No home interfaces * Business Interfaces * Dependency Injection -* Intercpetors +* Interceptors * Java Persistence API * Service Locator (ala SessionContext.lookup) * POJO-style beans @@ -74,7 +74,7 @@ public class MyBean { Along the lines of injection, one of the last remaining things in EJB 3 that people need an `ejb-jar.xml` file for is to supply the value of env-entries. Env Entries are the source of data for all user supplied -data injected into your bean; the afore mentioned String, Boolean, +data injected into your bean; the aforementioned String, Boolean, Integer, etc. This is a very big burden as each env-entry is going to cost you 5 lines of xml and the complication of having to figure out how to add you bean declaration in xml as an override of an existing bean diff --git a/docs/openejb.xml.adoc b/docs/openejb.xml.adoc index 5b6ba7c7e2..6a1de84bd9 100644 --- a/docs/openejb.xml.adoc +++ b/docs/openejb.xml.adoc @@ -64,7 +64,7 @@ details. == What properties are available? -To know what properties can be overriden the './bin/openejb properties' +To know what properties can be overridden the './bin/openejb properties' command is very useful: see link:properties-tool.html[Properties Tool] Its function is to connect to a running server and print a canonical diff --git a/docs/properties-listing.adoc b/docs/properties-listing.adoc index 1df64db82d..1821d3ae44 100644 --- a/docs/properties-listing.adoc +++ b/docs/properties-listing.adoc @@ -25,7 +25,7 @@ prefix>.threads host or IP, port, bool override the host. Available for ejbd and httpejbd services (used by -jaxws and jaxrs), number of thread to maneg requests +jaxws and jaxrs), number of thread to manage requests openejb.embedded.initialcontext.close @@ -471,7 +471,7 @@ string separated by comma + + + -list of prefixes you want to remove from thedefault list of exclusion +list of prefixes you want to remove from the default list of exclusion + + + @@ -683,7 +683,7 @@ tomee.jaxws.oldsubcontext bool -wether or not activate old way to bind jaxws webservices directly on +whether or not activate old way to bind jaxws webservices directly on root context openejb.modulename.useHash @@ -699,7 +699,7 @@ openejb.session.manager qualified name (string) -configure a session managaer to use for all contexts +configure a session manager to use for all contexts == TomEE Arquillian adaptor @@ -713,7 +713,7 @@ tomee.ejbcontainer.http.port int -tomee port, -1 means random. When using a random port you can retreive +tomee port, -1 means random. When using a random port you can retrieve it getting this property too. tomee.arquillian.http diff --git a/docs/property-overriding.adoc b/docs/property-overriding.adoc index 9dd6990095..ef16a97e29 100644 --- a/docs/property-overriding.adoc +++ b/docs/property-overriding.adoc @@ -28,7 +28,7 @@ details. == What properties are available? -To know what properties can be overriden the './bin/openejb properties' +To know what properties can be overridden the './bin/openejb properties' command is very useful: see link:properties-tool.html[Properties Tool] Its function is to connect to a running server and print a canonical diff --git a/docs/provisioning.adoc b/docs/provisioning.adoc index 4592ef144c..c4d9debbbf 100644 --- a/docs/provisioning.adoc +++ b/docs/provisioning.adoc @@ -24,7 +24,7 @@ urls are supported for such features. These features are explained in other places. -== Supported provionings +== Supported provisioning === file diff --git a/docs/security.adoc b/docs/security.adoc index f7eadaf903..56330c663c 100644 --- a/docs/security.adoc +++ b/docs/security.adoc @@ -37,7 +37,7 @@ Here, you can configure any number of security realms to authenticate against. To specify which of the realms you want to authenticate against, you can set the _openejb.authentication.realmName_ property to any of the configured realm names in _login.config_. If you don't -speficy a realm name, the default (currently _PropertiesLogin_) is used. +specify a realm name, the default (currently _PropertiesLogin_) is used. For examples and more information on JAAS configuration, see the http://java.sun.com/javase/6/docs/technotes/guides/security/jaas/JAASRefGuide.html[JAAS Reference Guide] . @@ -197,5 +197,5 @@ would have to implement to supply the OpenEJB client with alternate data to send to the server with each invocation request. If you're plugging in a new version of this it is likely that you may also want to plugin in your own SecurityService implementation. Reason being, the object -returned from IdentiyResolve.getIdentity() is sent across the wire and +returned from IdentityResolve.getIdentity() is sent across the wire and straight in to the SecurityService.associate(Object) method. diff --git a/docs/singleton-beans.adoc b/docs/singleton-beans.adoc index e059e846c8..ae142a2dd6 100644 --- a/docs/singleton-beans.adoc +++ b/docs/singleton-beans.adoc @@ -4,8 +4,9 @@ :jbake-type: page :jbake-status: published -= Singleton Overview For the first time in years EJB has a new -bean type, the _`@Singleton_`. In my opinion, the jakarta.ejb.Singleton will += Singleton Overview + +For the first time in years EJB has a new bean type, the `@Singleton`. In my opinion, the jakarta.ejb.Singleton will replace a lot of what people are using `@Stateless` for today. The Singleton is essentially what you get if you take a Stateless bean @@ -18,9 +19,9 @@ Additionally, the Singleton can have its `@PostConstruct` method called with the application starts up and its `@PreDestroy` method called when the application shuts down. This allows it to serve as an application lifecycle listener which is something only Servlets could do before. It -has an _`@Startup_` annotation which is similar in concept to the servlet +has an `@Startup` annotation which is similar in concept to the servlet , but unlike servlets it doesn't take a number as an argument. Instead, -you can use an _`@DependsOn_` annotation to say which other Singletons you +you can use an `@DependsOn` annotation to say which other Singletons you need and the container will ensure they start before you. See the link:singleton-example.html[Singleton Example] for sample bean @@ -107,7 +108,7 @@ downgrading, and ==== Acquiring the Lock -The _`@AccessTimetout_` annotation can configure how long a thread will +The `@AccessTimeout` annotation can configure how long a thread will wait to acquire the read or write lock. This annotation can be used on the bean class or individual methods. The annotation maps directly to the @@ -148,7 +149,7 @@ _jakarta.ejb.ConcurrentAccessTimeoutException_ will be thrown. ==== Default Timeout -The default value of _`@AccessTimeout_` annotation is vendor specific. In +The default value of `@AccessTimeout` annotation is vendor specific. In OpenEJB, it defaults to the value of the _AccessTimeout_ property which can be configured in many different scopes. Here is the order of preference: @@ -167,16 +168,16 @@ link:configuring-durations.html[Configuring Durations] for details. == Startup and Startup Ordering -Singletons have an _`@Startup_` annotation which can be applied to the +Singletons have an `@Startup` annotation which can be applied to the bean class. When used, the Container will instantiate the Singleton instance _eagerly_ when the application starts up, otherwise the Container will instantiate the Singleton instance _lazily_ when the bean is first accessed. If one Singleton refers to another Singleton in the `@PostConstruct` or -@PreDestroy method, there must be some measure taken to ensure the other +`@PreDestroy` method, there must be some measure taken to ensure the other Singleton exists and is started. This sort of ordering is achieved with -the _`@DependsOn_` annotation which can be used to list the names of +the `@DependsOn` annotation which can be used to list the names of Singleton beans that must be started before the Singleton bean using the annotation. diff --git a/docs/singletoncontainer-config.adoc b/docs/singletoncontainer-config.adoc index 27020c4375..66c4911e05 100644 --- a/docs/singletoncontainer-config.adoc +++ b/docs/singletoncontainer-config.adoc @@ -63,7 +63,7 @@ bean instance to become available before giving up. After the timeout is reached a `jakarta.ejb.ConcurrentAccessTimeoutException` will be thrown. -Usable time units: nanoseconds, microsecons, milliseconds, seconds, +Usable time units: nanoseconds, microseconds, milliseconds, seconds, minutes, hours, days. Or any combination such as `1 hour and 27 minutes and 10 seconds` diff --git a/docs/spring.adoc b/docs/spring.adoc index 51b507e808..b4ab712c45 100644 --- a/docs/spring.adoc +++ b/docs/spring.adoc @@ -16,7 +16,7 @@ Spring beans. The injection system supports arbitrarily complex nesting (e.g., Spring bean injected into a Java EE component, which is then injected into another Spring bean), including: -* @Resouce injection of any Spring bean into EJB +* @Resource injection of any Spring bean into EJB * Injection of any Java EE resource into a Spring bean, including: ** EJB 3.0 beans ** EJB 3.1 Singleton Bean ** JDBC Connector ** JMS Connector ** JMS Queue and Topic ** Generic Java EE Connector (JCA) diff --git a/docs/statefulcontainer-config.adoc b/docs/statefulcontainer-config.adoc index 5c1a82e45e..b60433dfe3 100644 --- a/docs/statefulcontainer-config.adoc +++ b/docs/statefulcontainer-config.adoc @@ -133,7 +133,7 @@ bean instance to become available before giving up. After the timeout is reached a `jakarta.ejb.ConcurrentAccessTimeoutException` will be thrown. -Usable time units: nanoseconds, microsecons, milliseconds, seconds, +Usable time units: nanoseconds, microseconds, milliseconds, seconds, minutes, hours, days. Or any combination such as "1 hour and 27 minutes and 10 seconds" diff --git a/docs/statelesscontainer-config.adoc b/docs/statelesscontainer-config.adoc index ffe6a20d3b..c275f3a2ef 100644 --- a/docs/statelesscontainer-config.adoc +++ b/docs/statelesscontainer-config.adoc @@ -76,7 +76,7 @@ time 30 seconds -Specifies the time an invokation should wait for an instance of the pool +Specifies the time an invocation should wait for an instance of the pool to become available. callbackThreads @@ -190,13 +190,13 @@ expired instances. == accessTimeout -Specifies the time an invokation should wait for an instance of the pool +Specifies the time an invocation should wait for an instance of the pool to become available. After the timeout is reached, if an instance in the pool cannot be obtained, the method invocation will fail. -Usable time units: nanoseconds, microsecons, milliseconds, seconds, +Usable time units: nanoseconds, microseconds, milliseconds, seconds, minutes, hours, days. Or any combination such as "1 hour and 27 minutes and 10 seconds" @@ -224,7 +224,7 @@ bean is undeployed and its pool is closed. The `CloseTimeout` specifies the maximum time to wait for the pool to close and `PostConstruct` methods to be invoked. -Usable time units: nanoseconds, microsecons, milliseconds, seconds, +Usable time units: nanoseconds, microseconds, milliseconds, seconds, minutes, hours, days. Or any combination such as `1 hour and 27 minutes and 10 seconds` @@ -258,7 +258,7 @@ Only instances in surplus of the pool's `MinSize` are eligible to expire via `IdleTimeout` Instances that expire due to `IdleTimeout` will have their `@PreDestroy` methods invoked before being completely destroyed. -Usable time units: nanoseconds, microsecons, milliseconds, seconds, +Usable time units: nanoseconds, microseconds, milliseconds, seconds, minutes, hours, days. Or any combination such as "1 hour and 27 minutes and 10 seconds" @@ -271,7 +271,7 @@ This will happen gracefully. Useful for situations where bean instances are designed to hold potentially expensive resources such as memory or file handles and need to be periodically cleared out. -Usable time units: nanoseconds, microsecons, milliseconds, seconds, +Usable time units: nanoseconds, microseconds, milliseconds, seconds, minutes, hours, days. Or any combination such as `1 hour and 27 minutes and 10 seconds` @@ -436,10 +436,10 @@ functionality is enforced. Higher intervals are better. Instances in use are excluded from sweeping. Should an instance expire while in use it will be evicted immediately upon return to the pool. Effectively `MaxAge` and flushes will be enforced as a part of normal -activity or sweeping, while IdleTimeout is only enforcable via sweeping. +activity or sweeping, while IdleTimeout is only enforceable via sweeping. This makes aggressive sweeping less important for a pool under moderate load. -Usable time units: nanoseconds, microsecons, milliseconds, seconds, +Usable time units: nanoseconds, microseconds, milliseconds, seconds, minutes, hours, days. Or any combination such as `1 hour and 27 minutes and 10 seconds` diff --git a/docs/system-properties-files.adoc b/docs/system-properties-files.adoc index d553ecb44d..267e6eb9ed 100644 --- a/docs/system-properties-files.adoc +++ b/docs/system-properties-files.adoc @@ -21,5 +21,5 @@ Here how it works: $\{user.home}/.openejb/system.properties * instance system.properties: conf/system.properties -Note: generally you place in the user system properties file the contant +Note: generally you place in the user system properties file the constant configuration (check my openejb version for instance). diff --git a/docs/tomee-and-hibernate.adoc b/docs/tomee-and-hibernate.adoc index 1dc4a37b45..3e874fccd2 100644 --- a/docs/tomee-and-hibernate.adoc +++ b/docs/tomee-and-hibernate.adoc @@ -14,7 +14,7 @@ The basic steps are: . Add the Hibernate jars to `<tomee-home>/lib/` . Configure the webapp or the server to use Hibernate -*The atifact versions defined here are just for example, so please feel +*The artifact versions defined here are just for example, so please feel free to use current library versions.* == Webapp Configuration @@ -73,7 +73,7 @@ Hibernate over OpenJPA. Using the `<tomee-home>/conf/system.properties` file or any other valid means of setting `java.lang.System.getProperties()`, the following -standard properties can set the detault for any `persistence.xml` file. +standard properties can set the default for any `persistence.xml` file. * `jakarta.persistence.provider` * `jakarta.persistence.transactionType` diff --git a/docs/tomee-and-intellij.adoc b/docs/tomee-and-intellij.adoc index aa798f1bd4..833ab58a6d 100644 --- a/docs/tomee-and-intellij.adoc +++ b/docs/tomee-and-intellij.adoc @@ -29,7 +29,7 @@ supports. The evolving TomEE/Intellij integration sets the pace for all other IDE integrations. http://youtrack.jetbrains.com/issues/IDEA[Feature requests very welcome!] TomEE is to Intellij what GlassFish is to NetBeans and your -feedback is a critcal part of that. +feedback is a critical part of that. == Getting Started diff --git a/docs/tomee-maven-plugin.adoc b/docs/tomee-maven-plugin.adoc index d12c654913..fa63c427f6 100644 --- a/docs/tomee-maven-plugin.adoc +++ b/docs/tomee-maven-plugin.adoc @@ -72,7 +72,7 @@ supported. * remove:<some prefix of jar in lib folder>: remove all jar starting with the specified prefix * unzip:<some maven zip>: extract the zip in lib folder -* ?name=<new-name>: rename the libary once copied in lib folder +* ?name=<new-name>: rename the library once copied in lib folder Note: the name tweak can be used to rename applications too diff --git a/docs/tomee-version-policies.adoc b/docs/tomee-version-policies.adoc index 7bc6ed515f..8344cb06c7 100644 --- a/docs/tomee-version-policies.adoc +++ b/docs/tomee-version-policies.adoc @@ -10,7 +10,7 @@ TomEE version policy is made of three dot-separated numbers: x.y.z * x is the major version. It corresponds to the maximum Java EE specification supported by TomEE and a codebase generation, starting -with value 1 for Java EE 6 support. Next major will be 7 targetting +with value 1 for Java EE 6 support. Next major will be 7 targeting JavaEE 7 etc... * y is the minor version. It corresponds to a features level, starting at 0. Initial TomEE release was 1.0.0, followed by 1.5.0 because of the @@ -31,9 +31,9 @@ validate you are compliant with a JavaEE version. TomEE 1.x passed the JavaEE 6 TCK which was donated to Apache Software Foundation by Oracle. This donation hasn't been done to Apache for JavaEE 7 so TomEE is not able for now to be validated against it and therefore TomEE versions -targetting JavaEE 7 are not yet certified. +targeting JavaEE 7 are not yet certified. -To make it more explicit here is a small table showing the targetted +To make it more explicit here is a small table showing the targeted JavaEE version and the related certification state by version: TomEE Version diff --git a/docs/transaction-annotations.adoc b/docs/transaction-annotations.adoc index 837ba7bcf6..12efe7aca9 100644 --- a/docs/transaction-annotations.adoc +++ b/docs/transaction-annotations.adoc @@ -73,7 +73,7 @@ an exception. ==== MANDATORY A _MANDATORY_ method is guaranteed to always be executed in a -transaction. However, it's the caller's job to take care of suppling the +transaction. However, it's the caller's job to take care of supplying the transaction. If the caller attempts to invoke the method _outside_ of a transaction, then the container will block the call and throw them an _exception_. @@ -187,7 +187,7 @@ public static class MyBean implements MyBusinessInterface { = Illegal Usage -Generally, transaction annotationss cannot be made on AroundInvoke +Generally, transaction annotations cannot be made on AroundInvoke methods and most callbacks. The following usages of `@TransactionAttribute` have no effect. diff --git a/docs/understanding-the-directory-layout.adoc b/docs/understanding-the-directory-layout.adoc index 40d5a7e265..e8e0c4089d 100644 --- a/docs/understanding-the-directory-layout.adoc +++ b/docs/understanding-the-directory-layout.adoc @@ -36,9 +36,9 @@ classpath to do EJB development) == apps/ -Once you create your EJB's and jar them up, you can place your jar file +Once you create your EJBs and jar them up, you can place your jar file in this directory and start the server. The server will automatically -deploy all the EJB's contained in this JAR. +deploy all the EJBs contained in this JAR. == logs/ diff --git a/docs/validation-tool.adoc b/docs/validation-tool.adoc index 2ce7911fbb..9b765a3c7a 100644 --- a/docs/validation-tool.adoc +++ b/docs/validation-tool.adoc @@ -66,7 +66,7 @@ More checks will be added in the future. -v -Sets the output level to 1. This will output just the minumum details on +Sets the output level to 1. This will output just the minimum details on each failure. -vv @@ -101,7 +101,7 @@ Show examples of how to use the options. # COMMON ISSUES -== Misslocated class or NoClassDefFoundError +== Mislocated class or NoClassDefFoundError The short explanation is that the parent doesn't have all the classes it needs as some of them are only in the child classloader, where the @@ -132,7 +132,7 @@ system attempts to load the Employee interface, the call goes right through that classloader and down to the system classloader. The Employee interface is found, because it was accidentally added to that extra jar in the system classpath. So now the system classloader goes -looking for Employee's superinterface, Person, where it immediatly blows +looking for Employee's superinterface, Person, where it immediately blows up and throws a NoClassDefFoundError: Person. Most people will look at their ejb-jar and think, "But all my classes
