Author: dblevins
Date: Fri Aug 26 20:10:12 2011
New Revision: 1162234
URL: http://svn.apache.org/viewvc?rev=1162234&view=rev
Log:
strip out the default config -- TomEE/OpenEJB will build everything needed
automatically with default settings, respecting overrides of course
strip out all remote services -- can use the http ports for everything
Modified:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/resources/org/apache/openejb/tomee/configs/openejb.xml
Modified:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java?rev=1162234&r1=1162233&r2=1162234&view=diff
==============================================================================
---
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java
(original)
+++
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java
Fri Aug 26 20:10:12 2011
@@ -84,23 +84,23 @@ public class TomEEContainer implements D
System.out.println("Starting TomEE from: " +
catalinaDirectory.getAbsolutePath());
String catalinaBase = catalinaDirectory.getAbsolutePath();
- System.setProperty("openejb.deployments.classpath.exclude", ".*");
- System.setProperty("openejb.deployments.classpath.include", "");
+ System.setProperty("openejb.deployments.classpath", "false");
System.setProperty("catalina.home", catalinaBase);
System.setProperty("catalina.base", catalinaBase);
System.setProperty("openejb.home", catalinaBase);
System.setProperty("openejb.base", catalinaBase);
- System.setProperty("openejb.servicemanager.enabled", "true");
+ System.setProperty("openejb.servicemanager.enabled", "false");
bootstrap = new Bootstrap();
bootstrap.start();
// Bootstrap OpenEJB
Properties properties = new Properties();
+ properties.setProperty("openejb.deployments.classpath", "false");
properties.setProperty("openejb.loader", "tomcat-system");
properties.setProperty("openejb.home", catalinaBase);
properties.setProperty("openejb.base", catalinaBase);
- properties.setProperty("openejb.servicemanager.enabled", "true");
+ properties.setProperty("openejb.servicemanager.enabled", "false");
try {
Properties tomcatServerInfo = new Properties();
Modified:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/resources/org/apache/openejb/tomee/configs/openejb.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/resources/org/apache/openejb/tomee/configs/openejb.xml?rev=1162234&r1=1162233&r2=1162234&view=diff
==============================================================================
---
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/resources/org/apache/openejb/tomee/configs/openejb.xml
(original)
+++
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/resources/org/apache/openejb/tomee/configs/openejb.xml
Fri Aug 26 20:10:12 2011
@@ -1,238 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<openejb>
-
-
-<Container id="My Stateful Container" type="STATEFUL">
- # Specifies the maximum time an invocation could wait for the
- # stateful bean instance to become available before giving up.
- #
- # After the timeout is reached a javax.ejb.ConcurrentAccessTimeoutException
- # will be thrown.
- #
- # Usable time units: nanoseconds, microsecons, milliseconds,
- # seconds, minutes, hours, days. Or any combination such as
- # "1 hour and 27 minutes and 10 seconds"
-
- AccessTimeout = 0 milliseconds
-
- # The passivator is responsible for writing beans to disk
- # at passivation time. Different passivators can be used
- # by setting this property to the fully qualified class name
- # of the PassivationStrategy implementation. The passivator
- # is not responsible for invoking any callbacks or other
- # processing, its only responsibly is to write the bean state
- # to disk.
- #
- # Known implementations:
- # org.apache.openejb.core.stateful.RAFPassivater
- # org.apache.openejb.core.stateful.SimplePassivater
-
- Passivator org.apache.openejb.core.stateful.SimplePassivater
-
- # Specifies the time to wait between invocations. This
- # value is measured in minutes. A value of 5 would
- # result in a time-out of 5 minutes between invocations.
- # A value of zero would mean no timeout.
-
- TimeOut 20
-
- # Specifies the size of the bean pools for this
- # stateful SessionBean container.
-
- Capacity 1000
-
- # Property name that specifies the number of instances
- # to passivate at one time when doing bulk passivation.
- # Must be less than the PoolSize.
-
- BulkPassivate 100
-
-</Container>
-
-
-<Container id="My Stateless Container" type="STATELESS">
-
- # 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"
-
- AccessTimeout = 0 milliseconds
-
- # Specifies the size of the bean pools for this stateless
- # SessionBean container. If StrictPooling is not used, instances
- # will still be created beyond this number if there is demand, but
- # they will not be returned to the pool and instead will be
- # immediately destroyed.
-
- MaxSize = 10
-
- # 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.
-
- MinSize = 0
-
- # 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.
-
- StrictPooling = true
-
- # 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"
-
- MaxAge = 0 hours
-
- # Specifies the maximum time that an instance should be allowed to
- # sit idly in the pool without use before it should be retired and
- # removed.
- #
- # Usable time units: nanoseconds, microsecons, milliseconds,
- # seconds, minutes, hours, days. Or any combination such as
- # "1 hour and 27 minutes and 10 seconds"
-
- IdleTimeout = 0 minutes
-
-</Container>
-
-
-<Container id="My MDB Container" type="MESSAGE">
-
- # The resource adapter delivers messages to the container
-
- ResourceAdapter My JMS Resource Adapter
-
- # Specifies the message listener interface handled by this container
-
- MessageListenerInterface javax.jms.MessageListener
-
- # Specifies the activation spec class
-
- ActivationSpecClass org.apache.activemq.ra.ActiveMQActivationSpec
-
- # Specifies the maximum number of bean instances that are
- # allowed to exist for each MDB deployment.
-
- InstanceLimit 10
-
-</Container>
-
-
-<!--
-# For more examples of database configuration see:
-# http://openejb.apache.org/3.0/databases.html
--->
-
-<Resource id="My DataSource" type="DataSource">
- JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
- JdbcUrl jdbc:derby:data/derbydb;create=true
- UserName
- Password
- JtaManaged true
-</Resource>
-
-
-<Resource id="My Unmanaged DataSource" type="DataSource">
- JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
- JdbcUrl jdbc:derby:data/derbydb;create=true
- UserName
- Password
- JtaManaged false
-</Resource>
-
-
-<Resource id="My JMS Resource Adapter" type="ActiveMQResourceAdapter">
- # Broker configuration URI as defined by ActiveMQ
- # see http://activemq.apache.org/broker-configuration-uri.html
-
- BrokerXmlConfig broker:(tcp://localhost:61616)?useJmx=false
-
- # Broker address
-
- ServerUrl vm://localhost?async=true
-
- # DataSource for persistence messages
-
- DataSource My Unmanaged DataSource
-</Resource>
-
-
-<Connector id="My JMS Connection Factory" type="javax.jms.ConnectionFactory">
-
- ResourceAdapter My JMS Resource Adapter
-
- # Specifies if the connection is enrolled in global transaction
- # allowed values: xa, local or none
-
- TransactionSupport xa
-
- # Maximum number of physical connection to the ActiveMQ broker
-
- PoolMaxSize 10
-
- # Minimum number of physical connection to the ActiveMQ broker
-
- PoolMinSize 0
-
- # Maximum amount of time to wait for a connection
-
- ConnectionMaxWaitMilliseconds 5000
-
- # Maximum amount of time a connection can be idle before being reclaimed
-
- ConnectionMaxIdleMinutes 15
-
-</Connector>
-
-<!--
-#
-# The <Deployments> element can be used to configure file
-# paths where OpenEJB should look for ejb jars or ear files.
-#
-# See http://openejb.apache.org/3.0/deployments.html
-#
-# The below entry is simply a default and can be changed or deleted
--->
-<Deployments dir="apps/" />
-
-</openejb>
+<openejb/>
