tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject [02/20] tomee git commit: Docs old and new
Date Fri, 30 Nov 2018 23:04:17 GMT
http://git-wip-us.apache.org/repos/asf/tomee/blob/f779264f/docs/statelesscontainer-config.mdtext
----------------------------------------------------------------------
diff --git a/docs/statelesscontainer-config.mdtext b/docs/statelesscontainer-config.mdtext
new file mode 100644
index 0000000..460bbc4
--- /dev/null
+++ b/docs/statelesscontainer-config.mdtext
@@ -0,0 +1,458 @@
+Title: StatelessContainer Configuration
+
+
+A StatelessContainer can be declared via xml in the `<tomee-home>/conf/tomee.xml` file or in a `WEB-INF/resources.xml` file using a declaration like the following.  All properties in the element body are optional.
+
+    <Container id="myStatelessContainer" type="STATELESS">
+        accessTimeout = 30 seconds
+        callbackThreads = 5
+        closeTimeout = 5 minutes
+        garbageCollection = false
+        idleTimeout = 0 minutes
+        maxAge = 0 hours
+        maxAgeOffset = -1
+        maxSize = 10
+        minSize = 0
+        replaceAged = true
+        replaceFlushed = false
+        strictPooling = true
+        sweepInterval = 5 minutes
+    </Container>
+
+Alternatively, a StatelessContainer can be declared via properties in the `<tomee-home>/conf/system.properties` file or via Java VirtualMachine `-D` properties.  The properties can also be used when embedding TomEE via the `javax.ejb.embeddable.EJBContainer` API or `InitialContext`
+
+    myStatelessContainer = new://Container?type=STATELESS
+    myStatelessContainer.accessTimeout = 30 seconds
+    myStatelessContainer.callbackThreads = 5
+    myStatelessContainer.closeTimeout = 5 minutes
+    myStatelessContainer.garbageCollection = false
+    myStatelessContainer.idleTimeout = 0 minutes
+    myStatelessContainer.maxAge = 0 hours
+    myStatelessContainer.maxAgeOffset = -1
+    myStatelessContainer.maxSize = 10
+    myStatelessContainer.minSize = 0
+    myStatelessContainer.replaceAged = true
+    myStatelessContainer.replaceFlushed = false
+    myStatelessContainer.strictPooling = true
+    myStatelessContainer.sweepInterval = 5 minutes
+
+Properties and xml can be mixed.  Properties will override the xml allowing for easy configuration change without the need for ${} style variable substitution.  Properties are not case sensitive.  If a property is specified that is not supported by the declared StatelessContainer a warning will be logged.  If a StatelessContainer is needed by the application and one is not declared, TomEE will create one dynamically using default settings.  Multiple StatelessContainer declarations are allowed.
+# Supported Properties
+<table>
+<tr>
+<th>Property</th>
+<th>Type</th>
+<th>Default</th>
+<th>Description</th>
+</tr>
+<tr>
+  <td><a href="#accessTimeout">accessTimeout</a></td>
+  <td><a href="configuring-durations.html">time</a></td>
+  <td>30&nbsp;seconds</td>
+  <td>
+Specifies the time an invokation should wait for an instance
+of the pool to become available.
+</td>
+</tr>
+<tr>
+  <td><a href="#callbackThreads">callbackThreads</a></td>
+  <td>int</td>
+  <td>5</td>
+  <td>
+The number of threads for constructing and destroying beans.
+</td>
+</tr>
+<tr>
+  <td><a href="#closeTimeout">closeTimeout</a></td>
+  <td><a href="configuring-durations.html">time</a></td>
+  <td>5&nbsp;minutes</td>
+  <td>
+Maximum time to wait for instances to be destroyed when shutting down the pool
+</td>
+</tr>
+<tr>
+  <td><a href="#garbageCollection">garbageCollection</a></td>
+  <td>boolean</td>
+  <td>false</td>
+  <td>
+Allows Garbage Collection to be used as a mechanism for shrinking
+the pool.
+</td>
+</tr>
+<tr>
+  <td><a href="#idleTimeout">idleTimeout</a></td>
+  <td><a href="configuring-durations.html">time</a></td>
+  <td>0&nbsp;minutes</td>
+  <td>
+Specifies the maximum time that an instance should be allowed to
+sit idly in the pool without use before it should be retired and
+removed.
+</td>
+</tr>
+<tr>
+  <td><a href="#maxAge">maxAge</a></td>
+  <td><a href="configuring-durations.html">time</a></td>
+  <td>0&nbsp;hours</td>
+  <td>
+Specifies the maximum time that an instance should live before
+it should be retired and removed from use.
+</td>
+</tr>
+<tr>
+  <td><a href="#maxAgeOffset">maxAgeOffset</a></td>
+  <td>int</td>
+  <td>-1</td>
+  <td>
+Applies to MaxAge usage and would rarely be changed, but is a
+nice feature to understand.
+</td>
+</tr>
+<tr>
+  <td><a href="#maxSize">maxSize</a></td>
+  <td>int</td>
+  <td>10</td>
+  <td>
+Specifies the size of the instance pool for this stateless
+SessionBean container.
+</td>
+</tr>
+<tr>
+  <td><a href="#minSize">minSize</a></td>
+  <td>int</td>
+  <td>0</td>
+  <td>
+Specifies the minimum number of bean instances that should be in
+the pool for each bean.
+</td>
+</tr>
+<tr>
+  <td><a href="#replaceAged">replaceAged</a></td>
+  <td>boolean</td>
+  <td>true</td>
+  <td>
+When `ReplaceAged` is enabled, any instances in the pool that
+expire due to reaching their `MaxAge` will be replaced immediately
+so that the pool will remain at its current size.
+</td>
+</tr>
+<tr>
+  <td><a href="#replaceFlushed">replaceFlushed</a></td>
+  <td>boolean</td>
+  <td>false</td>
+  <td>
+When `ReplaceFlushed` is enabled, any instances in the pool that
+are flushed will be replaced immediately so that the pool will
+remain at its current size.
+</td>
+</tr>
+<tr>
+  <td><a href="#strictPooling">strictPooling</a></td>
+  <td>boolean</td>
+  <td>true</td>
+  <td>
+StrictPooling tells the container what to do when the pool
+reaches it's maximum size and there are incoming requests that
+need instances.
+</td>
+</tr>
+<tr>
+  <td><a href="#sweepInterval">sweepInterval</a></td>
+  <td><a href="configuring-durations.html">time</a></td>
+  <td>5&nbsp;minutes</td>
+  <td>
+The frequency in which the container will sweep the pool and
+evict expired instances.
+</td>
+</tr>
+</table>
+
+
+
+<a name="accessTimeout"></a>
+## accessTimeout
+
+Specifies the time an invokation should wait for an instance
+of the pool to become available.
+
+After the timeout is reached, if an instance in the pool cannot
+be obtained, the method invocation will fail.
+
+Usable time units: nanoseconds, microsecons, milliseconds,
+seconds, minutes, hours, days.  Or any combination such as
+"1 hour and 27 minutes and 10 seconds"
+
+Any usage of the `javax.ejb.AccessTimeout` annotation will
+override this setting for the bean or method where the
+annotation is used.
+
+
+<a name="callbackThreads"></a>
+## callbackThreads
+
+The number of threads for constructing and destroying beans.
+
+When sweeping the pool for expired instances a thread pool is
+used to process calling `@PreDestroy` on expired instances as well
+as creating new instances as might be required to fill the pool
+to the minimum after a Flush or `MaxAge` expiration.  The
+`CallbackThreads` setting dictates the size of the thread pool and
+is shared by all beans deployed in the container.
+
+
+<a name="closeTimeout"></a>
+## closeTimeout
+
+Maximum time to wait for instances to be destroyed when shutting down the pool
+
+PostConstruct methods are invoked on all instances in the pool
+when the bean is undeployed and its pool is closed.  The
+`CloseTimeout` specifies the maximum time to wait for the pool to
+close and `PostConstruct` methods to be invoked.
+
+Usable time units: nanoseconds, microsecons, milliseconds,
+seconds, minutes, hours, days.  Or any combination such as
+`1 hour and 27 minutes and 10 seconds`
+
+
+<a name="garbageCollection"></a>
+## garbageCollection
+
+Allows Garbage Collection to be used as a mechanism for shrinking
+the pool.
+
+When set to true all instances in the pool, excluding
+the minimum, are eligible for garbage collection by the virtual
+machine as per the rules of `java.lang.ref.SoftReference` and can be
+claimed by the JVM to free memory.  Instances garbage collected
+will have their `@PreDestroy` methods called during finalization.
+
+In the OpenJDK VM the `-XX:SoftRefLRUPolicyMSPerMB` flag can adjust
+how aggressively SoftReferences are collected.  The default
+OpenJDK setting is 1000, resulting in inactive pooled instances
+living one second of lifetime per free megabyte in the heap, which
+is very aggressive.  The setting should be increased to get the
+most out of the `GarbageCollection` feature of the pool.  Much
+higher settings are safe.  Even a setting as high as 3600000 (1
+hour per free MB in the heap) does not affect the ability for the
+VM to garbage collect SoftReferences in the event that memory is
+needed to avoid an `OutOfMemoryException`.
+
+
+<a name="idleTimeout"></a>
+## idleTimeout
+
+Specifies the maximum time that an instance should be allowed to
+sit idly in the pool without use before it should be retired and
+removed.
+
+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, minutes, hours, days.  Or any combination such as
+"1 hour and 27 minutes and 10 seconds"
+
+
+<a name="maxAge"></a>
+## maxAge
+
+Specifies the maximum time that an instance should live before
+it should be retired and removed from use.
+
+This will happen
+gracefully.  Useful for situations where bean instances are
+designed to hold potentially expensive resources such as memory
+or file handles and need to be periodically cleared out.
+
+Usable time units: nanoseconds, microsecons, milliseconds,
+seconds, minutes, hours, days.  Or any combination such as
+`1 hour and 27 minutes and 10 seconds`
+
+
+<a name="maxAgeOffset"></a>
+## maxAgeOffset
+
+Applies to MaxAge usage and would rarely be changed, but is a
+nice feature to understand.
+
+When the container first starts and the pool is filled to the
+minimum size, all those "minimum" instances will have the same
+creation time and therefore all expire at the same time dictated
+by the `MaxAge` setting.  To protect against this sudden drop
+scenario and provide a more gradual expiration from the start
+the container will spread out the age of the instances that fill
+the pool to the minimum using an offset.
+
+The `MaxAgeOffset` is not the final value of the offset, but
+rather it is used in creating the offset and allows the
+spreading to push the initial ages into the future or into the
+past.  The pool is filled at startup as follows:
+
+    for (int i = 0; i < poolMin; i++) {
+        long ageOffset = (maxAge / poolMin * i * maxAgeOffset) % maxAge;
+        pool.add(new Bean(), ageOffset));
+    }
+
+The default `MaxAgeOffset` is -1 which causes the initial
+instances in the pool to live a bit longer before expiring.  As
+a concrete example, let's say the MinSize is 4 and the MaxAge is
+100 years.  The generated offsets for the four instances created
+at startup would be 0, -25, -50, -75.  So the first instance
+would be "born" at age 0, die at 100, living 100 years.  The
+second instance would be born at -25, die at 100, living a total
+of 125 years.  The third would live 150 years.  The fourth 175
+years.
+
+A `MaxAgeOffset` of 1 would cause instances to be "born" older
+and therefore die sooner.  Using the same example `MinSize` of 4
+and `MaxAge` of `100 years`, the life spans of these initial four
+instances would be 100, 75, 50, and 25 years respectively.
+
+A `MaxAgeOffset` of 0 will cause no "spreading" of the age of the
+first instances used to fill the pool to the minimum and these
+instances will of course reach their MaxAge at the same time.
+It is possible to set to decimal values such as -0.5, 0.5, -1.2,
+or 1.2.
+
+
+<a name="maxSize"></a>
+## maxSize
+
+Specifies the size of the instance pool for this stateless
+SessionBean container.
+
+Each `@Stateless` bean will get its own instance pool.
+If StrictPooling is not used, instances
+will still be created beyond this number if there is demand, but
+they will not be returned to the pool and instead will be
+immediately expire.
+
+
+<a name="minSize"></a>
+## minSize
+
+Specifies the minimum number of bean instances that should be in
+the pool for each bean.
+
+Pools are prefilled to the minimum on
+startup.  Note this will create start order dependencies between
+other beans that also eagerly start, such as other `@Stateless`
+beans with a minimum or `@Singleton` beans using `@Startup`.  The
+`@DependsOn` annotation can be used to appropriately influence
+start order.
+
+The minimum pool size is rigidly maintained.  Instances in the
+minimum side of the pool are not eligible for `IdleTimeout` or
+`GarbageCollection`, but are subject to `MaxAge` and flushing.
+
+If the pool is flushed it is immediately refilled to the minimum
+size with `MaxAgeOffset` applied.  If an instance from the minimum
+side of the pool reaches its `MaxAge`, it is also immediately
+replaced.  Replacement is done in a background queue using the
+number of threads specified by `CallbackThreads`.
+
+
+<a name="replaceAged"></a>
+## replaceAged
+
+When `ReplaceAged` is enabled, any instances in the pool that
+expire due to reaching their `MaxAge` will be replaced immediately
+so that the pool will remain at its current size.
+
+Replacement
+is done in a background queue so that incoming threads will not
+have to wait for instance creation.
+
+The aim of his option is to prevent user requests from paying
+the instance creation cost as `MaxAge` is enforced, potentially
+while under heavy load at peak hours.
+
+Instances from the minimum side of the pool are always replaced
+when they reach their `MaxAge`, this setting dictates the
+treatment of non-minimum instances.
+
+
+<a name="replaceFlushed"></a>
+## replaceFlushed
+
+When `ReplaceFlushed` is enabled, any instances in the pool that
+are flushed will be replaced immediately so that the pool will
+remain at its current size.
+
+Replacement is done in a background
+queue so that incoming threads will not have to wait for
+instance creation.
+
+The aim of his option is to prevent user requests from paying
+the instance creation cost if a flush performed while under
+heavy load at peak hours.
+
+Instances from the minimum side of the pool are always replaced
+when they are flushed, this setting dictates the treatment of
+non-minimum instances.
+
+A bean may flush its pool by casting the `SessionContext` to
+`Flushable` and calling `flush()`.  See `SweepInterval` for details on
+how flush is performed.
+
+    import javax.annotation.Resource;
+    import javax.ejb.SessionContext;
+    import javax.ejb.Stateless;
+    import java.io.Flushable;
+    import java.io.IOException;
+
+    public class MyBean {
+
+        private SessionContext sessionContext;
+
+        public void flush() throws IOException {
+
+            ((Flushable) sessionContext).flush();
+        }
+    }
+
+
+<a name="strictPooling"></a>
+## strictPooling
+
+StrictPooling tells the container what to do when the pool
+reaches it's maximum size and there are incoming requests that
+need instances.
+
+With strict pooling, requests will have to wait for instances to
+become available. The pool size will never grow beyond the the
+set `MaxSize` value.  The maximum amount of time a request should
+wait is specified via the `AccessTimeout` setting.
+
+Without strict pooling, the container will create temporary
+instances to meet demand. The instances will last for just one
+method invocation and then are removed.
+
+Setting `StrictPooling` to `false` and `MaxSize` to `0` will result in
+no pooling. Instead instances will be created on demand and live
+for exactly one method call before being removed.
+
+
+<a name="sweepInterval"></a>
+## sweepInterval
+
+The frequency in which the container will sweep the pool and
+evict expired instances.
+
+Eviction is how the `IdleTimeout`,
+`MaxAge`, and pool "flush" functionality is enforced.  Higher
+intervals are better.
+
+Instances in use are excluded from sweeping.  Should an instance
+expire while in use it will be evicted immediately upon return
+to the pool.  Effectively `MaxAge` and flushes will be enforced as
+a part of normal activity or sweeping, while IdleTimeout is only
+enforcable via sweeping.  This makes aggressive sweeping less
+important for a pool under moderate load.
+
+Usable time units: nanoseconds, microsecons, milliseconds,
+seconds, minutes, hours, days.  Or any combination such as
+`1 hour and 27 minutes and 10 seconds`
+

http://git-wip-us.apache.org/repos/asf/tomee/blob/f779264f/docs/system-properties-files.mdtext
----------------------------------------------------------------------
diff --git a/docs/system-properties-files.mdtext b/docs/system-properties-files.mdtext
new file mode 100644
index 0000000..e457401
--- /dev/null
+++ b/docs/system-properties-files.mdtext
@@ -0,0 +1,20 @@
+Title: System Properties Files
+
+# OpenEJB System Properties File
+
+OpenEJB and TomEE are really configurable in particular through system properties.
+
+What is not so known is these system properties can be read from several places. The order is important,
+it means if the second place provides the same property than the first one, the first one will be
+omitted.
+
+Here how it works:
+
+* JVM system properties: -Dxxx=yyy
+* user system.properties: the file ${user.home}/.openejb/system.properties
+* instance system.properties: conf/system.properties
+
+Note: generally you place in the user system properties file the contant configuration (check my openejb
+version for instance).
+
+

http://git-wip-us.apache.org/repos/asf/tomee/blob/f779264f/docs/system-properties.mdtext
----------------------------------------------------------------------
diff --git a/docs/system-properties.mdtext b/docs/system-properties.mdtext
new file mode 100644
index 0000000..8b53bd4
--- /dev/null
+++ b/docs/system-properties.mdtext
@@ -0,0 +1,64 @@
+Title: System Properties
+
+<a name="SystemProperties-Overridingopenejb.xml"></a>
+
+You can find a list of properties [here](properties-listing.html). But read on to understand how these can be used.
+
+#  Overriding openejb.xml
+
+Anything in the openejb.xml file can be overridden via system properties of
+the format: 
+
+
+  `-D<id>.<property-name>=<property-value>`
+
+..where id is the value in the config file for example: 
+
+
+    <Connector id="mysql"> 
+        JdbcDriver com.mysql.jdbc.Driver 
+        JdbcUrl jdbc:mysql://localhost/test 
+        UserName test 
+    </Connector> 
+
+
+Could be overridden as follows via system properties on the command line: 
+
+> ./bin/openejb start -Dmysql.JdbcDriver=com.mysql.jdbc.Driver
+> -Dmysql.JdbcUrl=jdbc:mysql://localhost/test -Dmysql.UserName=test
+
+<a name="SystemProperties-OverridingServerServices"></a>
+
+#  Overriding Server Services
+
+Any server service installed into OpenEJB can be overridden in the same
+fashion as things in the openejb.xml file.  
+
+For example, when OpenEJB starts it prints out the following:
+
+
+      ** Starting Services **
+      NAME		       IP	       PORT  
+      httpejbd	       0.0.0.0	       4204  
+      telnet	       0.0.0.0	       4202  
+      ejbd		       0.0.0.0	       4201  
+      hsql		       0.0.0.0	       9001  
+      activemq	       127.0.0.1       4206  
+      derbynet	       0.0.0.0	       4205  
+      admin thread	       0.0.0.0	       4200  
+
+
+Each of those has the same standard xinet.d-like properties which can also
+be configured as such:
+
+
+  `-D<id>.<property-name>=<property-value>`
+
+
+... where 'id' is the name of the server service and 'property-name' is one
+of the following: bind, port, threads, disabled, only_from.
+
+So to set the address and port the ejbd service will bind to, simply
+specify this on the command line:
+
+    ./bin/openejb start -Dejbd.bind=192.168.1.12 -Dejbd.port=9988
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/f779264f/docs/telnet-console.mdtext
----------------------------------------------------------------------
diff --git a/docs/telnet-console.mdtext b/docs/telnet-console.mdtext
new file mode 100644
index 0000000..793201e
--- /dev/null
+++ b/docs/telnet-console.mdtext
@@ -0,0 +1,163 @@
+Title: Telnet Console
+{note} Availability: Since OpenEJB 0.9{note}
+
+<a name="TelnetConsole-BasicUsage"></a>
+# Basic Usage
+
+To use OpenEJB's Telnet Console, simply boot your server normally.
+
+> $ ./bin/openejb start
+
+
+    OPENEJB_HOME=/Users/dblevins/Desktop/openejb-1.0
+    OpenEJB 1.0    build: 20060226-1701
+    http://www.openejb.org
+    resources 1
+    OpenEJB ready.
+    [init]
+ OpenEJB Remote Server
+      ** Starting Services **
+      NAME		       IP	       PORT  
+      webadmin	       0.0.0.0	       4203  
+      httpejbd	       0.0.0.0	       4204  
+      telnet	       0.0.0.0	       4202  
+      ejbd		       0.0.0.0	       4201  
+      admin 	       0.0.0.0	       4200  
+    -------
+    Ready!
+
+
+
+Then in another shell telnet in 
+
+> $ telnet localhost 4202
+
+    Trying ::1...
+    Connected to localhost.
+    Escape character is '^]
+'.
+    OpenEJB Remote Server Console
+    type 'help' for a list of commands
+    [openejb]
+$ help 
+     stop
+     exit
+     system
+     version
+     lookup
+     help
+    [openejb]
+$ system
+    Containers:
+     Default BMP Container
+     Default CMP Container
+     Default Stateful Container
+     Default Stateless Container
+    
+    Deployments:
+     client/tests/stateful/EncBean
+     client/tests/entity/cmp/RMI-over-IIOP/EJBHome
+     client/tests/stateful/BasicStatefulHome
+     ClientTools/ViewClass
+     Webadmin/Configuration
+     EJBGenerator/CreateEJB
+     ClientTools/InvokeObject
+     Webadmin/Properties
+     client/tests/stateful/RMI-over-IIOP/EJBHome
+     Webadmin/Home
+     client/tests/entity/bmp/allowed_operations/EntityHome
+     client/tests/entity/cmp/EncBean
+     httpd/DefaultBean
+     client/tests/stateful/BeanManagedBasicStatefulHome
+     client/tools/DatabaseHome
+     client/tests/entity/bmp/EncBean
+     config/webadmin/ConfigurationData
+     deploy/webadmin/Deployer
+     ClientTools/ViewJndi
+     Webadmin/DeploymentList
+     client/tests/stateless/BeanManagedBasicStatelessHome
+     Webadmin/CMPMapping
+     client/tests/stateless/EncBean
+     client/tests/stateful/BeanManagedTransactionTests/EJBHome
+     client/tests/entity/bmp/RMI-over-IIOP/EJBHome
+     Webadmin/ListLogs
+     client/tests/stateless/BeanManagedTransactionTests/EJBHome
+     ClientTools/ViewEjb
+     client/tests/entity/bmp/BasicBmpHome
+     mapping/webadmin/CMPMappingData
+     client/tests/stateless/BasicStatelessHome
+     client/tests/entity/cmp/BasicCmpHome
+     Webadmin/Deployment
+     httpd/session
+     client/tests/entity/cmp/allowed_operations/EntityHome
+     client/tests/stateless/RMI-over-IIOP/EJBHome
+    [openejb]
+$ exit
+    Connection closed by foreign host.
+
+
+<a name="TelnetConsole-ConfiguringtheTelnetService"></a>
+#  Configuring the Telnet Service
+
+The configuration of all server services (network facing services) is done
+in xinet.d style config files.	The telnet shell is controlled via the
+$OPENEJB_HOME/conf/telnet.properties file.  This file is created for you
+automatically after the first time OpenEJB boots.
+
+> $ cat conf/telnet.properties 
+
+        server	= org.openejb.server.telnet.TelnetServer
+        bind	= 127.0.0.1
+        port	= 4202
+        disabled	= false
+        threads	= 5
+    #   only_from	= 192.168.1.123
+
+
+You can change the IP, port, and even the number of threads allowed to
+concurrently access the Telnet service via this file.
+
+<a name="TelnetConsole-DisablingtheTelnetService"></a>
+#  Disabling the Telnet Service
+
+Simply edit the config file and set 'disabled' to true
+
+
+        disabled	= true
+
+
+Then restart OpenEJB.
+
+<a name="TelnetConsole-RestrictingAccess"></a>
+#  Restricting Access
+
+It is unlikely you want just anyone to be able to login and execute
+commands.  While you can't restrict access on a user basis, yet, you can
+restrict access to specific hosts.  Host based access control (HBA) is a
+built-in part of any Server Service in OpenEJB and the Telnet Service is no
+different.   This is done with the 'only_from' property, which like the
+rest of the file is a direct copy of the xinet.d syntax for HBA.  
+
+For an example to restrict access to the localhost, you could configure the
+Telnet Service like this:
+
+
+        server	= org.openejb.server.telnet.TelnetServer
+        bind	= 127.0.0.1
+        port	= 4202
+        disabled	= false
+        threads	= 5
+        only_from	= localhost
+
+
+If you wanted to restrict access to localhost *and* say the hosts
+192.168.1.207 and 192.168.1.16, you can simply add them to the list.
+
+
+        server	= org.openejb.server.telnet.TelnetServer
+        bind	= 127.0.0.1
+        port	= 4202
+        disabled	= false
+        threads	= 5
+        only_from	= localhost, 192.168.1.207, 192.168.1.16
+

http://git-wip-us.apache.org/repos/asf/tomee/blob/f779264f/docs/tip-concurrency.mdtext
----------------------------------------------------------------------
diff --git a/docs/tip-concurrency.mdtext b/docs/tip-concurrency.mdtext
new file mode 100644
index 0000000..d9935ef
--- /dev/null
+++ b/docs/tip-concurrency.mdtext
@@ -0,0 +1,22 @@
+Title: Global Concurrency Management
+
+If for whatever reason you want to define the global default concurrency add this to your META-INF/ejb-jar.xml:
+
+	<?xml version="1.0"?>
+	<ejb-jar
+		xmlns="http://java.sun.com/xml/ns/javaee"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
+		version="3.1">
+
+		<enterprise-beans>
+			<session>
+				<ejb-name>*</ejb-name>
+				<concurrency-management-type>Bean</concurrency-management-type>
+			</session>
+		<enterprise-beans>
+	</ejb-jar>
+	
+You may need to create the file if it does not exist.	
+
+	src/main/resources/META-INF/ejb-jar.xml
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/f779264f/docs/tip-jersey-client.mdtext
----------------------------------------------------------------------
diff --git a/docs/tip-jersey-client.mdtext b/docs/tip-jersey-client.mdtext
new file mode 100644
index 0000000..763fb79
--- /dev/null
+++ b/docs/tip-jersey-client.mdtext
@@ -0,0 +1,18 @@
+Title: Jersey Client
+
+If you have an application that uses jersey-client in any way then it may fail with an error along the lines of:
+
+    Caused by: java.lang.ClassNotFoundException: com.sun.jersey.core.util.FeaturesAndProperties
+    at org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java)
+    at org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java)
+    at org.apache.tomee.catalina.LazyStopWebappClassLoader.loadClass(LazyStopWebappClassLoader.java)
+    ... 34 more
+
+This is due to the fact that the jersey-core.jar contains some classes that should not be deployed as part of a javaEE application. For example, it contains javax.ws.rs.Path but does not contain javax.ws.rs.core.Configurable, so the jar is usually ignored by TomEE. 
+
+You could switch to using the [Apache CXF Client](http://cxf.apache.org/), which is what we would recommend.
+If you really want to keep Jersey then you can use set the following property in your *[TomEE]\conf\system.properties*
+
+    openejb.api.javax.ws.rs.Path.validation=false
+
+This will then allow Jersey classes to be loaded by TomEE (After a restart).
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/f779264f/docs/tip-weblogic.mdtext
----------------------------------------------------------------------
diff --git a/docs/tip-weblogic.mdtext b/docs/tip-weblogic.mdtext
new file mode 100644
index 0000000..42e783c
--- /dev/null
+++ b/docs/tip-weblogic.mdtext
@@ -0,0 +1,13 @@
+Title: WebLogic Lookup
+
+How to lookup WebLogic Objects from within a TomEE context:
+
+	Hashtable<String, String> props = new Hashtable<String, String>();
+	props.put(javax.naming.Context.INITIAL_CONTEXT_FACTORY, "weblogic.jndi.WLInitialContextFactory");
+	props.put(javax.naming.Context.URL_PKG_PREFIXES, "weblogic.jndi.factories"); 
+	props.put("java.naming.provider.url", "t3://your.host.name:7023");
+	Context ctx = new InitialContext(props);
+
+	IService s = (IService) ctx.lookup("java:global.com.test.ServiceImpl!com.test.IService");
+	
+Obviously you will need to change the actual lookup to your specific object, but you get the idea.	
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/f779264f/docs/tomcat-object-factory.mdtext
----------------------------------------------------------------------
diff --git a/docs/tomcat-object-factory.mdtext b/docs/tomcat-object-factory.mdtext
new file mode 100644
index 0000000..1a3c77e
--- /dev/null
+++ b/docs/tomcat-object-factory.mdtext
@@ -0,0 +1,12 @@
+Title: Tomcat Object Factory
+*The TomcatEjbFactory as discussed in the [OnJava article "OpenEJB: EJB for Tomcat"](http://www.onjava.com/pub/a/onjava/2003/02/12/ejb_tomcat.html)
+ is no longer required.*
+
+As of OpenEJB 3.0 references from Servlets to EJBs happen automatically
+with usage of the [@EJB annotation](openejbx30:injection-of-other-ejbs-example.html)
+ in the Servlet, Filter or Listener or with the <ejb-ref> or
+<ejb-local-ref> declared in the web.xml.
+
+See the [Tomcat Integration](openejbx30:tomcat.html)
+ page for the most up-to-date details on using OpenEJB inside Tomcat.
+

http://git-wip-us.apache.org/repos/asf/tomee/blob/f779264f/docs/tomee-and-eclipse.mdtext
----------------------------------------------------------------------
diff --git a/docs/tomee-and-eclipse.mdtext b/docs/tomee-and-eclipse.mdtext
new file mode 100644
index 0000000..d7aa1f9
--- /dev/null
+++ b/docs/tomee-and-eclipse.mdtext
@@ -0,0 +1,141 @@
+Title: TomEE and Eclipse
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+Using TomEE in Eclipse is pretty simple since it uses the existing Tomcat 7 server adaptor that comes
+with Eclipse.
+
+## Quick Start
+
+An excellent instructional video with step-by-step instructions on how to install Eclipse, TomEE
+and create/deploy your first project is available on YouTube here: [Getting Started with Apache TomEE][1] (Remember to select the 'Generate web.xml descriptor' checkbox during project setup. Otherwise the ejb does not get injected and you will get an error.).
+
+1. Download and install both Apache TomEE and Eclipse.
+
+1. Start Eclipse and from the main menu go to **File** - **New** - **Dynamic Web Project**
+
+1. Enter a new project name
+
+1. In the **Target Runtime** section click on the **New Runtime** button.
+
+1. Pick **Apache Tomcat v7.0** and click Next
+
+1. Change the **Name** field to *TomEE* to indicate that this is a TomEE server rather than a Tomcat server.
+
+1. Set the **Tomcat installation directory** by clicking the **Browse** button and selecting the folder
+where you extracted TomEE
+
+1. Click **Finish** to return to the New Project dialog
+
+1. Click **Finish** to complete creating your new Project
+
+1. When you're ready to deploy your project, right-click your project and select Run As - Run On Server
+
+1. Make sure that the *TomEE* environment is selected in the **Server runtime environment**
+
+1. On the **Run on Server** dialog, click the **Always use this server when running this project** checkbox
+
+1. Click **Finish** - Eclipse will start TomEE and deploy your project
+
+## Advanced installation
+
+1. In Eclipse, click on the **Servers** tab, right click and select New - Server.
+
+1. Select **Apache - Tomcat v7.0 Server** and click **Next**
+
+1. Set the **Tomcat installation directory** by clicking the **Browse** button and selecting the folder
+where you extracted TomEE
+
+1. Add your webapp to the server. Click **Finish**.
+
+1. In the **Servers** tab, double click on your server to open up the **Overview** page.
+Click on the **Modules** tab
+
+1. Click **Add External Web Module**. In the **Add Web Module** dialog, for document base, browse
+to `<TomEE>/webapps/tomee`. Set **Path:** to `/tomee`. Uncheck **Auto reloading enabled**. Click OK.
+
+1. Return to the **Overview** tab for the server.
+
+1. Deselect the **Modules auto reload by default** checkbox.
+
+1. If you do not want Eclipse to take control of your TomEE installation, select **Use Workspace Metadata**
+under **Server Locations**. Please review the *Workspace Metadata Installation* section below for additional steps
+in this scenario. Otherwise, select **Use Tomcat Installation**
+
+1. Click the Save button in Eclipse so the server configuration gets saved.
+
+1. Click on your webapp project, then select Project - clean. Hit OK. This will cause
+Eclipse to clean and rebuild
+
+1. In the **Servers** tab, right click on the server and select **Publish**.
+
+1. Start the server.
+
+### Workspace Metadata Installation
+If you used **Use Workspace Metadata** in the **Server Locations** definition of the TomEE server,
+you will have to add TomEE specific configuration files to your Servers project in your workspace
+in case you need to change system properties or add containers / resources and have those reflected in the
+server running under Eclipse.
+
+1. Locate your TomEE server configuration in Workspace / Servers
+
+1. Right-click the server project and select **Import**
+
+1. Select General - File System and click **Next**
+
+1. Browse to your `<TomEE>/conf` folder
+
+1. Select the following files for import: `logging.properties`, `system.properties` and `tomee.xml`
+
+1. Click **Finish** to import the files.
+
+1. In the **Servers** tab, right-click the TomEE server and select **Publish** to publish the files to the
+Eclipse metadata folder
+
+If you need to modify system properties or change your TomEE resources, containers, etc., you now need to make
+those changes in the Workspace / Servers / `<`Your Server`>` location and publish them to the server for
+the changes to take effect.
+
+### JSP Hot Deployment
+
+If jsp changes are not being hot deployed then this is because the jsp servlet is set to development=false in the web.xml file. To allow jsp hot deployment alter this value to true and restart Tomee.
+
+This is the relevant snippet of the web.xml file.
+
+    <servlet>
+        <servlet-name>jsp</servlet-name>
+        <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
+        ....
+        <init-param>
+            <param-name>development</param-name>
+            <param-value>true</param-value>
+        </init-param>
+        ....
+    </servlet>
+
+## How to use JULI for TomEE in WTP?
+
+It seems that WTP doesn't manage correctly Tomcat logging configuration (which needs to be done through
+system properties). A quick workaround is to add these properties manually:
+
+    -Djava.util.logging.config.file="<tomee>/conf/logging.properties"
+    -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
+
+More information on: http://wiki.eclipse.org/WTP_Tomcat_FAQ#How_do_I_enable_the_JULI_logging_in_a_Tomcat_5.5_Server_instance.3F
+
+
+  [1]: http://www.youtube.com/watch?v=Lr8pxEACVRI "Getting Started with Apache TomEE"

http://git-wip-us.apache.org/repos/asf/tomee/blob/f779264f/docs/tomee-and-hibernate.mdtext
----------------------------------------------------------------------
diff --git a/docs/tomee-and-hibernate.mdtext b/docs/tomee-and-hibernate.mdtext
new file mode 100644
index 0000000..79c11d3
--- /dev/null
+++ b/docs/tomee-and-hibernate.mdtext
@@ -0,0 +1,159 @@
+Title: TomEE and Hibernate
+
+Apache TomEE ships with OpenJPA as the default JPA provider, however any valid JPA 2.0 provider can be used.
+
+The basic steps are:
+
+ 1. Add the Hibernate jars to `<tomee-home>/lib/`
+ 2. Configure the webapp or the server to use Hibernate
+
+
+**The atifact versions defined here are just for example, so please feel free to use current library versions.**
+
+# Webapp Configuration
+
+Any webapp can specify the JPA provider it would like to use via the `persistence.xml` file, which can be at any of the following locations in a webapp
+
+ - `WEB-INF/persistence.xml` of the `.war` file
+ - `META-INF/persistence.xml` in any jar located in `WEB-INF/lib/`
+
+A single webapp may have many `persistence.xml` files and each may use whichever JPA provider it needs.
+
+The following is an example of a fairly common `persistence.xml` for Hibernate
+
+    <persistence version="1.0"
+           xmlns="http://java.sun.com/xml/ns/persistence"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
+           http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
+
+      <persistence-unit name="movie-unit">
+        <provider>org.hibernate.ejb.HibernatePersistence</provider>
+        <jta-data-source>movieDatabase</jta-data-source>
+        <non-jta-data-source>movieDatabaseUnmanaged</non-jta-data-source>
+
+        <properties>
+          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+        </properties>
+      </persistence-unit>
+    </persistence>
+
+
+Note, TomEE will automatically add the following property unless it is explicitly configured:
+
+          <property name="hibernate.transaction.manager_lookup_class"
+                    value="org.apache.openejb.hibernate.TransactionManagerLookup"/>
+
+# Server Configuration
+
+The default JPA provider can be changed at the server level to favor 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.
+
+ - `javax.persistence.provider`
+ - `javax.persistence.transactionType`
+ - `javax.persistence.jtaDataSource`
+ - `javax.persistence.nonJtaDataSource`
+
+So, for example, Hibernate can become the default provider via setting
+
+ `CATALINA_OPTS=-Djavax.persistence.provider=org.hibernate.ejb.HibernatePersistence`
+
+You **must** of course add the Hibernate libraries to `<tomee-home>/lib/` for this to work.
+
+# Hibernate libraries
+
+Jars needed for Hibernate 4.x:
+
+Add:
+
+- `<tomee-home>/lib/antlr-2.7.7.jar`
+- `<tomee-home>/lib/dom4j-1.6.1.jar`
+- `<tomee-home>/lib/hibernate-commons-annotations-4.0.1.Final.jar`
+- `<tomee-home>/lib/hibernate-core-4.1.4.Final.jar`
+- `<tomee-home>/lib/hibernate-entitymanager-4.1.4.Final.jar`
+- `<tomee-home>/lib/hibernate-validator-4.3.0.Final.jar`
+- `<tomee-home>/lib/jboss-logging-3.1.0.GA.jar`
+
+Remove (optional):
+
+- `<tomee-home>/lib/asm-3.2.jar`
+- `<tomee-home>/lib/openjpa-2.2.0.jar`
+
+# Ehcache (optional)
+
+To use Hibernate with Ehcache, add:
+
+- `<tomee-home>/lib/hibernate-ehcache-4.1.4.Final.jar`
+- `<tomee-home>/lib/ehcache-core-2.5.1.jar`
+- `<tomee-home>/lib/ehcache-terracotta-2.5.1.jar`
+- `<tomee-home>/lib/terracotta-toolkit-1.4-runtime-4.1.0.jar`
+
+# Infinispan (optional)
+
+To use Infinispan cache (default Hibernate 2nd level cache) you need the below jars:
+
+<pre><code>
+    <lib>org.infinispan:infinispan-core:5.1.4.FINAL</lib>
+    <lib>org.hibernate:hibernate-infinispan:${hibernate.core.version}</lib>
+    <lib>org.jgroups:jgroups:3.0.9.Final</lib>
+    <lib>org.jboss.marshalling:jboss-marshalling-river:1.3.11.GA:</lib>
+    <lib>org.jboss.marshalling:jboss-marshalling:1.3.11.GA</lib>
+    <lib>org.codehaus.woodstox:woodstox-core-asl:4.1.1</lib>
+    <lib>org.codehaus.woodstox:stax2-api:3.1.1</lib>
+    <lib>org.rhq.helpers:rhq-pluginAnnotations:3.0.4</lib>
+    <lib>org.jboss.logmanager:jboss-logmanager:1.2.2.GA</lib>
+</code></pre>
+
+There are many guides on how to use 2nd level cache with JPA 2.
+You can remove OpenJPA jar so less jars are in `<tomee-home>/lib` folder.
+Also, be sure to put your Database JDBC driver in `<tomee-home>/lib`.
+
+The actual Maven dependencies for your project can be added in the usual way:
+
+		<!-- Hibernate -->		
+		<dependency>
+			<groupId>antlr</groupId>
+			<artifactId>antlr</artifactId>
+			<version>2.7.7</version>
+		</dependency>		
+		<dependency>
+			<groupId>dom4j</groupId>
+			<artifactId>dom4j</artifactId>
+			<version>1.6.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate.common</groupId>
+			<artifactId>hibernate-commons-annotations</artifactId>
+			<version>4.0.5.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>4.2.16.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-ehcache</artifactId>
+			<version>4.2.16.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-entitymanager</artifactId>
+			<version>4.2.16.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>4.3.2.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.logging</groupId>
+			<artifactId>jboss-logging</artifactId>
+			<version>3.1.0.GA</version>
+		</dependency>
+		<dependency>
+			<groupId>org.javassist</groupId>
+			<artifactId>javassist</artifactId>
+			<version>3.15.0-GA</version>
+		</dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/f779264f/docs/tomee-and-intellij.mdtext
----------------------------------------------------------------------
diff --git a/docs/tomee-and-intellij.mdtext b/docs/tomee-and-intellij.mdtext
new file mode 100644
index 0000000..0358a6b
--- /dev/null
+++ b/docs/tomee-and-intellij.mdtext
@@ -0,0 +1,77 @@
+Title: TomEE and Intellij
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+Intellij is the preferred editor of most of the developers on Apache TomEE.  It's fast and light and goes out of its way
+to guess what you're thinking and act accordingly in efforts to save you time and increase your enjoyment.  In this regard
+TomEE and Intellij have a lot in common.
+
+While TomEE works with most IDEs via the Tomcat adapter and this covers WAR files, JetBrains has stepped up to the plate
+with a TomEE specific adapter to allow deployment of the full range of archives that TomEE supports.  The evolving
+TomEE/Intellij integration sets the pace for all other IDE integrations.
+[Feature requests very welcome!](http://youtrack.jetbrains.com/issues/IDEA)  TomEE is to Intellij
+what GlassFish is to NetBeans and your feedback is a critcal part of that.
+
+
+# Getting Started
+
+We will use one of the existing [examples][1] for this demo. Let's import it.
+  ![alt text][2]
+  ![alt text][3]
+  ![alt text][4]
+
+Give a minute while Intellij imports the dependencies.
+  ![alt text][5]
+
+It's time to run the application. Open "Edit Configurations".
+  ![alt text][6]
+
+Click the "+" icon and select "TomEE Server" and "Local".
+  ![alt text][7]
+
+If your server is still not configured, click the "Configure" button and point it to your local TomEE installation.
+  ![alt text][8]
+
+If you see a warning message like "No artifacts marked for deployment", click the "Fix" button and select one of the options.
+  ![alt text][9]
+
+You can change the "Application Context".
+  ![alt text][10]
+
+Now you can run it. Click the "play" button.
+  ![alt text][11]
+  ![alt text][12]
+
+Your application is up and running.
+  ![alt text][13]
+  ![alt text][14]
+
+
+  [1]: https://svn.apache.org/repos/asf/tomee/tomee/trunk/examples/
+  [2]: http://people.apache.org/~tveronezi/tomee/tomee_site/intellij_integration/windows8_01.png
+  [3]: http://people.apache.org/~tveronezi/tomee/tomee_site/intellij_integration/windows8_02.png
+  [4]: http://people.apache.org/~tveronezi/tomee/tomee_site/intellij_integration/windows8_03.png
+  [5]: http://people.apache.org/~tveronezi/tomee/tomee_site/intellij_integration/windows8_04.png
+  [6]: http://people.apache.org/~tveronezi/tomee/tomee_site/intellij_integration/windows8_05.png
+  [7]: http://people.apache.org/~tveronezi/tomee/tomee_site/intellij_integration/windows8_06.png
+  [8]: http://people.apache.org/~tveronezi/tomee/tomee_site/intellij_integration/windows8_07.png
+  [9]: http://people.apache.org/~tveronezi/tomee/tomee_site/intellij_integration/windows8_08.png
+  [10]: http://people.apache.org/~tveronezi/tomee/tomee_site/intellij_integration/windows8_09.png
+  [11]: http://people.apache.org/~tveronezi/tomee/tomee_site/intellij_integration/windows8_10.png
+  [12]: http://people.apache.org/~tveronezi/tomee/tomee_site/intellij_integration/windows8_11.png
+  [13]: http://people.apache.org/~tveronezi/tomee/tomee_site/intellij_integration/windows8_12.png
+  [14]: http://people.apache.org/~tveronezi/tomee/tomee_site/intellij_integration/windows8_13.png
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/f779264f/docs/tomee-and-netbeans.mdtext
----------------------------------------------------------------------
diff --git a/docs/tomee-and-netbeans.mdtext b/docs/tomee-and-netbeans.mdtext
new file mode 100644
index 0000000..b0783e0
--- /dev/null
+++ b/docs/tomee-and-netbeans.mdtext
@@ -0,0 +1,93 @@
+Title: TomEE and NetBeans
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+		   
+There is some great information over at [Geertjan's Blog](https://blogs.oracle.com/geertjan/entry/tomee_apache_cxf_and_maven) on how to hit the ground running with Netbeans, CXF and Maven. Geertjan is a Netbeans evangelist and has an incredible insight into everything Netbeans.
+
+**WORKAROUND**: There is a known issue with Netbeans 8 and TomEE detection that currently requires the following workaround:
+
+Netbeans 8 has a bug in which it fails to find the **tomee-common-[version].jar** in the **[TomEE]/lib** directory. The solution is to simply rename the jar file to an older version.
+
+For example, you have **[TomEE]/lib/tomee-common-1.6.0.2.jar** or **[TomEE]/lib/tomee-common-1.7.1.jar**. Rename these files to **[TomEE]/lib/tomee-common-1.6.0.jar**
+
+This should resolve the detection issue and will not break your installation - Be sure to document the change for yourself as a reminder.
+
+###Quickstart
+Check out this video on [How to Consume REST in a Java Client ](https://www.youtube.com/watch?v=HISV7eagogI)
+
+You can download Netbeans 8 here: [https://netbeans.org/community/releases/80/](https://netbeans.org/community/releases/80/)
+
+Here is a quick run through on how to set up TomEE. We will use one of the existing examples for this demo. Let's import it.  
+
+  ![Subversion Checkout][1]
+  ![Subversion URL][2]
+  ![Local Project][3]
+  ![alt text][4]
+
+Click 'Open Project'.  
+
+  ![alt text][5]
+  ![alt text][6]
+
+It's time to add our local TomEE server. Click 'Tools' and then 'Servers'.  
+
+  ![alt text][7]
+
+Select 'Apache Tomcat'.  
+
+  ![alt text][8]
+  
+Select your local TomEE directory.  
+
+  ![alt text][9]
+  ![alt text][10]
+  ![alt text][11]
+
+It's time to run it. Click the play button.  
+
+  ![alt text][12]
+
+Select 'Apache Tomcat'.  
+
+  ![alt text][13]
+
+Give it some time. It's building your application.  
+
+  ![alt text][14]
+
+Done. Your server is up and running.  
+
+  ![alt text][15]
+  ![alt text][16]
+
+
+  [1]: http://people.apache.org/~tveronezi/tomee/tomee_site/netbeans_integration/windows8_01.png
+  [2]: http://people.apache.org/~tveronezi/tomee/tomee_site/netbeans_integration/windows8_02.png
+  [3]: http://people.apache.org/~tveronezi/tomee/tomee_site/netbeans_integration/windows8_03.png
+  [4]: http://people.apache.org/~tveronezi/tomee/tomee_site/netbeans_integration/windows8_04.png
+  [5]: http://people.apache.org/~tveronezi/tomee/tomee_site/netbeans_integration/windows8_05.png
+  [6]: http://people.apache.org/~tveronezi/tomee/tomee_site/netbeans_integration/windows8_06.png
+  [7]: http://people.apache.org/~tveronezi/tomee/tomee_site/netbeans_integration/windows8_07.png
+  [8]: http://people.apache.org/~tveronezi/tomee/tomee_site/netbeans_integration/windows8_08.png
+  [9]: http://people.apache.org/~tveronezi/tomee/tomee_site/netbeans_integration/windows8_09.png
+  [10]: http://people.apache.org/~tveronezi/tomee/tomee_site/netbeans_integration/windows8_10.png
+  [11]: http://people.apache.org/~tveronezi/tomee/tomee_site/netbeans_integration/windows8_11.png
+  [12]: http://people.apache.org/~tveronezi/tomee/tomee_site/netbeans_integration/windows8_12.png
+  [13]: http://people.apache.org/~tveronezi/tomee/tomee_site/netbeans_integration/windows8_13.png
+  [14]: http://people.apache.org/~tveronezi/tomee/tomee_site/netbeans_integration/windows8_14.png
+  [15]: http://people.apache.org/~tveronezi/tomee/tomee_site/netbeans_integration/windows8_15.png
+  [16]: http://people.apache.org/~tveronezi/tomee/tomee_site/netbeans_integration/windows8_16.png
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/f779264f/docs/tomee-and-security.mdtext
----------------------------------------------------------------------
diff --git a/docs/tomee-and-security.mdtext b/docs/tomee-and-security.mdtext
new file mode 100644
index 0000000..e6b9123
--- /dev/null
+++ b/docs/tomee-and-security.mdtext
@@ -0,0 +1,41 @@
+Title:     Apache TomEE and security
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+Rather than providing its own security implementation, TomEE makes full use of the security features that are part of Tomcat. Any Catalina realm is supported or you can provide your own security module using the login.config file. 
+
+For example, to add some simple security to the [moviefun application](http://tomee.apache.org/examples-trunk/webapps/moviefun/README.html) , all we would need to do is: 
+
+1.    Add some users to the tomcat-users.xml file     
+2.    Add the necessary @DefineRoles and @RolesAllowed annotations on MoviesImpl     
+3.    Add some security config to do HTTP Basic authentication to web.xml Webservice security is also looked after – username/password based security (HTTP basic, or WS-Security) uses the same Tomcat security. Certificate based security is also available.
+
+To put it short,
+
+*    TomEE uses Tomcat's Security Realm
+
+*     Extra TomEE layer adds support for JAAS JACC WS Security
+
+*     Supports any org.apache.catalina.Realm implementation
+
+*     E.g. add users to $CATALINA_BASE/conf/tomcat-users.xml
+
+*     Alternatively use login.config to provide your own security module
+
+
+####See Also:
+[TomEE-and-JAAS](tomee-jaas.html) 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/f779264f/docs/tomee-and-webspheremq.mdtext
----------------------------------------------------------------------
diff --git a/docs/tomee-and-webspheremq.mdtext b/docs/tomee-and-webspheremq.mdtext
new file mode 100644
index 0000000..e44aa65
--- /dev/null
+++ b/docs/tomee-and-webspheremq.mdtext
@@ -0,0 +1,132 @@
+Title: TomEE and WebSphere MQ
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+**Steps to integrate TomEE with Websphere MQ** 
+
+1. Unzip rar file place jars under tomee/lib
+
+2. Added the below to conf/tomee.xml
+    
+<pre>
+    &lt;tomee&gt;     
+    &lt;Container id=&quot;wmq&quot; type=&quot;MESSAGE&quot;&gt;
+    ResourceAdapter=wmqRA
+    MessageListenerInterface=javax.jms.MessageListener
+    ActivationSpecClass=com.ibm.mq.connector.inbound.ActivationSpecImpl
+    &lt;/Container&gt;
+
+
+   &lt;Resource id=&quot;wmqRA&quot; type=&quot;com.ibm.mq.connector.ResourceAdapterImpl&quot; class-name=&quot;com.ibm.mq.connector.ResourceAdapterImpl&quot;&gt;
+    connectionConcurrency=5  
+    maxConnections=10 
+    logWriterEnabled=true 
+    reconnectionRetryCount=5 
+    reconnectionRetryInterval=300000 
+    traceEnabled=false 
+    traceLevel=3 
+   &lt;/Resource&gt;
+
+   &lt;Resource **id=&quot;qcf&quot;**  type=&quot;javax.jms.ConnectionFactory&quot; class-name=&quot;com.ibm.mq.connector.outbound.ManagedConnectionFactoryImpl&quot;&gt;
+    TransactionSupport=none 
+    ResourceAdapter=wmqRA 
+    HostName=10.a.b.c   
+    Port=1414 
+    QueueManager=QM_TIERL
+   Channel=SYSTEM.ADMIN.SVRCONN
+   TransportType=Client
+   UserName=xyz
+   Password=*****
+  &lt;/Resource&gt;
+
+  &lt;Resource id=&quot;wmq-javax.jms.QueueConnectionFactory&quot;  type=&quot;javax.jms.QueueConnectionFactory&quot; class-name=&quot;com.ibm.mq.connector.outbound.ManagedQueueConnectionFactoryImpl&quot;&gt;
+    TransactionSupport=xa 
+    ResourceAdapter=wmqRA 
+  &lt;/Resource&gt;
+
+  &lt;Resource id=&quot;wmq-javax.jms.TopicConnectionFactory&quot;  type=&quot;javax.jms.TopicConnectionFactory&quot; class-name=&quot;com.ibm.mq.connector.outbound.ManagedTopicConnectionFactoryImpl&quot;&gt;
+    TransactionSupport=xa 
+    ResourceAdapter=wmqRA 
+  &lt;/Resource&gt;
+
+  &lt;Resource **id=&quot;queue&quot;** type=&quot;javax.jms.Queue&quot;  
+class-name=&quot;com.ibm.mq.connector.outbound.MQQueueProxy&quot;&gt; 
+    arbitraryProperties 
+    baseQueueManagerName 
+    baseQueueName 
+    CCSID=1208 
+    encoding=NATIVE 
+    expiry=APP 
+    failIfQuiesce=true 
+    persistence=APP 
+    priority=APP 
+    readAheadClosePolicy=ALL 
+    targetClient=JMS 
+  &lt;/Resource&gt;
+
+  &lt;Resource id=&quot;wmq-javax.jms.Topic&quot; type=&quot;javax.jms.Topic&quot; class-name=&quot;com.ibm.mq.connector.outbound.MQTopicProxy&quot;&gt;
+    arbitraryProperties 
+    baseTopicName 
+    brokerCCDurSubQueue=SYSTEM.JMS.D.CC.SUBSCRIBER.QUEUE 
+    brokerDurSubQueue=SYSTEM.JMS.D.SUBSCRIBER.QUEUE 
+    brokerPubQueue 
+    brokerPubQueueManager 
+    brokerVersion=1 
+    CCSID=1208 
+    encoding=NATIVE 
+    expiry=APP 
+    failIfQuiesce=true 
+    persistence=APP 
+    priority=APP 
+    readAheadClosePolicy=ALL 
+    targetClient=JMS 
+  &lt;/Resource&gt; 
+
+ &lt;/tomee&gt;	 
+
+3. In web.xml add the below to access resources
+ &lt;resource-ref&gt; 
+     &lt;res-ref-name&gt;myqcf&lt; /res-ref-name&gt; 
+    &lt;res-type&gt;javax.jms.ConnectionFactory &lt; /res-type&gt;
+    &lt;res-auth&gt;Container&lt;/res-auth&gt;&lt; /br&gt;
+    &lt;res-sharing-scope&gt;Shareable&lt; /res-sharing-scope&gt;
+    &lt;mapped-name&gt;qcf&lt; /mapped-name&gt;
+  &lt;/resource-ref&gt;
+  
+ &lt;resource-env-ref&gt;
+   &lt;resource-env-ref-name&gt;myqueue&lt; /resource-env-ref-name&gt;
+   &lt;resource-env-ref-type&gt;javax.jms.Queue&lt; /resource-env-ref-type&gt;
+   &lt;mapped-name&gt;queue&lt; /mapped-name&gt;
+  &lt;/resource-env-ref&gt;
+</pre>
+
+**Code:**
+<pre>    
+    @Resource(name = &quot;qcf&quot;) 
+    private ConnectionFactory connectionFactory; 
+    @Resource(name = &quot;queue&quot;) 
+    private Queue queue;
+    Connection connection = connectionFactory.createConnection();
+    Session session = connection.createSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+    MessageProducer producer = session.createProducer(queue);
+    TextMessage message = session.createTextMessage();
+    message.setText(&quot;Test Message&quot;);
+    connection.start();
+    producer.send(message);
+    session.close();
+    connection.close();
+</pre>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/f779264f/docs/tomee-cluster.txt
----------------------------------------------------------------------
diff --git a/docs/tomee-cluster.txt b/docs/tomee-cluster.txt
new file mode 100644
index 0000000..e74c37d
--- /dev/null
+++ b/docs/tomee-cluster.txt
@@ -0,0 +1,72 @@
+The scope of this document to to define how Apache TomEE can be configured for HA (High Availability) clustering.  
+
+The configuration will focus on two local instances, with a view to an open ended remote configuration.  
+
+It is beyond the scope of this documentation to discuss Tomcat CLustering in depth.
+Please read the [Apache Tomcat Clustering Howto](http://tomcat.apache.org/tomcat-7.0-doc/cluster-howto.html) for more information.
+
+###Local cluster
+To test clustering locally (on the same physical machine) the default ports need to be modified on the second TomEE server.
+You do not need to do this if the second TomEE instance is to run on different machine or virtual host.
+
+Note: You cannot test load balancing on a local cluster as they will be running of different ports.
+This configuration is only useful for testing Session Replication and application deployment.
+
+In the [TomEE]/conf/server.xml look for and change the following port definitions to something like:
+
+	<Server port="9005" shutdown="SHUTDOWN">
+
+	<Connector port="9080" protocol="HTTP/1.1"
+				   connectionTimeout="20000"
+				   redirectPort="9443" />
+				   
+	<!--
+	<Connector port="9443" protocol="HTTP/1.1" SSLEnabled="true"
+			   maxThreads="150" scheme="https" secure="true"
+			   clientAuth="false" sslProtocol="TLS" />
+	-->
+
+	<Connector port="9009" protocol="AJP/1.3" redirectPort="9443" />
+
+###Test Startup	
+Start both TomEE servers together and check for and resolve any errors before proceeding any further.
+
+Once you are sure both servers can run without error add the following to the **<Host>** section of both server.xml files:
+
+	...
+	<Engine name="Catalina" defaultHost="localhost">
+		...
+		<Host name="localhost"  appBase="webapps"
+            unpackWARs="true" autoDeploy="true">
+			
+			<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/> 
+
+Start both TomEE servers together and again check for and resolve any errors before proceeding any further.
+Basically look in both [TomEE]/logs/catalina.[date].log and search for *"SimpleTcpCluster memberAdded"*.
+This lets us know that the cluster added a new member.
+
+Stop both the servers, as we will need to add some more configuration to the *server.xml*.
+
+First create the following directory structure within the TomEE installation (You can change the names later to suit your needs if required).
+
+	[TomEE]/cluster
+	[TomEE]/cluster/temp
+	[TomEE]/cluster/watch
+	[TomEE]/cluster/webapps
+
+We now need to add these paths to the **Host** section of the configuration file:
+	
+	...
+	<Engine name="Catalina" defaultHost="localhost">
+		...
+		<Host name="localhost"  appBase="webapps"
+            unpackWARs="true" autoDeploy="true">
+			
+			<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"> 	
+				<Deployer className="org.apache.catalina.ha.deploy.FarmWarDeployer"
+					tempDir="cluster/temp"
+					deployDir="cluster/webapps"
+					watchDir="cluster/watch"
+					watchEnabled="true"/>
+			</Cluster>
+		...
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/f779264f/docs/tomee-directory-structure.mdtext
----------------------------------------------------------------------
diff --git a/docs/tomee-directory-structure.mdtext b/docs/tomee-directory-structure.mdtext
new file mode 100644
index 0000000..da6d2e0
--- /dev/null
+++ b/docs/tomee-directory-structure.mdtext
@@ -0,0 +1,57 @@
+Title:
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+#TomEE Directory Layout:
+
+TomEE directory layout is the same as that of Tomcat, with a few changes as described below.
+
+Considering this root to be the $tomee-install-dir>
+
+<pre>
+/bin
+  Added tomee.sh (Access all TomEE tools: cipher, deploy, properties, undeploy)
+  Added TomEE.*.exe (Windows service binaries)
+  Added service*.bat (Windows service installer - uses binaries above)
+  Modified catalina.(sh|bat) (Optional - add the OpenJPA javaagent to enhance JPA entities. Only necessary if you use both JPA and the OpenJPA implementation and you did not enhance bytecode at build time)
+
+/conf
+  Added system.properties (Easy way to configure whatever you want on TomEE. Check it out and look into, you will discover so many interesting properties)
+  Added tomee.xml (The place where you can declare/configure resources, containers, Transaction manager, etc)
+  Modified server.xml (As in tomcat with one extra listener - can configure ports, hosts, engines, threadpools etc)    
+  Modified tomcat-users.xml (optional - only changed to define tomee user to secure the webapp/tomee GUI)
+
+/endorsed
+  Added annotation-api.jar (Override Tomcat default jar, because not compliant with the current JEE 6 specification)
+  Added jaxb-(api|impl).jar (Override JDK 1.6 default implementation cause too old for the JEE 6 specification)
+  
+/lib
+  That's where all the magic is. This directory will receive a set of new jars. First, it gets all openejb-* and tomee-* jars. It also contains dependencies (Specification implementations: openjpa-*, openwebbeans-*, etc).
+  Removed annotation-api.jar (Non compliant with JEE 6 specification. See endorsed/)
+  Removed el-api.jar (Already contained in javaee-api.jar provided by TomEE in that same directory)
+ 
+/webapps    
+  Works the same way as it does for Tomcat. Drop your directories/wars in here!
+  Removed examples (Just because most of people does not care)
+  
+/apps (does not exist by default)
+  Can receive WARs of course, but also JAR and EAR files. Optionally add your resources.xml file here.
+     
+/webapps/tomee (added but optional)
+  The TomEE graphical user interface. That's the administration interface.
+  ** This webapp is mandatory if you need EJBs remote invocation
+</pre>
\ No newline at end of file


Mime
View raw message